SVN commit 798250 by raggi: double click on the titlebar maximizes the tool window M +12 -44 ideal.cpp M +1 -5 ideal.h --- trunk/KDE/kdevplatform/sublime/ideal.cpp #798249:798250 @@ -261,7 +261,8 @@ : QDockWidget(parent), m_area(0), m_view(0), - m_docking_area(Qt::NoDockWidgetArea) + m_docking_area(Qt::NoDockWidgetArea), + m_maximized(false) { QAbstractButton *floatButton = @@ -281,7 +282,7 @@ "will be automatically hidden when you click outside it. " "A locked tool will remain visible until you explicitly " "hide it, or switch to a different tool.")); - connect(m_anchor, SIGNAL(toggled(bool)), SLOT(slotAnchor(bool))); + connect(m_anchor, SIGNAL(toggled(bool)), SIGNAL(anchor(bool))); m_close = closeButton; m_close->setToolTip(i18n("Remove the tool")); @@ -314,44 +315,24 @@ void IdealDockWidget::setDockWidgetArea(Qt::DockWidgetArea dockingArea) { m_docking_area = dockingArea; } -QSize IdealDockWidget::sizeHint() const -{ - return QWidget::sizeHint(); -} - -QSize IdealDockWidget::minimumSizeHint() const -{ - return QWidget::minimumSizeHint(); -} - void IdealDockWidget::mouseDoubleClickEvent(QMouseEvent *event) { event->accept(); - // ### maximize here + setMaximized(!isMaximized()); + slotMaximize(isMaximized()); } bool IdealDockWidget::isMaximized() const -{ - return false; // ### fixme -#if 0 - return m_maximize->isChecked(); -#endif -} +{ return m_maximized; } +void IdealDockWidget::setMaximized(bool maximized) +{ m_maximized = maximized; } + bool IdealDockWidget::event(QEvent *e) -{ - return QWidget::event(e); -} +{ return QWidget::event(e); } -void IdealDockWidget::paintEvent(QPaintEvent *event) -{ - QDockWidget::paintEvent(event); -} - bool IdealDockWidget::isAnchored() const -{ - return m_anchor->isChecked(); -} +{ return m_anchor->isChecked(); } void IdealDockWidget::setAnchored(bool anchored, bool emitSignals) { @@ -366,19 +347,6 @@ m_anchor->blockSignals(blocked); } -void IdealDockWidget::slotAnchor(bool anchored) -{ - emit anchor(anchored); -} - -void IdealDockWidget::setMaximized(bool maximized) -{ - return; // ### fixme -#if 0 - m_maximize->setChecked(maximized); -#endif -} - void IdealDockWidget::slotMaximize(bool maximized) { #if 0 // ### fixme @@ -390,9 +358,9 @@ pix = QStyle::SP_TitleBarMaxButton; m_maximize->setIcon(style()->standardPixmap(pix)); +#endif emit maximize(maximized); -#endif } void IdealDockWidget::slotRemove() --- trunk/KDE/kdevplatform/sublime/ideal.h #798249:798250 @@ -131,14 +131,10 @@ bool isMaximized() const; void setMaximized(bool maximized); - virtual QSize sizeHint() const; - virtual QSize minimumSizeHint() const; - virtual bool event(QEvent *event); protected: // QWidget overrides virtual void contextMenuEvent(QContextMenuEvent *); - virtual void paintEvent(QPaintEvent *event); virtual void mouseDoubleClickEvent(QMouseEvent *event); Q_SIGNALS: @@ -147,7 +143,6 @@ void close(); private Q_SLOTS: - void slotAnchor(bool anchored); void slotMaximize(bool maximized); void slotRemove(); @@ -158,6 +153,7 @@ Area *m_area; View *m_view; Qt::DockWidgetArea m_docking_area; + bool m_maximized; }; class IdealCentralWidget : public QWidget