Mercurial > hg > octave-nkf
diff libgui/src/m-editor/file-editor.h @ 19134: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 | 095fdef3d67c |
children | 62756ba9e4e5 |
line wrap: on
line diff
--- a/libgui/src/m-editor/file-editor.h +++ b/libgui/src/m-editor/file-editor.h @@ -64,6 +64,7 @@ void check_actions (void); void empty_script (bool startup, bool visible); + void enable_menu_shortcuts (bool enable); signals: @@ -238,7 +239,10 @@ QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text, const char *member); + QMenu* m_add_menu (QMenuBar *p, QString text); + std::map<QString, QWidget *> editor_tab_map; + QHash<QMenu*, QStringList> _hash_menu_text; QString ced; @@ -322,7 +326,6 @@ QMenu *_mru_file_menu; QAction *_mru_file_actions[MaxMRUFiles]; QStringList _mru_files; - }; #endif // FILEEDITORMDISUBWINDOW_H