From fdcb1970331aa5b67d5bf777fd31e8c658a89fdf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 31 Mar 2010 10:13:05 +0200 Subject: [PATCH] More widgets in the Qt Designer plugin containing Qt Creator widgets. --- src/libs/utils/styledbar.h | 2 ++ src/tools/qtcreatorwidgets/customwidgets.cpp | 36 ++++++++++++++++++++ src/tools/qtcreatorwidgets/customwidgets.h | 33 ++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/src/libs/utils/styledbar.h b/src/libs/utils/styledbar.h index 1163ae5af94..cad9de955e7 100644 --- a/src/libs/utils/styledbar.h +++ b/src/libs/utils/styledbar.h @@ -38,6 +38,7 @@ namespace Utils { class QTCREATOR_UTILS_EXPORT StyledBar : public QWidget { + Q_OBJECT public: StyledBar(QWidget *parent = 0); void setSingleRow(bool singleRow); @@ -52,6 +53,7 @@ protected: class QTCREATOR_UTILS_EXPORT StyledSeparator : public QWidget { + Q_OBJECT public: StyledSeparator(QWidget *parent = 0); protected: diff --git a/src/tools/qtcreatorwidgets/customwidgets.cpp b/src/tools/qtcreatorwidgets/customwidgets.cpp index ea80d4b98ec..98e8d894886 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.cpp +++ b/src/tools/qtcreatorwidgets/customwidgets.cpp @@ -190,6 +190,39 @@ DetailsButton_CW::DetailsButton_CW(QObject *parent) : { } +StyledBar_CW::StyledBar_CW(QObject *parent) : + QObject(parent), + CustomWidget + (QLatin1String(""), + false, + QLatin1String(groupC), + QIcon(), + QLatin1String("Styled bar")) +{ +} + +StyledSeparator_CW::StyledSeparator_CW(QObject *parent) : + QObject(parent), + CustomWidget + (QLatin1String(""), + false, + QLatin1String(groupC), + QIcon(), + QLatin1String("Styled separator")) +{ +} + +Wizard_CW::Wizard_CW(QObject *parent) : + QObject(parent), + CustomWidget + (QLatin1String(""), + true, + QLatin1String(groupC), + QIcon(), + QLatin1String("Wizard with progress indicator")) +{ +} + DetailsWidget_CW::DetailsWidget_CW(QObject *parent) : QObject(parent), CustomWidget @@ -312,6 +345,9 @@ WidgetCollection::WidgetCollection(QObject *parent) : m_plugins.push_back(new PathListEditor_CW(this)); m_plugins.push_back(new DetailsButton_CW(this)); m_plugins.push_back(new DetailsWidget_CW(this)); + m_plugins.push_back(new StyledBar_CW(this)); + m_plugins.push_back(new StyledSeparator_CW(this)); + m_plugins.push_back(new Wizard_CW(this)); } QList WidgetCollection::customWidgets() const diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index c2716694c8b..97ebaf621de 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -45,6 +45,8 @@ #include #include #include +#include +#include #include #include @@ -191,6 +193,37 @@ public: explicit DetailsButton_CW(QObject *parent = 0); }; +class StyledBar_CW : + public QObject, + public CustomWidget +{ + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) +public: + explicit StyledBar_CW(QObject *parent = 0); +}; + +class StyledSeparator_CW : + public QObject, + public CustomWidget +{ + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) +public: + explicit StyledSeparator_CW(QObject *parent = 0); +}; + +class Wizard_CW : + public QObject, + public CustomWidget +{ + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) +public: + explicit Wizard_CW(QObject *parent = 0); +}; + + // Details Widget: plugin + simple, hacky container extension that // accepts only one page.