Mercurial > octave-nkf
comparison 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 |
comparison
equal
deleted
inserted
replaced
19641:18c213fa9b20 | 19642:4b980842edba |
---|---|
1587 this, SLOT (edit_status_update (bool, bool))); | 1587 this, SLOT (edit_status_update (bool, bool))); |
1588 | 1588 |
1589 connect (f->qsci_edit_area (), SIGNAL (show_doc_signal (const QString&)), | 1589 connect (f->qsci_edit_area (), SIGNAL (show_doc_signal (const QString&)), |
1590 main_win (), SLOT (handle_show_doc (const QString&))); | 1590 main_win (), SLOT (handle_show_doc (const QString&))); |
1591 | 1591 |
1592 connect (f->qsci_edit_area (), SIGNAL (create_context_menu_signal (QMenu *)), | |
1593 this, SLOT (create_context_menu (QMenu *))); | |
1594 | |
1595 connect (f->qsci_edit_area (), SIGNAL (execute_command_in_terminal_signal (const QString&)), | |
1596 main_win (), SLOT (execute_command_in_terminal (const QString&))); | |
1597 | |
1592 // Signals from the file editor_tab | 1598 // Signals from the file editor_tab |
1593 connect (f, SIGNAL (file_name_changed (const QString&, const QString&)), | 1599 connect (f, SIGNAL (file_name_changed (const QString&, const QString&)), |
1594 this, SLOT (handle_file_name_changed (const QString&, | 1600 this, SLOT (handle_file_name_changed (const QString&, |
1595 const QString&))); | 1601 const QString&))); |
1596 | 1602 |
1607 this, SLOT (check_conflict_save (const QString&, bool))); | 1613 this, SLOT (check_conflict_save (const QString&, bool))); |
1608 | 1614 |
1609 connect (f, SIGNAL (mru_add_file (const QString&)), | 1615 connect (f, SIGNAL (mru_add_file (const QString&)), |
1610 this, SLOT (handle_mru_add_file (const QString&))); | 1616 this, SLOT (handle_mru_add_file (const QString&))); |
1611 | 1617 |
1612 connect (f, SIGNAL (create_context_menu_tab_signal (QMenu *)), | |
1613 this, SLOT (create_context_menu (QMenu *))); | |
1614 | |
1615 connect (f, SIGNAL (run_file_signal (const QFileInfo&)), | 1618 connect (f, SIGNAL (run_file_signal (const QFileInfo&)), |
1616 main_win (), SLOT (run_file_in_terminal (const QFileInfo&))); | 1619 main_win (), SLOT (run_file_in_terminal (const QFileInfo&))); |
1617 | |
1618 connect (f, SIGNAL (execute_command_in_terminal_signal (const QString&)), | |
1619 main_win (), SLOT (execute_command_in_terminal (const QString&))); | |
1620 | 1620 |
1621 connect (f, SIGNAL (request_open_file (const QString&)), | 1621 connect (f, SIGNAL (request_open_file (const QString&)), |
1622 this, SLOT (request_open_file (const QString&))); | 1622 this, SLOT (request_open_file (const QString&))); |
1623 | 1623 |
1624 connect (f, SIGNAL (set_global_edit_shortcuts_signal (bool)), | 1624 connect (f, SIGNAL (set_global_edit_shortcuts_signal (bool)), |