From 64b5394e9c811ddd285fcf8f759a9a1241ec0e69 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Sun, 28 Oct 2012 09:34:59 +0100 Subject: [PATCH] Add support for ScrollBar --- declarativeobjects.cpp | 8 ++++++++ declarativeobjects_p.h | 9 +++++++++ declarativewidgetdocument.cpp | 1 + gallery.qml | 7 +++++++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp index 12685d3..c054c1c 100644 --- a/declarativeobjects.cpp +++ b/declarativeobjects.cpp @@ -1225,6 +1225,14 @@ DeclarativeRadioButton::DeclarativeRadioButton(QObject *parent) : DeclarativeWid CUSTOM_METAOBJECT(DeclarativeRadioButton, QRadioButton) +// DeclarativeScrollBar +DeclarativeScrollBar::DeclarativeScrollBar(QObject *parent) : DeclarativeWidgetProxy(parent) +{ + connectAllSignals(m_proxiedObject, this); +} + +CUSTOM_METAOBJECT(DeclarativeScrollBar, QScrollBar) + // DeclarativeSlider DeclarativeSlider::DeclarativeSlider(QObject *parent) : DeclarativeWidgetProxy(parent) { diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h index d3bc6f6..0332f05 100644 --- a/declarativeobjects_p.h +++ b/declarativeobjects_p.h @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -746,6 +747,14 @@ class DeclarativeRadioButton : public DeclarativeWidgetProxy DeclarativeRadioButton(QObject *parent = 0); }; +class DeclarativeScrollBar : public DeclarativeWidgetProxy +{ + DECLARATIVE_OBJECT + + public: + DeclarativeScrollBar(QObject *parent = 0); +}; + class DeclarativeSlider : public DeclarativeWidgetProxy { DECLARATIVE_OBJECT diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp index 4bce215..f6f16fa 100644 --- a/declarativewidgetdocument.cpp +++ b/declarativewidgetdocument.cpp @@ -73,6 +73,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p qmlRegisterType("QtGui", 1, 0, "PlainTextEdit"); qmlRegisterType("QtGui", 1, 0, "PushButton"); qmlRegisterType("QtGui", 1, 0, "RadioButton"); + qmlRegisterType("QtGui", 1, 0, "ScrollBar"); qmlRegisterType("QtGui", 1, 0, "Slider"); qmlRegisterType("QtGui", 1, 0, "SpinBox"); qmlRegisterType(); diff --git a/gallery.qml b/gallery.qml index 019018a..dbc2069 100644 --- a/gallery.qml +++ b/gallery.qml @@ -86,6 +86,13 @@ TabWidget { Dial {} + ScrollBar { + minimum: 0 + maximum: 100 + value: 50 + orientation: Qt.Horizontal + } + Slider { minimum: 0 maximum: 100 -- 1.7.2.5