Mercurial > octave-nkf
diff libgui/src/m-editor/file-editor.cc @ 19642:4b980842edba gui-release
clean up some signal-slot combinations in the editor
* file-editor-tab.cc (contructor): remove connections of signals for command
execution and for creating the context menu;
(execute_command_in_terminal, create_context_menu): related slots removed
* file-editor-tab.h: removed slots and signals that were emitted therein
* file-editor.cc (add_file_editor_tab): connect edit area signals directly
to the related slots without involving the editor tab
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Thu, 22 Jan 2015 21:38:12 +0100 |
| parents | 3156773fcc80 |
| children | 8ef79bc61d8a |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.cc Thu Jan 22 14:46:30 2015 -0500 +++ b/libgui/src/m-editor/file-editor.cc Thu Jan 22 21:38:12 2015 +0100 @@ -1589,6 +1589,12 @@ connect (f->qsci_edit_area (), SIGNAL (show_doc_signal (const QString&)), main_win (), SLOT (handle_show_doc (const QString&))); + connect (f->qsci_edit_area (), SIGNAL (create_context_menu_signal (QMenu *)), + this, SLOT (create_context_menu (QMenu *))); + + connect (f->qsci_edit_area (), SIGNAL (execute_command_in_terminal_signal (const QString&)), + main_win (), SLOT (execute_command_in_terminal (const QString&))); + // Signals from the file editor_tab connect (f, SIGNAL (file_name_changed (const QString&, const QString&)), this, SLOT (handle_file_name_changed (const QString&, @@ -1609,15 +1615,9 @@ connect (f, SIGNAL (mru_add_file (const QString&)), this, SLOT (handle_mru_add_file (const QString&))); - connect (f, SIGNAL (create_context_menu_tab_signal (QMenu *)), - this, SLOT (create_context_menu (QMenu *))); - connect (f, SIGNAL (run_file_signal (const QFileInfo&)), main_win (), SLOT (run_file_in_terminal (const QFileInfo&))); - connect (f, SIGNAL (execute_command_in_terminal_signal (const QString&)), - main_win (), SLOT (execute_command_in_terminal (const QString&))); - connect (f, SIGNAL (request_open_file (const QString&)), this, SLOT (request_open_file (const QString&)));