From: Tobias Koenig Date: Sun, 28 Oct 2012 08:19:11 +0000 (+0100) Subject: Add support for RadioButton X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4dbedb7e4d88c3a7eda9a3d2977734eb5fb18184;p=web%2Fkonrad%2FDeclarativeWidgets.git Add support for RadioButton --- diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp index 5d8f10c..d546482 100644 --- a/declarativeobjects.cpp +++ b/declarativeobjects.cpp @@ -1193,6 +1193,14 @@ DeclarativePushButton::DeclarativePushButton(QObject *parent) : DeclarativeWidge CUSTOM_METAOBJECT(DeclarativePushButton, QPushButton) +// DeclarativeRadioButton +DeclarativeRadioButton::DeclarativeRadioButton(QObject *parent) : DeclarativeWidgetProxy(parent) +{ + connectAllSignals(m_proxiedObject, this); +} + +CUSTOM_METAOBJECT(DeclarativeRadioButton, QRadioButton) + // DeclarativeSlider DeclarativeSlider::DeclarativeSlider(QObject *parent) : DeclarativeWidgetProxy(parent) { diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h index 39a76f7..cbc125c 100644 --- a/declarativeobjects_p.h +++ b/declarativeobjects_p.h @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -710,6 +711,14 @@ class DeclarativePushButton : public DeclarativeWidgetProxy DeclarativePushButton(QObject *parent = 0); }; +class DeclarativeRadioButton : public DeclarativeWidgetProxy +{ + DECLARATIVE_OBJECT + + public: + DeclarativeRadioButton(QObject *parent = 0); +}; + class DeclarativeSlider : public DeclarativeWidgetProxy { DECLARATIVE_OBJECT diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp index 0f3e33c..82094e3 100644 --- a/declarativewidgetdocument.cpp +++ b/declarativewidgetdocument.cpp @@ -69,6 +69,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p qmlRegisterType("QtGui", 1, 0, "MessageBox"); qmlRegisterType("QtGui", 1, 0, "PlainTextEdit"); qmlRegisterType("QtGui", 1, 0, "PushButton"); + qmlRegisterType("QtGui", 1, 0, "RadioButton"); qmlRegisterType("QtGui", 1, 0, "Slider"); qmlRegisterType(); qmlRegisterType("QtGui", 1, 0, "StatusBar"); diff --git a/gallery.qml b/gallery.qml index a30d5c3..4a3941a 100644 --- a/gallery.qml +++ b/gallery.qml @@ -16,6 +16,10 @@ TabWidget { text: qsTr("ToolButton") } + RadioButton { + text: qsTr("RadioButton") + } + CheckBox { text: qsTr("CheckBox") } diff --git a/qwidgets.list b/qwidgets.list index 7ea83ba..bf25c5d 100644 --- a/qwidgets.list +++ b/qwidgets.list @@ -26,7 +26,6 @@ qmdisubwindow.h qmessagebox.h qprintpreviewwidget.h qprogressbar.h -qradiobutton.h qscrollarea.h qscrollbar.h qspinbox.h @@ -37,7 +36,6 @@ qstackedwidget.h qtabbar.h qtableview.h qtablewidget.h -qtabwidget.h qtoolbox.h qtreeview.h qtreewidget.h