octave: libgui/src/octave-dock-widget.cc annotate

annotate libgui/src/octave-dock-widget.cc @ 27629:8b6e928e0705

in GUI objects, store reference to base_qobject instead of resource_manager We'll need access to both the resource_manager and the shortcut_manager in many objects. The shortcut_manager will be moved to be a member of the base_qobject class instead of being a singleton, so this change will make it easier to access both of these as well as any other core GUI properties in any of the Octave-specific widgets that make up the GUI. Once again, may files are affecte but the changes are straightforward: store a reference to the base_qobject object and access the resource_manager object from that instead of storing a reference to the resource_manager directly.

author	John W. Eaton <jwe@octave.org>
date	Mon, 04 Nov 2019 13:34:44 -0500
parents	45bb5bbaf291
children	a1271c5b621a

rev	line source
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	1 /*
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26343 diff changeset	3 Copyright (C) 2012-2019 Richard Crozier
26428 93c4fabb2ead only reset floating geometry of dock widget when not visible (bug #53207) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	4 Copyright (C) 2013-2019 Torsten <mttl@mailbox.org>
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	5
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	6 This file is part of Octave.
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	7
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24318 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24318 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	11 (at your option) any later version.
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22599 diff changeset	16 GNU General Public License for more details.
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	17
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	18 You should have received a copy of the GNU General Public License
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	19 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24318 diff changeset	20 <https://www.gnu.org/licenses/>.
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	21
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	22 */
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	25 # include "config.h"
17923 b602014eeb54 * octave-dock-widget.cc: Include config.h. John W. Eaton <jwe@octave.org> parents: 17899 diff changeset	26 #endif
b602014eeb54 * octave-dock-widget.cc: Include config.h. John W. Eaton <jwe@octave.org> parents: 17899 diff changeset	27
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	28 #include <QAction>
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16865 diff changeset	29 #include <QApplication>
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	30 #include <QDesktopWidget>
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	31 #include <QHBoxLayout>
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	32 #include <QLabel>
19918 66928b4546ab dock-/undock- and close-icons with variable size (bug #41938) Torsten <ttl@justmail.de> parents: 19913 diff changeset	33 #include <QStyle>
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	34 #include <QToolBar>
27468 8ba19629d5ef compacter menu bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	35 #include <QMenuBar>
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	36
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27478 diff changeset	37 #include "gui-preferences-global.h"
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	38 #include "gui-preferences-mw.h"
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27562 diff changeset	39 #include "gui-settings.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	40 #include "octave-dock-widget.h"
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	41 #include "octave-qobject.h"
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	42
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	43 namespace octave
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	44 {
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	45 label_dock_widget::label_dock_widget (QWidget *p, base_qobject& oct_qobj)
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	46 : QDockWidget (p), m_octave_qobj (oct_qobj),
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	47 m_default_float_button (nullptr), m_default_close_button (nullptr)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	48 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	49 QStyle *st = style ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	50 m_icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
19918 66928b4546ab dock-/undock- and close-icons with variable size (bug #41938) Torsten <ttl@justmail.de> parents: 19913 diff changeset	51
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	52 // keep track of the original buttons on the default title bar,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	53 // the button further left is considered "float"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	54 QList<QAbstractButton > buttonlist = findChildren<QAbstractButton > ();
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	55 if (buttonlist.size () == 2)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	56 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	57 if (buttonlist.at (0)->x () < buttonlist.at (1)->x ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	58 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	59 m_default_float_button = buttonlist.at (0);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	60 m_default_close_button = buttonlist.at (1);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	61 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	62 else
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	63 {
26343 df510676ca6a octave-dock-widget.cc: Fix copy & paste error. (bug #55347) Andreas Weber <octave@josoansi.de> parents: 26299 diff changeset	64 m_default_float_button = buttonlist.at (1);
df510676ca6a octave-dock-widget.cc: Fix copy & paste error. (bug #55347) Andreas Weber <octave@josoansi.de> parents: 26299 diff changeset	65 m_default_close_button = buttonlist.at (0);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	66 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	67 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	68
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	69 // the custom (extra) title bar of the widget
24858 8ce66fe46f18 Improve fullscreen action for variable editor panes (bug #53275) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24842 diff changeset	70 m_title_widget = new QWidget ();
8ce66fe46f18 Improve fullscreen action for variable editor panes (bug #53275) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24842 diff changeset	71
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	72 m_dock_action = new QAction
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	73 (QIcon (":/actions/icons/widget-undock.png"), "", this);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	74 m_dock_action->setToolTip (tr ("Undock widget"));
24858 8ce66fe46f18 Improve fullscreen action for variable editor panes (bug #53275) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24842 diff changeset	75 m_dock_button = new QToolButton (m_title_widget);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	76 m_dock_button->setDefaultAction (m_dock_action);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	77 m_dock_button->setFocusPolicy (Qt::NoFocus);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	78 m_dock_button->setIconSize (QSize (m_icon_size,m_icon_size));
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	79
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	80 m_close_action = new QAction
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	81 (QIcon (":/actions/icons/widget-close.png"), "", this);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	82 m_close_action->setToolTip (tr ("Close widget"));
24858 8ce66fe46f18 Improve fullscreen action for variable editor panes (bug #53275) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24842 diff changeset	83 m_close_button = new QToolButton (m_title_widget);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	84 m_close_button->setDefaultAction (m_close_action);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	85 m_close_button->setFocusPolicy (Qt::NoFocus);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	86 m_close_button->setIconSize (QSize (m_icon_size,m_icon_size));
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	87
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	88 QString css_button = QString ("QToolButton {background: transparent; border: 0px;}");
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	89 m_dock_button->setStyleSheet (css_button);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	90 m_close_button->setStyleSheet (css_button);
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	91
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	92 QHBoxLayout *h_layout = new QHBoxLayout ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	93 h_layout->addStretch (100);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	94 h_layout->addWidget (m_dock_button);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	95 h_layout->addWidget (m_close_button);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	96 h_layout->setSpacing (10);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	97 h_layout->setContentsMargins (5,2,2,2);
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	98
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	99 m_title_widget->setLayout (h_layout);
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	100
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	101 // copy & paste handling
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	102 connect (p, SIGNAL (copyClipboard_signal ()),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	103 this, SLOT (copyClipboard ()));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	104 connect (p, SIGNAL (pasteClipboard_signal ()),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	105 this, SLOT (pasteClipboard ()));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	106 connect (p, SIGNAL (selectAll_signal ()),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	107 this, SLOT (selectAll ()));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	108 // undo handling
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	109 connect (p, SIGNAL (undo_signal ()), this, SLOT (do_undo ()));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	110 }
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	111
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	112 // set the title in the dockwidgets title bar
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	113 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	114 label_dock_widget::set_title (const QString& title)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	115 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	116 QHBoxLayout *h_layout
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	117 = static_cast<QHBoxLayout *> (m_title_widget->layout ());
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	118 QLabel *label = new QLabel (title, m_title_widget);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	119 label->setStyleSheet ("background-color: transparent;");
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	120 h_layout->insertWidget (0,label);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	121 setTitleBarWidget (m_title_widget);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	122 setWindowTitle (title);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	123 }
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	124
ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	125
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	126 static QString
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	127 qdockwidget_css (const QString& close_icon, const QString& close_tooltip,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	128 const QString& float_icon, const QString& float_tooltip,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	129 int icon_size, const QString& titlebar_foreground,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	130 const QString& titlebar_background)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	131 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	132 return QString ("QDockWidget\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	133 "{\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	134 "%6"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	135 " border: none;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	136 " titlebar-close-icon: url(%1);\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	137 " titlebar-normal-icon: url(%2);\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	138 "}\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	139 "\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	140 "QDockWidget::close-button, QDockWidget::float-button\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	141 "{\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	142 " border: none;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	143 " icon-size: %3px;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	144 "}\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	145 "\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	146 "QAbstractButton#qt_dockwidget_closebutton\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	147 "{\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	148 " qproperty-toolTip: \"%4\";\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	149 "}\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	150 "\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	151 "QAbstractButton#qt_dockwidget_floatbutton\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	152 "{\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	153 " qproperty-toolTip: \"%5\";\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	154 "}\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	155 "\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	156 "QDockWidget::title {\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	157 " text-align: left;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	158 "%7"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	159 " padding-left: 1px;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	160 "}\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	161 "\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	162 "QDockWidget::close-button\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	163 "{\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	164 " right: %8px;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	165 " top: 3px;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	166 "}\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	167 "\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	168 "QDockWidget::float-button\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	169 "{\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	170 " right: %9px;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	171 " top: 3px;\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	172 "}\n"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	173 ).arg (close_icon).arg (float_icon).arg (icon_size)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	174 .arg (close_tooltip).arg (float_tooltip)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	175 .arg (titlebar_foreground). arg (titlebar_background)
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	176 .arg ((icon_size2)/3). arg((icon_size7)/3);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	177 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	178
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	179 octave_dock_widget::octave_dock_widget (const QString& obj_name, QWidget *p,
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	180 base_qobject& oct_qobj)
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	181 : label_dock_widget (p, oct_qobj), m_recent_float_geom (),
27620 45bb5bbaf291 don't use singleton pattern for resource manager in GUI John W. Eaton <jwe@octave.org> parents: 27611 diff changeset	182 m_recent_dock_geom (), m_waiting_for_mouse_button_release (false)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	183 {
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	184 setObjectName (obj_name);
5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	185
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	186 m_parent = static_cast<QMainWindow *> (p); // store main window
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	187 m_predecessor_widget = nullptr;
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	188
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	189 connect (this, SIGNAL (topLevelChanged (bool)),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	190 this, SLOT (toplevel_change (bool)));
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	191 connect (this, SIGNAL (visibilityChanged (bool)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	192 this, SLOT (handle_visibility_changed (bool)));
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	193
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27562 diff changeset	194 connect (p, SIGNAL (settings_changed (const gui_settings *)),
0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27562 diff changeset	195 this, SLOT (handle_settings (const gui_settings *)));
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	196
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	197 connect (p, SIGNAL (active_dock_changed (octave_dock_widget*,
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	198 octave_dock_widget*)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	199 this, SLOT (handle_active_dock_changed (octave_dock_widget*,
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	200 octave_dock_widget*)));
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	201
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	202 if (m_default_float_button != nullptr)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	203 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	204 disconnect (m_default_float_button, 0, 0, 0);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	205 connect (m_default_float_button, SIGNAL (clicked (bool)),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	206 this, SLOT (make_window (bool)));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	207 }
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	208 connect (this, SIGNAL (queue_make_window (bool)),
f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	209 this, SLOT (make_window (bool)), Qt::QueuedConnection);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	210 connect (this, SIGNAL (queue_make_widget ()),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	211 this, SLOT (make_widget ()), Qt::QueuedConnection);
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	212
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	213 connect (m_dock_action, SIGNAL (triggered (bool)),
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	214 this, SLOT (make_window (bool)));
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	215 connect (m_close_action, SIGNAL (triggered (bool)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	216 this, SLOT (change_visibility (bool)));
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	217
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	218 // Any interpreter_event signal from an octave_dock_widget object is
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	219 // handled the same as for the parent main_window object.
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	220
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	221 connect (this, SIGNAL (interpreter_event (const fcn_callback&)),
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	222 p, SIGNAL (interpreter_event (const fcn_callback&)));
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	223
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	224 connect (this, SIGNAL (interpreter_event (const meth_callback&)),
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	225 p, SIGNAL (interpreter_event (const meth_callback&)));
5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27281 diff changeset	226
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	227 m_close_action->setToolTip (tr ("Hide widget"));
24812 ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	228
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	229 setStyleSheet (qdockwidget_css (QString (":/actions/icons/widget-close.png"),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	230 QString ("Close widget"),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	231 QString (":/actions/icons/widget-undock.png"),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	232 QString ("Undock widget"),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	233 m_icon_size,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	234 QString (""),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	235 QString ("")));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	236 if (widget ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	237 widget ()->setToolTip (QString (""));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	238
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	239 m_icon_color = "";
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	240 m_title_3d = 50;
19360 2f9d9663b6b0 fix double clicks into the borders of floating dock widgets (bug #43662) Torsten <ttl@justmail.de> parents: 18555 diff changeset	241
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	242 installEventFilter (this);
19360 2f9d9663b6b0 fix double clicks into the borders of floating dock widgets (bug #43662) Torsten <ttl@justmail.de> parents: 18555 diff changeset	243
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	244 setFocusPolicy (Qt::StrongFocus);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	245
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	246 setFeatures (QDockWidget::AllDockWidgetFeatures);
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	247
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	248 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	249 handle_settings (rmgr.get_settings ());
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	250 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	251
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	252 // connect signal visibility changed to related slot (called from main-window)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	253 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	254 octave_dock_widget::connect_visibility_changed (void)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	255 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	256 connect (this, SIGNAL (visibilityChanged (bool)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	257 this, SLOT (handle_visibility (bool)));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	258 emit active_changed (isVisible ()); // emit once for init of window menu
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	259 }
16809 84505f200e05 fix checked state of window menu entries at startup (bug #39322) Torsten <ttl@justmail.de> parents: 16798 diff changeset	260
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	261 // make the widget floating
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	262 void
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	263 octave_dock_widget::make_window (bool widget_was_dragged)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	264 {
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	265 bool vis = isVisible ();
1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	266
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	267 // prevent follow-up calls by clearing state variable
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	268 m_waiting_for_mouse_button_release = false;
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	269
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	270 set_focus_predecessor (); // set focus previously active widget if tabbed
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	271
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	272 // Before unparenting, get current geometry for restoring if dragged
f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	273 QRect geom = geometry ();
f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	274
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	275 // the widget has to be reparented (parent = 0), preferably
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	276 // from a non-toplevel widget otherwise may not have full
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	277 // decorations, e.g., no taskbar icon and always in front
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	278 if (isFloating ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	279 setFloating (false);
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	280
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	281 // Remove after thorough testing 3/20/18 m_parent->removeDockWidget (this);
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	282
25509 e00aa6a75edd Do not make floated widgets a Qt::Window to conserve title bar (bug #54078) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25396 diff changeset	283 setParent (0, Qt::CustomizeWindowHint \| Qt::WindowTitleHint \|
25887 ad3417a54be6 Keep QWindow flag when setting parent in undocked mode (Bug #54495) John Donoghue parents: 25509 diff changeset	284 Qt::WindowMinMaxButtonsHint \| Qt::WindowCloseButtonHint \| Qt::Window);
24570 c9aab297130e make floating dock widgets resizable in KDE Oxygen (bug #52797) Torsten <mttl@mailbox.org> parents: 24534 diff changeset	285
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	286 // restore the last geometry when floating only if we have not dragged
f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	287 // the window outside the main window
f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	288 if (! widget_was_dragged)
f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	289 geom = m_recent_float_geom.isNull () ? QRect (50,100,480,480)
f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	290 : m_recent_float_geom;
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	291 setGeometry (geom);
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	292
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	293 // adjust the (un)dock icon
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	294 if (titleBarWidget ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	295 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	296 m_dock_action->setIcon (QIcon (":/actions/icons/widget-dock"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	297 + m_icon_color + ".png"));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	298 m_dock_action->setToolTip (tr ("Dock widget"));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	299 disconnect (m_dock_action, 0, this, 0);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	300 connect (m_dock_action, SIGNAL (triggered (bool)),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	301 this, SLOT (make_widget (bool)));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	302 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	303 else
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	304 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	305 disconnect (m_default_float_button, 0, this, 0);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	306 connect (m_default_float_button, SIGNAL (clicked (bool)),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	307 this, SLOT (make_widget (bool)));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	308 }
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	309
25384 9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	310 raise ();
9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	311 activateWindow ();
9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	312
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	313 if (vis)
1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	314 {
1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	315 show ();
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	316 setFocus ();
25384 9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	317 set_style (true);
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	318 }
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 26818 diff changeset	319
9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 26818 diff changeset	320 emit topLevelChanged (true); // Be sure signal is emitted
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	321 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	322
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	323 // dock the widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	324 void
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	325 octave_dock_widget::make_widget (bool)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	326 {
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	327 bool vis = isVisible ();
1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	328
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	329 // Since floating widget has no parent, we have to read it
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	330 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	331 gui_settings *settings = rmgr.get_settings ();
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	332
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	333 settings->setValue (mw_state.key, m_parent->saveState ());
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	334 // Stay window, otherwise will bounce back to window by default because
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	335 // there is no layout information for this widget in the saved settings.
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	336 setParent (m_parent, Qt::Window);
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	337 m_parent->addDockWidget (Qt::BottomDockWidgetArea, this);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	338 // recover old window states, hide and re-show new added widget
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	339 m_parent->restoreState (settings->value (mw_state.key).toByteArray ());
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	340 setFloating (false);
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	341
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	342 // adjust the (un)dock icon
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	343 if (titleBarWidget ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	344 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	345 m_dock_action->setIcon (QIcon (":/actions/icons/widget-undock"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	346 + m_icon_color + ".png"));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	347 m_dock_action->setToolTip (tr ("Undock widget"));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	348 disconnect (m_dock_action, 0, this, 0);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	349 connect (m_dock_action, SIGNAL (triggered (bool)),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	350 this, SLOT (make_window (bool)));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	351 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	352 else
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	353 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	354 disconnect (m_default_float_button, 0, this, 0);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	355 connect (m_default_float_button, SIGNAL (clicked (bool)),
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	356 this, SLOT (make_window (bool)));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	357 }
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	358
25384 9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	359 raise ();
9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	360 QApplication::setActiveWindow (this);
9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	361
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	362 if (vis)
1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	363 {
1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	364 show ();
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	365 setFocus ();
25384 9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	366 set_style (true);
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	367 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	368 }
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	369
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	370 // dock the widget
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	371 void
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	372 octave_dock_widget::default_dock (bool)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	373 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	374 setFloating (false);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	375 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	376
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	377 // set the widget which previously had focus when tabified
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	378 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	379 octave_dock_widget::set_predecessor_widget (octave_dock_widget *prev_widget)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	380 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	381 m_predecessor_widget = prev_widget;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	382 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	383
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	384 // close event
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	385 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	386 octave_dock_widget::closeEvent (QCloseEvent *e)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	387 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	388 emit active_changed (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	389 set_focus_predecessor ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	390 QDockWidget::closeEvent (e);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	391 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	392
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	393 // get focus widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	394 QWidget *
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	395 octave_dock_widget::focusWidget (void)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	396 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	397 QWidget *w = QApplication::focusWidget ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	398 if (w && w->focusProxy ()) w = w->focusProxy ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	399 return w;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	400 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	401
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	402 bool
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	403 octave_dock_widget::event (QEvent *event)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	404 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	405 // low-level check of whether docked-widget became a window via
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	406 // double-click or via drag-and-drop
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	407 if ( (event->type () == QEvent::MouseButtonDblClick && ! isFloating ())
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	408 \|\| (event->type () == QEvent::ActivationChange && m_waiting_for_mouse_button_release))
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	409 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	410 bool retval = QDockWidget::event (event);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	411 if (isFloating () && parent () != 0)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	412 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	413 m_waiting_for_mouse_button_release = false;
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	414 emit queue_make_window (event->type () != QEvent::MouseButtonDblClick);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	415 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	416 return retval;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	417 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	418
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	419 return QDockWidget::event (event);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	420 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	421
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	422 void
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27562 diff changeset	423 octave_dock_widget::handle_settings (const gui_settings *settings)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	424 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	425 m_custom_style
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	426 = settings->value ("DockWidgets/widget_title_custom_style",false).toBool ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	427
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	428 m_title_3d
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	429 = settings->value ("DockWidgets/widget_title_3d",50).toInt ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	430
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	431 QColor default_var = QColor (0,0,0);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	432 m_fg_color = settings->value ("DockWidgets/title_fg_color",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	433 default_var).value<QColor> ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	434 default_var = QColor (0,0,0);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	435 m_fg_color_active = settings->value ("DockWidgets/title_fg_color_active",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	436 default_var).value<QColor> ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	437
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	438 default_var = QColor (255,255,255);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	439 m_bg_color = settings->value ("DockWidgets/title_bg_color",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	440 default_var).value<QColor> ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	441 default_var = QColor (192,192,192);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	442 m_bg_color_active = settings->value ("DockWidgets/title_bg_color_active",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	443 default_var).value<QColor> ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	444
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	445 QColor bcol (m_bg_color);
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	446 QColor bcola (m_bg_color_active);
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	447
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	448 if (! m_custom_style)
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	449 {
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	450 bcol = QWidget::palette ().color (m_title_widget->backgroundRole ());
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	451 bcola = bcol;
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	452 }
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	453
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	454 int r, g, b;
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	455 bcol.getRgb (&r, &g, &b);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	456 if (r+g+b < 400)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	457 m_icon_color = "-light";
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	458 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	459 m_icon_color = "";
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	460
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	461 bcola.getRgb (&r, &g, &b);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	462 if (r+g+b < 400)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	463 m_icon_color_active = "-light";
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	464 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	465 m_icon_color_active = "";
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	466
26428 93c4fabb2ead only reset floating geometry of dock widget when not visible (bug #53207) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	467 QRect available_size = QApplication::desktop ()->availableGeometry (m_parent);
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	468 int x1, y1, x2, y2;
c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	469 available_size.getCoords (&x1, &y1, &x2, &y2);
26452 abe3e8597a55 default geometry of floating widgets not exactly in upper left corner (bug #53207) Torsten <mttl@mailbox.org> parents: 26428 diff changeset	470 QRect default_size = QRect (x1+16, y1+32, x2/3, 2*y2/3);
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	471
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	472 m_recent_float_geom = settings->value ("DockWidgets/" + objectName ()
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	473 + "_floating_geometry",
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	474 default_size).toRect ();
c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	475
26428 93c4fabb2ead only reset floating geometry of dock widget when not visible (bug #53207) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	476 QWidget dummy;
93c4fabb2ead only reset floating geometry of dock widget when not visible (bug #53207) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	477 dummy.setGeometry (m_recent_float_geom);
93c4fabb2ead only reset floating geometry of dock widget when not visible (bug #53207) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	478
93c4fabb2ead only reset floating geometry of dock widget when not visible (bug #53207) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	479 if (QApplication::desktop ()->screenNumber (&dummy) == -1)
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	480 m_recent_float_geom = default_size;
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	481
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	482 m_recent_dock_geom = settings->value ("DockWidgets/" + objectName (),
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	483 QByteArray ()).toByteArray ();
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	484
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	485 notice_settings (settings); // call individual handler
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	486
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	487 set_style (false);
27467 c7a898396151 compacter tool bar and filter bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	488
c7a898396151 compacter tool bar and filter bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	489 // Compacter design
c7a898396151 compacter tool bar and filter bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	490 QToolBar* toolbar = findChild <QToolBar *> ();
c7a898396151 compacter tool bar and filter bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	491 if (toolbar)
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27478 diff changeset	492 toolbar->setStyleSheet (toolbar->styleSheet () + global_toolbar_style);
27478 9e526393d80a reduced vertical space in gui with responsive toolbar buttons (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27468 diff changeset	493
27468 8ba19629d5ef compacter menu bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	494 QMenuBar* menubar = findChild <QMenuBar *> ();
8ba19629d5ef compacter menu bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	495 if (menubar)
27560 3fcc650de22f split gui-preferences.h into one file per widget John W. Eaton <jwe@octave.org> parents: 27478 diff changeset	496 menubar->setStyleSheet (menubar->styleSheet () + global_menubar_style);
27467 c7a898396151 compacter tool bar and filter bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	497
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	498 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	499
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	500 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	501 octave_dock_widget::handle_active_dock_changed (octave_dock_widget *w_old,
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	502 octave_dock_widget *w_new)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	503 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	504 if (m_custom_style && this == w_old)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	505 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	506 set_style (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	507 update ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	508 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	509
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	510 if (m_custom_style && this == w_new)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	511 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	512 set_style (true);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	513 update ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	514 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	515 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	516
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	517 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	518 octave_dock_widget::save_settings (void)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	519 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	520 // save state of this dock-widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	521 QString name = objectName ();
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	522 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	523 gui_settings *settings = rmgr.get_settings ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	524
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	525 if (! settings)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	526 return;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	527
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	528 store_geometry ();
5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	529
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	530 settings->beginGroup ("DockWidgets");
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	531
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	532 // conditional needed?
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	533 if (! m_recent_float_geom.isNull ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	534 settings->setValue (name + "_floating_geometry", m_recent_float_geom);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	535
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	536 if (! m_recent_dock_geom.isEmpty ())
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	537 settings->setValue (name, m_recent_dock_geom);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	538 settings->setValue (name+"Visible", isVisible ()); // store visibility
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	539 settings->setValue (name+"Floating", isFloating ()); // store floating
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	540 settings->setValue (name+"_minimized", isMinimized ()); // store minimized
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	541
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	542 settings->endGroup ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	543 settings->sync ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	544 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	545
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	546 bool octave_dock_widget::eventFilter (QObject obj, QEvent e)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	547 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	548 if (e->type () == QEvent::NonClientAreaMouseButtonDblClick)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	549 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	550 e->ignore (); // ignore double clicks into window decoration elements
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	551 return true;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	552 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	553
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	554 return QDockWidget::eventFilter (obj,e);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	555 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	556
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	557 void
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	558 octave_dock_widget::store_geometry (void)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	559 {
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	560 if (isFloating ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	561 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	562 if (! parent ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	563 m_recent_float_geom = geometry ();
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	564 }
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	565 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	566 {
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	567 m_recent_dock_geom = saveGeometry ();
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	568 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	569 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	570
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	571 void
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	572 octave_dock_widget::moveEvent (QMoveEvent *event)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	573 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	574 store_geometry ();
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	575
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	576 QDockWidget::moveEvent (event);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	577 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	578
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	579 void
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	580 octave_dock_widget::resizeEvent (QResizeEvent *event)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	581 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	582 store_geometry ();
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	583
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	584 QDockWidget::resizeEvent (event);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	585 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	586
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	587 // slot for hiding the widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	588 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	589 octave_dock_widget::change_visibility (bool)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	590 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	591 setVisible (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	592 emit active_changed (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	593 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	594
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	595 void octave_dock_widget::activate (void)
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	596 {
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	597 if (! isVisible ())
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	598 setVisible (true);
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	599
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	600 setFocus ();
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	601 activateWindow ();
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	602 raise ();
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	603 }
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	604
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	605 void octave_dock_widget::handle_visibility (bool visible)
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	606 {
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	607 if (visible && ! isFloating ())
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	608 setFocus ();
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	609 }
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	610
0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	611 void
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	612 octave_dock_widget::toplevel_change (bool toplevel)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	613 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	614 QObject *dockobj;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	615 const char *docksig;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	616
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	617 if (titleBarWidget ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	618 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	619 dockobj = m_dock_action;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	620 docksig = SIGNAL (triggered (bool));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	621 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	622 else
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	623 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	624 dockobj = m_default_float_button;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	625 docksig = SIGNAL (clicked (bool));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	626 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	627
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	628 if (toplevel)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	629 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	630 // This is a fallback in case the attempt to create a floated
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	631 // top-level window fails and the QDockWidget remains a child
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	632 // of the QMainWindow.
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	633 connect (dockobj, docksig, this, SLOT (default_dock (bool)));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	634
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	635 // Could be dragging window, so must wait until there is a
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	636 // change in focus.
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	637 if (parent () != 0)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	638 m_waiting_for_mouse_button_release = true;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	639 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	640 else
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	641 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	642 // If a drag-and-drop within the QMainWindow occurred, want to remain a widget.
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	643 m_waiting_for_mouse_button_release = false;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	644
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	645 // Making into a widget immediately will mangle the double-click
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	646 // status and cause problems on followup button clicks.
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	647 if (parent () == 0)
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	648 emit queue_make_widget ();
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	649 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	650 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	651
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	652 void
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	653 octave_dock_widget::set_style (bool active)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	654 {
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	655 QString css_foreground;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	656 QString css_background;
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	657 QString css_button;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	658 QString dock_icon;
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	659
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	660 QString icon_col = m_icon_color;
19431 bd27cd403d00 fix errors when building octave for windows (regression from d93293218966) Torsten <ttl@justmail.de> parents: 19423 diff changeset	661
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	662 QString close_tooltip = "Close widget";
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	663 QString dock_tooltip;
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	664
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	665 if (isFloating ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	666 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	667 dock_icon = "widget-dock";
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	668 dock_tooltip = "Dock widget";
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	669 }
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	670 else
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	671 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	672 dock_icon = "widget-undock";
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	673 dock_tooltip = "Undock widget";
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	674 }
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	675
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	676 #if defined (Q_OS_MAC)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	677 QString alignment = "center";
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	678 #else
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	679 QString alignment = "center left";
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	680 #endif
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	681 if (m_custom_style)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	682 {
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	683
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	684 QColor bg_col, fg_col;
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	685
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	686 if (active)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	687 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	688 bg_col = m_bg_color_active;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	689 fg_col = m_fg_color_active;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	690 icon_col = m_icon_color_active;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	691 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	692 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	693 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	694 bg_col = m_bg_color;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	695 fg_col = m_fg_color;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	696 icon_col = m_icon_color;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	697 }
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	698
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	699 QColor bg_col_top, bg_col_bottom;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	700 if (m_title_3d > 0)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	701 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	702 bg_col_top = bg_col.lighter (100 + m_title_3d);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	703 bg_col_bottom = bg_col.darker (100 + m_title_3d);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	704 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	705 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	706 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	707 bg_col_top = bg_col.darker (100 - m_title_3d);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	708 bg_col_bottom = bg_col.lighter (100 - m_title_3d);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	709 }
19913 2a992bd19169 make color gradient of custom title bar adjustable (bug #44435) Torsten <ttl@justmail.de> parents: 19911 diff changeset	710
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	711 css_foreground = QString (" color: %1;\n").arg (fg_col.name ());
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	712
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	713 css_background =
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	714 QString (" background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	715 " stop: 0 %1, stop: 0.60 %2, stop: 0.95 %2 stop: 1.0 %3);\n").
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	716 arg (bg_col_top.name ()).
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	717 arg (bg_col.name ()).
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	718 arg (bg_col_bottom.name ());
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	719 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	720 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	721 {
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	722 css_foreground = QString ("");
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	723 css_background = QString ("");
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	724 }
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	725
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	726 QString full_dock_icon = ":/actions/icons/" + dock_icon + icon_col + ".png";
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	727 QString full_close_icon = ":/actions/icons/widget-close" + icon_col + ".png";
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	728 if (titleBarWidget ())
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	729 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	730 titleBarWidget ()->setStyleSheet (css_foreground + css_background);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	731 css_button = QString ("QToolButton {background: transparent; border: 0px;}");
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	732 m_dock_button->setStyleSheet (css_button);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	733 m_close_button->setStyleSheet (css_button);
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	734 m_dock_action->setIcon (QIcon (full_dock_icon));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	735 m_close_action->setIcon (QIcon (full_close_icon));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	736 }
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	737 else
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	738 {
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	739 setStyleSheet (qdockwidget_css (full_close_icon,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	740 close_tooltip,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	741 full_dock_icon,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	742 dock_tooltip,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	743 m_icon_size,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	744 css_foreground,
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	745 css_background));
05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	746 }
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	747 }
19423 d93293218966 custom style of dock widget title bars depending on focus (bug #43837) Torsten <ttl@justmail.de> parents: 19360 diff changeset	748
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	749 // set focus to previously active widget in tabbed widget stack
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	750 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	751 octave_dock_widget::set_focus_predecessor (void)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	752 {
25396 75fef3484d12 Prevent hidden predecessor windows appearing when successor is floated (bug #53357) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25384 diff changeset	753 // only != 0 if widget was tabbed
75fef3484d12 Prevent hidden predecessor windows appearing when successor is floated (bug #53357) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25384 diff changeset	754 if (m_predecessor_widget && m_predecessor_widget->isVisible ())
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	755 m_predecessor_widget->setFocus ();
19423 d93293218966 custom style of dock widget title bars depending on focus (bug #43837) Torsten <ttl@justmail.de> parents: 19360 diff changeset	756
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	757 m_predecessor_widget = nullptr;
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	758
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	759 // FIXME: Until cset bda0c5b38bda, the wrong keys "Dockwidget/..." were used
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	760 // here. This had no effect in Qt4, but does in Qt5. In the following, the
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	761 // four incorrect keys are updated if still present in the settings files.
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	762 // The keys are also used in the settings dialog, but
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	763 // octave_dock_widget::handle_settings is already called at program start.
25172 7b1b504c2f12 update future version numbers in doc strings and comments John W. Eaton <jwe@octave.org> parents: 25086 diff changeset	764 // These tests can be removed in a future version of Octave (version 6).
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	765
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	766 resource_manager& rmgr = m_octave_qobj.get_resource_manager ();
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	767
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	768 rmgr.update_settings_key ("Dockwidgets/title_bg_color",
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	769 "DockWidgets/title_bg_color");
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	770
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	771 rmgr.update_settings_key ("Dockwidgets/title_bg_color_active",
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	772 "DockWidgets/title_bg_color_active");
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	773
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	774 rmgr.update_settings_key ("Dockwidgets/title_fg_color",
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	775 "DockWidgets/title_fg_color");
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	776
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	777 rmgr.update_settings_key ("Dockwidgets/title_fg_color_active",
8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	778 "DockWidgets/title_fg_color_active");
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	779 }
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	780 }

Mercurial > octave

annotate libgui/src/octave-dock-widget.cc @ 27629:8b6e928e0705