Mercurial > octave

comparison libgui/src/dw-main-window.cc @ 31646:c6d54dd31a7e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use macros to begin/end C++ namespaces. * BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, KeyMap.h, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, QtHandlesUtils.cc, QtHandlesUtils.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.cc, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, annotation-dialog.cc, annotation-dialog.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.cc, qt-graphics-toolkit.h, QTerminal.h, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, graphics-init.cc, graphics-init.h, gui-settings.cc, gui-settings.h, gui-utils.cc, gui-utils.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, led-indicator.cc, led-indicator.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, qt-utils.h, release-notes.cc, release-notes.h, resource-manager.cc, resource-manager.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, shortcut-manager.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h: Use new macros to begin/end C++ namespaces.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Dec 2022 14:37:51 -0500
parents 796f54d4ddbf
children 431f80aba37a 29d734430e5f
comparison
equal deleted inserted replaced
31644:9089bd969b37 31646:c6d54dd31a7e
38 #include "dw-main-window.h" 38 #include "dw-main-window.h"
39 #include "octave-qobject.h" 39 #include "octave-qobject.h"
40 #include "shortcut-manager.h" 40 #include "shortcut-manager.h"
41 #include "gui-preferences-sc.h" 41 #include "gui-preferences-sc.h"
42 42
43 namespace octave 43 OCTAVE_BEGIN_NAMESPACE(octave)
44 {
45 44
46 dw_main_window::dw_main_window (base_qobject& oct_qobj, QWidget *p) 45 dw_main_window::dw_main_window (base_qobject& oct_qobj, QWidget *p)
47 : QMainWindow (p), m_octave_qobj (oct_qobj) 46 : QMainWindow (p), m_octave_qobj (oct_qobj)
48 { 47 {
49 resource_manager& rmgr = m_octave_qobj.get_resource_manager (); 48 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
77 m_actions_list << m_switch_right_action; 76 m_actions_list << m_switch_right_action;
78 77
79 notice_settings (rmgr.get_settings ()); 78 notice_settings (rmgr.get_settings ());
80 } 79 }
81 80
82
83 // Re-implementing the popup menu of the main window 81 // Re-implementing the popup menu of the main window
84 QMenu *dw_main_window::createPopupMenu () 82 QMenu *dw_main_window::createPopupMenu ()
85 { 83 {
86 QList<QAction *> new_actions = QList<QAction *> (); 84 QList<QAction *> new_actions = QList<QAction *> ();
87 new_actions.append (m_close_action); 85 new_actions.append (m_close_action);
100 menu->addActions (new_actions); 98 menu->addActions (new_actions);
101 99
102 return menu; 100 return menu;
103 } 101 }
104 102
105
106 // Adding an action to the main window 103 // Adding an action to the main window
107 QAction * dw_main_window::add_action (QMenu *menu, const QIcon& icon, 104 QAction * dw_main_window::add_action (QMenu *menu, const QIcon& icon,
108 const QString& text, const char *member, 105 const QString& text, const char *member,
109 QWidget *receiver) 106 QWidget *receiver)
110 { 107 {
139 scmgr.set_shortcut (m_close_others_action, sc_edit_file_close_other); 136 scmgr.set_shortcut (m_close_others_action, sc_edit_file_close_other);
140 137
141 scmgr.set_shortcut (m_switch_left_action, sc_edit_tabs_switch_left_tab); 138 scmgr.set_shortcut (m_switch_left_action, sc_edit_tabs_switch_left_tab);
142 scmgr.set_shortcut (m_switch_right_action, sc_edit_tabs_switch_right_tab); 139 scmgr.set_shortcut (m_switch_right_action, sc_edit_tabs_switch_right_tab);
143 } 140 }
144
145 141
146 // Slots for handling actions 142 // Slots for handling actions
147 143
148 // Close current widget 144 // Close current widget
149 void dw_main_window::request_close () 145 void dw_main_window::request_close ()
216 m_dw_list.at (next)->raise (); 212 m_dw_list.at (next)->raise ();
217 m_dw_list.at (next)->activateWindow (); 213 m_dw_list.at (next)->activateWindow ();
218 m_dw_list.at (next)->setFocus (); 214 m_dw_list.at (next)->setFocus ();
219 } 215 }
220 216
221
222 // Reimplemented Event 217 // Reimplemented Event
223 bool dw_main_window::event (QEvent *ev) 218 bool dw_main_window::event (QEvent *ev)
224 { 219 {
225 if (ev->type () == QEvent::ChildAdded 220 if (ev->type () == QEvent::ChildAdded
226 || ev->type () == QEvent::ChildRemoved) 221 || ev->type () == QEvent::ChildRemoved)
248 } 243 }
249 244
250 return QMainWindow::event (ev); 245 return QMainWindow::event (ev);
251 } 246 }
252 247
253 } 248 OCTAVE_END_NAMESPACE(octave)
254 249