From 4d7f7455811dee0e15dc1b33ae507a16ca807cc8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Nov 2011 00:35:13 -0600 Subject: Fix accidental conversion of dockwin (part 2 of 2) --- qtinterface/qt4/Qt/q3dockwindow.h | 239 ++++++++++++++++++++++++++++++++++++++ qtinterface/qt4/Qt/q3doctwindow.h | 239 -------------------------------------- qtinterface/tqdockwindow.cpp | 23 ++++ qtinterface/tqdockwindow.h | 45 +++++++ qtinterface/tqdoctwindow.cpp | 23 ---- qtinterface/tqdoctwindow.h | 45 ------- 6 files changed, 307 insertions(+), 307 deletions(-) create mode 100644 qtinterface/qt4/Qt/q3dockwindow.h delete mode 100644 qtinterface/qt4/Qt/q3doctwindow.h create mode 100644 qtinterface/tqdockwindow.cpp create mode 100644 qtinterface/tqdockwindow.h delete mode 100644 qtinterface/tqdoctwindow.cpp delete mode 100644 qtinterface/tqdoctwindow.h diff --git a/qtinterface/qt4/Qt/q3dockwindow.h b/qtinterface/qt4/Qt/q3dockwindow.h new file mode 100644 index 0000000..1069012 --- /dev/null +++ b/qtinterface/qt4/Qt/q3dockwindow.h @@ -0,0 +1,239 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt3Support module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef Q3DOCKWINDOW_H +#define Q3DOCKWINDOW_H + +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Qt3SupportLight) + +#ifndef QT_NO_MAINWINDOW + +class Q3DockWindowHandle; +class Q3DockWindowTitleBar; +class QPainter; +class Q3DockWindowResizeHandle; +class QBoxLayout; +class QHBoxLayout; +class QVBoxLayout; +class Q3DockArea; +class QWidgetResizeHandler; +class Q3MainWindow; +class Q3DockAreaLayout; +class Q3DockWindowPrivate; +class Q3ToolBar; +class QWindowsXPStyle; +class QRubberBand; + +class Q_COMPAT_EXPORT Q3DockWindow : public Q3Frame +{ + Q_OBJECT + Q_ENUMS(CloseMode Place) + Q_PROPERTY(int closeMode READ closeMode WRITE setCloseMode) + Q_PROPERTY(bool resizeEnabled READ isResizeEnabled WRITE setResizeEnabled) + Q_PROPERTY(bool movingEnabled READ isMovingEnabled WRITE setMovingEnabled) + Q_PROPERTY(bool horizontallyStretchable READ isHorizontallyStretchable WRITE setHorizontallyStretchable) + Q_PROPERTY(bool verticallyStretchable READ isVerticallyStretchable WRITE setVerticallyStretchable) + Q_PROPERTY(bool stretchable READ isStretchable) + Q_PROPERTY(bool newLine READ newLine WRITE setNewLine) + Q_PROPERTY(bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving) + Q_PROPERTY(int offset READ offset WRITE setOffset) + Q_PROPERTY(Place place READ place) + + friend class Q3DockWindowHandle; + friend class Q3DockWindowTitleBar; + friend class Q3DockArea; + friend class Q3DockAreaLayout; + friend class Q3MainWindow; + friend class QCEMainWindow; + friend class Q3ToolBar; + friend class QWindowsXPStyle; + +public: + enum Place { InDock, OutsideDock }; + enum CloseMode { Never = 0, Docked = 1, Undocked = 2, Always = Docked | Undocked }; + + Q3DockWindow(Place p = InDock, QWidget* parent=0, const char* name=0, Qt::WindowFlags f = 0); + Q3DockWindow(QWidget* parent, const char* name=0, Qt::WindowFlags f = 0); + ~Q3DockWindow(); + + virtual void setWidget(QWidget *w); + QWidget *widget() const; + + Place place() const { return curPlace; } + + Q3DockArea *area() const; + + virtual void setCloseMode(int m); + bool isCloseEnabled() const; + int closeMode() const; + + virtual void setResizeEnabled(bool b); + virtual void setMovingEnabled(bool b); + bool isResizeEnabled() const; + bool isMovingEnabled() const; + + virtual void setHorizontallyStretchable(bool b); + virtual void setVerticallyStretchable(bool b); + bool isHorizontallyStretchable() const; + bool isVerticallyStretchable() const; + void setHorizontalStretchable(bool b) { setHorizontallyStretchable(b); } + void setVerticalStretchable(bool b) { setVerticallyStretchable(b); } + bool isHorizontalStretchable() const { return isHorizontallyStretchable(); } + bool isVerticalStretchable() const { return isVerticallyStretchable(); } + bool isStretchable() const; + + virtual void setOffset(int o); + int offset() const; + + virtual void setFixedExtentWidth(int w); + virtual void setFixedExtentHeight(int h); + QSize fixedExtent() const; + + virtual void setNewLine(bool b); + bool newLine() const; + + Qt::Orientation orientation() const; + + QSize sizeHint() const; + QSize minimumSize() const; + QSize minimumSizeHint() const; + + QBoxLayout *boxLayout(); + + virtual void setOpaqueMoving(bool b); + bool opaqueMoving() const; + + bool eventFilter(QObject *o, QEvent *e); + + QString windowTitle() const; + +Q_SIGNALS: + void orientationChanged(Qt::Orientation o); + void placeChanged(Q3DockWindow::Place p); + void visibilityChanged(bool); + +public Q_SLOTS: + virtual void undock(QWidget *w); + virtual void undock() { undock(0); } + virtual void dock(); + virtual void setOrientation(Qt::Orientation o); + +protected: + void resizeEvent(QResizeEvent *e); + void showEvent(QShowEvent *e); + void hideEvent(QHideEvent *e); + void contextMenuEvent(QContextMenuEvent *e); + + void drawFrame(QPainter *); + void drawContents(QPainter *); + + bool event(QEvent *e); + +private Q_SLOTS: + void toggleVisible() { setVisible(!isVisible()); } + +private: + Q3DockWindow(Place p, QWidget* parent, const char* name, Qt::WindowFlags f, bool toolbar); + + void handleMove(const QPoint &pos, const QPoint &gp, bool drawRect); + void updateGui(); + void updateSplitterVisibility(bool visible); + + void startRectDraw(const QPoint &so, bool drawRect); + void endRectDraw(bool drawRect); + void updatePosition(const QPoint &globalPos ); + QWidget *areaAt(const QPoint &gp); + void removeFromDock(bool fixNewLines = true); + void swapRect(QRect &r, Qt::Orientation o, const QPoint &offset, Q3DockArea *area); + void init(); + +private: + Q3DockWindowHandle *horHandle, *verHandle; + Q3DockWindowTitleBar *titleBar; + QWidget *wid; + QRubberBand *rubberBand; + Q3DockArea *dockArea, *tmpDockArea; + QRect currRect; + Place curPlace; + Place state; + bool resizeEnabled : 1; + bool moveEnabled : 1; + bool nl : 1; + bool opaque : 1; + bool isToolbar : 1; + bool stretchable[3]; + Qt::Orientation startOrientation; + int cMode; + QPoint startOffset; + int offs; + QSize fExtent; + Q3DockWindowResizeHandle *hHandleTop, *hHandleBottom, *vHandleLeft, *vHandleRight; + QVBoxLayout *hbox; + QHBoxLayout *vbox; + QBoxLayout *childBox; + void *dockWindowData; + QPoint lastPos; + QSize lastSize; + QWidgetResizeHandler *widgetResizeHandler; + Q3DockWindowPrivate *d; + +private: + Q_DISABLE_COPY(Q3DockWindow) +}; + +inline Q3DockArea *Q3DockWindow::area() const +{ + return dockArea; +} + +#endif // QT_NO_MAINWINDOW + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // Q3DOCKWINDOW_H diff --git a/qtinterface/qt4/Qt/q3doctwindow.h b/qtinterface/qt4/Qt/q3doctwindow.h deleted file mode 100644 index 1069012..0000000 --- a/qtinterface/qt4/Qt/q3doctwindow.h +++ /dev/null @@ -1,239 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt3Support module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial Usage -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Nokia. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef Q3DOCKWINDOW_H -#define Q3DOCKWINDOW_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Qt3SupportLight) - -#ifndef QT_NO_MAINWINDOW - -class Q3DockWindowHandle; -class Q3DockWindowTitleBar; -class QPainter; -class Q3DockWindowResizeHandle; -class QBoxLayout; -class QHBoxLayout; -class QVBoxLayout; -class Q3DockArea; -class QWidgetResizeHandler; -class Q3MainWindow; -class Q3DockAreaLayout; -class Q3DockWindowPrivate; -class Q3ToolBar; -class QWindowsXPStyle; -class QRubberBand; - -class Q_COMPAT_EXPORT Q3DockWindow : public Q3Frame -{ - Q_OBJECT - Q_ENUMS(CloseMode Place) - Q_PROPERTY(int closeMode READ closeMode WRITE setCloseMode) - Q_PROPERTY(bool resizeEnabled READ isResizeEnabled WRITE setResizeEnabled) - Q_PROPERTY(bool movingEnabled READ isMovingEnabled WRITE setMovingEnabled) - Q_PROPERTY(bool horizontallyStretchable READ isHorizontallyStretchable WRITE setHorizontallyStretchable) - Q_PROPERTY(bool verticallyStretchable READ isVerticallyStretchable WRITE setVerticallyStretchable) - Q_PROPERTY(bool stretchable READ isStretchable) - Q_PROPERTY(bool newLine READ newLine WRITE setNewLine) - Q_PROPERTY(bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving) - Q_PROPERTY(int offset READ offset WRITE setOffset) - Q_PROPERTY(Place place READ place) - - friend class Q3DockWindowHandle; - friend class Q3DockWindowTitleBar; - friend class Q3DockArea; - friend class Q3DockAreaLayout; - friend class Q3MainWindow; - friend class QCEMainWindow; - friend class Q3ToolBar; - friend class QWindowsXPStyle; - -public: - enum Place { InDock, OutsideDock }; - enum CloseMode { Never = 0, Docked = 1, Undocked = 2, Always = Docked | Undocked }; - - Q3DockWindow(Place p = InDock, QWidget* parent=0, const char* name=0, Qt::WindowFlags f = 0); - Q3DockWindow(QWidget* parent, const char* name=0, Qt::WindowFlags f = 0); - ~Q3DockWindow(); - - virtual void setWidget(QWidget *w); - QWidget *widget() const; - - Place place() const { return curPlace; } - - Q3DockArea *area() const; - - virtual void setCloseMode(int m); - bool isCloseEnabled() const; - int closeMode() const; - - virtual void setResizeEnabled(bool b); - virtual void setMovingEnabled(bool b); - bool isResizeEnabled() const; - bool isMovingEnabled() const; - - virtual void setHorizontallyStretchable(bool b); - virtual void setVerticallyStretchable(bool b); - bool isHorizontallyStretchable() const; - bool isVerticallyStretchable() const; - void setHorizontalStretchable(bool b) { setHorizontallyStretchable(b); } - void setVerticalStretchable(bool b) { setVerticallyStretchable(b); } - bool isHorizontalStretchable() const { return isHorizontallyStretchable(); } - bool isVerticalStretchable() const { return isVerticallyStretchable(); } - bool isStretchable() const; - - virtual void setOffset(int o); - int offset() const; - - virtual void setFixedExtentWidth(int w); - virtual void setFixedExtentHeight(int h); - QSize fixedExtent() const; - - virtual void setNewLine(bool b); - bool newLine() const; - - Qt::Orientation orientation() const; - - QSize sizeHint() const; - QSize minimumSize() const; - QSize minimumSizeHint() const; - - QBoxLayout *boxLayout(); - - virtual void setOpaqueMoving(bool b); - bool opaqueMoving() const; - - bool eventFilter(QObject *o, QEvent *e); - - QString windowTitle() const; - -Q_SIGNALS: - void orientationChanged(Qt::Orientation o); - void placeChanged(Q3DockWindow::Place p); - void visibilityChanged(bool); - -public Q_SLOTS: - virtual void undock(QWidget *w); - virtual void undock() { undock(0); } - virtual void dock(); - virtual void setOrientation(Qt::Orientation o); - -protected: - void resizeEvent(QResizeEvent *e); - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); - void contextMenuEvent(QContextMenuEvent *e); - - void drawFrame(QPainter *); - void drawContents(QPainter *); - - bool event(QEvent *e); - -private Q_SLOTS: - void toggleVisible() { setVisible(!isVisible()); } - -private: - Q3DockWindow(Place p, QWidget* parent, const char* name, Qt::WindowFlags f, bool toolbar); - - void handleMove(const QPoint &pos, const QPoint &gp, bool drawRect); - void updateGui(); - void updateSplitterVisibility(bool visible); - - void startRectDraw(const QPoint &so, bool drawRect); - void endRectDraw(bool drawRect); - void updatePosition(const QPoint &globalPos ); - QWidget *areaAt(const QPoint &gp); - void removeFromDock(bool fixNewLines = true); - void swapRect(QRect &r, Qt::Orientation o, const QPoint &offset, Q3DockArea *area); - void init(); - -private: - Q3DockWindowHandle *horHandle, *verHandle; - Q3DockWindowTitleBar *titleBar; - QWidget *wid; - QRubberBand *rubberBand; - Q3DockArea *dockArea, *tmpDockArea; - QRect currRect; - Place curPlace; - Place state; - bool resizeEnabled : 1; - bool moveEnabled : 1; - bool nl : 1; - bool opaque : 1; - bool isToolbar : 1; - bool stretchable[3]; - Qt::Orientation startOrientation; - int cMode; - QPoint startOffset; - int offs; - QSize fExtent; - Q3DockWindowResizeHandle *hHandleTop, *hHandleBottom, *vHandleLeft, *vHandleRight; - QVBoxLayout *hbox; - QHBoxLayout *vbox; - QBoxLayout *childBox; - void *dockWindowData; - QPoint lastPos; - QSize lastSize; - QWidgetResizeHandler *widgetResizeHandler; - Q3DockWindowPrivate *d; - -private: - Q_DISABLE_COPY(Q3DockWindow) -}; - -inline Q3DockArea *Q3DockWindow::area() const -{ - return dockArea; -} - -#endif // QT_NO_MAINWINDOW - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif // Q3DOCKWINDOW_H diff --git a/qtinterface/tqdockwindow.cpp b/qtinterface/tqdockwindow.cpp new file mode 100644 index 0000000..47ee368 --- /dev/null +++ b/qtinterface/tqdockwindow.cpp @@ -0,0 +1,23 @@ +/* + +Copyright (C) 2010 Timothy Pearson + +This library 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 2 of the License, or (at your option) any later version. + +This library 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public License +along with this library; see the file COPYING.LIB. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + +*/ + +#include +#include diff --git a/qtinterface/tqdockwindow.h b/qtinterface/tqdockwindow.h new file mode 100644 index 0000000..569d3bd --- /dev/null +++ b/qtinterface/tqdockwindow.h @@ -0,0 +1,45 @@ +/* + +Copyright (C) 2010 Timothy Pearson + +This library 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 2 of the License, or (at your option) any later version. + +This library 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public License +along with this library; see the file COPYING.LIB. If not, write to +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. + +*/ + +#ifndef TQDOCKWINDOW_H +#define TQDOCKWINDOW_H + +#include + +#ifdef USE_QT3 + +// Reimplement the QDockWindow class +// For Qt3, no changes are needed + +#include + +#endif // USE_QT3 + +#ifdef USE_QT4 + +// Reimplement the QDockWindow class +// For Qt4, some changes are needed + +#include + +#endif // USE_QT4 + +#endif /* TQDOCKWINDOW_H */ \ No newline at end of file diff --git a/qtinterface/tqdoctwindow.cpp b/qtinterface/tqdoctwindow.cpp deleted file mode 100644 index 47ee368..0000000 --- a/qtinterface/tqdoctwindow.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library 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 2 of the License, or (at your option) any later version. - -This library 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#include -#include diff --git a/qtinterface/tqdoctwindow.h b/qtinterface/tqdoctwindow.h deleted file mode 100644 index 569d3bd..0000000 --- a/qtinterface/tqdoctwindow.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - -Copyright (C) 2010 Timothy Pearson - -This library 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 2 of the License, or (at your option) any later version. - -This library 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public License -along with this library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. - -*/ - -#ifndef TQDOCKWINDOW_H -#define TQDOCKWINDOW_H - -#include - -#ifdef USE_QT3 - -// Reimplement the QDockWindow class -// For Qt3, no changes are needed - -#include - -#endif // USE_QT3 - -#ifdef USE_QT4 - -// Reimplement the QDockWindow class -// For Qt4, some changes are needed - -#include - -#endif // USE_QT4 - -#endif /* TQDOCKWINDOW_H */ \ No newline at end of file -- cgit v1.2.1