Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 18:32:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

QWorkspace class dismissed

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-03-04 19:36:29 +02:00
parent 351b6f320c
commit be6bde63ea
30 changed files with 36 additions and 3657 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package/freebsd/pkg-plist
View file

@ -527,7 +527,6 @@ include/katie/QtDesignerComponents/qlonglongvalidator.h
include/katie/QtDesignerComponents/qmainwindow_container.h
include/katie/QtDesignerComponents/qmdiarea_container.h
include/katie/QtDesignerComponents/qwizard_container.h
include/katie/QtDesignerComponents/qworkspace_container.h
include/katie/QtDesignerComponents/spacer_propertysheet.h
include/katie/QtDesignerComponents/stringlisteditor.h
include/katie/QtDesignerComponents/stringlisteditorbutton.h
@ -909,7 +908,6 @@ include/katie/QtGui/QWindowStateChangeEvent
include/katie/QtGui/QWindowsStyle
include/katie/QtGui/QWizard
include/katie/QtGui/QWizardPage
include/katie/QtGui/QWorkspace
include/katie/QtGui/QX11EmbedContainer
include/katie/QtGui/QX11EmbedWidget
include/katie/QtGui/QX11Info
@ -1111,7 +1109,6 @@ include/katie/QtGui/qwidgetaction.h
include/katie/QtGui/qwindowdefs.h
include/katie/QtGui/qwindowsstyle.h
include/katie/QtGui/qwizard.h
include/katie/QtGui/qworkspace.h
include/katie/QtGui/qx11embed_x11.h
include/katie/QtGui/qx11info_x11.h
include/katie/QtNetwork/QAbstractSocket

3
package/netbsd/PLIST
View file

@ -530,7 +530,6 @@ include/katie/QtDesignerComponents/qlonglongvalidator.h
include/katie/QtDesignerComponents/qmainwindow_container.h
include/katie/QtDesignerComponents/qmdiarea_container.h
include/katie/QtDesignerComponents/qwizard_container.h
include/katie/QtDesignerComponents/qworkspace_container.h
include/katie/QtDesignerComponents/spacer_propertysheet.h
include/katie/QtDesignerComponents/stringlisteditor.h
include/katie/QtDesignerComponents/stringlisteditorbutton.h
@ -912,7 +911,6 @@ include/katie/QtGui/QWindowStateChangeEvent
include/katie/QtGui/QWindowsStyle
include/katie/QtGui/QWizard
include/katie/QtGui/QWizardPage
include/katie/QtGui/QWorkspace
include/katie/QtGui/QX11EmbedContainer
include/katie/QtGui/QX11EmbedWidget
include/katie/QtGui/QX11Info
@ -1114,7 +1112,6 @@ include/katie/QtGui/qwidgetaction.h
include/katie/QtGui/qwindowdefs.h
include/katie/QtGui/qwindowsstyle.h
include/katie/QtGui/qwizard.h
include/katie/QtGui/qworkspace.h
include/katie/QtGui/qx11embed_x11.h
include/katie/QtGui/qx11info_x11.h
include/katie/QtNetwork/QAbstractSocket

3
package/openbsd/pkg/PLIST
View file

@ -534,7 +534,6 @@ include/katie/QtDesignerComponents/qlonglongvalidator.h
include/katie/QtDesignerComponents/qmainwindow_container.h
include/katie/QtDesignerComponents/qmdiarea_container.h
include/katie/QtDesignerComponents/qwizard_container.h
include/katie/QtDesignerComponents/qworkspace_container.h
include/katie/QtDesignerComponents/spacer_propertysheet.h
include/katie/QtDesignerComponents/stringlisteditor.h
include/katie/QtDesignerComponents/stringlisteditorbutton.h
@ -917,7 +916,6 @@ include/katie/QtGui/QWindowStateChangeEvent
include/katie/QtGui/QWindowsStyle
include/katie/QtGui/QWizard
include/katie/QtGui/QWizardPage
include/katie/QtGui/QWorkspace
include/katie/QtGui/QX11EmbedContainer
include/katie/QtGui/QX11EmbedWidget
include/katie/QtGui/QX11Info
@ -1119,7 +1117,6 @@ include/katie/QtGui/qwidgetaction.h
include/katie/QtGui/qwindowdefs.h
include/katie/QtGui/qwindowsstyle.h
include/katie/QtGui/qwizard.h
include/katie/QtGui/qworkspace.h
include/katie/QtGui/qx11embed_x11.h
include/katie/QtGui/qx11info_x11.h
include/katie/QtNetwork/

