Mercurial > octave-dspies
changeset 18707:f31fde98c872 gui-release
use shortcut manager for the window menu
* main-window.cc (construct_window_menu_item): add action and connect its slot;
(construct_window_menu): created menu actions are class variables, removed
calls to connect which are now obsolete here;
(set_global_shortcuts): call shortcut manager for setting the shortcuts
* main-window.h: construct_window_menu_item with other parameters, window
actions as class variables
* shirtcut-manger.cc (do_init_data): insert debug actions into the list
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Wed, 30 Apr 2014 19:33:55 +0200 |
| parents | 908523bd79b4 |
| children | d6b962aa2e76 |
| files | libgui/src/main-window.cc libgui/src/main-window.h libgui/src/shortcut-manager.cc |
| diffstat | 3 files changed, 110 insertions(+), 126 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Mon Apr 28 22:48:28 2014 +0200 +++ b/libgui/src/main-window.cc Wed Apr 30 19:33:55 2014 +0200 @@ -1629,15 +1629,32 @@ QAction * main_window::construct_window_menu_item (QMenu *p, const QString& item, - bool checkable, - const QKeySequence& key) + bool checkable, QWidget *widget) { - QAction *action = p->addAction (item); - + QAction *action = p->addAction (QIcon (), item); + + addAction (action); // important for shortcut context action->setCheckable (checkable); - action->setShortcut (key); action->setShortcutContext (Qt::ApplicationShortcut); + if (widget) // might be zero for editor_window + { + if (checkable) + { + // action for visibilty of dock widget + connect (action, SIGNAL (toggled (bool)), + widget, SLOT (setVisible (bool))); + + connect (widget, SIGNAL (active_changed (bool)), + action, SLOT (setChecked (bool))); + } + else + { + // action for focus of dock widget + connect (action, SIGNAL (triggered ()), widget, SLOT (focus ())); + } + } + return action; } @@ -1646,125 +1663,48 @@ { QMenu *window_menu = p->addMenu (tr ("&Window")); - QKeySequence ctrl = Qt::ControlModifier; - QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier; - - QAction *show_command_window_action = construct_window_menu_item - (window_menu, - tr ("Show Command Window"), true, - ctrl_shift + Qt::Key_0); - - QAction *show_history_action = construct_window_menu_item - (window_menu, tr ("Show Command History"), - true, ctrl_shift + Qt::Key_1); - - QAction *show_file_browser_action = construct_window_menu_item - (window_menu, tr ("Show File Browser"), - true, ctrl_shift + Qt::Key_2); - - QAction *show_workspace_action = construct_window_menu_item - (window_menu, tr ("Show Workspace"), true, - ctrl_shift + Qt::Key_3); - - QAction *show_editor_action = construct_window_menu_item - (window_menu, tr ("Show Editor"), true, - ctrl_shift + Qt::Key_4); - - QAction *show_documentation_action = construct_window_menu_item - (window_menu, tr ("Show Documentation"), - true, ctrl_shift + Qt::Key_5); - - window_menu->addSeparator (); - - QAction *command_window_action = construct_window_menu_item - (window_menu, tr ("Command Window"), false, - ctrl + Qt::Key_0); - - QAction *history_action = construct_window_menu_item - (window_menu, tr ("Command History"), false, - ctrl + Qt::Key_1); - - QAction *file_browser_action = construct_window_menu_item - (window_menu, tr ("File Browser"), false, - ctrl + Qt::Key_2); - - QAction *workspace_action = construct_window_menu_item - (window_menu, tr ("Workspace"), false, - ctrl + Qt::Key_3); - - QAction *editor_action = construct_window_menu_item - (window_menu, tr ("Editor"), false, - ctrl + Qt::Key_4); - - QAction *documentation_action = construct_window_menu_item - (window_menu, tr ("Documentation"), false, - ctrl + Qt::Key_5); + _show_command_window_action = construct_window_menu_item + (window_menu, tr ("Show Command Window"), true, command_window); + + _show_history_action = construct_window_menu_item + (window_menu, tr ("Show Command History"), true, history_window); + + _show_file_browser_action = construct_window_menu_item + (window_menu, tr ("Show File Browser"), true, file_browser_window); + + _show_workspace_action = construct_window_menu_item + (window_menu, tr ("Show Workspace"), true, workspace_window); + + _show_editor_action = construct_window_menu_item + (window_menu, tr ("Show Editor"), true, editor_window); + + _show_documentation_action = construct_window_menu_item + (window_menu, tr ("Show Documentation"), true, doc_browser_window); window_menu->addSeparator (); - QAction *reset_windows_action - = window_menu->addAction (tr ("Reset Default Window Layout")); - - connect (show_command_window_action, SIGNAL (toggled (bool)), - command_window, SLOT (setVisible (bool))); - - connect (command_window, SIGNAL (active_changed (bool)), - show_command_window_action, SLOT (setChecked (bool))); - - connect (show_workspace_action, SIGNAL (toggled (bool)), - workspace_window, SLOT (setVisible (bool))); - - connect (workspace_window, SIGNAL (active_changed (bool)), - show_workspace_action, SLOT (setChecked (bool))); - - connect (show_history_action, SIGNAL (toggled (bool)), - history_window, SLOT (setVisible (bool))); - - connect (history_window, SIGNAL (active_changed (bool)), - show_history_action, SLOT (setChecked (bool))); - - connect (show_file_browser_action, SIGNAL (toggled (bool)), - file_browser_window, SLOT (setVisible (bool))); - - connect (file_browser_window, SIGNAL (active_changed (bool)), - show_file_browser_action, SLOT (setChecked (bool))); - -#ifdef HAVE_QSCINTILLA - connect (show_editor_action, SIGNAL (toggled (bool)), - editor_window, SLOT (setVisible (bool))); - - connect (editor_window, SIGNAL (active_changed (bool)), - show_editor_action, SLOT (setChecked (bool))); -#endif - - connect (show_documentation_action, SIGNAL (toggled (bool)), - doc_browser_window, SLOT (setVisible (bool))); - - connect (doc_browser_window, SIGNAL (active_changed (bool)), - show_documentation_action, SLOT (setChecked (bool))); - - connect (command_window_action, SIGNAL (triggered ()), - command_window, SLOT (focus ())); - - connect (workspace_action, SIGNAL (triggered ()), - workspace_window, SLOT (focus ())); - - connect (history_action, SIGNAL (triggered ()), - history_window, SLOT (focus ())); - - connect (file_browser_action, SIGNAL (triggered ()), - file_browser_window, SLOT (focus ())); - -#ifdef HAVE_QSCINTILLA - connect (editor_action, SIGNAL (triggered ()), - editor_window, SLOT (focus ())); -#endif - - connect (documentation_action, SIGNAL (triggered ()), - doc_browser_window, SLOT (focus ())); - - connect (reset_windows_action, SIGNAL (triggered ()), - this, SLOT (reset_windows ())); + _command_window_action = construct_window_menu_item + (window_menu, tr ("Command Window"), false, command_window); + + _history_action = construct_window_menu_item + (window_menu, tr ("Command History"), false, history_window); + + _file_browser_action = construct_window_menu_item + (window_menu, tr ("File Browser"), false, file_browser_window); + + _workspace_action = construct_window_menu_item + (window_menu, tr ("Workspace"), false, workspace_window); + + _editor_action = construct_window_menu_item + (window_menu, tr ("Editor"), false, editor_window); + + _documentation_action = construct_window_menu_item + (window_menu, tr ("Documentation"), false, doc_browser_window); + + window_menu->addSeparator (); + + _reset_windows_action = add_action (window_menu, QIcon (), + tr ("Reset Default Window Layout"), SLOT (reset_windows ())); } void @@ -2323,6 +2263,21 @@ shortcut_manager::set_shortcut (_debug_step_out, "main_debug:step_out"); shortcut_manager::set_shortcut (_debug_continue, "main_debug:continue"); shortcut_manager::set_shortcut (_debug_quit, "main_debug:quit"); + + // window menu + shortcut_manager::set_shortcut (_show_command_window_action, "main_window:show_command"); + shortcut_manager::set_shortcut (_show_history_action, "main_window:show_history"); + shortcut_manager::set_shortcut (_show_workspace_action, "main_window:show_workspace"); + shortcut_manager::set_shortcut (_show_file_browser_action, "main_window:show_file_browser"); + shortcut_manager::set_shortcut (_show_editor_action, "main_window:show_editor"); + shortcut_manager::set_shortcut (_show_documentation_action, "main_window:show_doc"); + shortcut_manager::set_shortcut (_command_window_action, "main_window:command"); + shortcut_manager::set_shortcut (_history_action, "main_window:history"); + shortcut_manager::set_shortcut (_workspace_action, "main_window:workspace"); + shortcut_manager::set_shortcut (_file_browser_action, "main_window:file_browser"); + shortcut_manager::set_shortcut (_editor_action, "main_window:editor"); + shortcut_manager::set_shortcut (_documentation_action, "main_window:doc"); + shortcut_manager::set_shortcut (_reset_windows_action, "main_window:reset"); } else { @@ -2340,9 +2295,6 @@ _exit_action->setShortcut (no_key); // edit menu - //_copy_action->setShortcut (no_key); - //_paste_action->setShortcut (no_key); - //_undo_action->setShortcut (no_key); _select_all_action->setShortcut (no_key); _clear_clipboard_action->setShortcut (no_key); _find_files_action->setShortcut (no_key); @@ -2350,6 +2302,8 @@ _clear_command_window_action->setShortcut (no_key); _clear_workspace_action->setShortcut (no_key); + // window menu + _reset_windows_action->setShortcut (no_key); } }
--- a/libgui/src/main-window.h Mon Apr 28 22:48:28 2014 +0200 +++ b/libgui/src/main-window.h Wed Apr 30 19:33:55 2014 +0200 @@ -224,8 +224,7 @@ const char* member); void construct_debug_menu (QMenuBar *p); QAction *construct_window_menu_item (QMenu *p, const QString& item, - bool checkable, - const QKeySequence& key); + bool checkable, QWidget*); void construct_window_menu (QMenuBar *p); void construct_help_menu (QMenuBar *p); void construct_documentation_menu (QMenu *p); @@ -333,6 +332,20 @@ QAction *_find_files_action; QAction *_select_all_action; + QAction *_show_command_window_action; + QAction *_show_history_action; + QAction *_show_workspace_action; + QAction *_show_file_browser_action; + QAction *_show_editor_action; + QAction *_show_documentation_action; + QAction *_command_window_action; + QAction *_history_action; + QAction *_workspace_action; + QAction *_file_browser_action; + QAction *_editor_action; + QAction *_documentation_action; + QAction *_reset_windows_action; + // Toolbars. QComboBox *_current_directory_combo_box; static const int current_directory_width = 300;
--- a/libgui/src/shortcut-manager.cc Mon Apr 28 22:48:28 2014 +0200 +++ b/libgui/src/shortcut-manager.cc Wed Apr 30 19:33:55 2014 +0200 @@ -109,6 +109,23 @@ init (tr ("Continue"), "main_debug:continue", QKeySequence (Qt::Key_F5)); init (tr ("Quit Debug Mode"), "main_debug:quit", QKeySequence (Qt::ShiftModifier + Qt::Key_F5)); + // window + QKeySequence ctrl = Qt::ControlModifier; + QKeySequence ctrl_shift = Qt::ControlModifier + Qt::ShiftModifier; + init (tr ("Show Command Window"), "main_window:show_command", ctrl_shift + Qt::Key_0); + init (tr ("Show Command History"), "main_window:show_history", ctrl_shift + Qt::Key_1); + init (tr ("Show File Browser"), "main_window:show_file_browser", ctrl_shift + Qt::Key_2); + init (tr ("Show Workspace"), "main_window:show_workspace", ctrl_shift + Qt::Key_3); + init (tr ("Show Editor"), "main_window:show_editor", ctrl_shift + Qt::Key_4); + init (tr ("Show Documentation"), "main_window:show_doc", ctrl_shift + Qt::Key_5); + init (tr ("Command Window"), "main_window:command", ctrl + Qt::Key_0); + init (tr ("Command History"), "main_window:history", ctrl + Qt::Key_1); + init (tr ("File Browser"), "main_window:file_browser", ctrl + Qt::Key_2); + init (tr ("Workspace"), "main_window:workspace", ctrl + Qt::Key_3); + init (tr ("Editor"), "main_window:editor", ctrl + Qt::Key_4); + init (tr ("Documentation"), "main_window:doc", ctrl + Qt::Key_5); + init (tr ("Reset Window Layout"), "main_window:reset", QKeySequence ()); + // actions of the editor // file