From 18aa389f1b0c0fec289878d44eeb4518b8b2bdbe Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Sun, 28 Oct 2012 09:45:51 +0100 Subject: [PATCH] Add support for ProgressBar --- declarativeobjects.cpp | 8 ++++++++ declarativeobjects_p.h | 9 +++++++++ declarativewidgetdocument.cpp | 1 + gallery.qml | 7 +++++++ qwidgets.list | 3 --- 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp index c054c1c..0a3b0d2 100644 --- a/declarativeobjects.cpp +++ b/declarativeobjects.cpp @@ -1209,6 +1209,14 @@ DeclarativePlainTextEdit::DeclarativePlainTextEdit(QObject *parent) : Declarativ CUSTOM_METAOBJECT(DeclarativePlainTextEdit, QPlainTextEdit) +// DeclarativeProgressBar +DeclarativeProgressBar::DeclarativeProgressBar(QObject *parent) : DeclarativeWidgetProxy(parent) +{ + connectAllSignals(m_proxiedObject, this); +} + +CUSTOM_METAOBJECT(DeclarativeProgressBar, QProgressBar) + // DeclarativePushButton DeclarativePushButton::DeclarativePushButton(QObject *parent) : DeclarativeWidgetProxy(parent) { diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h index 0332f05..565ee4f 100644 --- a/declarativeobjects_p.h +++ b/declarativeobjects_p.h @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -731,6 +732,14 @@ class DeclarativePlainTextEdit : public DeclarativeWidgetProxy DeclarativePlainTextEdit(QObject *parent = 0); }; +class DeclarativeProgressBar : public DeclarativeWidgetProxy +{ + DECLARATIVE_OBJECT + + public: + DeclarativeProgressBar(QObject *parent = 0); +}; + class DeclarativePushButton : public DeclarativeWidgetProxy { DECLARATIVE_OBJECT diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp index f6f16fa..d34f5da 100644 --- a/declarativewidgetdocument.cpp +++ b/declarativewidgetdocument.cpp @@ -71,6 +71,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p qmlRegisterType(); qmlRegisterType("QtGui", 1, 0, "MessageBox"); qmlRegisterType("QtGui", 1, 0, "PlainTextEdit"); + qmlRegisterType("QtGui", 1, 0, "ProgressBar"); qmlRegisterType("QtGui", 1, 0, "PushButton"); qmlRegisterType("QtGui", 1, 0, "RadioButton"); qmlRegisterType("QtGui", 1, 0, "ScrollBar"); diff --git a/gallery.qml b/gallery.qml index dbc2069..54891e4 100644 --- a/gallery.qml +++ b/gallery.qml @@ -117,6 +117,13 @@ TabWidget { CalendarWidget {} + ProgressBar { + minimum: 0 + maximum: 100 + value: 42 + textVisible: true + } + WebView { url: "http://www.kdab.com" } diff --git a/qwidgets.list b/qwidgets.list index 3e19378..2002ae7 100644 --- a/qwidgets.list +++ b/qwidgets.list @@ -10,7 +10,6 @@ qprogressdialog.h // widgets qcolumnview.h qcombobox.h -qdial.h qdockwidget.h qfocusframe.h qfontcombobox.h @@ -23,9 +22,7 @@ qlistwidget.h qmdiarea.h qmdisubwindow.h qprintpreviewwidget.h -qprogressbar.h qscrollarea.h -qscrollbar.h qsplashscreen.h qsplitter.h qstackedlayout.h -- 1.7.2.5