1
scripts/namefsck.py
View file

@ -720,7 +720,6 @@ classlist = [
"QWindowStateChangeEvent",
"QWizard",
"QWizardPage",
"QWorkspace",
"QWriteLocker",
"QX11EmbedContainer",
"QX11EmbedWidget",

6
src/core/global/qconfig.h.cmake
View file

@ -220,7 +220,6 @@
#cmakedefine QT_NO_VECTOR2D
#cmakedefine QT_NO_WHATSTHIS
#cmakedefine QT_NO_WHEELEVENT
#cmakedefine QT_NO_WORKSPACE
// Debugging
#if defined(QT_NO_TEXTSTREAM) && !defined(QT_NO_DEBUG_STREAM)
@ -507,11 +506,6 @@
# define QT_NO_COMBOBOX
#endif
// QWorkSpace
#if !defined(QT_NO_WORKSPACE) && (defined(QT_NO_SCROLLBAR) || defined(QT_NO_MAINWINDOW) || defined(QT_NO_MENUBAR))
# define QT_NO_WORKSPACE
#endif
// QPrintPreviewWidget
#if !defined(QT_NO_PRINTPREVIEWWIDGET) && (defined(QT_NO_GRAPHICSVIEW) || defined(QT_NO_PRINTER) || defined(QT_NO_MAINWINDOW))
# define QT_NO_PRINTPREVIEWWIDGET

2
src/designer/components/CMakeLists.txt
View file

@ -36,7 +36,6 @@ set(DESIGNERCOMPONENTS_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/default_container.h
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/default_actionprovider.h
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qmainwindow_container.h
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qworkspace_container.h
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qmdiarea_container.h
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qwizard_container.h
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/default_layoutdecoration.h
@ -120,7 +119,6 @@ set(DESIGNERCOMPONENTS_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/spacer_propertysheet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/line_propertysheet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qmainwindow_container.cpp
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qworkspace_container.cpp
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qmdiarea_container.cpp
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/qwizard_container.cpp
${CMAKE_CURRENT_SOURCE_DIR}/formeditor/default_container.cpp

7
src/designer/components/formeditor/formeditor.cpp
View file

@ -28,7 +28,6 @@
#include "widgetfactory_p.h"
#include "formwindowmanager.h"
#include "qmainwindow_container.h"
#include "qworkspace_container.h"
#include "qmdiarea_container.h"
#include "qwizard_container.h"
#include "default_container.h"
@ -93,9 +92,6 @@ FormEditor::FormEditor(QObject *parent)
QMainWindowContainerFactory::registerExtension(mgr, containerExtensionId);
QDockWidgetContainerFactory::registerExtension(mgr, containerExtensionId);
QScrollAreaContainerFactory::registerExtension(mgr, containerExtensionId);
#ifndef QT_NO_WORKSPACE
QWorkspaceContainerFactory::registerExtension(mgr, containerExtensionId);
#endif // QT_NO_WORKSPACE
QMdiAreaContainerFactory::registerExtension(mgr, containerExtensionId);
QWizardContainerFactory::registerExtension(mgr, containerExtensionId);
@ -116,9 +112,6 @@ FormEditor::FormEditor(QObject *parent)
QToolBoxWidgetPropertySheetFactory::registerExtension(mgr);
QTabWidgetPropertySheetFactory::registerExtension(mgr);
QMdiAreaPropertySheetFactory::registerExtension(mgr);
#ifndef QT_NO_WORKSPACE
QWorkspacePropertySheetFactory::registerExtension(mgr);
#endif // QT_NO_WORKSPACE
QWizardPagePropertySheetFactory::registerExtension(mgr);
QWizardPropertySheetFactory::registerExtension(mgr);

2
src/designer/components/formeditor/formwindowmanager.cpp
View file

@ -190,7 +190,7 @@ bool FormWindowManager::eventFilter(QObject *o, QEvent *e)
}
if (QWidget *managedWidget = findManagedWidget(fw, widget)) {
// Prevent MDI and QWorkspace subwindows from being closed by clicking at the title bar
// Prevent MDI subwindows from being closed by clicking at the title bar
if (managedWidget != widget && eventType == QEvent::Close) {
e->ignore();
return true;

5
src/designer/components/formeditor/qdesigner_resource.cpp
View file

@ -81,7 +81,6 @@
#include <QtGui/QMainWindow>
#include <QtGui/QSplitter>
#include <QtGui/QMdiArea>
#include <QtGui/QWorkspace>
#include <QtGui/QMenuBar>
#include <QtGui/QFileDialog>
#include <QtGui/QHeaderView>
@ -1695,10 +1694,6 @@ static inline bool checkContainerProperty(const QWidget *w, const QString &prope
return QStackedWidgetPropertySheet::checkProperty(propertyName);
if (qobject_cast<const QMdiArea *>(w))
return QMdiAreaPropertySheet::checkProperty(propertyName);
#ifndef QT_NO_WORKSPACE
if (qobject_cast<const QWorkspace *>(w))
return QMdiAreaPropertySheet::checkProperty(propertyName);
#endif // QT_NO_WORKSPACE
return true;
}

5
src/designer/components/formeditor/qmdiarea_container.h
View file

@ -29,7 +29,6 @@
#include <extensionfactory_p.h>
#include <QtGui/QMdiArea>
#include <QtGui/QWorkspace>
QT_BEGIN_NAMESPACE
@ -59,7 +58,6 @@ private:
};
// PropertySheet for QMdiArea: Fakes window title and name.
// Also works for a QWorkspace as it relies on the container extension.
class QMdiAreaPropertySheet: public QDesignerPropertySheet
{
@ -91,9 +89,6 @@ private:
typedef ExtensionFactory<QDesignerContainerExtension, QMdiArea, QMdiAreaContainer> QMdiAreaContainerFactory;
typedef QDesignerPropertySheetFactory<QMdiArea, QMdiAreaPropertySheet> QMdiAreaPropertySheetFactory;
#ifndef QT_NO_WORKSPACE
typedef QDesignerPropertySheetFactory<QWorkspace, QMdiAreaPropertySheet> QWorkspacePropertySheetFactory;
#endif // QT_NO_WORKSPACE
} // namespace qdesigner_internal
QT_END_NAMESPACE

86
src/designer/components/formeditor/qworkspace_container.cpp
View file

@ -1,86 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2016 Ivailo Monev
**
** This file is part of the Katie Designer of the Katie Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** GNU Lesser General Public License Usage
** 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.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qworkspace_container.h"
#include "qmdiarea_container.h"
#include <QtGui/QWorkspace>
#ifndef QT_NO_WORKSPACE
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
QWorkspaceContainer::QWorkspaceContainer(QWorkspace *widget, QObject *parent)
: QObject(parent),
m_workspace(widget)
{
}
int QWorkspaceContainer::count() const
{
return m_workspace->windowList(QWorkspace::CreationOrder).count();
}
QWidget *QWorkspaceContainer::widget(int index) const
{
if (index < 0)
return 0;
return m_workspace->windowList(QWorkspace::CreationOrder).at(index);
}
int QWorkspaceContainer::currentIndex() const
{
if (QWidget *aw = m_workspace->activeWindow())
return m_workspace->windowList(QWorkspace::CreationOrder).indexOf(aw);
return -1;
}
void QWorkspaceContainer::setCurrentIndex(int index)
{
m_workspace->setActiveWindow(m_workspace->windowList(QWorkspace::CreationOrder).at(index));
}
void QWorkspaceContainer::addWidget(QWidget *widget)
{
QWidget *frame = m_workspace->addWindow(widget, Qt::Window);
frame->show();
m_workspace->cascade();
QMdiAreaContainer::positionNewMdiChild(m_workspace, frame);
}
void QWorkspaceContainer::insertWidget(int, QWidget *widget)
{
addWidget(widget);
}
void QWorkspaceContainer::remove(int /* index */)
{
// nothing to do here, reparenting to formwindow is apparently sufficient
}
}
QT_END_NAMESPACE
#include "moc_qworkspace_container.h"
#endif // QT_NO_WORKSPACE

63
src/designer/components/formeditor/qworkspace_container.h
View file

@ -1,63 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2016 Ivailo Monev
**
** This file is part of the Katie Designer of the Katie Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** GNU Lesser General Public License Usage
** 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.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QWORKSPACE_CONTAINER_H
#define QWORKSPACE_CONTAINER_H
#include <QtDesigner/container.h>
#include <QtDesigner/default_extensionfactory.h>
#include <extensionfactory_p.h>
#include <QtGui/QWorkspace>
#ifndef QT_NO_WORKSPACE
QT_BEGIN_NAMESPACE
namespace qdesigner_internal {
class QWorkspaceContainer: public QObject, public QDesignerContainerExtension
{
Q_OBJECT
Q_INTERFACES(QDesignerContainerExtension)
public:
explicit QWorkspaceContainer(QWorkspace *widget, QObject *parent = nullptr);
virtual int count() const;
virtual QWidget *widget(int index) const;
virtual int currentIndex() const;
virtual void setCurrentIndex(int index);
virtual void addWidget(QWidget *widget);
virtual void insertWidget(int index, QWidget *widget);
virtual void remove(int index);
private:
QWorkspace *m_workspace;
};
typedef ExtensionFactory<QDesignerContainerExtension, QWorkspace, QWorkspaceContainer> QWorkspaceContainerFactory;
} // namespace qdesigner_internal
QT_END_NAMESPACE
#endif // QT_NO_WORKSPACE
#endif // QWORKSPACE_CONTAINER_H

17
src/designer/components/taskmenu/containerwidget_taskmenu.cpp
View file

@ -38,7 +38,6 @@
#include <QtGui/QTabWidget>
#include <QtGui/QScrollArea>
#include <QtGui/QMdiArea>
#include <QtGui/QWorkspace>
#include <QtGui/QWizard>
#include <QtGui/QMenu>
@ -243,18 +242,6 @@ MdiContainerWidgetTaskMenu::MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *par
connect(m_cascadeAction, SIGNAL(triggered()), m, SLOT(cascadeSubWindows()));
}
#ifndef QT_NO_WORKSPACE
MdiContainerWidgetTaskMenu::MdiContainerWidgetTaskMenu(QWorkspace *m, QObject *parent) :
ContainerWidgetTaskMenu(m, MdiContainer, parent)
{
initializeActions();
connect(m_nextAction, SIGNAL(triggered()), m, SLOT(activateNextWindow()));
connect(m_previousAction, SIGNAL(triggered()), m, SLOT(activatePreviousWindow()));
connect(m_tileAction, SIGNAL(triggered()),m , SLOT(tile()));
connect(m_cascadeAction, SIGNAL(triggered()), m, SLOT(cascade()));
}
#endif // QT_NO_WORKSPACE
void MdiContainerWidgetTaskMenu::initializeActions()
{
m_nextAction =new QAction(tr("Next Subwindow"), this);
@ -319,10 +306,6 @@ QObject *ContainerWidgetTaskMenuFactory::createExtension(QObject *object, const
if (QMdiArea* ma = qobject_cast<QMdiArea*>(widget))
return new MdiContainerWidgetTaskMenu(ma, parent);
#ifndef QT_NO_WORKSPACE
if (QWorkspace *ws = qobject_cast<QWorkspace*>(widget))
return new MdiContainerWidgetTaskMenu(ws, parent);
#endif // QT_NO_WORKSPACE
if (QWizard *wz = qobject_cast<QWizard *>(widget))
return new WizardContainerWidgetTaskMenu(wz, parent);
return new ContainerWidgetTaskMenu(widget, PageContainer, parent);

4
src/designer/components/taskmenu/containerwidget_taskmenu.h
View file

@ -36,7 +36,6 @@ class QDesignerFormEditorInterface;
class QDesignerContainerExtension;
class QAction;
class QMdiArea;
class QWorkspace;
class QMenu;
class QWizard;
@ -105,9 +104,6 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu {
Q_OBJECT
public:
explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = nullptr);
#ifndef QT_NO_WORKSPACE
explicit MdiContainerWidgetTaskMenu(QWorkspace *m, QObject *parent = nullptr);
#endif // QT_NO_WORKSPACE
virtual QList<QAction*> taskActions() const;
private:

1
src/designer/shared/qdesigner_promotion.cpp
View file

@ -46,7 +46,6 @@ namespace {
rc.insert(QLatin1String("Spacer"));
rc.insert(QLatin1String("QMainWindow"));
rc.insert(QLatin1String("QDialog"));
rc.insert(QLatin1String("QWorkspace"));
rc.insert(QLatin1String("QMdiArea"));
rc.insert(QLatin1String("QMdiSubWindow"));
}

3
src/designer/shared/widgetdatabase.cpp
View file

@ -286,7 +286,6 @@ WidgetDataBase::WidgetDataBase(QDesignerFormEditorInterface *core, QObject *pare
item(indexOfClassName(QLatin1String("QDockWidget")))->setContainer(true);
item(indexOfClassName(QLatin1String("QDesignerDockWidget")))->setContainer(true);
item(indexOfClassName(QLatin1String("QMdiArea")))->setContainer(true);
item(indexOfClassName(QLatin1String("QWorkspace")))->setContainer(true);
item(indexOfClassName(QLatin1String("QWizard")))->setContainer(true);
item(indexOfClassName(QLatin1String("QWizardPage")))->setContainer(true);
@ -481,8 +480,6 @@ static inline bool suitableForNewForm(const QString &className)
{
if (className.isEmpty()) // Missing custom widget information
return false;
if (className == QLatin1String("QWorkspace"))
return false;
if (className == QLatin1String("QSplitter"))
return false;
if (className.startsWith(QLatin1String("QDesigner")) || className.startsWith(QLatin1String("QLayout")))

8
src/designer/shared/widgetfactory.cpp
View file

@ -795,10 +795,10 @@ bool WidgetFactory::isPassiveInteractor(QWidget *widget)
return m_lastWasAPassiveInteractor;
}
}
} else if (qstrcmp(widget->metaObject()->className(), "QDockWidgetTitle") == 0)
return (m_lastWasAPassiveInteractor = true);
else if (qstrcmp(widget->metaObject()->className(), "QWorkspaceTitleBar") == 0)
return (m_lastWasAPassiveInteractor = true);
} else if (qstrcmp(widget->metaObject()->className(), "QDockWidgetTitle") == 0) {
m_lastWasAPassiveInteractor = true;
return m_lastWasAPassiveInteractor;
}
const QString name = widget->objectName();
if (name.startsWith(qtPassive) || name == qtMainWindowSplitter) {
m_lastWasAPassiveInteractor = true;

3
src/gui/CMakeLists.txt
View file

@ -198,7 +198,6 @@ set(GUI_PUBLIC_HEADERS
QWidgetAction
QWindowsStyle
QWizard
QWorkspace
QGuiPlatformPlugin
)
@ -580,7 +579,6 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qwidgetresizehandler_p.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qfocusframe.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qscrollarea.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qworkspace.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qwidgetanimator_p.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qtoolbararealayout_p.h
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qplaintextedit.h
@ -874,7 +872,6 @@ set(GUI_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qwidgetresizehandler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qfocusframe.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qscrollarea.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qworkspace.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qwidgetanimator.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qtoolbararealayout.cpp
${CMAKE_CURRENT_SOURCE_DIR}/widgets/qplaintextedit.cpp

2
src/gui/kernel/qwidget.cpp
View file

@ -840,7 +840,7 @@ int QWidget::devType() const
}
//### w is a "this" ptr, passed as a param because QWorkspace needs special logic
//### w is a "this" ptr
void QWidgetPrivate::adjustFlags(Qt::WindowFlags &flags, QWidget *w)
{
bool customize = (flags & (Qt::CustomizeWindowHint

4
src/gui/styles/qcleanlooksstyle.cpp
View file

@ -3495,7 +3495,7 @@ void QCleanlooksStyle::polish(QWidget *widget)
#ifndef QT_NO_SPINBOX
|| qobject_cast<QAbstractSpinBox *>(widget)
#endif
|| (widget->inherits("QWorkspaceChild"))) {
) {
widget->setAttribute(Qt::WA_Hover, true);
}
}
@ -3539,7 +3539,7 @@ void QCleanlooksStyle::unpolish(QWidget *widget)
#ifndef QT_NO_SPINBOX
|| qobject_cast<QAbstractSpinBox *>(widget)
#endif
|| widget->inherits("QWorkspaceChild")) {
) {
widget->setAttribute(Qt::WA_Hover, false);
}
}

8
src/gui/styles/qcommonstyle.cpp
View file

@ -3526,7 +3526,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
}
break;
#endif // QT_NO_GROUPBOX
#ifndef QT_NO_WORKSPACE
#ifndef QT_NO_MDIAREA
case CC_MdiControls:
{
QStyleOptionButton btnOpt;
@ -3587,7 +3587,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
}
}
break;
#endif // QT_NO_WORKSPACE
#endif // QT_NO_MDIAREA
default:
qWarning("QCommonStyle::drawComplexControl: Control %d not handled", cc);
@ -4114,7 +4114,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
break;
}
#endif // QT_NO_GROUPBOX
#ifndef QT_NO_WORKSPACE
#ifndef QT_NO_MDIAREA
case CC_MdiControls: {
int numSubControls = 0;
if (opt->subControls & SC_MdiCloseButton)
@ -4156,7 +4156,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
ret = QRect(offset, 0, buttonWidth, opt->rect.height());
break;
}
#endif // QT_NO_WORKSPACE
#endif // QT_NO_MDIAREA
default:
qWarning("QCommonStyle::subControlRect: Case %d not handled", cc);
}

