From b5f8b47f97a92b7e9624e7de8c35ae232f56035b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Nov 2011 00:35:14 -0600 Subject: Fix accidental conversion of dockwin (part 2 of 2) --- src/newui/ddockwindow.cpp | 413 ++++++++++++++++++++++++++++++++++++++++++++++ src/newui/ddockwindow.h | 115 +++++++++++++ src/newui/ddoctwindow.cpp | 413 ---------------------------------------------- src/newui/ddoctwindow.h | 115 ------------- 4 files changed, 528 insertions(+), 528 deletions(-) create mode 100644 src/newui/ddockwindow.cpp create mode 100644 src/newui/ddockwindow.h delete mode 100644 src/newui/ddoctwindow.cpp delete mode 100644 src/newui/ddoctwindow.h (limited to 'src/newui') diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp new file mode 100644 index 00000000..bf7cc627 --- /dev/null +++ b/src/newui/ddockwindow.cpp @@ -0,0 +1,413 @@ +/*************************************************************************** + * Copyright (C) 2005 by Alexander Dymo * + * adymo@kdevelop.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Library General Public License as * + * published by the Free Software Foundation; either version 2 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Library General Public * + * License along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#include "ddockwindow.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "buttonbar.h" +#include "button.h" +#include "dmainwindow.h" + +DDockWindow::DDockWindow(DMainWindow *parent, Position position) + :TQDockWindow(TQDockWindow::InDock, parent), m_position(position), m_visible(false), + m_mainWindow(parent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) +{ + setMovingEnabled(false); + setResizeEnabled(true); + + Ideal::Place place = Ideal::Left; + switch (position) { + case DDockWindow::Bottom: + m_name = "BottomToolWindow"; + place = Ideal::Bottom; + m_internalLayout = new TQVBoxLayout(boxLayout(), 0); + m_internalLayout->setDirection(TQBoxLayout::BottomToTop); + break; + case DDockWindow::Left: + m_name = "LeftToolWindow"; + place = Ideal::Left; + m_internalLayout = new TQHBoxLayout(boxLayout(), 0); + m_internalLayout->setDirection(TQBoxLayout::LeftToRight); + break; + case DDockWindow::Right: + m_name = "RightToolWindow"; + place = Ideal::Right; + m_internalLayout = new TQHBoxLayout(boxLayout(), 0); + m_internalLayout->setDirection(TQBoxLayout::RightToLeft); + break; + } + + KConfig *config = kapp->config(); + config->setGroup("UI"); + int mode = config->readNumEntry("MDIStyle", 3); + Ideal::ButtonMode buttonMode = Ideal::Text; + if (mode == 0) + buttonMode = Ideal::Icons; + else if (mode == 1) + buttonMode = Ideal::Text; + else if (mode == 3) + buttonMode = Ideal::IconsAndText; + + m_bar = new Ideal::ButtonBar(place, buttonMode, this); + m_internalLayout->addWidget(m_bar); + + m_widgetStack = new TQWidgetStack(this); + m_internalLayout->addWidget(m_widgetStack); + + m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); + m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); + m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + + setVisible(m_visible); + + loadSettings(); +} + +DDockWindow::~DDockWindow() +{ +//done in DMainWindow now +// saveSettings(); +} + +void DDockWindow::setVisible(bool v) +{ + //write dock width to the config file + KConfig *config = kapp->config(); + TQString group = TQString("%1").tqarg(m_name); + config->setGroup(group); + + if (m_visible) + config->writeEntry("ViewWidth", m_position == DDockWindow::Bottom ? height() : width() ); + setResizeEnabled(v); + setVerticallyStretchable(true); + setHorizontallyStretchable(true); + v ? m_widgetStack->show() : m_widgetStack->hide(); + m_visible = v; + + m_internalLayout->tqinvalidate(); + if (!m_visible) + { + if (m_position == DDockWindow::Bottom) + setFixedExtentHeight(m_internalLayout->tqsizeHint().height()); + else + setFixedExtentWidth(m_internalLayout->tqsizeHint().width()); + emit hidden(); + } + else + { + //restore widget size from the config + int size = 0; + if (m_position == DDockWindow::Bottom) + { + size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height()); + setFixedExtentHeight(size); + } + else + { + size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width()); + setFixedExtentWidth(size); + } + } +} + +void DDockWindow::loadSettings() +{ +} + +void DDockWindow::saveSettings() +{ + KConfig *config = kapp->config(); + TQString group = TQString("%1").tqarg(m_name); + int invisibleWidth = 0; + config->setGroup(group); + if (config->hasKey("ViewWidth")) + invisibleWidth = config->readNumEntry("ViewWidth"); + config->deleteEntry("ViewWidth"); + config->deleteEntry("ViewLastWidget"); + if (m_toggledButton && m_visible) + { + config->writeEntry("ViewWidth", m_position == DDockWindow::Bottom ? height() : width()); + config->writeEntry("ViewLastWidget", m_toggledButton->realTextWithoutAccel()); + } + else if (invisibleWidth != 0) + config->writeEntry("ViewWidth", invisibleWidth); +} + +TQWidget *DDockWindow::currentWidget() const +{ + return m_widgetStack->visibleWidget(); +} + +void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipActivation) +{ + kdDebug(9000) << k_funcinfo << endl; + TQPixmap *pm = const_cast(widget->icon()); + Ideal::Button *button; + if (pm != 0) + { + //force 16pt for now + if (pm->height() > 16) + { + TQImage img = pm->convertToImage(); + img = img.smoothScale(16, 16); + pm->convertFromImage(img); + } + button = new Ideal::Button(m_bar, title, *pm); + } + else + button = new Ideal::Button(m_bar, title); + m_widgets[button] = widget; + m_buttons[widget] = button; + m_bar->addButton(button); + + m_widgetStack->addWidget(widget); + connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget())); + connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) ); + + if (!skipActivation) + { + //if the widget was selected last time the dock is deleted + //we need to show it + KConfig *config = kapp->config(); + TQString group = TQString("%1").tqarg(m_name); + config->setGroup(group); + if (config->readEntry("ViewLastWidget") == title) + { + kdDebug(9000) << k_funcinfo << " : activating last widget " << title << endl; + button->setOn(true); + selectWidget(button); + } + } +} + +void DDockWindow::raiseWidget(TQWidget *widget) +{ + kdDebug(9000) << k_funcinfo << endl; + + if ( !widget ) return; + + Ideal::Button *button = m_buttons[widget]; + if ((button != 0) && (!button->isOn())) + { + button->setOn(true); + selectWidget(button); + } +} + +void DDockWindow::lowerWidget(TQWidget * widget) +{ + kdDebug(9000) << k_funcinfo << endl; + + if ( !widget ) return; + + Ideal::Button *button = m_buttons[widget]; + if ((button != 0) && (button->isOn())) + { + button->setOn(false); + selectWidget(button); + } +} + +void DDockWindow::removeWidget(TQWidget *widget) +{ + kdDebug(9000) << k_funcinfo << endl; + if (m_widgetStack->id(widget) == -1) + return; //not in dock + + bool changeVisibility = false; + if (m_widgetStack->visibleWidget() == widget) + changeVisibility = true; + + Ideal::Button *button = m_buttons[widget]; + if (button) + m_bar->removeButton(button); + m_widgets.remove(button); + m_buttons.remove(widget); + m_widgetStack->removeWidget(widget); + + if (changeVisibility) + { + m_toggledButton = 0; + setVisible(false); + } +} + +void DDockWindow::selectWidget(Ideal::Button *button) +{ + bool special = m_doNotCloseActiveWidget; + m_doNotCloseActiveWidget = false; + kdDebug(9000) << k_funcinfo << endl; + if (m_toggledButton == button) + { + if (special && m_visible && (!isActive())) + { + //special processing for keyboard navigation events + m_toggledButton->setOn(true); + m_widgets[button]->setFocus(); + } + else + { + m_widgets[button]->setFocus(); + setVisible(!m_visible); + } + return; + } + + if (m_toggledButton) + m_toggledButton->setOn(false); + m_toggledButton = button; + setVisible(true); + m_widgetStack->raiseWidget(m_widgets[button]); + m_widgets[button]->setFocus(); +} + +void DDockWindow::selectWidget() +{ + selectWidget((Ideal::Button*)sender()); +} + +void DDockWindow::hideWidget(TQWidget *widget) +{ + Ideal::Button *button = m_buttons[widget]; + if (button != 0) + { + button->setOn(false); + button->hide(); + } + widget->hide(); + if (button == m_toggledButton) + setVisible(false); +} + +void DDockWindow::showWidget(TQWidget *widget) +{ + Ideal::Button *button = m_buttons[widget]; + if (button != 0) + button->show(); +// widget->show(); +} + +void DDockWindow::setMovingEnabled(bool) +{ + //some operations on KMainWindow cause moving to be enabled + //but we always don't want DDockWindow instances to be movable + TQDockWindow::setMovingEnabled(false); +} + +void DDockWindow::selectLastWidget() +{ + m_doNotCloseActiveWidget = true; + if (m_toggledButton) + m_toggledButton->animateClick(); + else if (Ideal::Button *button = m_bar->firstButton()) + button->animateClick(); +} + +bool DDockWindow::isActive() +{ + if (m_toggledButton) + { + TQWidget *w = tqApp->tqfocusWidget(); + if (!w) + return false; + TQWidget *toolWidget = m_widgets[m_toggledButton]; + if (toolWidget == w) + return true; + else + { + do { + w = (TQWidget*)w->parent(); + if (w && (w == toolWidget)) return true; + } while (w); + } + } + return false; +} + +void DDockWindow::selectNextWidget() +{ + if (!m_toggledButton) + return; + Ideal::Button *b = m_bar->nextTo(m_toggledButton); + if (b) + b->animateClick(); +} + +void DDockWindow::selectPrevWidget() +{ + if (!m_toggledButton) + return; + Ideal::Button *b = m_bar->prevTo(m_toggledButton); + if (b) + b->animateClick(); +} + +void DDockWindow::contextMenu(TQPopupMenu * menu) +{ + m_lastContextMenuButton = static_cast( TQT_TQWIDGET(const_cast( sender() )) ); + + menu->insertSeparator(); + + if ( position() != DDockWindow::Left ) + m_moveToDockLeft->plug( menu ); + if ( position()!= DDockWindow::Right ) + m_moveToDockRight->plug( menu ); + if ( position() != DDockWindow::Bottom ) + m_moveToDockBottom->plug( menu ); +} + +void DDockWindow::moveToDockLeft() +{ + moveToDock( DDockWindow::Left ); +} + +void DDockWindow::moveToDockRight() +{ + moveToDock( DDockWindow::Right ); +} + +void DDockWindow::moveToDockBottom() +{ + moveToDock( DDockWindow::Bottom ); +} + +void DDockWindow::moveToDock(DDockWindow::Position position ) +{ + if ( m_widgets.contains( m_lastContextMenuButton ) ) + { + mainWindow()->moveWidget( position, m_widgets[ m_lastContextMenuButton ], m_lastContextMenuButton->realTextWithoutAccel() ); + } +} + +#include "ddockwindow.moc" diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h new file mode 100644 index 00000000..d98aa375 --- /dev/null +++ b/src/newui/ddockwindow.h @@ -0,0 +1,115 @@ +/*************************************************************************** + * Copyright (C) 2005 by Alexander Dymo * + * adymo@kdevelop.org * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU Library General Public License as * + * published by the Free Software Foundation; either version 2 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Library General Public * + * License along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef DDOCKWINDOW_H +#define DDOCKWINDOW_H + +#include +#include + +class TQBoxLayout; +class TQToolButton; +class TQWidgetStack; +class TQPopupMenu; + +class KComboBox; +class KAction; + +class DMainWindow; + +namespace Ideal { + class Button; + class ButtonBar; +} + +class DDockWindow : public TQDockWindow { + Q_OBJECT + TQ_OBJECT +public: + enum Position { Bottom, Left, Right }; + + DDockWindow(DMainWindow *parent, Position position); + virtual ~DDockWindow(); + + virtual void setVisible(bool v); + bool visible() const { return m_visible; } + Position position() const { return m_position; } + + virtual void addWidget(const TQString &title, TQWidget *widget, bool skipActivation = false); + virtual void raiseWidget(TQWidget *widget); + virtual void lowerWidget(TQWidget *widget); + /**Removes the widget from dock. Does not delete it.*/ + virtual void removeWidget(TQWidget *widget); + + virtual void hideWidget(TQWidget *widget); + virtual void showWidget(TQWidget *widget); + + virtual TQWidget *currentWidget() const; + + virtual void setMovingEnabled(bool b); + + virtual void saveSettings(); + + DMainWindow *mainWindow() const { return m_mainWindow; } + + virtual void selectLastWidget(); + virtual void selectNextWidget(); + virtual void selectPrevWidget(); + + bool isActive(); + +signals: + void hidden(); + +private slots: + void selectWidget(); + void selectWidget(Ideal::Button *button); + void contextMenu(TQPopupMenu*); + void moveToDockLeft(); + void moveToDockRight(); + void moveToDockBottom(); + void moveToDock(DDockWindow::Position); + +protected: + virtual void loadSettings(); + + Ideal::ButtonBar *m_bar; + TQWidgetStack *m_widgetStack; + + TQMap m_widgets; + TQMap m_buttons; + +private: + Position m_position; + bool m_visible; + TQString m_name; + DMainWindow *m_mainWindow; + bool m_doNotCloseActiveWidget; + + Ideal::Button *m_toggledButton; + Ideal::Button *m_lastContextMenuButton; + TQBoxLayout *m_internalLayout; + + + KAction * m_moveToDockLeft; + KAction * m_moveToDockRight; + KAction * m_moveToDockBottom; +}; + +#endif diff --git a/src/newui/ddoctwindow.cpp b/src/newui/ddoctwindow.cpp deleted file mode 100644 index bf7cc627..00000000 --- a/src/newui/ddoctwindow.cpp +++ /dev/null @@ -1,413 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Alexander Dymo * - * adymo@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Library General Public License as * - * published by the Free Software Foundation; either version 2 of the * - * License, or (at your option) any later version. * - * * - * This program 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 Library General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#include "ddockwindow.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "buttonbar.h" -#include "button.h" -#include "dmainwindow.h" - -DDockWindow::DDockWindow(DMainWindow *parent, Position position) - :TQDockWindow(TQDockWindow::InDock, parent), m_position(position), m_visible(false), - m_mainWindow(parent), m_doNotCloseActiveWidget(false), m_toggledButton(0), m_lastContextMenuButton(0) -{ - setMovingEnabled(false); - setResizeEnabled(true); - - Ideal::Place place = Ideal::Left; - switch (position) { - case DDockWindow::Bottom: - m_name = "BottomToolWindow"; - place = Ideal::Bottom; - m_internalLayout = new TQVBoxLayout(boxLayout(), 0); - m_internalLayout->setDirection(TQBoxLayout::BottomToTop); - break; - case DDockWindow::Left: - m_name = "LeftToolWindow"; - place = Ideal::Left; - m_internalLayout = new TQHBoxLayout(boxLayout(), 0); - m_internalLayout->setDirection(TQBoxLayout::LeftToRight); - break; - case DDockWindow::Right: - m_name = "RightToolWindow"; - place = Ideal::Right; - m_internalLayout = new TQHBoxLayout(boxLayout(), 0); - m_internalLayout->setDirection(TQBoxLayout::RightToLeft); - break; - } - - KConfig *config = kapp->config(); - config->setGroup("UI"); - int mode = config->readNumEntry("MDIStyle", 3); - Ideal::ButtonMode buttonMode = Ideal::Text; - if (mode == 0) - buttonMode = Ideal::Icons; - else if (mode == 1) - buttonMode = Ideal::Text; - else if (mode == 3) - buttonMode = Ideal::IconsAndText; - - m_bar = new Ideal::ButtonBar(place, buttonMode, this); - m_internalLayout->addWidget(m_bar); - - m_widgetStack = new TQWidgetStack(this); - m_internalLayout->addWidget(m_widgetStack); - - m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); - - setVisible(m_visible); - - loadSettings(); -} - -DDockWindow::~DDockWindow() -{ -//done in DMainWindow now -// saveSettings(); -} - -void DDockWindow::setVisible(bool v) -{ - //write dock width to the config file - KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); - config->setGroup(group); - - if (m_visible) - config->writeEntry("ViewWidth", m_position == DDockWindow::Bottom ? height() : width() ); - setResizeEnabled(v); - setVerticallyStretchable(true); - setHorizontallyStretchable(true); - v ? m_widgetStack->show() : m_widgetStack->hide(); - m_visible = v; - - m_internalLayout->tqinvalidate(); - if (!m_visible) - { - if (m_position == DDockWindow::Bottom) - setFixedExtentHeight(m_internalLayout->tqsizeHint().height()); - else - setFixedExtentWidth(m_internalLayout->tqsizeHint().width()); - emit hidden(); - } - else - { - //restore widget size from the config - int size = 0; - if (m_position == DDockWindow::Bottom) - { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().height()); - setFixedExtentHeight(size); - } - else - { - size = config->readNumEntry("ViewWidth", m_internalLayout->tqsizeHint().width()); - setFixedExtentWidth(size); - } - } -} - -void DDockWindow::loadSettings() -{ -} - -void DDockWindow::saveSettings() -{ - KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); - int invisibleWidth = 0; - config->setGroup(group); - if (config->hasKey("ViewWidth")) - invisibleWidth = config->readNumEntry("ViewWidth"); - config->deleteEntry("ViewWidth"); - config->deleteEntry("ViewLastWidget"); - if (m_toggledButton && m_visible) - { - config->writeEntry("ViewWidth", m_position == DDockWindow::Bottom ? height() : width()); - config->writeEntry("ViewLastWidget", m_toggledButton->realTextWithoutAccel()); - } - else if (invisibleWidth != 0) - config->writeEntry("ViewWidth", invisibleWidth); -} - -TQWidget *DDockWindow::currentWidget() const -{ - return m_widgetStack->visibleWidget(); -} - -void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipActivation) -{ - kdDebug(9000) << k_funcinfo << endl; - TQPixmap *pm = const_cast(widget->icon()); - Ideal::Button *button; - if (pm != 0) - { - //force 16pt for now - if (pm->height() > 16) - { - TQImage img = pm->convertToImage(); - img = img.smoothScale(16, 16); - pm->convertFromImage(img); - } - button = new Ideal::Button(m_bar, title, *pm); - } - else - button = new Ideal::Button(m_bar, title); - m_widgets[button] = widget; - m_buttons[widget] = button; - m_bar->addButton(button); - - m_widgetStack->addWidget(widget); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget())); - connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) ); - - if (!skipActivation) - { - //if the widget was selected last time the dock is deleted - //we need to show it - KConfig *config = kapp->config(); - TQString group = TQString("%1").tqarg(m_name); - config->setGroup(group); - if (config->readEntry("ViewLastWidget") == title) - { - kdDebug(9000) << k_funcinfo << " : activating last widget " << title << endl; - button->setOn(true); - selectWidget(button); - } - } -} - -void DDockWindow::raiseWidget(TQWidget *widget) -{ - kdDebug(9000) << k_funcinfo << endl; - - if ( !widget ) return; - - Ideal::Button *button = m_buttons[widget]; - if ((button != 0) && (!button->isOn())) - { - button->setOn(true); - selectWidget(button); - } -} - -void DDockWindow::lowerWidget(TQWidget * widget) -{ - kdDebug(9000) << k_funcinfo << endl; - - if ( !widget ) return; - - Ideal::Button *button = m_buttons[widget]; - if ((button != 0) && (button->isOn())) - { - button->setOn(false); - selectWidget(button); - } -} - -void DDockWindow::removeWidget(TQWidget *widget) -{ - kdDebug(9000) << k_funcinfo << endl; - if (m_widgetStack->id(widget) == -1) - return; //not in dock - - bool changeVisibility = false; - if (m_widgetStack->visibleWidget() == widget) - changeVisibility = true; - - Ideal::Button *button = m_buttons[widget]; - if (button) - m_bar->removeButton(button); - m_widgets.remove(button); - m_buttons.remove(widget); - m_widgetStack->removeWidget(widget); - - if (changeVisibility) - { - m_toggledButton = 0; - setVisible(false); - } -} - -void DDockWindow::selectWidget(Ideal::Button *button) -{ - bool special = m_doNotCloseActiveWidget; - m_doNotCloseActiveWidget = false; - kdDebug(9000) << k_funcinfo << endl; - if (m_toggledButton == button) - { - if (special && m_visible && (!isActive())) - { - //special processing for keyboard navigation events - m_toggledButton->setOn(true); - m_widgets[button]->setFocus(); - } - else - { - m_widgets[button]->setFocus(); - setVisible(!m_visible); - } - return; - } - - if (m_toggledButton) - m_toggledButton->setOn(false); - m_toggledButton = button; - setVisible(true); - m_widgetStack->raiseWidget(m_widgets[button]); - m_widgets[button]->setFocus(); -} - -void DDockWindow::selectWidget() -{ - selectWidget((Ideal::Button*)sender()); -} - -void DDockWindow::hideWidget(TQWidget *widget) -{ - Ideal::Button *button = m_buttons[widget]; - if (button != 0) - { - button->setOn(false); - button->hide(); - } - widget->hide(); - if (button == m_toggledButton) - setVisible(false); -} - -void DDockWindow::showWidget(TQWidget *widget) -{ - Ideal::Button *button = m_buttons[widget]; - if (button != 0) - button->show(); -// widget->show(); -} - -void DDockWindow::setMovingEnabled(bool) -{ - //some operations on KMainWindow cause moving to be enabled - //but we always don't want DDockWindow instances to be movable - TQDockWindow::setMovingEnabled(false); -} - -void DDockWindow::selectLastWidget() -{ - m_doNotCloseActiveWidget = true; - if (m_toggledButton) - m_toggledButton->animateClick(); - else if (Ideal::Button *button = m_bar->firstButton()) - button->animateClick(); -} - -bool DDockWindow::isActive() -{ - if (m_toggledButton) - { - TQWidget *w = tqApp->tqfocusWidget(); - if (!w) - return false; - TQWidget *toolWidget = m_widgets[m_toggledButton]; - if (toolWidget == w) - return true; - else - { - do { - w = (TQWidget*)w->parent(); - if (w && (w == toolWidget)) return true; - } while (w); - } - } - return false; -} - -void DDockWindow::selectNextWidget() -{ - if (!m_toggledButton) - return; - Ideal::Button *b = m_bar->nextTo(m_toggledButton); - if (b) - b->animateClick(); -} - -void DDockWindow::selectPrevWidget() -{ - if (!m_toggledButton) - return; - Ideal::Button *b = m_bar->prevTo(m_toggledButton); - if (b) - b->animateClick(); -} - -void DDockWindow::contextMenu(TQPopupMenu * menu) -{ - m_lastContextMenuButton = static_cast( TQT_TQWIDGET(const_cast( sender() )) ); - - menu->insertSeparator(); - - if ( position() != DDockWindow::Left ) - m_moveToDockLeft->plug( menu ); - if ( position()!= DDockWindow::Right ) - m_moveToDockRight->plug( menu ); - if ( position() != DDockWindow::Bottom ) - m_moveToDockBottom->plug( menu ); -} - -void DDockWindow::moveToDockLeft() -{ - moveToDock( DDockWindow::Left ); -} - -void DDockWindow::moveToDockRight() -{ - moveToDock( DDockWindow::Right ); -} - -void DDockWindow::moveToDockBottom() -{ - moveToDock( DDockWindow::Bottom ); -} - -void DDockWindow::moveToDock(DDockWindow::Position position ) -{ - if ( m_widgets.contains( m_lastContextMenuButton ) ) - { - mainWindow()->moveWidget( position, m_widgets[ m_lastContextMenuButton ], m_lastContextMenuButton->realTextWithoutAccel() ); - } -} - -#include "ddockwindow.moc" diff --git a/src/newui/ddoctwindow.h b/src/newui/ddoctwindow.h deleted file mode 100644 index d98aa375..00000000 --- a/src/newui/ddoctwindow.h +++ /dev/null @@ -1,115 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2005 by Alexander Dymo * - * adymo@kdevelop.org * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU Library General Public License as * - * published by the Free Software Foundation; either version 2 of the * - * License, or (at your option) any later version. * - * * - * This program 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 Library General Public * - * License along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ -#ifndef DDOCKWINDOW_H -#define DDOCKWINDOW_H - -#include -#include - -class TQBoxLayout; -class TQToolButton; -class TQWidgetStack; -class TQPopupMenu; - -class KComboBox; -class KAction; - -class DMainWindow; - -namespace Ideal { - class Button; - class ButtonBar; -} - -class DDockWindow : public TQDockWindow { - Q_OBJECT - TQ_OBJECT -public: - enum Position { Bottom, Left, Right }; - - DDockWindow(DMainWindow *parent, Position position); - virtual ~DDockWindow(); - - virtual void setVisible(bool v); - bool visible() const { return m_visible; } - Position position() const { return m_position; } - - virtual void addWidget(const TQString &title, TQWidget *widget, bool skipActivation = false); - virtual void raiseWidget(TQWidget *widget); - virtual void lowerWidget(TQWidget *widget); - /**Removes the widget from dock. Does not delete it.*/ - virtual void removeWidget(TQWidget *widget); - - virtual void hideWidget(TQWidget *widget); - virtual void showWidget(TQWidget *widget); - - virtual TQWidget *currentWidget() const; - - virtual void setMovingEnabled(bool b); - - virtual void saveSettings(); - - DMainWindow *mainWindow() const { return m_mainWindow; } - - virtual void selectLastWidget(); - virtual void selectNextWidget(); - virtual void selectPrevWidget(); - - bool isActive(); - -signals: - void hidden(); - -private slots: - void selectWidget(); - void selectWidget(Ideal::Button *button); - void contextMenu(TQPopupMenu*); - void moveToDockLeft(); - void moveToDockRight(); - void moveToDockBottom(); - void moveToDock(DDockWindow::Position); - -protected: - virtual void loadSettings(); - - Ideal::ButtonBar *m_bar; - TQWidgetStack *m_widgetStack; - - TQMap m_widgets; - TQMap m_buttons; - -private: - Position m_position; - bool m_visible; - TQString m_name; - DMainWindow *m_mainWindow; - bool m_doNotCloseActiveWidget; - - Ideal::Button *m_toggledButton; - Ideal::Button *m_lastContextMenuButton; - TQBoxLayout *m_internalLayout; - - - KAction * m_moveToDockLeft; - KAction * m_moveToDockRight; - KAction * m_moveToDockBottom; -}; - -#endif -- cgit v1.2.1