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

annotate libgui/src/octave-dock-widget.cc @ 24858:8ce66fe46f18

Improve fullscreen action for variable editor panes (bug #53275) * octave-dock-widget.cc (label_dock_widget::label_dock_widget): Make m_title_widget the parent of all items placed in the h_layout QHBoxLayout. * variable-editor.cc (variable_dock_widget::variable_dock_widget): Replace member variable m_initial_float with variables m_fullscreen_action, m_full_screen, m_prev_floating. All is pre-processor-conditioned on HAVE_QGUIAPPLICATION. (variable_dock_widget::change_floating): Set the full-screen action tooltip to "Fullscreen" if undocking. If docking, change full-screen action tooltip to "Fullscreen undock" and if in full screen mode restore the non-full-screen size and QAction icon. All is pre-processor-conditioned on HAVE_QGUIAPPLICATION. (variable_dock_widget::toplevel_change): Remove the code that made the initial floating size full screen. (variable_dock_widget::change_fullscreen): New slot/method to undock a panel if it is docked and then set the panel size to fullscreen as well as change the QAction icon to view-restore and if the panel was not undocked set the QAction tooltip to "Restore geometry". If in fullscreen mode, change back to the state, icon and tooltips prior to fullscreen mode. The inside of the function is pre-processor-conditioned on HAVE_QGUIAPPLICATION. * variable-editor.h (variable_dock_widget): Declare new slot change_fullscreen(). Replace member variable m_initial_float with m_fullscreen_action, m_full_screen, m_prev_floating and m_prev_geom. Place just the variables and not the slot within pre-processor-condition of HAVE_QGUIAPPLICATION.

author	Daniel J Sebald <daniel.sebald@ieee.org>
date	Mon, 05 Mar 2018 22:11:33 -0600
parents	74229798f604
children	5f7b9ee5b878

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
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	3 Copyright (C) 2012-2017 Richard Crozier
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22177 diff changeset	4 Copyright (C) 2013-2016 Torsten <ttl@justmail.de>
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
16881 944ade6e7f66 Make main window copy and paste global for current focused window John Donoghue <john.donoghue@ieee.org> parents: 16865 diff changeset	28 #include <QApplication>
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	29 #include <QToolBar>
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	30 #include <QAction>
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>
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	33 #include <QSettings>
19918 66928b4546ab dock-/undock- and close-icons with variable size (bug #41938) Torsten <ttl@justmail.de> parents: 19913 diff changeset	34 #include <QStyle>
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	35
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	36 #include "resource-manager.h"
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	37 #include "octave-dock-widget.h"
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	38
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	39 namespace octave
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	40 {
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	41 label_dock_widget::label_dock_widget (QWidget *p)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	42 : QDockWidget (p)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	43 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	44 QStyle *st = style ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	45 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	46
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	47 // 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	48 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	49
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	50 m_dock_action = new QAction
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	51 (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	52 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	53 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	54 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	55 m_dock_button->setFocusPolicy (Qt::NoFocus);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	56 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	57
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	58 m_close_action = new QAction
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	59 (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	60 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	61 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	62 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	63 m_close_button->setFocusPolicy (Qt::NoFocus);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	64 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	65
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	66 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	67 m_dock_button->setStyleSheet (css_button);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	68 m_close_button->setStyleSheet (css_button);
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	69
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	70 QHBoxLayout *h_layout = new QHBoxLayout ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	71 h_layout->addStretch (100);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	72 h_layout->addWidget (m_dock_button);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	73 h_layout->addWidget (m_close_button);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	74 h_layout->setSpacing (0);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	75 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	76
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	77 m_title_widget->setLayout (h_layout);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	78 setTitleBarWidget (m_title_widget);
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 // copy & paste handling
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	81 connect (p, SIGNAL (copyClipboard_signal ()),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	82 this, SLOT (copyClipboard ()));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	83 connect (p, SIGNAL (pasteClipboard_signal ()),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	84 this, SLOT (pasteClipboard ()));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	85 connect (p, SIGNAL (selectAll_signal ()),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	86 this, SLOT (selectAll ()));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	87 // undo handling
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	88 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	89 }
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	90
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	91 // 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	92 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	93 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	94 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	95 QHBoxLayout *h_layout
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	96 = static_cast<QHBoxLayout *> (titleBarWidget ()->layout ());
24858 8ce66fe46f18 Improve fullscreen action for variable editor panes (bug #53275) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24842 diff changeset	97 QLabel *label = new QLabel (title, titleBarWidget ());
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	98 label->setStyleSheet ("background: transparent;");
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	99 h_layout->insertWidget (0,label);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	100 setWindowTitle (title);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	101 }
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	102
ed9ba20d6ed3 Make the variable editor multi-panel via a QMainWindow layout (bug #53046) Daniel J Sebald <daniel.sebald@ieee.org> parents: 24696 diff changeset	103
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	104 octave_dock_widget::octave_dock_widget (QWidget *p)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	105 : label_dock_widget (p)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	106 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	107 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	108 m_floating = false;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	109 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	110
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	111 connect (this, SIGNAL (visibilityChanged (bool)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	112 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	113
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	114 connect (p, SIGNAL (settings_changed (const QSettings*)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	115 this, SLOT (handle_settings (const QSettings*)));
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	116
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	117 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	118 octave_dock_widget*)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	119 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	120 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	121
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	122 setFeatures (QDockWidget::DockWidgetMovable); // not floatable or closeable
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	123
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	124 connect (m_dock_action, SIGNAL (triggered (bool)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	125 this, SLOT (change_floating (bool)));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	126 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	127 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	128
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	129 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	130
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	131 m_icon_color = "";
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	132 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	133
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	134 installEventFilter (this);
19360 2f9d9663b6b0 fix double clicks into the borders of floating dock widgets (bug #43662) Torsten <ttl@justmail.de> parents: 18555 diff changeset	135
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	136 setFocusPolicy (Qt::StrongFocus);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	137 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	138
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	139 // 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	140 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	141 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	142 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	143 connect (this, SIGNAL (visibilityChanged (bool)),
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	144 this, SLOT (handle_visibility (bool)));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	145 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	146 }
16809 84505f200e05 fix checked state of window menu entries at startup (bug #39322) Torsten <ttl@justmail.de> parents: 16798 diff changeset	147
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	148 // make the widget floating
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	149 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	150 octave_dock_widget::make_window (void)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	151 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	152 // the widget has to be reparented (parent = 0)
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	153
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	154 QSettings *settings = resource_manager::get_settings ();
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	155
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	156 // save the docking area and geometry for later redocking
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	157 // FIXME: dockWidgetArea always returns 2
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	158 settings->setValue ("DockWidgets/" + objectName () + "_dock_area",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	159 m_parent->dockWidgetArea (this));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	160 settings->setValue ("DockWidgets/" + objectName (), saveGeometry ());
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	161 settings->sync ();
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	162
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	163 // remove parent and adjust the (un)dock icon
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	164 setTitleBarWidget (0);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	165 setParent (0, Qt::Window \| Qt::CustomizeWindowHint \| Qt::WindowTitleHint \|
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	166 Qt::WindowMinimizeButtonHint \| Qt::WindowCloseButtonHint);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	167 setTitleBarWidget (m_title_widget);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	168 setParent (0, Qt::Window \| Qt::CustomizeWindowHint \| Qt::WindowTitleHint \|
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	169 Qt::WindowMinimizeButtonHint \| Qt::WindowCloseButtonHint);
24570 c9aab297130e make floating dock widgets resizable in KDE Oxygen (bug #52797) Torsten <mttl@mailbox.org> parents: 24534 diff changeset	170
24836 fd3edb183ee2 add a tooltip on ix-systems for moving a floating dock widget (bug #52797) Torsten <mttl@mailbox.org> parents: 24828 diff changeset	171 #if defined (Q_OS_UNIX)
fd3edb183ee2 add a tooltip on ix-systems for moving a floating dock widget (bug #52797) Torsten <mttl@mailbox.org> parents: 24828 diff changeset	172 m_title_widget->setToolTip (
fd3edb183ee2 add a tooltip on ix-systems for moving a floating dock widget (bug #52797) Torsten <mttl@mailbox.org> parents: 24828 diff changeset	173 tr ("Use <Alt> + <Left Mouse Button> for moving the window"));
fd3edb183ee2 add a tooltip on ix-systems for moving a floating dock widget (bug #52797) Torsten <mttl@mailbox.org> parents: 24828 diff changeset	174 #endif
fd3edb183ee2 add a tooltip on ix-systems for moving a floating dock widget (bug #52797) Torsten <mttl@mailbox.org> parents: 24828 diff changeset	175
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	176 m_dock_action->setIcon (QIcon (":/actions/icons/widget-dock"
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	177 + m_icon_color + ".png"));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	178 m_dock_action->setToolTip (tr ("Dock widget"));
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	179
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	180 // restore the last geometry when floating
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	181 setGeometry (settings->value ("DockWidgets/" + objectName ()
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	182 + "_floating_geometry",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	183 QRect (50,100,480,480)).toRect ());
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	184
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	185 m_floating = true;
19983 643de08e524c save and restore previously active widget in a tabbed stack (bug #42980) Torsten <ttl@justmail.de> parents: 19945 diff changeset	186
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	187 set_focus_predecessor (); // set focus previously active widget if tabbed
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	188 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	189
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	190 // dock the widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	191 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	192 octave_dock_widget::make_widget (bool dock)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	193 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	194 // Since floating widget has no parent, we have to read it
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	195
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	196 QSettings *settings = resource_manager::get_settings ();
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	197
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	198 // save last floating geometry if widget really was floating
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	199 if (m_floating)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	200 settings->setValue ("DockWidgets/" + objectName () + "_floating_geometry",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	201 geometry ());
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	202 settings->sync ();
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	203
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	204 if (dock)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	205 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	206 settings->setValue ("MainWindow/windowState", m_parent->saveState ());
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	207 m_parent->addDockWidget (Qt::TopDockWidgetArea, this);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	208 // recover old window states, hide and re-show new added widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	209 m_parent->restoreState (settings->value ("MainWindow/windowState").toByteArray ());
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	210 focus ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	211 QApplication::setActiveWindow (this);
24836 fd3edb183ee2 add a tooltip on ix-systems for moving a floating dock widget (bug #52797) Torsten <mttl@mailbox.org> parents: 24828 diff changeset	212 m_title_widget->setToolTip ("");
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	213 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	214 else // only reparent, no docking
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	215 setParent (m_parent);
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	216
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	217 // adjust the (un)dock icon
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	218 m_dock_action->setIcon (QIcon (":/actions/icons/widget-undock"
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	219 + m_icon_color + ".png"));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	220 m_dock_action->setToolTip (tr ("Undock widget"));
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	221
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	222 m_floating = false;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	223 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	224
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	225 // 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	226 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	227 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	228 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	229 m_predecessor_widget = prev_widget;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	230 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	231
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	232 // close event
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	233 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	234 octave_dock_widget::closeEvent (QCloseEvent *e)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	235 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	236 emit active_changed (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	237 set_focus_predecessor ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	238 QDockWidget::closeEvent (e);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	239 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	240
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	241 // get focus widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	242 QWidget *
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	243 octave_dock_widget::focusWidget (void)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	244 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	245 QWidget *w = QApplication::focusWidget ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	246 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	247 return w;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	248 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	249
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	250 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	251 octave_dock_widget::handle_settings (const QSettings *settings)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	252 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	253 m_custom_style
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	254 = 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	255
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	256 m_title_3d
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	257 = 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	258
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	259 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	260 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	261 default_var).value<QColor> ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	262 default_var = QColor (0,0,0);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	263 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	264 default_var).value<QColor> ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	265
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	266 default_var = QColor (255,255,255);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	267 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	268 default_var).value<QColor> ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	269 default_var = QColor (192,192,192);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	270 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	271 default_var).value<QColor> ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	272
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	273 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	274 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	275
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	276 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	277 {
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	278 bcol = QWidget::palette ().color (m_title_widget->backgroundRole());
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	279 bcola = bcol;
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	280 }
74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	281
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	282 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	283 bcol.getRgb (&r, &g, &b);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	284 if (r+g+b < 400)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	285 m_icon_color = "-light";
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	286 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	287 m_icon_color = "";
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	288
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	289 bcola.getRgb (&r, &g, &b);
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	290 if (r+g+b < 400)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	291 m_icon_color_active = "-light";
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	292 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	293 m_icon_color_active = "";
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	294
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	295 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	296
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	297 set_style (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	298 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	299
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	300 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	301 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	302 octave_dock_widget *w_new)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	303 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	304 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	305 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	306 set_style (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	307 update ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	308 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	309
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	310 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	311 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	312 set_style (true);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	313 update ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	314 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	315 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	316
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	317 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	318 octave_dock_widget::save_settings (void)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	319 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	320 // save state of this dock-widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	321 QString name = objectName ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	322 QSettings *settings = resource_manager::get_settings ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	323
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	324 if (! settings)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	325 return;
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	326
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	327 settings->beginGroup ("DockWidgets");
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	328
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	329 if (m_floating) // widget is floating (windows), save actual floating geometry
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	330 settings->setValue (name+"_floating_geometry", geometry ());
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	331 else // not floating save docked (normal) geometry
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	332 settings->setValue (name, saveGeometry ());
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	333
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	334 settings->setValue (name+"Visible", isVisible ()); // store visibility
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	335 settings->setValue (name+"Floating", m_floating); // store visibility
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	336 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	337
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	338 settings->endGroup ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	339 settings->sync ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	340 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	341
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	342 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	343 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	344 if (e->type () == QEvent::NonClientAreaMouseButtonDblClick)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	345 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	346 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	347 return true;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	348 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	349
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	350 return QDockWidget::eventFilter (obj,e);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	351 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	352
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	353 // slot for (un)dock action
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	354 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	355 octave_dock_widget::change_floating (bool)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	356 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	357 if (m_floating)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	358 make_widget ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	359 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	360 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	361 make_window ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	362 focus ();
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	363 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	364 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	365
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	366 // slot for hiding the widget
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	367 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	368 octave_dock_widget::change_visibility (bool)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	369 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	370 setVisible (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	371 emit active_changed (false);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	372 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	373
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	374 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	375 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	376 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	377 QString css;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	378 QString css_button;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	379 QString dock_icon;
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	380
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	381 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	382
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	383 if (m_floating)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	384 dock_icon = "widget-dock";
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	385 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	386 dock_icon = "widget-undock";
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	387
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	388 #if defined (Q_OS_MAC)
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	389 QString alignment = "center";
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	390 #else
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	391 QString alignment = "center left";
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	392 #endif
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	393 if (m_custom_style)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	394 {
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	395
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	396 QColor bg_col, fg_col;
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	397
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	398 if (active)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	399 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	400 bg_col = m_bg_color_active;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	401 fg_col = m_fg_color_active;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	402 icon_col = m_icon_color_active;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	403 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	404 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	405 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	406 bg_col = m_bg_color;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	407 fg_col = m_fg_color;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	408 icon_col = m_icon_color;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	409 }
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	410
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	411 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	412 if (m_title_3d > 0)
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	413 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	414 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	415 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	416 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	417 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	418 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	419 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	420 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	421 }
19913 2a992bd19169 make color gradient of custom title bar adjustable (bug #44435) Torsten <ttl@justmail.de> parents: 19911 diff changeset	422
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	423 QString background =
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	424 QString ("background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	425 " stop: 0 %1, stop: 0.60 %2, stop: 0.95 %2 stop: 1.0 %3);").
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	426 arg (bg_col_top.name ()).
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	427 arg (bg_col.name ()).
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	428 arg (bg_col_bottom.name ());
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	429
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	430 css = background + QString (" color: %1 ;").arg (fg_col.name ());
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	431 }
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	432 else
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	433 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	434 css = QString ("");
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	435 }
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	436
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	437 m_title_widget->setStyleSheet (css);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	438 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	439 m_dock_button->setStyleSheet (css_button);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	440 m_close_button->setStyleSheet (css_button);
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	441 m_dock_action->setIcon (QIcon (":/actions/icons/" + dock_icon + icon_col +
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	442 ".png"));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	443 m_close_action->setIcon (QIcon (":/actions/icons/widget-close" + icon_col +
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	444 ".png"));
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	445 }
19423 d93293218966 custom style of dock widget title bars depending on focus (bug #43837) Torsten <ttl@justmail.de> parents: 19360 diff changeset	446
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	447 // 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	448 void
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	449 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	450 {
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	451 if (m_predecessor_widget) // only != 0 if widget was tabbed
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	452 m_predecessor_widget->focus ();
19423 d93293218966 custom style of dock widget title bars depending on focus (bug #43837) Torsten <ttl@justmail.de> parents: 19360 diff changeset	453
24828 0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	454 m_predecessor_widget = nullptr;
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	455 // 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	456 // 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	457 // 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	458 // 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	459 // octave_dock_widget::handle_settings is already called at program start.
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	460 // These tests can be removed in a future version of Octave (version 4.8).
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	461 resource_manager::update_settings_key ("Dockwidgets/title_bg_color",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	462 "DockWidgets/title_bg_color");
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	463 resource_manager::update_settings_key ("Dockwidgets/title_bg_color_active",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	464 "DockWidgets/title_bg_color_active");
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	465 resource_manager::update_settings_key ("Dockwidgets/title_fg_color",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	466 "DockWidgets/title_fg_color");
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	467 resource_manager::update_settings_key ("Dockwidgets/title_fg_color_active",
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	468 "DockWidgets/title_fg_color_active");
0f6a261ab144 move some GUI classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 24812 diff changeset	469 }
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	470 }

Mercurial > octave

annotate libgui/src/octave-dock-widget.cc @ 24858:8ce66fe46f18