Mercurial > octave
changeset 29068:d8089b13d4d7
add shortcuts for the new profiler actions in the gui
* gui-preferences-sc.h: define preference keys and default shortcuts
* main-window.cc (construct_menu_bar): construct_profile_menu renamed
into construct_tools_menu;
(construct_tools_menu): renamed from construct_profile_menu;
(configure_shortcuts): add the shortcuts to the related actions;
* main-window.h: renamed coonstruct_profile_menu into construct_tools_menu
* shortcut-manager.cc (init_data): initialize the shortcuts with default
data;
(fill_treewidget): add section for tools menu
| author | Torsten Lilge <ttl-octave@mailbox.org> |
|---|---|
| date | Sun, 15 Nov 2020 21:52:58 +0100 |
| parents | 913088ffe8e3 |
| children | ab3e0676b8d6 |
| files | libgui/src/gui-preferences-sc.h libgui/src/main-window.cc libgui/src/main-window.h libgui/src/shortcut-manager.cc |
| diffstat | 4 files changed, 30 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/gui-preferences-sc.h Sat Nov 14 09:54:31 2020 +0100 +++ b/libgui/src/gui-preferences-sc.h Sun Nov 15 21:52:58 2020 +0100 @@ -96,6 +96,13 @@ const sc_pref sc_main_debug_continue (sc_main_debug + ":continue", PRE + Qt::Key_F5); const sc_pref sc_main_debug_quit (sc_main_debug + ":quit", PRE + Qt::ShiftModifier + Qt::Key_F5); +// tools +const QString sc_main_tools ("main_tools"); +const sc_pref sc_main_tools_start_profiler (sc_main_tools + ":start_profiler", CTRL_SHIFT + Qt::Key_P); +const sc_pref sc_main_tools_resume_profiler (sc_main_tools + ":resume_profiler", QKeySequence::UnknownKey); +const sc_pref sc_main_tools_show_profiler (sc_main_tools + ":show_profiler", Qt::AltModifier + Qt::ShiftModifier + Qt::Key_P); + + // window const QString sc_main_window ("main_window"); const sc_pref sc_main_window_show_command (sc_main_window + ":show_command", PRE + CTRL_SHIFT + Qt::Key_0);
--- a/libgui/src/main-window.cc Sat Nov 14 09:54:31 2020 +0100 +++ b/libgui/src/main-window.cc Sun Nov 15 21:52:58 2020 +0100 @@ -2381,7 +2381,7 @@ construct_debug_menu (menu_bar); - construct_profile_menu (menu_bar); + construct_tools_menu (menu_bar); construct_window_menu (menu_bar); @@ -2620,21 +2620,21 @@ SLOT (debug_quit (void))); } - void main_window::construct_profile_menu (QMenuBar *p) + void main_window::construct_tools_menu (QMenuBar *p) { - QMenu *profiler_menu = m_add_menu (p, tr ("&Profiler")); - - m_profiler_start = add_action (profiler_menu, QIcon (), + QMenu *tools_menu = m_add_menu (p, tr ("&Tools")); + + m_profiler_start = add_action (tools_menu, QIcon (), tr ("Start &Profiler Session"), SLOT (profiler_session ())); - m_profiler_resume = add_action (profiler_menu, QIcon (), + m_profiler_resume = add_action (tools_menu, QIcon (), tr ("&Resume Profiler Session"), SLOT (profiler_session_resume ())); - m_profiler_stop = add_action (profiler_menu, QIcon (), + m_profiler_stop = add_action (tools_menu, QIcon (), tr ("&Stop Profiler"), SLOT (profiler_stop ())); m_profiler_stop->setEnabled (false); - m_profiler_show = add_action (profiler_menu, QIcon (), + m_profiler_show = add_action (tools_menu, QIcon (), tr ("&Show Profile Data"), SLOT (profiler_show ())); } @@ -2886,6 +2886,12 @@ scmgr.set_shortcut (m_debug_continue, sc_main_debug_continue); scmgr.set_shortcut (m_debug_quit, sc_main_debug_quit); + // tools menu + scmgr.set_shortcut (m_profiler_start, sc_main_tools_start_profiler); + scmgr.set_shortcut (m_profiler_resume, sc_main_tools_resume_profiler); + scmgr.set_shortcut (m_profiler_stop, sc_main_tools_start_profiler); // same, toggling + scmgr.set_shortcut (m_profiler_show, sc_main_tools_show_profiler); + // window menu scmgr.set_shortcut (m_show_command_window_action, sc_main_window_show_command); scmgr.set_shortcut (m_show_history_action, sc_main_window_show_history);
--- a/libgui/src/main-window.h Sat Nov 14 09:54:31 2020 +0100 +++ b/libgui/src/main-window.h Sun Nov 15 21:52:58 2020 +0100 @@ -292,7 +292,7 @@ void construct_debug_menu (QMenuBar *p); QAction * construct_window_menu_item (QMenu *p, const QString& item, bool checkable, QWidget*); - void construct_profile_menu (QMenuBar *p); + void construct_tools_menu (QMenuBar *p); void construct_window_menu (QMenuBar *p); void construct_help_menu (QMenuBar *p); void construct_documentation_menu (QMenu *p);
--- a/libgui/src/shortcut-manager.cc Sat Nov 14 09:54:31 2020 +0100 +++ b/libgui/src/shortcut-manager.cc Sun Nov 15 21:52:58 2020 +0100 @@ -164,6 +164,11 @@ init (tr ("Continue"), sc_main_debug_continue); init (tr ("Quit Debug Mode"), sc_main_debug_quit); + // tools + init (tr ("Start/Stop Profiler Session"), sc_main_tools_start_profiler); + init (tr ("Resume Profiler Session"), sc_main_tools_resume_profiler); + init (tr ("Show Profile Data"), sc_main_tools_show_profiler); + // window init (tr ("Show Command Window"), sc_main_window_show_command); init (tr ("Show Command History"), sc_main_window_show_history); @@ -379,6 +384,8 @@ main_edit->setText (0, tr ("Edit Menu")); QTreeWidgetItem *main_debug = new QTreeWidgetItem (main); main_debug->setText (0, tr ("Debug Menu")); + QTreeWidgetItem *main_tools = new QTreeWidgetItem (main); + main_tools->setText (0, tr ("Tools Menu")); QTreeWidgetItem *main_window = new QTreeWidgetItem (main); main_window->setText (0, tr ("Window Menu")); QTreeWidgetItem *main_help = new QTreeWidgetItem (main); @@ -397,6 +404,7 @@ m_level_hash[sc_main_file] = main_file; m_level_hash[sc_main_edit] = main_edit; m_level_hash[sc_main_debug] = main_debug; + m_level_hash[sc_main_tools] = main_tools; m_level_hash[sc_main_window] = main_window; m_level_hash[sc_main_help] = main_help; m_level_hash[sc_main_news] = main_news;