Mercurial > octave-libgccjit
diff libgui/src/main-window.h @ 18944:b2c4d6d461f0 gui-release
fix conflict between main and editor menus when using alt keys (bug #42659)
* file-editor.cc (enable_menu_shortcuts): new function enabling/disabling the
alt-key accelerators;
(m_add_menu): new function adding a menu and storing menu title with and
without the char & indicating the accelerator in a hash;
(construct): use m_add_menu for adding a new menu to the menu bar
* file-editor-interface.h: new virtual function enable_menu_shortcuts
* file-editor.h: new functions enable_menu_shortcuts amd m_add_menu, new hash
for storing the menu titles
* main-window.cc (connect_visibility_changed): disable editors menu shortcuts;
(enable_menu_shortcuts): new function enabling/disabling the
alt-key accelerators;
(m_add_menu): new function adding a menu and storing menu title with and
without the char & indicating the accelerator in a hash;
(construct_file_menu, construct_edit_menu, construct_debug_menu,
construct_window_menu, construct_help_menu, construct_news_menu):
use m_add_menu for adding a new menu to the menu bar;
(set_global_edit_shortcuts): enable/disable the main and the editors
menu shortcuts
author | Torsten <ttl@justmail.de> |
---|---|
date | Sun, 20 Jul 2014 20:44:30 +0200 |
parents | f017240310fb |
children |
line wrap: on
line diff
--- a/libgui/src/main-window.h Thu Jul 10 18:01:56 2014 +0200 +++ b/libgui/src/main-window.h Sun Jul 20 20:44:30 2014 +0200 @@ -216,6 +216,8 @@ QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text, const char *member, const QWidget *receiver = 0); + void enable_menu_shortcuts (bool enable); + QMenu* m_add_menu (QMenuBar *p, QString text); void construct_menu_bar (void); void construct_file_menu (QMenuBar *p); void construct_new_menu (QMenu *p); @@ -276,6 +278,9 @@ workspace_model *_workspace_model; + QHash<QMenu*, QStringList> _hash_menu_text; + + // Toolbars. QStatusBar *status_bar;