Mercurial > octave
changeset 29200:6e0952fa5a4f
removing obsolete code for some main window menus
* files-dock-widget.cc (files_dock_widget):
* history-dock-widget.cc (history_dock_widget):
connect directly to related signal instead of slot which
in turn emits the signal
* main-window.cc (new_file, open_file): remove obsolete slots
(find_files): connect directly to related signal instead of slot which
in turn emits the signal
(construct_file_menu): use own add_action method and move connection
of signals for opening and creating files from construct_new_menu to here;
(construct_new_menu): use own add_action method and move connection, move
connections from here to construct_file_menu
* main-window.h: remove new_file, open_file
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sat, 19 Dec 2020 16:29:32 +0100 |
| parents | 0b18887bc997 |
| children | 66af654b3485 |
| files | libgui/src/files-dock-widget.cc libgui/src/history-dock-widget.cc libgui/src/main-window.cc libgui/src/main-window.h |
| diffstat | 4 files changed, 39 insertions(+), 68 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/files-dock-widget.cc Sat Dec 19 10:49:43 2020 +0100 +++ b/libgui/src/files-dock-widget.cc Sat Dec 19 16:29:32 2020 +0100 @@ -106,7 +106,7 @@ setWidget (container); connect (this, SIGNAL (open_file (const QString&)), - main_win (), SLOT (open_file (const QString&))); + main_win (), SIGNAL (open_file_signal (const QString&))); connect (this, SIGNAL (displayed_directory_changed (const QString&)), main_win (),
--- a/libgui/src/history-dock-widget.cc Sat Dec 19 10:49:43 2020 +0100 +++ b/libgui/src/history-dock-widget.cc Sat Dec 19 16:29:32 2020 +0100 @@ -53,7 +53,7 @@ setStatusTip (tr ("Browse and search the command history.")); connect (this, SIGNAL (command_create_script (const QString&)), - p, SLOT (new_file (const QString&))); + p, SIGNAL (new_file_signal (const QString&))); connect (this, SIGNAL (information (const QString&)), p, SLOT (report_status_message (const QString&)));
--- a/libgui/src/main-window.cc Sat Dec 19 10:49:43 2020 +0100 +++ b/libgui/src/main-window.cc Sat Dec 19 16:29:32 2020 +0100 @@ -618,19 +618,6 @@ }); } - void main_window::new_file (const QString& commands) - { - emit new_file_signal (commands); - } - - void main_window::open_file (const QString& file_name, int line) - { - if (line < 0) - emit open_file_signal (file_name); - else - emit open_file_signal (file_name, QString (), line); - } - void main_window::edit_mfile (const QString& name, int line) { handle_edit_mfile_request (name, QString (), QString (), line); @@ -1780,7 +1767,7 @@ SLOT (set_current_directory (const QString&))); connect (m_find_files_dlg, SIGNAL (file_selected (const QString &)), - this, SLOT (open_file (const QString &))); + this, SIGNAL (open_file_signal (const QString &))); m_find_files_dlg->setWindowModality (Qt::NonModal); } @@ -2371,7 +2358,7 @@ << m_undo_action << m_copy_action << m_paste_action - <<m_select_all_action; + << m_select_all_action; m_editor_window->insert_global_actions (shared_actions); #endif } @@ -2383,9 +2370,10 @@ construct_new_menu (file_menu); resource_manager& rmgr = m_octave_qobj.get_resource_manager (); - m_open_action - = file_menu->addAction (rmgr.icon ("document-open"), tr ("Open...")); - m_open_action->setShortcutContext (Qt::ApplicationShortcut); + + m_open_action = add_action ( + file_menu, rmgr.icon ("document-open"), tr ("Open..."), + SLOT (request_open_file (void)), this); m_open_action->setToolTip (tr ("Open an existing file in editor")); #if defined (HAVE_QSCINTILLA) @@ -2394,53 +2382,22 @@ file_menu->addSeparator (); - m_load_workspace_action - = file_menu->addAction (tr ("Load Workspace...")); - - m_save_workspace_action - = file_menu->addAction (tr ("Save Workspace As...")); + m_load_workspace_action = add_action ( + file_menu, QIcon (), tr ("Load Workspace..."), + SLOT (handle_load_workspace_request (void)), this); + + m_save_workspace_action = add_action ( + file_menu, QIcon (), tr ("Save Workspace As..."), + SLOT (handle_save_workspace_request (void)), this); file_menu->addSeparator (); - m_exit_action = file_menu->addAction (tr ("Exit")); + m_exit_action = add_action ( + file_menu, QIcon (), tr ("Exit"), + SLOT (close (void)), this); m_exit_action->setMenuRole (QAction::QuitRole); - m_exit_action->setShortcutContext (Qt::ApplicationShortcut); - - connect (m_open_action, SIGNAL (triggered (void)), - this, SLOT (request_open_file (void))); - - connect (m_load_workspace_action, SIGNAL (triggered (void)), - this, SLOT (handle_load_workspace_request (void))); - - connect (m_save_workspace_action, SIGNAL (triggered (void)), - this, SLOT (handle_save_workspace_request (void))); - - connect (m_exit_action, SIGNAL (triggered (void)), - this, SLOT (close (void))); - } - - void main_window::construct_new_menu (QMenu *p) - { - QMenu *new_menu = p->addMenu (tr ("New")); - - resource_manager& rmgr = m_octave_qobj.get_resource_manager (); - m_new_script_action - = new_menu->addAction (rmgr.icon ("document-new"), tr ("New Script")); - m_new_script_action->setShortcutContext (Qt::ApplicationShortcut); - - m_new_function_action = new_menu->addAction (tr ("New Function...")); - m_new_function_action->setEnabled (true); - m_new_function_action->setShortcutContext (Qt::ApplicationShortcut); - - m_new_figure_action = new_menu->addAction (tr ("New Figure")); - m_new_figure_action->setEnabled (true); - - connect (m_new_script_action, SIGNAL (triggered (void)), - this, SLOT (request_new_script (void))); - - connect (m_new_function_action, SIGNAL (triggered (void)), - this, SLOT (request_new_function (void))); - + + // Connect signal related to opening or creating editor files connect (this, SIGNAL (new_file_signal (const QString&)), m_active_editor, SLOT (request_new_file (const QString&))); @@ -2451,9 +2408,25 @@ SIGNAL (open_file_signal (const QString&, const QString&, int)), m_active_editor, SLOT (request_open_file (const QString&, const QString&, int))); - - connect (m_new_figure_action, SIGNAL (triggered (void)), - this, SLOT (handle_new_figure_request (void))); + } + + void main_window::construct_new_menu (QMenu *p) + { + QMenu *new_menu = p->addMenu (tr ("New")); + + resource_manager& rmgr = m_octave_qobj.get_resource_manager (); + + m_new_script_action = add_action ( + new_menu, rmgr.icon ("document-new"), tr ("New Script"), + SLOT (request_new_script (void)), this); + + m_new_function_action = add_action ( + new_menu, QIcon (), tr ("New Function..."), + SLOT (request_new_function (void)), this); + + m_new_figure_action = add_action ( + new_menu, QIcon (), tr ("New Figure"), + SLOT (handle_new_figure_request (void)), this); } void main_window::construct_edit_menu (QMenuBar *p)
--- a/libgui/src/main-window.h Sat Dec 19 10:49:43 2020 +0100 +++ b/libgui/src/main-window.h Sat Dec 19 16:29:32 2020 +0100 @@ -144,8 +144,6 @@ void handle_rename_variable_request (const QString& old_name, const QString& new_name); void modify_path (const octave_value_list& dir_list, bool rm, bool subdirs); - void new_file (const QString& commands = QString ()); - void open_file (const QString& file_name = QString (), int line = -1); void edit_mfile (const QString&, int); void file_remove_proxy (const QString& o, const QString& n); void open_online_documentation_page (void);