Mercurial > octave
diff libgui/src/main-window.h @ 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 | 584b20e9112c |
line wrap: on
line diff
--- 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;