2
src/gui/widgets/qwidgetresizehandler.cpp
View file

@ -317,7 +317,7 @@ void QWidgetResizeHandler::setMouseCursor(MousePosition m)
QObjectList children = widget->children();
for (int i = 0; i < children.size(); ++i) {
if (QWidget *w = qobject_cast<QWidget*>(children.at(i))) {
if (!w->testAttribute(Qt::WA_SetCursor) && !w->inherits("QWorkspaceTitleBar")) {
if (!w->testAttribute(Qt::WA_SetCursor)) {
w->setCursor(Qt::ArrowCursor);
}
}

3276
src/gui/widgets/qworkspace.cpp
View file

File diff suppressed because it is too large Load diff

109
src/gui/widgets/qworkspace.h
View file

@ -1,109 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2016 Ivailo Monev
**
** This file is part of the QtGui module of the Katie Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
**
** GNU Lesser General Public License Usage
** 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.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QWORKSPACE_H
#define QWORKSPACE_H
#include <QtGui/qwidget.h>
QT_BEGIN_NAMESPACE
#ifndef QT_NO_WORKSPACE
class QAction;
class QWorkspaceChild;
class QShowEvent;
class QWorkspacePrivate;
class Q_GUI_EXPORT QWorkspace : public QWidget
{
Q_OBJECT
Q_PROPERTY(bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled)
Q_PROPERTY(QBrush background READ background WRITE setBackground)
public:
explicit QWorkspace(QWidget *parent = nullptr);
~QWorkspace();
enum WindowOrder { CreationOrder, StackingOrder };
QWidget* activeWindow() const;
QWidgetList windowList(WindowOrder order = CreationOrder) const;
QWidget * addWindow(QWidget *w, Qt::WindowFlags flags = 0);
QSize sizeHint() const;
bool scrollBarsEnabled() const;
void setScrollBarsEnabled(bool enable);
void setBackground(const QBrush &background);
QBrush background() const;
Q_SIGNALS:
void windowActivated(QWidget* w);
public Q_SLOTS:
void setActiveWindow(QWidget *w);
void cascade();
void tile();
void arrangeIcons();
void closeActiveWindow();
void closeAllWindows();
void activateNextWindow();
void activatePreviousWindow();
protected:
bool event(QEvent *e);
void paintEvent(QPaintEvent *e);
void changeEvent(QEvent *);
void childEvent(QChildEvent *);
void resizeEvent(QResizeEvent *);
bool eventFilter(QObject *, QEvent *);
void showEvent(QShowEvent *e);
void hideEvent(QHideEvent *e);
#ifndef QT_NO_WHEELEVENT
void wheelEvent(QWheelEvent *e);
#endif
private:
Q_DECLARE_PRIVATE(QWorkspace)
Q_DISABLE_COPY(QWorkspace)
Q_PRIVATE_SLOT(d_func(), void _q_normalizeActiveWindow())
Q_PRIVATE_SLOT(d_func(), void _q_minimizeActiveWindow())
Q_PRIVATE_SLOT(d_func(), void _q_showOperationMenu())
Q_PRIVATE_SLOT(d_func(), void _q_popupOperationMenu(const QPoint&))
Q_PRIVATE_SLOT(d_func(), void _q_operationMenuActivated(QAction *))
Q_PRIVATE_SLOT(d_func(), void _q_updateActions())
Q_PRIVATE_SLOT(d_func(), void _q_scrollBarChanged())
friend class QWorkspaceChild;
};
#endif // QT_NO_WORKSPACE
QT_END_NAMESPACE
#endif // QWORKSPACE_H

3
src/shared/widgets.table
View file

@ -107,9 +107,6 @@ DECLARE_WIDGET(QTreeView, "")
DECLARE_WIDGET(QTreeWidget, "")
#endif
DECLARE_WIDGET(QWidget, "")
#ifndef QT_NO_WORKSPACE
DECLARE_WIDGET(QWorkspace, "")
#endif
#ifndef QT_NO_SPLITTER
DECLARE_WIDGET(QSplitter, "")
#endif

1
src/tools/uic/cpp/cppwriteincludes.cpp
View file

@ -622,7 +622,6 @@ static const struct ClassTblData {
{ QLatin1String("QWindowsStyle"), QLatin1String("QtGui/qwindowsstyle.h") },
{ QLatin1String("QWizard"), QLatin1String("QtGui/qwizard.h") },
{ QLatin1String("QWizardPage"), QLatin1String("QtGui/qwizard.h") },
{ QLatin1String("QWorkspace"), QLatin1String("QtGui/qworkspace.h") },
{ QLatin1String("QWriteLocker"), QLatin1String("QtCore/qreadwritelock.h") },
{ QLatin1String("QX11EmbedContainer"), QLatin1String("QtGui/qx11embed_x11.h") },
{ QLatin1String("QX11EmbedWidget"), QLatin1String("QtGui/qx11embed_x11.h") },

2
src/tools/uic/cpp/cppwriteinitialization.cpp
View file

@ -681,8 +681,6 @@ void WriteInitialization::acceptWidget(DomWidget *node)
m_output << m_indent << parentWidget << "->addWidget(" << varName << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QMdiArea"))) {
m_output << m_indent << parentWidget << "->addSubWindow(" << varName << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QWorkspace"))) {
m_output << m_indent << parentWidget << "->addWindow(" << varName << ");\n";
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QWizard"))) {
addWizardPage(varName, node, parentWidget);
} else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QToolBox"))) {

8
src/uitools/abstractformbuilder.cpp
View file

@ -72,7 +72,6 @@
#include <QtGui/QMenuBar>
#include <QtGui/QDockWidget>
#include <QtGui/QMdiArea>
#include <QtGui/QWorkspace>
#include <QtGui/QWizard>
#include <limits.h>
@ -565,13 +564,6 @@ bool QAbstractFormBuilder::addItem(DomWidget *ui_widget, QWidget *widget, QWidge
}
#endif
#ifndef QT_NO_WORKSPACE
else if (QWorkspace *ws = qobject_cast<QWorkspace*>(parentWidget)) {
ws->addWindow(widget);
return true;
}
#endif
#ifndef QT_NO_DOCKWIDGET
else if (QDockWidget *dockWidget = qobject_cast<QDockWidget*>(parentWidget)) {
dockWidget->setWidget(widget);

54
translations/qt.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-03 16:54+0200\n"
"POT-Creation-Date: 2022-03-04 19:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1296,7 +1296,6 @@ msgid "Font st&yle"
msgstr ""
#: src/gui/dialogs/qfontdialog.cpp:681 src/gui/widgets/qmdisubwindow.cpp:1016
#: src/gui/widgets/qworkspace.cpp:1016
msgid "&Size"
msgstr ""
@ -1945,12 +1944,11 @@ msgstr ""
msgid "- [%1]"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:250 src/gui/widgets/qworkspace.cpp:1792
#: src/gui/widgets/qworkspace.cpp:1852
#: src/gui/widgets/qmdisubwindow.cpp:250
msgid "%1 - [%2]"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:291 src/gui/widgets/qworkspace.cpp:95
#: src/gui/widgets/qmdisubwindow.cpp:291
msgid "Minimize"
msgstr ""
@ -1966,7 +1964,7 @@ msgstr ""
msgid "Shade"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:304 src/gui/widgets/qworkspace.cpp:97
#: src/gui/widgets/qmdisubwindow.cpp:304
msgid "Restore Down"
msgstr ""
@ -1974,7 +1972,7 @@ msgstr ""
msgid "Restore"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:309 src/gui/widgets/qworkspace.cpp:93
#: src/gui/widgets/qmdisubwindow.cpp:309
#: src/scripttools/debugging/qscriptbreakpointswidget.cpp:56
#: src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:116
msgid "Close"
@ -1984,27 +1982,27 @@ msgstr ""
msgid "Menu"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:1012 src/gui/widgets/qworkspace.cpp:1014
#: src/gui/widgets/qmdisubwindow.cpp:1012
msgid "&Restore"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:1015 src/gui/widgets/qworkspace.cpp:1015
#: src/gui/widgets/qmdisubwindow.cpp:1015
msgid "&Move"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:1017 src/gui/widgets/qworkspace.cpp:1018
#: src/gui/widgets/qmdisubwindow.cpp:1017
msgid "Mi&nimize"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:1019 src/gui/widgets/qworkspace.cpp:1020
#: src/gui/widgets/qmdisubwindow.cpp:1019
msgid "Ma&ximize"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:1021 src/gui/widgets/qworkspace.cpp:1028
#: src/gui/widgets/qmdisubwindow.cpp:1021
msgid "Stay on &Top"
msgstr ""
#: src/gui/widgets/qmdisubwindow.cpp:1024 src/gui/widgets/qworkspace.cpp:1022
#: src/gui/widgets/qmdisubwindow.cpp:1024
msgid "&Close"
msgstr ""
@ -2012,14 +2010,6 @@ msgstr ""
msgid "(Untitled)"
msgstr ""
#: src/gui/widgets/qworkspace.cpp:1031 src/gui/widgets/qworkspace.cpp:2070
msgid "Sh&ade"
msgstr ""
#: src/gui/widgets/qworkspace.cpp:2066
msgid "&Unshade"
msgstr ""
#: src/gui/widgets/qmenubar.cpp:1500
msgctxt "QMenuBar"
msgid "Corner Toolbar"
@ -4982,33 +4972,33 @@ msgid ""
"Script: %3"
msgstr ""
#: src/uitools/abstractformbuilder.cpp:182
#: src/uitools/abstractformbuilder.cpp:181
msgctxt "QAbstractFormBuilder"
msgid "Unexpected element <%1>"
msgstr ""
#: src/uitools/abstractformbuilder.cpp:187
#: src/uitools/abstractformbuilder.cpp:186
msgctxt "QAbstractFormBuilder"
msgid ""
"An error has occurred while reading the UI file at line %1, column %2: %3"
msgstr ""
#: src/uitools/abstractformbuilder.cpp:193
#: src/uitools/abstractformbuilder.cpp:192
msgctxt "QAbstractFormBuilder"
msgid "Invalid UI file: The root element <ui> is missing."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:297
#: src/uitools/abstractformbuilder.cpp:296
msgctxt "QAbstractFormBuilder"
msgid "The creation of a widget of the class '%1' failed."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:593
#: src/uitools/abstractformbuilder.cpp:585
msgctxt "QAbstractFormBuilder"
msgid "Attempt to add child that is not of class QWizardPage to QWizard."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:655
#: src/uitools/abstractformbuilder.cpp:647
msgctxt "QAbstractFormBuilder"
msgid ""
"Attempt to add a layout to a widget '%1' (%2) which already has a layout of "
@ -5016,27 +5006,27 @@ msgid ""
"This indicates an inconsistency in the ui-file."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:865
#: src/uitools/abstractformbuilder.cpp:857
msgctxt "QAbstractFormBuilder"
msgid "Empty widget item in %1 '%2'."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:1599
#: src/uitools/abstractformbuilder.cpp:1591
msgctxt "QAbstractFormBuilder"
msgid "Flags property are not supported yet."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:1680
#: src/uitools/abstractformbuilder.cpp:1672
msgctxt "QAbstractFormBuilder"
msgid "While applying tab stops: The widget '%1' could not be found."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:2426
#: src/uitools/abstractformbuilder.cpp:2418
msgctxt "QAbstractFormBuilder"
msgid "Invalid QButtonGroup reference '%1' referenced by '%2'."
msgstr ""
#: src/uitools/abstractformbuilder.cpp:2937
#: src/uitools/abstractformbuilder.cpp:2929
msgctxt "QAbstractFormBuilder"
msgid "This version of the uitools library is linked without script support."
msgstr ""

2
translations/qt_tools.pot
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-03-03 16:54+0200\n"
"POT-Creation-Date: 2022-03-04 19:36+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"