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

annotate libgui/src/octave-dock-widget.cc @ 33634:4a70f390c85e default tip @

maint: Merge stable to default.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Tue, 28 May 2024 15:25:54 +0200
parents	7f18c537e101
children

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
32632 2e484f9f1f18 maint: update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 32519 diff changeset	3 // Copyright (C) 2012-2024 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
17923 b602014eeb54 * octave-dock-widget.cc: Include config.h. John W. Eaton <jwe@octave.org> parents: 17899 diff changeset	28 #endif
b602014eeb54 * octave-dock-widget.cc: Include config.h. John W. Eaton <jwe@octave.org> parents: 17899 diff changeset	29
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	30 #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	31 #include <QApplication>
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	32 #include <QHBoxLayout>
d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	33 #include <QLabel>
30690 e2c8c852399e replace use of depreciated QDesktopWidget in GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30626 diff changeset	34 #include <QScreen>
19918 66928b4546ab dock-/undock- and close-icons with variable size (bug #41938) Torsten <ttl@justmail.de> parents: 19913 diff changeset	35 #include <QStyle>
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	36 #include <QToolBar>
27468 8ba19629d5ef compacter menu bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27467 diff changeset	37 #include <QMenuBar>
30690 e2c8c852399e replace use of depreciated QDesktopWidget in GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30626 diff changeset	38 #include <QWindow>
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	39
27665 a1271c5b621a replace preference literals by symbolic constants for dock widgets Torsten Lilge <ttl-octave@mailbox.org> parents: 27629 diff changeset	40 #include "gui-preferences-dw.h"
27671 61883a1a80a1 don't include gui-preferences-global.h in gui-preferences.h John W. Eaton <jwe@octave.org> parents: 27665 diff changeset	41 #include "gui-preferences-global.h"
27562 d7876110e854 use symbolic preference keys if available John W. Eaton <jwe@octave.org> parents: 27560 diff changeset	42 #include "gui-preferences-mw.h"
27937 8dc5b36f1245 include new undock/dock actions into the shortcut manager Torsten Lilge <ttl-octave@mailbox.org> parents: 27936 diff changeset	43 #include "gui-preferences-sc.h"
27611 0495b64288f7 use new gui_settings class instead of using QSettings directly John W. Eaton <jwe@octave.org> parents: 27562 diff changeset	44 #include "gui-settings.h"
30690 e2c8c852399e replace use of depreciated QDesktopWidget in GUI Torsten Lilge <ttl-octave@mailbox.org> parents: 30626 diff changeset	45 #include "gui-utils.h"
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29612 diff changeset	46 #include "main-window.h"
27412 da1f59fe04b3 try to use consitent ordering for include files in libgui sources John W. Eaton <jwe@octave.org> parents: 27302 diff changeset	47 #include "octave-dock-widget.h"
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	48
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30788 diff changeset	49 OCTAVE_BEGIN_NAMESPACE(octave)
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30788 diff changeset	50
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	51 label_dock_widget::label_dock_widget (QWidget *p)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	52 : QDockWidget (p), m_default_float_button (nullptr),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	53 m_default_close_button (nullptr)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	54 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	55 QStyle *st = style ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	56 m_icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	57
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	58 // keep track of the original buttons on the default title bar,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	59 // the button further left is considered "float"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	60 QList<QAbstractButton > buttonlist = findChildren<QAbstractButton > ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	61 if (buttonlist.size () == 2)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	62 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	63 if (buttonlist.at (0)->x () < buttonlist.at (1)->x ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	64 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	65 m_default_float_button = buttonlist.at (0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	66 m_default_close_button = buttonlist.at (1);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	67 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	68 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	69 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	70 m_default_float_button = buttonlist.at (1);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	71 m_default_close_button = buttonlist.at (0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	72 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	73 }
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	74
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	75 gui_settings settings;
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	76
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	77 // the custom (extra) title bar of the widget
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	78 m_title_widget = new QWidget ();
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	79
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	80 m_dock_action = new QAction
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	81 (settings.icon ("widget-undock", true), "", this);
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	82 m_dock_action->setToolTip (tr ("Undock Widget"));
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	83 m_dock_button = new QToolButton (m_title_widget);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	84 m_dock_button->setDefaultAction (m_dock_action);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	85 m_dock_button->setFocusPolicy (Qt::NoFocus);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	86 m_dock_button->setIconSize (QSize (m_icon_size, m_icon_size));
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	87
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	88 m_close_action = new QAction
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	89 (settings.icon ("widget-close", true), "", this);
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	90 m_close_action->setToolTip (tr ("Close Widget"));
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	91 m_close_button = new QToolButton (m_title_widget);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	92 m_close_button->setDefaultAction (m_close_action);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	93 m_close_button->setFocusPolicy (Qt::NoFocus);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	94 m_close_button->setIconSize (QSize (m_icon_size, m_icon_size));
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	95
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	96 QString css_button = QString ("QToolButton {background: transparent; border: 0px;}");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	97 m_dock_button->setStyleSheet (css_button);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	98 m_close_button->setStyleSheet (css_button);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	99
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	100 QHBoxLayout *h_layout = new QHBoxLayout ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	101 h_layout->addStretch (100);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	102 h_layout->addWidget (m_dock_button);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	103 h_layout->addWidget (m_close_button);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	104 h_layout->setSpacing (10);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	105 h_layout->setContentsMargins (5, 2, 2, 2);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	106
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	107 m_title_widget->setLayout (h_layout);
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	108
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	109 if (p && (p->objectName () == gui_obj_name_main_window))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	110 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	111 // Only connect the when a parent (main window) is given
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	112 // copy & paste handling
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	113 connect (p, SIGNAL (copyClipboard_signal ()),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	114 this, SLOT (copyClipboard ()));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	115 connect (p, SIGNAL (pasteClipboard_signal ()),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	116 this, SLOT (pasteClipboard ()));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	117 connect (p, SIGNAL (selectAll_signal ()),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	118 this, SLOT (selectAll ()));
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	119
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	120 // undo handling
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	121 connect (p, SIGNAL (undo_signal ()), this, SLOT (do_undo ()));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	122 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 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
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	125 // set the title in the dockwidgets title bar
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	126 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	127 label_dock_widget::set_title (const QString& title)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	128 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	129 QHBoxLayout *h_layout
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	130 = static_cast<QHBoxLayout *> (m_title_widget->layout ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	131 QLabel *label = new QLabel (title, m_title_widget);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	132 label->setStyleSheet ("background-color: transparent;");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	133 h_layout->insertWidget (0, label);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	134 setTitleBarWidget (m_title_widget);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	135 setWindowTitle (title);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	136 }
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	137
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	138 static QString
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	139 qdockwidget_css (const QString& close_icon, const QString& close_tooltip,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	140 const QString& float_icon, const QString& float_tooltip,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	141 int icon_size, const QString& titlebar_foreground,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	142 const QString& titlebar_background)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	143 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	144 return QString ("QDockWidget\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	145 "{\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	146 "%6"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	147 " border: none;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	148 " titlebar-close-icon: url(%1);\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	149 " titlebar-normal-icon: url(%2);\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	150 "}\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	151 "\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	152 "QDockWidget::close-button, QDockWidget::float-button\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	153 "{\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	154 " border: none;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	155 " icon-size: %3px;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	156 "}\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	157 "\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	158 "QAbstractButton#qt_dockwidget_closebutton\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	159 "{\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	160 " qproperty-toolTip: \"%4\";\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	161 "}\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	162 "\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	163 "QAbstractButton#qt_dockwidget_floatbutton\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	164 "{\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	165 " qproperty-toolTip: \"%5\";\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	166 "}\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	167 "\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	168 "QDockWidget::title {\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	169 " text-align: left;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	170 "%7"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	171 " padding-left: 1px;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	172 "}\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	173 "\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	174 "QDockWidget::close-button\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	175 "{\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	176 " right: %8px;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	177 " top: 3px;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	178 "}\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	179 "\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	180 "QDockWidget::float-button\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	181 "{\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	182 " right: %9px;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	183 " top: 3px;\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	184 "}\n"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	185 ).arg (close_icon).arg (float_icon).arg (icon_size)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	186 .arg (close_tooltip).arg (float_tooltip)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	187 .arg (titlebar_foreground).arg (titlebar_background)
33359 689d4d069bbf maint: Use Octave coding convention of space between function name and parentheses in libgui/. Rik <rik@octave.org> parents: 33034 diff changeset	188 .arg ((icon_size2)/3).arg ((icon_size7)/3);
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	189 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	190
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	191 octave_dock_widget::octave_dock_widget (const QString& obj_name, QWidget *p)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	192 : label_dock_widget (p), m_main_window (nullptr), m_adopted (false),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	193 m_custom_style (false), m_focus_follows_mouse (false),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	194 m_recent_float_geom (), m_recent_dock_geom (),
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	195 m_waiting_for_mouse_button_release (false)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	196 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	197 setObjectName (obj_name);
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	198
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	199 // FIXME: Can we avoid the cast here?
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	200 m_main_window = dynamic_cast<main_window *> (p);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	201
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	202 m_predecessor_widget = nullptr;
26818 f7b10bd40045 fix dock widget position when being dragged out of the main window (bug #55704) Torsten <mttl@mailbox.org> parents: 26452 diff changeset	203
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	204 connect (this, &octave_dock_widget::topLevelChanged,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	205 this, &octave_dock_widget::toplevel_change);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	206 connect (this, &octave_dock_widget::visibilityChanged,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	207 this, &octave_dock_widget::handle_visibility);
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	208
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	209 if (m_default_float_button != nullptr)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	210 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	211 disconnect (m_default_float_button, 0, 0, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	212 connect (m_default_float_button, &QAbstractButton::clicked,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	213 this, &octave_dock_widget::make_window);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	214 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	215 connect (this, &octave_dock_widget::queue_make_window,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	216 this, &octave_dock_widget::make_window, Qt::QueuedConnection);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	217 connect (this, &octave_dock_widget::queue_make_widget,
33034 49128bdb9eb2 use explicit lambda-expression captures (bug #65318) John W. Eaton <jwe@octave.org> parents: 33033 diff changeset	218 this, [this] () { make_widget (); }, Qt::QueuedConnection);
27937 8dc5b36f1245 include new undock/dock actions into the shortcut manager Torsten Lilge <ttl-octave@mailbox.org> parents: 27936 diff changeset	219
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	220 gui_settings settings;
27937 8dc5b36f1245 include new undock/dock actions into the shortcut manager Torsten Lilge <ttl-octave@mailbox.org> parents: 27936 diff changeset	221
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	222 settings.set_shortcut (m_dock_action, sc_dock_widget_dock);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	223 m_dock_action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	224 addAction (m_dock_action);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	225 connect (m_dock_action, &QAction::triggered,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	226 this, &octave_dock_widget::make_window);
25384 9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	227
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	228 settings.set_shortcut (m_close_action, sc_dock_widget_close);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	229 m_close_action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	230 addAction (m_close_action);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	231 connect (m_close_action, &QAction::triggered,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	232 this, &octave_dock_widget::change_visibility);
27089 9326c2258e60 fix visibility of find dialog when editor is docked/undocked (bug #5) Torsten Lilge <ttl-octave@mailbox.org> parents: 26818 diff changeset	233
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	234 m_close_action->setToolTip (tr ("Hide Widget"));
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	235
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	236 setStyleSheet (qdockwidget_css
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	237 (global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-close.png",
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	238 QString ("Close Widget"),
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	239 global_icon_paths.at (ICON_THEME_OCTAVE) + "widget-undock.png",
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	240 QString ("Undock Widget"), m_icon_size, "", ""));
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	241
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	242 if (widget ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	243 widget ()->setToolTip ("");
29754 4c569e386e9b improve behavior of dockable widgets (bug #60750) John W. Eaton <jwe@octave.org> parents: 29709 diff changeset	244
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	245 m_icon_color = "";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	246 m_title_3d = 50;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	247
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	248 installEventFilter (this);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	249
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	250 setFocusPolicy (Qt::StrongFocus);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	251
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	252 setFeatures (QDockWidget::DockWidgetClosable
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	253 \| QDockWidget::DockWidgetMovable
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	254 \| QDockWidget::DockWidgetFloatable);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	255
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	256 handle_settings ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	257 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	258
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	259 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	260 octave_dock_widget::init_window_menu_entry ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	261 {
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33375 diff changeset	262 Q_EMIT active_changed (isVisible ()); // emit once for init of window menu
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	263 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	264
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	265 // make the widget floating
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	266 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	267 octave_dock_widget::make_window (bool widget_was_dragged)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	268 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	269 bool vis = isVisible ();
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	270
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	271 // prevent follow-up calls by clearing state variable
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	272 m_waiting_for_mouse_button_release = false;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	273
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	274 set_focus_predecessor (); // set focus previously active widget if tabbed
25384 9b67c2294129 fix missing title bar highlighting when (un)docking a widget Torsten <mttl@mailbox.org> parents: 25373 diff changeset	275
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	276 // Before unparenting, get current geometry for restoring if dragged
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	277 QRect geom = geometry ();
17686 65544374c1cf restore (un)docking of widgets without reparenting on non-windows systems Torsten <ttl@justmail.de> parents: 17090 diff changeset	278
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	279 // the widget has to be reparented (parent = 0), preferably
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	280 // from a non-toplevel widget otherwise may not have full
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	281 // decorations, e.g., no taskbar icon and always in front
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	282 if (isFloating ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	283 setFloating (false);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	284
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	285 if (m_main_window)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	286 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	287 // Before making it a separate (no more parent) floating widget,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	288 // remove the dock widget from the main window. This ensures
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	289 // that tabbed widgets keep their focus when it is re-docked
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	290 // later
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	291 m_main_window->removeDockWidget (this);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	292 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	293
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	294 setParent (0, Qt::CustomizeWindowHint \| Qt::WindowTitleHint \|
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	295 Qt::WindowMinMaxButtonsHint \| Qt::WindowCloseButtonHint \| Qt::Window);
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29612 diff changeset	296
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	297 // restore the last geometry when floating only if we have not dragged
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	298 // the window outside the main window
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	299 if (! widget_was_dragged)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	300 geom = m_recent_float_geom.isNull () ? QRect (50,100,480,480)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	301 : m_recent_float_geom;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	302 setGeometry (geom);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	303
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	304 // adjust the (un)dock action
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	305 disconnect (m_dock_action, 0, this, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	306 connect (m_dock_action, &QAction::triggered,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	307 this, &octave_dock_widget::make_widget);
27937 8dc5b36f1245 include new undock/dock actions into the shortcut manager Torsten Lilge <ttl-octave@mailbox.org> parents: 27936 diff changeset	308
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	309 // adjust the (un)dock icon
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	310 if (titleBarWidget ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	311 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	312 gui_settings settings;
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29612 diff changeset	313
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	314 m_dock_action->setIcon (settings.icon ("widget-dock" + m_icon_color, true));
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	315 m_dock_action->setToolTip (tr ("Dock Widget"));
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	316 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	317 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	318 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	319 disconnect (m_default_float_button, 0, this, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	320 connect (m_default_float_button, &QAbstractButton::clicked,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	321 this, &octave_dock_widget::make_widget);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	322 }
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29612 diff changeset	323
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	324 raise ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	325 activateWindow ();
28018 20a9b99d515c fix restoring floating console widget (bug #56989) Torsten Lilge <ttl-octave@mailbox.org> parents: 28005 diff changeset	326
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	327 if (vis)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	328 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	329 show ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	330 setFocus ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	331 set_style (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	332 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	333
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33375 diff changeset	334 Q_EMIT topLevelChanged (true); // Be sure signal is emitted
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	335 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	336
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	337 // dock the widget
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	338 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	339 octave_dock_widget::make_widget (bool)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	340 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	341 gui_settings settings;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	342
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	343 bool vis = isVisible ();
25356 1008b4797a6e fix visibility of dock widgets at startup Torsten <mttl@mailbox.org> parents: 25355 diff changeset	344
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	345 // Since floating widget has no parent, we have to read it
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	346
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	347 if (m_main_window)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	348 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	349 settings.setValue (mw_state.settings_key (), m_main_window->saveState ());
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	350
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	351 // Stay window, otherwise will bounce back to window by default
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	352 // because there is no layout information for this widget in the
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	353 // saved settings.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	354 setParent (m_main_window, Qt::Window);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	355 m_main_window->addDockWidget (Qt::BottomDockWidgetArea, this);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	356 m_adopted = false;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	357 // recover old window states, hide and re-show new added widget
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	358 m_main_window->restoreState (settings.value (mw_state.settings_key ()).toByteArray ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	359 setFloating (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	360 // restore size using setGeometry instead of restoreGeometry
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	361 // following this post:
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	362 // https://forum.qt.io/topic/79326/qdockwidget-restoregeometry-not-working-correctly-when-qmainwindow-is-maximized/5
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	363 setGeometry (m_recent_dock_geom);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	364 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	365
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	366 // adjust the (un)dock icon
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	367 disconnect (m_dock_action, 0, this, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	368 connect (m_dock_action, &QAction::triggered,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	369 this, &octave_dock_widget::make_window);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	370 if (titleBarWidget ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	371 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	372 m_dock_action->setIcon (settings.icon ("widget-undock" + m_icon_color, true));
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	373 m_dock_action->setToolTip (tr ("Undock Widget"));
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	374 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	375 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	376 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	377 disconnect (m_default_float_button, 0, this, 0);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	378 connect (m_default_float_button, &QAbstractButton::clicked,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	379 this, &octave_dock_widget::make_window);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	380 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	381
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	382 raise ();
32336 269aa0454b35 gui: Avoid using deprecated function "setActiveWindow". Markus Mützel <markus.muetzel@gmx.de> parents: 32280 diff changeset	383 activateWindow ();
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	384
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	385 if (vis)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	386 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	387 show ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	388 setFocus ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	389 set_style (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	390 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	391 }
29613 9367cba2a6d5 allow most dock widgets to be used from command line John W. Eaton <jwe@octave.org> parents: 29612 diff changeset	392
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	393 // dock the widget
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	394 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	395 octave_dock_widget::default_dock (bool)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	396 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	397 setFloating (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	398 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	399
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	400 // set the widget which previously had focus when tabified
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	401 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	402 octave_dock_widget::set_predecessor_widget (octave_dock_widget *prev_widget)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	403 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	404 m_predecessor_widget = prev_widget;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	405 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	406
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	407 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	408 octave_dock_widget::set_main_window (main_window *mw)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	409 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	410 m_main_window = mw;
27665 a1271c5b621a replace preference literals by symbolic constants for dock widgets Torsten Lilge <ttl-octave@mailbox.org> parents: 27629 diff changeset	411
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	412 if (m_main_window)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	413 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	414 connect (m_main_window, &main_window::copyClipboard_signal,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	415 this, &octave_dock_widget::copyClipboard);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	416
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	417 connect (m_main_window, &main_window::pasteClipboard_signal,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	418 this, &octave_dock_widget::pasteClipboard);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	419
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	420 connect (m_main_window, &main_window::selectAll_signal,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	421 this, &octave_dock_widget::selectAll);
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	422
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	423 connect (m_main_window, &main_window::undo_signal,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	424 this, &octave_dock_widget::do_undo);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	425 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	426 }
24842 74229798f604 always select suitable icon color for sock widgets depending on title bar color Torsten <mttl@mailbox.org> parents: 24836 diff changeset	427
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	428 // close event
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	429 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	430 octave_dock_widget::closeEvent (QCloseEvent *e)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	431 {
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33375 diff changeset	432 Q_EMIT active_changed (false);
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	433 set_focus_predecessor ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	434 save_settings ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	435
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	436 QDockWidget::closeEvent (e);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	437 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	438
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	439 // get focus widget
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	440 QWidget *
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	441 octave_dock_widget::focusWidget ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	442 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	443 QWidget *w = QApplication::focusWidget ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	444 if (w && w->focusProxy ()) w = w->focusProxy ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	445 return w;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	446 }
29694 54c0eb5548ee restore previous widget geometry when invoked from cli (bug #60630) Torsten Lilge <ttl-octave@mailbox.org> parents: 29613 diff changeset	447
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	448 bool
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	449 octave_dock_widget::event (QEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	450 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	451 // low-level check of whether docked-widget became a window via
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	452 // double-click or via drag-and-drop
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	453 if ( (event->type () == QEvent::MouseButtonDblClick && ! isFloating ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	454 \|\| (event->type () == QEvent::ActivationChange
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	455 && m_waiting_for_mouse_button_release))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	456 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	457 bool retval = QDockWidget::event (event);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	458 if (isFloating () && parent () != 0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	459 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	460 m_waiting_for_mouse_button_release = false;
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33375 diff changeset	461 Q_EMIT queue_make_window (event->type () != QEvent::MouseButtonDblClick);
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	462 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	463 return retval;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	464 }
26299 c95884eed1cf make restoring gui more robust to changes of desktop size (bug #53207) Torsten <mttl@mailbox.org> parents: 25907 diff changeset	465
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	466 return QDockWidget::event (event);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	467 }
26428 93c4fabb2ead only reset floating geometry of dock widget when not visible (bug #53207) Torsten <mttl@mailbox.org> parents: 26376 diff changeset	468
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	469 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	470 octave_dock_widget::handle_settings ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	471 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	472 gui_settings settings;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	473
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	474 m_focus_follows_mouse = settings.bool_value (dw_focus_follows_mouse);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	475
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	476 m_custom_style
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	477 = settings.bool_value (dw_title_custom_style);
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	478
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	479 m_title_3d = settings.int_value (dw_title_3d);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	480
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	481 m_fg_color = settings.color_value (dw_title_fg_color);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	482
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	483 m_fg_color_active = settings.color_value (dw_title_fg_color_active);
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
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	485 m_bg_color = settings.color_value (dw_title_bg_color);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	486
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	487 m_bg_color_active = settings.color_value (dw_title_bg_color_active);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	488
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	489 QColor bcol (m_bg_color);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	490 QColor bcola (m_bg_color_active);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	491
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	492 if (! m_custom_style)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	493 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	494 bcol = QWidget::palette ().color (m_title_widget->backgroundRole ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	495 bcola = bcol;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	496 }
27467 c7a898396151 compacter tool bar and filter bars in dock widgets (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27412 diff changeset	497
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	498 int r, g, b;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	499 bcol.getRgb (&r, &g, &b);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	500 if (r+g+b < 400)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	501 m_icon_color = "-light";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	502 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	503 m_icon_color = "";
27478 9e526393d80a reduced vertical space in gui with responsive toolbar buttons (bug #53902) Torsten Lilge <ttl-octave@mailbox.org> parents: 27468 diff changeset	504
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	505 bcola.getRgb (&r, &g, &b);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	506 if (r+g+b < 400)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	507 m_icon_color_active = "-light";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	508 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	509 m_icon_color_active = "";
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	510
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	511 int x, y, w, h;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	512 QGuiApplication::primaryScreen ()->availableGeometry ().getRect (&x, &y, &w, &h);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	513 QRect default_floating_size = QRect (x+16, y+32, w/3, h/2);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	514
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	515 QRect default_dock_size;
33375 a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	516 QString key_ext;
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	517 if (m_main_window)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	518 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	519 // We have a main window, dock size depends on size of main window
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	520 m_main_window->geometry ().getRect (&x, &y, &w, &h);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	521 default_dock_size = QRect (x+16, y+32, w/3, h/3);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	522 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	523 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	524 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	525 // No main window, default dock size should never be used
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	526 default_dock_size = QRect (0, 0, w/10, h/10);
33375 a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	527 key_ext = settings_no_mainwin;
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	528 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	529
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	530 m_recent_float_geom
33375 a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	531 = settings.value (dw_float_geometry.settings_key ().arg (objectName ()) + key_ext,
32592 094a296b3ba1 maint: C++ style check for libgui/ directory. Rik <rik@octave.org> parents: 32519 diff changeset	532 default_floating_size).toRect ();
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	533
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	534 adjust_to_screen (m_recent_float_geom, default_floating_size);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	535
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	536 // The following is required for ensure smooth transition from old
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	537 // saveGeomety to new QRect setting (see comment for restoring size
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	538 // of docked widgets)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	539 QVariant dock_geom
33375 a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	540 = settings.value (dw_dock_geometry.settings_key ().arg (objectName ()) + key_ext,
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	541 default_dock_size);
32280 6f39259f20be remove compiler warnings on QVariant::canConvert in Qt6 Torsten Lilge <ttl-octave@mailbox.org> parents: 31808 diff changeset	542 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
6f39259f20be remove compiler warnings on QVariant::canConvert in Qt6 Torsten Lilge <ttl-octave@mailbox.org> parents: 31808 diff changeset	543 if (dock_geom.canConvert (QMetaType (QMetaType::QRect)))
6f39259f20be remove compiler warnings on QVariant::canConvert in Qt6 Torsten Lilge <ttl-octave@mailbox.org> parents: 31808 diff changeset	544 #else
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	545 if (dock_geom.canConvert (QMetaType::QRect))
32280 6f39259f20be remove compiler warnings on QVariant::canConvert in Qt6 Torsten Lilge <ttl-octave@mailbox.org> parents: 31808 diff changeset	546 #endif
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	547 m_recent_dock_geom = dock_geom.toRect ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	548 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	549 m_recent_dock_geom = dw_dock_geometry.def ().toRect ();
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	550
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	551 notice_settings (); // call individual handler
25355 5bb07f6e3707 fix uninitialized settings of octave dock widgets at startup (bug #53835) Torsten <mttl@mailbox.org> parents: 25354 diff changeset	552
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	553 set_style (false);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	554
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	555 // Compacter design
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	556 QToolBar toolbar = findChild <QToolBar > ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	557 if (toolbar)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	558 toolbar->setStyleSheet (toolbar->styleSheet () + global_toolbar_style);
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	559
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	560 QMenuBar menubar = findChild <QMenuBar > ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	561 if (menubar)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	562 menubar->setStyleSheet (menubar->styleSheet () + global_menubar_style);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	563
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	564 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	565
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	566 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	567 octave_dock_widget::handle_active_dock_changed (octave_dock_widget *w_old,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	568 octave_dock_widget *w_new)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	569 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	570 if (m_custom_style && this == w_old)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	571 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	572 set_style (false);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	573 update ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	574 }
24014 bffd7d826887 style fixes for some GUI source files John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	575
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	576 if (m_custom_style && this == w_new)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	577 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	578 set_style (true);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	579 update ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	580 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	581 }
29202 66af654b3485 provide focus follows mouse for widgets in the main window (bug #59701) Torsten Lilge <ttl-octave@mailbox.org> parents: 29199 diff changeset	582
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	583 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	584 octave_dock_widget::save_settings ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	585 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	586 gui_settings settings;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	587
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	588 // save state of this dock-widget
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	589 QString name = objectName ();
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	590
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	591 store_geometry ();
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	592
33375 a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	593 QString key_ext;
a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	594 if (! m_main_window)
a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	595 key_ext = settings_no_mainwin;
a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	596
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	597 // conditional needed?
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	598 if (! m_recent_float_geom.isNull ())
33375 a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	599 settings.setValue (dw_float_geometry.settings_key ().arg (name) + key_ext, m_recent_float_geom);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	600
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	601 if (! m_recent_dock_geom.isEmpty ())
33375 a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	602 settings.setValue (dw_dock_geometry.settings_key ().arg (name) + key_ext, m_recent_dock_geom);
a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	603 settings.setValue (dw_is_visible.settings_key ().arg (name) + key_ext, isVisible ()); // store visibility
a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	604 settings.setValue (dw_is_floating.settings_key ().arg (name) + key_ext, isFloating ()); // store floating
a45ccf01d41b use different widget geometry setting when widget launched from cli Torsten Lilge <ttl-octave@mailbox.org> parents: 33359 diff changeset	605 settings.setValue (dw_is_minimized.settings_key ().arg (name) + key_ext, isMinimized ()); // store minimized
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	606
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	607 settings.sync ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	608 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	609
32592 094a296b3ba1 maint: C++ style check for libgui/ directory. Rik <rik@octave.org> parents: 32519 diff changeset	610 bool
094a296b3ba1 maint: C++ style check for libgui/ directory. Rik <rik@octave.org> parents: 32519 diff changeset	611 octave_dock_widget::eventFilter (QObject obj, QEvent e)
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	612 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	613 // Ignore double clicks into window decoration elements
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	614 if (e->type () == QEvent::NonClientAreaMouseButtonDblClick)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	615 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	616 e->ignore ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	617 return true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	618 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	619
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	620 // Detect mouse enter events if "focus follows mouse" is desired
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	621 // for widgets docked to the main window (non floating) and activate
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	622 // the widget currently under the mouse
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	623 if (m_focus_follows_mouse && ! isFloating () && (e->type () == QEvent::Enter))
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	624 setFocus ();
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	625
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	626 return QDockWidget::eventFilter (obj, e);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	627 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	628
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	629 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	630 octave_dock_widget::store_geometry ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	631 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	632 if (isFloating ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	633 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	634 if (! parent ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	635 m_recent_float_geom = geometry ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	636 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	637 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	638 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	639 m_recent_dock_geom = geometry ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	640 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	641 }
16798 d749c9b588e5 make stand-alone windows from dock widgets when floating (bug #38785) Torsten <ttl@justmail.de> parents: diff changeset	642
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	643 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	644 octave_dock_widget::moveEvent (QMoveEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	645 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	646 store_geometry ();
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	647
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	648 QDockWidget::moveEvent (event);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	649 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	650
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	651 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	652 octave_dock_widget::resizeEvent (QResizeEvent *event)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	653 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	654 store_geometry ();
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	655
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	656 QDockWidget::resizeEvent (event);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	657 }
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	658
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	659 // slot for hiding the widget
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	660 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	661 octave_dock_widget::change_visibility (bool)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	662 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	663 setVisible (false);
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33375 diff changeset	664 Q_EMIT active_changed (false);
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	665 }
27281 0915fec3d3a9 prevent gui from catching focus when its desktop workspace becomes active Torsten Lilge <ttl-octave@mailbox.org> parents: 27255 diff changeset	666
32592 094a296b3ba1 maint: C++ style check for libgui/ directory. Rik <rik@octave.org> parents: 32519 diff changeset	667 void
094a296b3ba1 maint: C++ style check for libgui/ directory. Rik <rik@octave.org> parents: 32519 diff changeset	668 octave_dock_widget::activate ()
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	669 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	670 if (! isVisible ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	671 setVisible (true);
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	672
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	673 setFocus ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	674 activateWindow ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	675 raise ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	676 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	677
32592 094a296b3ba1 maint: C++ style check for libgui/ directory. Rik <rik@octave.org> parents: 32519 diff changeset	678 void
094a296b3ba1 maint: C++ style check for libgui/ directory. Rik <rik@octave.org> parents: 32519 diff changeset	679 octave_dock_widget::handle_visibility (bool visible)
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	680 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	681 if (visible)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	682 {
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33375 diff changeset	683 Q_EMIT active_changed (true);
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	684 if (! isFloating ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	685 setFocus ();
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	686 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	687 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	688
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	689 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	690 octave_dock_widget::toplevel_change (bool toplevel)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	691 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	692 QObject *dockobj;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	693 const char *docksig;
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	694
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	695 if (titleBarWidget ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	696 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	697 dockobj = m_dock_action;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	698 docksig = SIGNAL (triggered (bool));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	699 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	700 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	701 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	702 dockobj = m_default_float_button;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	703 docksig = SIGNAL (clicked (bool));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	704 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	705
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	706 if (toplevel)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	707 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	708 // This is a fallback in case the attempt to create a floated
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	709 // top-level window fails and the QDockWidget remains a child
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	710 // of the QMainWindow.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	711 connect (dockobj, docksig, this, SLOT (default_dock (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	712
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	713 // Could be dragging window, so must wait until there is a
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	714 // change in focus.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	715 if (parent () != 0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	716 m_waiting_for_mouse_button_release = true;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	717 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	718 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	719 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	720 // If a drag-and-drop within the QMainWindow occurred, want to remain a widget.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	721 m_waiting_for_mouse_button_release = false;
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	722
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	723 // Making into a widget immediately will mangle the double-click
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	724 // status and cause problems on followup button clicks.
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	725 if (parent () == 0)
33599 7f18c537e101 maint: Update Qt macros to avoid name collisions Arun Giridhar <arungiridhar@gmail.com> parents: 33375 diff changeset	726 Q_EMIT queue_make_widget ();
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	727 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	728 }
19431 bd27cd403d00 fix errors when building octave for windows (regression from d93293218966) Torsten <ttl@justmail.de> parents: 19423 diff changeset	729
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	730 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	731 octave_dock_widget::set_style (bool active)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	732 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	733 QString css_foreground;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	734 QString css_background;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	735 QString css_button;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	736 QString dock_icon;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	737
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	738 QString icon_col = m_icon_color;
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	739
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	740 QString close_tooltip = "Close Widget";
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	741 QString dock_tooltip;
31648 29d734430e5f maint: Re-indent code after switch to using namespace macros. John W. Eaton <jwe@octave.org> parents: 31646 diff changeset	742
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	743 if (isFloating ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	744 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	745 dock_icon = "widget-dock";
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	746 dock_tooltip = "Dock Widget";
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	747 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	748 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	749 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	750 dock_icon = "widget-undock";
32519 6ff63f154144 maint: Review and update strings that appear in GUI. Rik <rik@octave.org> parents: 32336 diff changeset	751 dock_tooltip = "Undock Widget";
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	752 }
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	753
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	754 #if defined (Q_OS_MAC)
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	755 QString alignment = "center";
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	756 #else
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	757 QString alignment = "center left";
20794 e870a68742a6 change alignment of dock widget titles for OSX (bug #46592) Torsten <ttl@justmail.de> parents: 20630 diff changeset	758 #endif
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	759 if (m_custom_style)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	760 {
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	761
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	762 QColor bg_col, fg_col;
18218 7952fb0435db improve title bar of dock widgets Torsten <ttl@justmail.de> parents: 18180 diff changeset	763
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	764 if (active)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	765 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	766 bg_col = m_bg_color_active;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	767 fg_col = m_fg_color_active;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	768 icon_col = m_icon_color_active;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	769 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	770 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	771 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	772 bg_col = m_bg_color;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	773 fg_col = m_fg_color;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	774 icon_col = m_icon_color;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	775 }
19913 2a992bd19169 make color gradient of custom title bar adjustable (bug #44435) Torsten <ttl@justmail.de> parents: 19911 diff changeset	776
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	777 QColor bg_col_top, bg_col_bottom;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	778 if (m_title_3d > 0)
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	779 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	780 bg_col_top = bg_col.lighter (100 + m_title_3d);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	781 bg_col_bottom = bg_col.darker (100 + m_title_3d);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	782 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	783 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	784 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	785 bg_col_top = bg_col.darker (100 - m_title_3d);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	786 bg_col_bottom = bg_col.lighter (100 - m_title_3d);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	787 }
25354 05a690606fd5 Use default title bar to preserve GUI float decorations (bug #53276) Daniel J Sebald <daniel.sebald@ieee.org> parents: 25172 diff changeset	788
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	789 css_foreground = QString (" color: %1;\n").arg (fg_col.name ());
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	790
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	791 css_background =
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	792 QString (" background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,"
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	793 " stop: 0 %1, stop: 0.60 %2, stop: 0.95 %2 stop: 1.0 %3);\n").
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	794 arg (bg_col_top.name ()).
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	795 arg (bg_col.name ()).
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	796 arg (bg_col_bottom.name ());
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	797 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	798 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	799 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	800 css_foreground = "";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	801 css_background = "";
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	802 }
18180 b3838cedfe04 redesign of dock widgets title bar with configurable colors Torsten <ttl@justmail.de> parents: 17929 diff changeset	803
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	804 QString full_dock_icon = dock_icon + icon_col;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	805 QString full_close_icon = "widget-close" + icon_col;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	806 if (titleBarWidget ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	807 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	808 gui_settings settings;
19423 d93293218966 custom style of dock widget title bars depending on focus (bug #43837) Torsten <ttl@justmail.de> parents: 19360 diff changeset	809
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	810 titleBarWidget ()->setStyleSheet (css_foreground + css_background);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	811 css_button = QString ("QToolButton {background: transparent; border: 0px;}");
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	812 m_dock_button->setStyleSheet (css_button);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	813 m_close_button->setStyleSheet (css_button);
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	814 m_dock_action->setIcon (settings.icon (full_dock_icon, true));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	815 m_close_action->setIcon (settings.icon (full_close_icon, true));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	816 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	817 else
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	818 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	819 setStyleSheet (qdockwidget_css (global_icon_paths.at (ICON_THEME_OCTAVE) + full_close_icon + ".png",
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	820 close_tooltip,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	821 global_icon_paths.at (ICON_THEME_OCTAVE) + full_dock_icon + ".png",
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	822 dock_tooltip,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	823 m_icon_size,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	824 css_foreground,
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	825 css_background));
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	826 }
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	827 }
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	828
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	829 // set focus to previously active widget in tabbed widget stack
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	830 void
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	831 octave_dock_widget::set_focus_predecessor ()
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	832 {
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	833 // only != 0 if widget was tabbed
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	834 if (m_predecessor_widget && m_predecessor_widget->isVisible ())
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	835 m_predecessor_widget->setFocus ();
27629 8b6e928e0705 in GUI objects, store reference to base_qobject instead of resource_manager John W. Eaton <jwe@octave.org> parents: 27620 diff changeset	836
31808 90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	837 m_predecessor_widget = nullptr;
90621682cc03 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libgui/ Rik <rik@octave.org> parents: 31771 diff changeset	838 }
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30788 diff changeset	839
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30788 diff changeset	840 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libgui/src/octave-dock-widget.cc @ 33634:4a70f390c85e default tip @