diff options
Diffstat (limited to 'src/designer/src')
54 files changed, 53 insertions, 217 deletions
diff --git a/src/designer/src/components/formeditor/formeditor.qrc b/src/designer/src/components/formeditor/formeditor.qrc index 492729040..38fbb6200 100644 --- a/src/designer/src/components/formeditor/formeditor.qrc +++ b/src/designer/src/components/formeditor/formeditor.qrc @@ -29,6 +29,7 @@ <file>images/downplus.png</file> <file>images/leveldown.png</file> <file>images/levelup.png</file> + <file>images/righttoleft.png</file> <file>images/mac/adjustsize.png</file> <file>images/mac/widgettool.png</file> <file>images/mac/signalslottool.png</file> diff --git a/src/designer/src/components/formeditor/images/righttoleft.png b/src/designer/src/components/formeditor/images/righttoleft.png Binary files differnew file mode 100644 index 000000000..26a69d5ba --- /dev/null +++ b/src/designer/src/components/formeditor/images/righttoleft.png diff --git a/src/designer/src/lib/components/qdesigner_components.h b/src/designer/src/lib/components/qdesigner_components.h index f27a49b37..e5c168292 100644 --- a/src/designer/src/lib/components/qdesigner_components.h +++ b/src/designer/src/lib/components/qdesigner_components.h @@ -45,8 +45,6 @@ #include <QtDesigner/qdesigner_components_global.h> #include <QtCore/qglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QObject; @@ -77,6 +75,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESIGNER_COMPONENTS_H diff --git a/src/designer/src/lib/components/qdesigner_components_global.h b/src/designer/src/lib/components/qdesigner_components_global.h index 1a7701fdb..98b289a85 100644 --- a/src/designer/src/lib/components/qdesigner_components_global.h +++ b/src/designer/src/lib/components/qdesigner_components_global.h @@ -44,8 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define QDESIGNER_COMPONENTS_EXTERN Q_DECL_EXPORT @@ -61,6 +59,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESIGNER_COMPONENTS_GLOBAL_H diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h index 685444700..c9ae32397 100644 --- a/src/designer/src/lib/extension/default_extensionfactory.h +++ b/src/designer/src/lib/extension/default_extensionfactory.h @@ -49,8 +49,6 @@ #include <QtCore/QHash> #include <QtCore/QPair> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QExtensionManager; @@ -81,6 +79,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DEFAULT_EXTENSIONFACTORY_H diff --git a/src/designer/src/lib/extension/extension.h b/src/designer/src/lib/extension/extension.h index 75fd12937..7f0685588 100644 --- a/src/designer/src/lib/extension/extension.h +++ b/src/designer/src/lib/extension/extension.h @@ -45,8 +45,6 @@ #include <QtCore/QString> #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define Q_TYPEID(IFace) QLatin1String(IFace##_iid) @@ -104,6 +102,4 @@ template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manag QT_END_NAMESPACE -QT_END_HEADER - #endif // EXTENSION_H diff --git a/src/designer/src/lib/extension/extension_global.h b/src/designer/src/lib/extension/extension_global.h index f1c9adf8c..1ea217e5f 100644 --- a/src/designer/src/lib/extension/extension_global.h +++ b/src/designer/src/lib/extension/extension_global.h @@ -44,7 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QDESIGNER_EXTENSION_EXTERN Q_DECL_EXPORT @@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // EXTENSION_GLOBAL_H diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h index aaf413fec..e220cee46 100644 --- a/src/designer/src/lib/extension/qextensionmanager.h +++ b/src/designer/src/lib/extension/qextensionmanager.h @@ -46,8 +46,6 @@ #include <QtDesigner/extension.h> #include <QtCore/QHash> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QObject; // Fool syncqt @@ -74,6 +72,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QEXTENSIONMANAGER_H diff --git a/src/designer/src/lib/sdk/abstractactioneditor.h b/src/designer/src/lib/sdk/abstractactioneditor.h index a1e124283..5ab553244 100644 --- a/src/designer/src/lib/sdk/abstractactioneditor.h +++ b/src/designer/src/lib/sdk/abstractactioneditor.h @@ -46,8 +46,6 @@ #include <QtWidgets/QWidget> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -71,6 +69,4 @@ public Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTACTIONEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractdialoggui_p.h b/src/designer/src/lib/sdk/abstractdialoggui_p.h index 9b533b3bf..635646456 100644 --- a/src/designer/src/lib/sdk/abstractdialoggui_p.h +++ b/src/designer/src/lib/sdk/abstractdialoggui_p.h @@ -57,8 +57,6 @@ #include <QtWidgets/QMessageBox> #include <QtWidgets/QFileDialog> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -102,6 +100,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTDIALOGGUI_H diff --git a/src/designer/src/lib/sdk/abstractdnditem.h b/src/designer/src/lib/sdk/abstractdnditem.h index d43f13a1c..342f58468 100644 --- a/src/designer/src/lib/sdk/abstractdnditem.h +++ b/src/designer/src/lib/sdk/abstractdnditem.h @@ -44,8 +44,6 @@ #include <QtDesigner/sdk_global.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DomUI; @@ -70,6 +68,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTDNDITEM_H diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h index 1ced0611f..1e7ae1d5b 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.h +++ b/src/designer/src/lib/sdk/abstractformeditor.h @@ -47,8 +47,6 @@ #include <QtCore/QObject> #include <QtCore/QPointer> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerWidgetBoxInterface; @@ -141,6 +139,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractformeditorplugin.h b/src/designer/src/lib/sdk/abstractformeditorplugin.h index 57dbba0c2..54d007162 100644 --- a/src/designer/src/lib/sdk/abstractformeditorplugin.h +++ b/src/designer/src/lib/sdk/abstractformeditorplugin.h @@ -46,8 +46,6 @@ #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -68,6 +66,4 @@ Q_DECLARE_INTERFACE(QDesignerFormEditorPluginInterface, "org.qt-project.Qt.Desig QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMEDITORPLUGIN_H diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h index d7667d5fc..b38d2ca41 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.h +++ b/src/designer/src/lib/sdk/abstractformwindow.h @@ -46,8 +46,6 @@ #include <QtWidgets/QWidget> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -196,6 +194,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOW_H diff --git a/src/designer/src/lib/sdk/abstractformwindowcursor.h b/src/designer/src/lib/sdk/abstractformwindowcursor.h index a03149c35..707f65751 100644 --- a/src/designer/src/lib/sdk/abstractformwindowcursor.h +++ b/src/designer/src/lib/sdk/abstractformwindowcursor.h @@ -44,8 +44,6 @@ #include <QtDesigner/sdk_global.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; @@ -104,6 +102,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOWCURSOR_H diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.h b/src/designer/src/lib/sdk/abstractformwindowmanager.h index 9f16ded6f..e70ebdd54 100644 --- a/src/designer/src/lib/sdk/abstractformwindowmanager.h +++ b/src/designer/src/lib/sdk/abstractformwindowmanager.h @@ -48,8 +48,6 @@ #include <QtCore/QObject> #include <QtCore/QScopedPointer> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -157,6 +155,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOWMANAGER_H diff --git a/src/designer/src/lib/sdk/abstractformwindowtool.h b/src/designer/src/lib/sdk/abstractformwindowtool.h index 74e1f7afb..28ed11d16 100644 --- a/src/designer/src/lib/sdk/abstractformwindowtool.h +++ b/src/designer/src/lib/sdk/abstractformwindowtool.h @@ -46,8 +46,6 @@ #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -80,6 +78,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMWINDOWTOOL_H diff --git a/src/designer/src/lib/sdk/abstractintegration.h b/src/designer/src/lib/sdk/abstractintegration.h index e15f0df15..d28f61f32 100644 --- a/src/designer/src/lib/sdk/abstractintegration.h +++ b/src/designer/src/lib/sdk/abstractintegration.h @@ -49,8 +49,6 @@ #include <QtCore/QStringList> #include <QtCore/QFlags> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormWindowInterface; @@ -189,6 +187,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTINTEGRATION_H diff --git a/src/designer/src/lib/sdk/abstractintrospection_p.h b/src/designer/src/lib/sdk/abstractintrospection_p.h index 12dbdc461..327e40d73 100644 --- a/src/designer/src/lib/sdk/abstractintrospection_p.h +++ b/src/designer/src/lib/sdk/abstractintrospection_p.h @@ -57,8 +57,6 @@ #include <QtCore/QVariant> #include <QtCore/QFlags> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDESIGNER_SDK_EXPORT QDesignerMetaEnumInterface @@ -169,6 +167,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTMETAOBJECT_H diff --git a/src/designer/src/lib/sdk/abstractlanguage.h b/src/designer/src/lib/sdk/abstractlanguage.h index 1d20b8c89..11c56c3d1 100644 --- a/src/designer/src/lib/sdk/abstractlanguage.h +++ b/src/designer/src/lib/sdk/abstractlanguage.h @@ -55,8 +55,6 @@ #include <QtDesigner/extension.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDialog; @@ -103,6 +101,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerLanguageExtension, "org.qt-project.Qt.Des QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESIGNER_ABTRACT_LANGUAGE_H diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.h b/src/designer/src/lib/sdk/abstractmetadatabase.h index bd97bde93..80aae6bf3 100644 --- a/src/designer/src/lib/sdk/abstractmetadatabase.h +++ b/src/designer/src/lib/sdk/abstractmetadatabase.h @@ -48,8 +48,6 @@ #include <QtCore/QList> #include <QtCore/QHash> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QCursor; @@ -94,6 +92,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTMETADATABASE_H diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.h b/src/designer/src/lib/sdk/abstractnewformwidget.h index c40f99696..b1295851b 100644 --- a/src/designer/src/lib/sdk/abstractnewformwidget.h +++ b/src/designer/src/lib/sdk/abstractnewformwidget.h @@ -46,8 +46,6 @@ #include <QtWidgets/QWidget> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -72,6 +70,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTNEWFORMWIDGET_H diff --git a/src/designer/src/lib/sdk/abstractobjectinspector.h b/src/designer/src/lib/sdk/abstractobjectinspector.h index 4462c5834..d461c6116 100644 --- a/src/designer/src/lib/sdk/abstractobjectinspector.h +++ b/src/designer/src/lib/sdk/abstractobjectinspector.h @@ -46,8 +46,6 @@ #include <QtWidgets/QWidget> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -68,6 +66,4 @@ public Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTOBJECTINSPECTOR_H diff --git a/src/designer/src/lib/sdk/abstractoptionspage.h b/src/designer/src/lib/sdk/abstractoptionspage.h index e98e5b012..2e3aecea6 100644 --- a/src/designer/src/lib/sdk/abstractoptionspage.h +++ b/src/designer/src/lib/sdk/abstractoptionspage.h @@ -44,8 +44,6 @@ #include <QtDesigner/sdk_global.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; @@ -63,6 +61,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTOPTIONSPAGE_P_H diff --git a/src/designer/src/lib/sdk/abstractpromotioninterface.h b/src/designer/src/lib/sdk/abstractpromotioninterface.h index 3d1eb716a..dd8510071 100644 --- a/src/designer/src/lib/sdk/abstractpromotioninterface.h +++ b/src/designer/src/lib/sdk/abstractpromotioninterface.h @@ -48,8 +48,6 @@ #include <QtCore/QList> #include <QtCore/QSet> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerWidgetDataBaseItemInterface; @@ -86,6 +84,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTPROMOTIONINTERFACE_H diff --git a/src/designer/src/lib/sdk/abstractpropertyeditor.h b/src/designer/src/lib/sdk/abstractpropertyeditor.h index 87dc43a45..39a6ad2b3 100644 --- a/src/designer/src/lib/sdk/abstractpropertyeditor.h +++ b/src/designer/src/lib/sdk/abstractpropertyeditor.h @@ -46,8 +46,6 @@ #include <QtWidgets/QWidget> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -79,6 +77,4 @@ public Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTPROPERTYEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractresourcebrowser.h b/src/designer/src/lib/sdk/abstractresourcebrowser.h index 317781828..d369a8cbd 100644 --- a/src/designer/src/lib/sdk/abstractresourcebrowser.h +++ b/src/designer/src/lib/sdk/abstractresourcebrowser.h @@ -46,8 +46,6 @@ #include <QtWidgets/QWidget> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; // FIXME: fool syncqt @@ -69,7 +67,5 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMEDITOR_H diff --git a/src/designer/src/lib/sdk/abstractsettings.h b/src/designer/src/lib/sdk/abstractsettings.h index deb0f0763..8aa787861 100644 --- a/src/designer/src/lib/sdk/abstractsettings.h +++ b/src/designer/src/lib/sdk/abstractsettings.h @@ -46,8 +46,6 @@ #include <QtCore/QVariant> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; @@ -68,6 +66,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTSETTINGS_P_H diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index 6f37129fe..15396fc17 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -49,8 +49,6 @@ #include <QtWidgets/QWidget> #include <QtGui/QIcon> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DomUI; @@ -141,6 +139,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QDesignerWidgetBoxInterface::Widget)) -QT_END_HEADER - #endif // ABSTRACTWIDGETBOX_H diff --git a/src/designer/src/lib/sdk/abstractwidgetdatabase.h b/src/designer/src/lib/sdk/abstractwidgetdatabase.h index 44e9e7bea..b993ef49a 100644 --- a/src/designer/src/lib/sdk/abstractwidgetdatabase.h +++ b/src/designer/src/lib/sdk/abstractwidgetdatabase.h @@ -47,8 +47,6 @@ #include <QtCore/QObject> #include <QtCore/QList> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QIcon; @@ -132,6 +130,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTWIDGETDATABASE_H diff --git a/src/designer/src/lib/sdk/abstractwidgetfactory.h b/src/designer/src/lib/sdk/abstractwidgetfactory.h index 24084ac6c..eb76da598 100644 --- a/src/designer/src/lib/sdk/abstractwidgetfactory.h +++ b/src/designer/src/lib/sdk/abstractwidgetfactory.h @@ -45,8 +45,6 @@ #include <QtDesigner/sdk_global.h> #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDesignerFormEditorInterface; @@ -74,6 +72,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTWIDGETFACTORY_H diff --git a/src/designer/src/lib/sdk/dynamicpropertysheet.h b/src/designer/src/lib/sdk/dynamicpropertysheet.h index 9904bc12e..9bf431ef2 100644 --- a/src/designer/src/lib/sdk/dynamicpropertysheet.h +++ b/src/designer/src/lib/sdk/dynamicpropertysheet.h @@ -55,8 +55,6 @@ #include <QtDesigner/extension.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; // FIXME: fool syncqt @@ -76,6 +74,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerDynamicPropertySheetExtension, "org.qt-pr QT_END_NAMESPACE -QT_END_HEADER - #endif // DYNAMICPROPERTYSHEET_H diff --git a/src/designer/src/lib/sdk/extrainfo.h b/src/designer/src/lib/sdk/extrainfo.h index 34be80b3a..96930dffd 100644 --- a/src/designer/src/lib/sdk/extrainfo.h +++ b/src/designer/src/lib/sdk/extrainfo.h @@ -45,8 +45,6 @@ #include <QtDesigner/sdk_global.h> #include <QtDesigner/extension.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class DomWidget; @@ -79,6 +77,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerExtraInfoExtension, "org.qt-project.Qt.De QT_END_NAMESPACE -QT_END_HEADER - #endif // EXTRAINFO_H diff --git a/src/designer/src/lib/sdk/layoutdecoration.h b/src/designer/src/lib/sdk/layoutdecoration.h index 2965cf765..91d08964b 100644 --- a/src/designer/src/lib/sdk/layoutdecoration.h +++ b/src/designer/src/lib/sdk/layoutdecoration.h @@ -47,8 +47,6 @@ #include <QtCore/QObject> #include <QtCore/QPair> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPoint; @@ -94,6 +92,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerLayoutDecorationExtension, "org.qt-projec QT_END_NAMESPACE -QT_END_HEADER - #endif // LAYOUTDECORATION_H diff --git a/src/designer/src/lib/sdk/membersheet.h b/src/designer/src/lib/sdk/membersheet.h index a2d87c324..4b33a11cf 100644 --- a/src/designer/src/lib/sdk/membersheet.h +++ b/src/designer/src/lib/sdk/membersheet.h @@ -47,8 +47,6 @@ #include <QtCore/QList> #include <QtCore/QByteArray> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; // FIXME: fool syncqt @@ -84,6 +82,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerMemberSheetExtension, "org.qt-project.Qt. QT_END_NAMESPACE -QT_END_HEADER - #endif // MEMBERSHEET_H diff --git a/src/designer/src/lib/sdk/propertysheet.h b/src/designer/src/lib/sdk/propertysheet.h index c29102389..ca1dfd4eb 100644 --- a/src/designer/src/lib/sdk/propertysheet.h +++ b/src/designer/src/lib/sdk/propertysheet.h @@ -44,8 +44,6 @@ #include <QtDesigner/extension.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QVariant; @@ -88,6 +86,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerPropertySheetExtension, QT_END_NAMESPACE -QT_END_HEADER - #endif // PROPERTYSHEET_H diff --git a/src/designer/src/lib/sdk/sdk_global.h b/src/designer/src/lib/sdk/sdk_global.h index 8eb0d0a31..3621b660e 100644 --- a/src/designer/src/lib/sdk/sdk_global.h +++ b/src/designer/src/lib/sdk/sdk_global.h @@ -44,7 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QDESIGNER_SDK_EXTERN Q_DECL_EXPORT @@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // SDK_GLOBAL_H diff --git a/src/designer/src/lib/sdk/taskmenu.h b/src/designer/src/lib/sdk/taskmenu.h index a483b0880..7948d7181 100644 --- a/src/designer/src/lib/sdk/taskmenu.h +++ b/src/designer/src/lib/sdk/taskmenu.h @@ -44,8 +44,6 @@ #include <QtDesigner/extension.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAction; @@ -67,6 +65,4 @@ inline QAction *QDesignerTaskMenuExtension::preferredEditAction() const QT_END_NAMESPACE -QT_END_HEADER - #endif // TASKMENU_H diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp index b86f40b93..4feda3f1e 100644 --- a/src/designer/src/lib/shared/formwindowbase.cpp +++ b/src/designer/src/lib/shared/formwindowbase.cpp @@ -495,7 +495,7 @@ QStringList FormWindowBase::checkContents() const QStringList problems; foreach (const Spacer *spacer, mainContainer()->findChildren<Spacer *>()) { if (spacer->parentWidget() && !spacer->parentWidget()->layout()) { - problems.push_back(tr("<p>This file contains top level spacers.<br>" + problems.push_back(tr("<p>This file contains top level spacers.<br/>" "They will <b>not</b> be saved.</p><p>" "Perhaps you forgot to create a layout?</p>")); break; diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp index a5ec912cc..9f1ae8273 100644 --- a/src/designer/src/lib/shared/layout.cpp +++ b/src/designer/src/lib/shared/layout.cpp @@ -1099,21 +1099,11 @@ bool Grid::locateWidget(QWidget *w, int &row, int &col, int &rowspan, int &colsp // QGridLayout/QFormLayout Helpers: get item position/add item (overloads to make templates work) -void getGridItemPosition(QGridLayout *gridLayout, int index, int *row, int *column, int *rowspan, int *colspan) -{ - gridLayout->getItemPosition(index, row, column, rowspan, colspan); -} - void addWidgetToGrid(QGridLayout *lt, QWidget * widget, int row, int column, int rowSpan, int columnSpan, Qt::Alignment alignment) { lt->addWidget(widget, row, column, rowSpan, columnSpan, alignment); } -inline void getGridItemPosition(QFormLayout *formLayout, int index, int *row, int *column, int *rowspan, int *colspan) -{ - getFormLayoutItemPosition(formLayout, index, row, column, rowspan, colspan); -} - inline void addWidgetToGrid(QFormLayout *lt, QWidget * widget, int row, int column, int, int columnSpan, Qt::Alignment) { formLayoutAddWidget(lt, widget, QRect(column, row, columnSpan, 1), false); @@ -1130,9 +1120,6 @@ public: virtual void sort() { setWidgets(buildGrid(widgets())); } protected: - QWidget *widgetAt(GridLikeLayout *layout, int row, int column) const; - -protected: QWidgetList buildGrid(const QWidgetList &); Grid m_grid; }; @@ -1145,22 +1132,6 @@ GridLayout<GridLikeLayout, LayoutType, GridMode>::GridLayout(const QWidgetList & } template <class GridLikeLayout, int LayoutType, int GridMode> -QWidget *GridLayout<GridLikeLayout, LayoutType, GridMode>::widgetAt(GridLikeLayout *layout, int row, int column) const -{ - int index = 0; - while (QLayoutItem *item = layout->itemAt(index)) { - if (item->widget()) { - int r, c, rowspan, colspan; - getGridItemPosition(layout, index, &r, &c, &rowspan, &colspan); - if (row == r && column == c) - return item->widget(); - } - ++index; - } - return 0; -} - -template <class GridLikeLayout, int LayoutType, int GridMode> void GridLayout<GridLikeLayout, LayoutType, GridMode>::doLayout() { bool needMove, needReparent; @@ -1207,7 +1178,7 @@ void removeIntVecDuplicates(QVector<int> &v) return; for (QVector<int>::iterator current = v.begin() ; (current != v.end()) && ((current+1) != v.end()) ; ) - if ( (*current == *(current+1)) ) + if ( *current == *(current+1) ) v.erase(current+1); else ++current; diff --git a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp index d8a7a7c6c..406037993 100644 --- a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp @@ -43,6 +43,9 @@ #include "pluginmanager_p.h" #include <QtDesigner/QDesignerFormEditorInterface> +#include <QtDesigner/QDesignerDynamicPropertySheetExtension> +#include <QtDesigner/QDesignerPropertySheetExtension> +#include <QtDesigner/QExtensionManager> #include <widgetfactory_p.h> #include <QtWidgets/QAction> #include <QtWidgets/QLineEdit> @@ -99,6 +102,20 @@ QDesignerPropertyEditor::QDesignerPropertyEditor(QWidget *parent, Qt::WindowFlag connect(this, SIGNAL(propertyChanged(QString,QVariant)), this, SLOT(slotPropertyChanged(QString,QVariant))); } +static inline bool isDynamicProperty(QDesignerFormEditorInterface *core, QObject *object, + const QString &propertyName) +{ + if (const QDesignerDynamicPropertySheetExtension *dynamicSheet = qt_extension<QDesignerDynamicPropertySheetExtension*>(core->extensionManager(), object)) { + if (dynamicSheet->dynamicPropertiesAllowed()) { + if (QDesignerPropertySheetExtension *propertySheet = qt_extension<QDesignerPropertySheetExtension*>(core->extensionManager(), object)) { + const int index = propertySheet->indexOf(propertyName); + return index >= 0 && dynamicSheet->isDynamicProperty(index); + } + } + } + return false; +} + QDesignerPropertyEditor::StringPropertyParameters QDesignerPropertyEditor::textPropertyValidationMode( QDesignerFormEditorInterface *core, const QObject *object, const QString &propertyName, bool isMainContainer) @@ -118,6 +135,9 @@ QDesignerPropertyEditor::StringPropertyParameters QDesignerPropertyEditor::textP return customType; } + if (isDynamicProperty(core, const_cast<QObject *>(object), propertyName)) + return StringPropertyParameters(ValidationMultiLine, true); + // Check hardcoded property ames const PropertyNameTypeMap::const_iterator hit = stringPropertyTypes().constFind(propertyName); if (hit != stringPropertyTypes().constEnd()) diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index 48118d74c..23c6885ee 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -57,6 +57,7 @@ #include <QtWidgets/QVBoxLayout> #include <QtWidgets/QGridLayout> #include <QtWidgets/QFormLayout> +#include <QtWidgets/QApplication> #include <QtGui/qevent.h> #include <QtCore/qdebug.h> @@ -1388,7 +1389,9 @@ void QLayoutSupport::adjustIndicator(const QPoint &pos, int index) const bool closeToLeft = fromLeftRight == fromLeft; showIndicator(RightIndicator, QRect(closeToLeft ? g.x() : g.right() + 1 - indicatorSize, 0, indicatorSize, r.height()), bluePalette); - const int incr = closeToLeft ? 0 : +1; + const QWidget *parent = layout()->parentWidget(); + const bool leftToRight = Qt::LeftToRight == (parent ? parent->layoutDirection() : QApplication::layoutDirection()); + const int incr = leftToRight == closeToLeft ? 0 : +1; setCurrentCellFromIndicator(indicatorOrientation, m_currentIndex, incr); } break; diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index 0da3a1010..92cf34048 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -394,6 +394,7 @@ private slots: void setVAlignSub(bool sub); void insertLink(); void insertImage(); + void layoutDirectionChanged(); private: QAction *m_bold_action; @@ -405,6 +406,7 @@ private: QAction *m_align_center_action; QAction *m_align_right_action; QAction *m_align_justify_action; + QAction *m_layoutDirectionAction; QAction *m_link_action; QAction *m_image_action; QAction *m_simplify_richtext_action; @@ -500,6 +502,11 @@ RichTextEditorToolBar::RichTextEditorToolBar(QDesignerFormEditorInterface *core, tr("Justify"), editor, 0, alignment_group); addAction(m_align_justify_action); + m_layoutDirectionAction = createCheckableAction( + createIconSet(QStringLiteral("righttoleft.png")), + tr("Right to Left"), this, SLOT(layoutDirectionChanged())); + addAction(m_layoutDirectionAction); + addSeparator(); // Superscript and subscript buttons @@ -626,6 +633,20 @@ void RichTextEditorToolBar::insertImage() m_editor->insertHtml(QStringLiteral("<img src=\"") + path + QStringLiteral("\"/>")); } +void RichTextEditorToolBar::layoutDirectionChanged() +{ + QTextCursor cursor = m_editor->textCursor(); + QTextBlock block = cursor.block(); + if (block.isValid()) { + QTextBlockFormat format = block.blockFormat(); + const Qt::LayoutDirection newDirection = m_layoutDirectionAction->isChecked() ? Qt::RightToLeft : Qt::LeftToRight; + if (format.layoutDirection() != newDirection) { + format.setLayoutDirection(newDirection); + cursor.setBlockFormat(format); + } + } +} + void RichTextEditorToolBar::updateActions() { if (m_editor == 0) { @@ -651,6 +672,7 @@ void RichTextEditorToolBar::updateActions() } else { m_align_justify_action->setChecked(true); } + m_layoutDirectionAction->setChecked(cursor.blockFormat().layoutDirection() == Qt::RightToLeft); m_bold_action->setChecked(font.bold()); m_italic_action->setChecked(font.italic()); diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index 28f488642..1cadf1b68 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -594,16 +594,6 @@ void WidgetFactory::initializeCommon(QWidget *widget) const // Apply style if (m_currentStyle) widget->setStyle(m_currentStyle); - // Prevent the wizard from emulating the Windows Vista Theme. - // This theme (in both Aero and Basic mode) is tricky to - // emulate properly in designer due to 1) the manipulation of the non-client area of - // the top-level window, and 2) the upper-right location of the Back button. - // The wizard falls back to QWizard::ModernStyle whenever the Vista theme - // would normally apply. - if (QWizard *wizard = qobject_cast<QWizard *>(widget)) { - wizard->setProperty("_q_wizard_vista_off", QVariant(true)); - return; - } } // Necessary initializations for preview objects diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h index c0b7bf16d..332291bbd 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.h +++ b/src/designer/src/lib/uilib/abstractformbuilder.h @@ -52,8 +52,6 @@ #include <QtWidgets/QSizePolicy> #include <QtGui/QPalette> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // pragma for syncqt, don't remove. @@ -268,6 +266,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // ABSTRACTFORMBUILDER_H diff --git a/src/designer/src/lib/uilib/container.h b/src/designer/src/lib/uilib/container.h index 2da07c77a..f4ed62d77 100644 --- a/src/designer/src/lib/uilib/container.h +++ b/src/designer/src/lib/uilib/container.h @@ -45,8 +45,6 @@ #include <QtDesigner/extension.h> #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -77,6 +75,4 @@ Q_DECLARE_EXTENSION_INTERFACE(QDesignerContainerExtension, "org.qt-project.Qt.De QT_END_NAMESPACE -QT_END_HEADER - #endif // CONTAINER_H diff --git a/src/designer/src/lib/uilib/customwidget.h b/src/designer/src/lib/uilib/customwidget.h index 75e15ad0b..d051866f0 100644 --- a/src/designer/src/lib/uilib/customwidget.h +++ b/src/designer/src/lib/uilib/customwidget.h @@ -47,8 +47,6 @@ #include <QtCore/QString> #include <QtGui/QIcon> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -100,6 +98,4 @@ Q_DECLARE_INTERFACE(QDesignerCustomWidgetCollectionInterface, QDesignerCustomWid QT_END_NAMESPACE -QT_END_HEADER - #endif // CUSTOMWIDGET_H diff --git a/src/designer/src/lib/uilib/extension.h b/src/designer/src/lib/uilib/extension.h index 75fd12937..7f0685588 100644 --- a/src/designer/src/lib/uilib/extension.h +++ b/src/designer/src/lib/uilib/extension.h @@ -45,8 +45,6 @@ #include <QtCore/QString> #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define Q_TYPEID(IFace) QLatin1String(IFace##_iid) @@ -104,6 +102,4 @@ template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manag QT_END_NAMESPACE -QT_END_HEADER - #endif // EXTENSION_H diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h index bbbb0919a..91d34275f 100644 --- a/src/designer/src/lib/uilib/formbuilder.h +++ b/src/designer/src/lib/uilib/formbuilder.h @@ -45,8 +45,6 @@ #include "uilib_global.h" #include "abstractformbuilder.h" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // pragma for syncqt, don't remove. @@ -105,6 +103,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // FORMBUILDER_H diff --git a/src/designer/src/lib/uilib/qdesignerexportwidget.h b/src/designer/src/lib/uilib/qdesignerexportwidget.h index f5f62571c..74ffe27fe 100644 --- a/src/designer/src/lib/uilib/qdesignerexportwidget.h +++ b/src/designer/src/lib/uilib/qdesignerexportwidget.h @@ -44,8 +44,6 @@ #include <QtCore/QtGlobal> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 @@ -61,6 +59,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif //QDESIGNEREXPORTWIDGET_H diff --git a/src/designer/src/lib/uilib/uilib_global.h b/src/designer/src/lib/uilib/uilib_global.h index 873c540ce..f8624cb73 100644 --- a/src/designer/src/lib/uilib/uilib_global.h +++ b/src/designer/src/lib/uilib/uilib_global.h @@ -44,7 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #define QDESIGNER_UILIB_EXTERN Q_DECL_EXPORT @@ -59,6 +58,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // UILIB_GLOBAL_H diff --git a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp index 39a5c5614..2917f586b 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp @@ -48,6 +48,7 @@ #include <QtDesigner/QDesignerPropertyEditorInterface> #include <QtDesigner/QExtensionManager> +#include <private/qdesigner_utils_p.h> #include <QtCore/QDebug> #include <QtCore/QTimer> @@ -111,7 +112,9 @@ void QAxWidgetPropertySheet::setProperty(int index, const QVariant &value) } // Loading forms: Reload if (name == m_controlProperty) { - const QString clsid = value.toString(); + const QString clsid = value.canConvert<qdesigner_internal::PropertySheetStringValue>() ? + qvariant_cast<qdesigner_internal::PropertySheetStringValue>(value).value() : + value.toString(); if (clsid.isEmpty() || !axWidget()->loadControl(clsid)) reset(index); else diff --git a/src/designer/src/uitools/quiloader.h b/src/designer/src/uitools/quiloader.h index 6977d20a4..12124dc0c 100644 --- a/src/designer/src/uitools/quiloader.h +++ b/src/designer/src/uitools/quiloader.h @@ -45,8 +45,6 @@ #include <QtCore/QObject> #include <QtCore/QScopedPointer> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QWidget; @@ -97,6 +95,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QUILOADER_H diff --git a/src/designer/src/uitools/quiloader_p.h b/src/designer/src/uitools/quiloader_p.h index 6ee4ca325..e7cbfb607 100644 --- a/src/designer/src/uitools/quiloader_p.h +++ b/src/designer/src/uitools/quiloader_p.h @@ -66,8 +66,6 @@ #define PROP_TABPAGETOOLTIP "_q_tabPageToolTip_notr" #define PROP_TABPAGEWHATSTHIS "_q_tabPageWhatsThis_notr" -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUiTranslatableStringValue @@ -101,8 +99,6 @@ extern const QUiItemRolePair qUiItemRoles[]; QT_END_NAMESPACE -QT_END_HEADER - Q_DECLARE_METATYPE(QUiTranslatableStringValue) |
