Mercurial > hg > octave-nkf

comparison libgui/src/main-window.h @ 19134:b2c4d6d461f0 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 96751a74bbbb 37159a873c96
comparison
equal deleted inserted replaced
19113:58f1178f49ef 19134:b2c4d6d461f0
214 void construct_octave_qt_link (void); 214 void construct_octave_qt_link (void);
215 215
216 QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text, 216 QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text,
217 const char *member, const QWidget *receiver = 0); 217 const char *member, const QWidget *receiver = 0);
218 218
219 void enable_menu_shortcuts (bool enable);
220 QMenu* m_add_menu (QMenuBar *p, QString text);
219 void construct_menu_bar (void); 221 void construct_menu_bar (void);
220 void construct_file_menu (QMenuBar *p); 222 void construct_file_menu (QMenuBar *p);
221 void construct_new_menu (QMenu *p); 223 void construct_new_menu (QMenu *p);
222 void construct_edit_menu (QMenuBar *p); 224 void construct_edit_menu (QMenuBar *p);
223 QAction *construct_debug_menu_item (const char *icon, const QString& item, 225 QAction *construct_debug_menu_item (const char *icon, const QString& item,
273 void configure_shortcuts (); 275 void configure_shortcuts ();
274 276
275 bool confirm_exit_octave (); 277 bool confirm_exit_octave ();
276 278
277 workspace_model *_workspace_model; 279 workspace_model *_workspace_model;
280
281 QHash<QMenu*, QStringList> _hash_menu_text;
282
278 283
279 // Toolbars. 284 // Toolbars.
280 QStatusBar *status_bar; 285 QStatusBar *status_bar;
281 286
282 // Subwindows. 287 // Subwindows.