Mercurial > octave-nkf
diff libgui/src/main-window.h @ 16454:246d25c8761b
split main_window::construct for clarity
* main-window.h, main-window.cc (_new_script_action, _open_action,
_cut_action, _copy_action, _paste_action, _undo_action,
_redo_action): New data members.
(construct_octave_qt_link, construct_menu_bar, construct_file_menu,
construct_new_menu, construct_edit_menu, construct_debug_menu_item,
construct_debug_menu_item, construct_debug_menu,
construct_desktop_menu, construct_window_menu_item,
construct_window_menu, construct_help_menu,
construct_documentation_menu, construct_tool_bar): New functions.
(main_window::construct): Use them.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 07 Apr 2013 04:14:31 -0400 |
| parents | 2e3c652c89d1 |
| children | 203efbbcea63 |
line wrap: on
line diff
--- a/libgui/src/main-window.h Sun Apr 07 00:43:36 2013 -0400 +++ b/libgui/src/main-window.h Sun Apr 07 04:14:31 2013 -0400 @@ -124,7 +124,31 @@ void closeEvent (QCloseEvent * closeEvent); private: + void construct (); + + void construct_octave_qt_link (void); + + void construct_menu_bar (void); + void construct_file_menu (QMenuBar *p); + void construct_new_menu (QMenu *p); + void construct_edit_menu (QMenuBar *p); + void construct_debug_menu_item (QMenu *p, const QString& item, + const QKeySequence& key); + QAction *construct_debug_menu_item (const char *icon_file, + const QString& item, + const QKeySequence& key); + void construct_debug_menu (QMenuBar *p); + void construct_desktop_menu (QMenuBar *p); + QAction *construct_window_menu_item (QMenu *p, const QString& item, + bool checkable, + const QKeySequence& key); + void construct_window_menu (QMenuBar *p); + void construct_help_menu (QMenuBar *p); + void construct_documentation_menu (QMenu *p); + + void construct_tool_bar (void); + void establish_octave_link (); void save_workspace_callback (const std::string& file); @@ -164,13 +188,23 @@ #ifdef HAVE_QSCINTILLA file_editor_interface * _file_editor; #endif - QMenu * _debug_menu; + + QMenu *_debug_menu; + + QAction *_debug_continue; + QAction *_debug_step_into; + QAction *_debug_step_over; + QAction *_debug_step_out; + QAction *_debug_quit; - QAction * _debug_continue; - QAction * _debug_step_into; - QAction * _debug_step_over; - QAction * _debug_step_out; - QAction * _debug_quit; + QAction *_new_script_action; + QAction *_open_action; + + QAction *_cut_action; + QAction *_copy_action; + QAction *_paste_action; + QAction *_undo_action; + QAction *_redo_action; // Dock widgets. workspace_view * _workspace_view;