Mercurial > octave

comparison libgui/src/octave-dock-widget.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 c11d34f72b3c
children 431f80aba37a 29d734430e5f
comparison
equal deleted inserted replaced
31644:9089bd969b37 31646:c6d54dd31a7e
45 #include "gui-utils.h" 45 #include "gui-utils.h"
46 #include "main-window.h" 46 #include "main-window.h"
47 #include "octave-dock-widget.h" 47 #include "octave-dock-widget.h"
48 #include "octave-qobject.h" 48 #include "octave-qobject.h"
49 49
50 namespace octave 50 OCTAVE_BEGIN_NAMESPACE(octave)
51 { 51
52 label_dock_widget::label_dock_widget (QWidget *p, base_qobject& oct_qobj) 52 label_dock_widget::label_dock_widget (QWidget *p, base_qobject& oct_qobj)
53 : QDockWidget (p), m_octave_qobj (oct_qobj), 53 : QDockWidget (p), m_octave_qobj (oct_qobj),
54 m_default_float_button (nullptr), m_default_close_button (nullptr) 54 m_default_float_button (nullptr), m_default_close_button (nullptr)
55 { 55 {
56 QStyle *st = style (); 56 QStyle *st = style ();
133 label->setStyleSheet ("background-color: transparent;"); 133 label->setStyleSheet ("background-color: transparent;");
134 h_layout->insertWidget (0, label); 134 h_layout->insertWidget (0, label);
135 setTitleBarWidget (m_title_widget); 135 setTitleBarWidget (m_title_widget);
136 setWindowTitle (title); 136 setWindowTitle (title);
137 } 137 }
138
139 138
140 static QString 139 static QString
141 qdockwidget_css (const QString& close_icon, const QString& close_tooltip, 140 qdockwidget_css (const QString& close_icon, const QString& close_tooltip,
142 const QString& float_icon, const QString& float_tooltip, 141 const QString& float_icon, const QString& float_tooltip,
143 int icon_size, const QString& titlebar_foreground, 142 int icon_size, const QString& titlebar_foreground,
515 if (r+g+b < 400) 514 if (r+g+b < 400)
516 m_icon_color_active = "-light"; 515 m_icon_color_active = "-light";
517 else 516 else
518 m_icon_color_active = ""; 517 m_icon_color_active = "";
519 518
520
521 int x, y, w, h; 519 int x, y, w, h;
522 QGuiApplication::primaryScreen ()->availableGeometry ().getRect (&x, &y, &w, &h); 520 QGuiApplication::primaryScreen ()->availableGeometry ().getRect (&x, &y, &w, &h);
523 QRect default_floating_size = QRect (x+16, y+32, w/3, h/2); 521 QRect default_floating_size = QRect (x+16, y+32, w/3, h/2);
524 522
525 QRect default_dock_size; 523 QRect default_dock_size;
854 dw_title_fg_color.key); 852 dw_title_fg_color.key);
855 853
856 rmgr.update_settings_key ("Dockwidgets/title_fg_color_active", 854 rmgr.update_settings_key ("Dockwidgets/title_fg_color_active",
857 dw_title_fg_color_active.key); 855 dw_title_fg_color_active.key);
858 } 856 }
859 } 857
858 OCTAVE_END_NAMESPACE(octave)