Mercurial > octave
view libgui/src/octave-dock-widget.cc @ 17686:65544374c1cf
restore (un)docking of widgets without reparenting on non-windows systems
* octave-dock-widget.cc(constructor): dock widgets features depending on system;
(destructor): update comment;
(set_title): set title in user defined title bar widget only on windows;
(make_window): just set the windows flag when floating on non-windows systems;
(make_widget): just set the widget flag when docked on non-windows systems;
(change_floating): detect actual state from related flag on non-windows sys.;
* main-window.cc(set_window_layout): use correct setting categorie for geometry
author | Torsten <ttl@justmail.de> |
---|---|
date | Fri, 18 Oct 2013 20:01:03 +0200 |
parents | 1d544ac39369 |
children | 86c6ae5f969e |
line wrap: on
line source
/* Copyright (C) 2012-2013 Richard Crozier Copyright (C) 2013 Torsten <ttl@justmail.de> This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #include <QApplication> #include <QToolBar> #include <QToolButton> #include <QAction> #include <QHBoxLayout> #include <QLabel> #include <QSettings> #include "resource-manager.h" #include "octave-dock-widget.h" octave_dock_widget::octave_dock_widget (QWidget *p) : QDockWidget (p) { _parent = static_cast<QMainWindow *> (p); // store main window connect (this, SIGNAL (visibilityChanged (bool)), this, SLOT (handle_visibility_changed (bool))); connect (p, SIGNAL (settings_changed (const QSettings*)), this, SLOT (notice_settings (const QSettings*))); #if defined (Q_OS_WIN32) // windows: add an extra title bar that persists when floating setFeatures (QDockWidget::DockWidgetMovable); // not floatable or closeable // the custom (extra) title bar of the widget _dock_action = new QAction (QIcon (":/actions/icons/widget-undock.png"), "", this); _dock_action-> setToolTip (tr ("Undock widget")); connect (_dock_action, SIGNAL (triggered (bool)), this, SLOT (change_floating (bool))); QToolButton *dock_button = new QToolButton (this); dock_button->setDefaultAction (_dock_action); dock_button->setFocusPolicy(Qt::NoFocus); dock_button->setIconSize(QSize(12,12)); QAction *close_action = new QAction (QIcon (":/actions/icons/widget-close.png"), "", this ); close_action-> setToolTip (tr ("Hide widget")); connect (close_action, SIGNAL (triggered (bool)), this, SLOT (change_visibility (bool))); QToolButton *close_button = new QToolButton (this); close_button->setDefaultAction (close_action); close_button->setFocusPolicy(Qt::NoFocus); close_button->setIconSize(QSize(12,12)); QHBoxLayout *h_layout = new QHBoxLayout (); h_layout->addStretch (100); h_layout->addWidget (dock_button); h_layout->addWidget (close_button); h_layout->setSpacing (0); h_layout->setContentsMargins (6,0,0,0); QWidget *title_widget = new QWidget (); title_widget->setLayout (h_layout); setTitleBarWidget (title_widget); #else // non windows: qt takes control of floating widgets setFeatures (QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetFloatable); // floatable and closeable connect (this, SIGNAL (topLevelChanged (bool)), this, SLOT (change_floating (bool))); #endif // copy & paste handling connect (p, SIGNAL (copyClipboard_signal ()), this, SLOT (copyClipboard ())); connect (p, SIGNAL (pasteClipboard_signal()), this, SLOT (pasteClipboard ())); } octave_dock_widget::~octave_dock_widget () { // save state of this dock-widget bool floating = false; bool visible; QString name = objectName (); QSettings *settings = resource_manager::get_settings (); settings->beginGroup ("DockWidgets"); if (!parent ()) { // widget is floating (windows), save actual floating geometry floating = true; settings->setValue (name+"_floating_geometry", saveGeometry ()); } else // not floating save docked (normal) geometry settings->setValue (name, saveGeometry ()); visible = isVisible (); settings->setValue (name+"Floating", floating); // store floating state settings->setValue (name+"Visible", visible); // store visibility settings->endGroup (); settings->sync (); } // connect signal visibility changed to related slot (called from main-window) void octave_dock_widget::connect_visibility_changed (void) { connect (this, SIGNAL (visibilityChanged (bool)), this, SLOT (handle_visibility (bool))); emit active_changed (isVisible ()); // emit once for init of window menu } // set the title in the dockwidgets title bar void octave_dock_widget::set_title (const QString& title) { #if defined (Q_OS_WIN32) QHBoxLayout* h_layout = static_cast<QHBoxLayout *> (titleBarWidget ()->layout ()); QLabel *label = new QLabel (title); h_layout->insertWidget (0,label); #endif setWindowTitle (title); } // make the widget floating void octave_dock_widget::make_window () { #if defined (Q_OS_WIN32) // windows: the widget has to be reparented (parent = 0) QSettings *settings = resource_manager::get_settings (); // save the docking area for later redocking // FIXME: dockWidgetArea always returns 2 settings->setValue ("DockWidgets/" + objectName () + "_dock_area", _parent->dockWidgetArea (this)); settings->sync (); // remove parent and adjust the (un)dock icon setParent (0, Qt::Window); _dock_action->setIcon (QIcon (":/actions/icons/widget-dock.png")); _dock_action->setToolTip (tr ("Dock widget")); // restore the last geometry when floating restoreGeometry (settings->value ("DockWidgets/" + objectName ()+"_floating_geometry").toByteArray ()); #else // non windows: Just set the appripriate window flag setWindowFlags (Qt::Window); #endif } // dock the widget void octave_dock_widget::make_widget (bool dock) { #if defined (Q_OS_WIN32) // windows: Since floating widget has no parent, we have to readd it QSettings *settings = resource_manager::get_settings (); // save last floating geometry settings->setValue ("DockWidgets/" + objectName () + "_floating_geometry", saveGeometry ()); settings->sync (); if (dock) { // add widget to last saved docking area (dock=true is default) int area = settings->value ("DockWidgets/" + objectName () + "_dock_area", Qt::TopDockWidgetArea).toInt (); _parent->addDockWidget (static_cast<Qt::DockWidgetArea> (area), this); // FIXME: restoreGeometry is ignored for docked widgets and its child widget // restoreGeometry (settings->value // ("DockWidgets/" + objectName ()).toByteArray ()); } else // only reparent, no docking setParent (_parent); // adjust the (un)dock icon _dock_action->setIcon (QIcon (":/actions/icons/widget-undock.png")); _dock_action->setToolTip (tr ("Undock widget")); #else // non windows: just say we are a docked widget again setWindowFlags (Qt::Widget); #endif } // slot for (un)dock action void octave_dock_widget::change_floating (bool floating) { #if defined (Q_OS_WIN32) if (parent()) #else if (floating) #endif { make_window (); focus (); } else make_widget (); } // slot for hiding the widget void octave_dock_widget::change_visibility (bool) { setVisible (false); emit active_changed (false); } // get focus widget QWidget * octave_dock_widget::focusWidget () { QWidget * w = QApplication::focusWidget (); if(w && w->focusProxy ()) w = w->focusProxy (); return w; }