diff --git a/src/libs/utils/styledbar.h b/src/libs/utils/styledbar.h index 1163ae5af94c64345a8234ca6b5ba6970ebb74cb..cad9de955e731217260e9e922207e6708ef38b4c 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 ea80d4b98ecc7edcafecb23b405e0964a3738a34..98e8d894886eb0336b8af2156537a249f295c6af 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<Utils::StyledBar> + (QLatin1String("<utils/styledbar.h>"), + false, + QLatin1String(groupC), + QIcon(), + QLatin1String("Styled bar")) +{ +} + +StyledSeparator_CW::StyledSeparator_CW(QObject *parent) : + QObject(parent), + CustomWidget<Utils::StyledSeparator> + (QLatin1String("<utils/styledbar.h>"), + false, + QLatin1String(groupC), + QIcon(), + QLatin1String("Styled separator")) +{ +} + +Wizard_CW::Wizard_CW(QObject *parent) : + QObject(parent), + CustomWidget<Utils::Wizard> + (QLatin1String("<utils/wizard.h>"), + true, + QLatin1String(groupC), + QIcon(), + QLatin1String("Wizard with progress indicator")) +{ +} + DetailsWidget_CW::DetailsWidget_CW(QObject *parent) : QObject(parent), CustomWidget<Utils::DetailsWidget> @@ -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<QDesignerCustomWidgetInterface*> WidgetCollection::customWidgets() const diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index c2716694c8b45738aba975aed1d47143c2994354..97ebaf621dec40ac58ebd155ab3215beef2aec2e 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -45,6 +45,8 @@ #include <utils/pathlisteditor.h> #include <utils/detailsbutton.h> #include <utils/detailswidget.h> +#include <utils/styledbar.h> +#include <utils/wizard.h> #include <QtDesigner/QDesignerCustomWidgetCollectionInterface> #include <QtDesigner/QDesignerContainerExtension> @@ -191,6 +193,37 @@ public: explicit DetailsButton_CW(QObject *parent = 0); }; +class StyledBar_CW : + public QObject, + public CustomWidget<Utils::StyledBar> +{ + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) +public: + explicit StyledBar_CW(QObject *parent = 0); +}; + +class StyledSeparator_CW : + public QObject, + public CustomWidget<Utils::StyledSeparator> +{ + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) +public: + explicit StyledSeparator_CW(QObject *parent = 0); +}; + +class Wizard_CW : + public QObject, + public CustomWidget<Utils::Wizard> +{ + Q_OBJECT + Q_INTERFACES(QDesignerCustomWidgetInterface) +public: + explicit Wizard_CW(QObject *parent = 0); +}; + + // Details Widget: plugin + simple, hacky container extension that // accepts only one page.