From: Kevin Krammer Date: Mon, 21 Jan 2013 20:05:55 +0000 (+0100) Subject: Ported double spin box X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=52cbddc9597cb8a4326c859de79c95166f2a1201;p=konrad%2FDeclarativeWidgets.git Ported double spin box --- diff --git a/lib/declarativedoublespinbox.cpp b/lib/declarativedoublespinbox.cpp deleted file mode 100644 index be39057..0000000 --- a/lib/declarativedoublespinbox.cpp +++ /dev/null @@ -1,29 +0,0 @@ -/* - Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com - Author: Kevin Krammer, krake@kdab.com - Author: Tobias Koenig, tokoe@kdab.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#include "declarativedoublespinbox_p.h" - -DeclarativeDoubleSpinBox::DeclarativeDoubleSpinBox(QObject *parent) - : DeclarativeWidgetProxy(parent) -{ - connectAllSignals(m_proxiedObject, this); -} - -CUSTOM_METAOBJECT(DeclarativeDoubleSpinBox, QDoubleSpinBox) diff --git a/lib/declarativedoublespinbox_p.h b/lib/declarativedoublespinbox_p.h deleted file mode 100644 index 9629f41..0000000 --- a/lib/declarativedoublespinbox_p.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com - Author: Kevin Krammer, krake@kdab.com - Author: Tobias Koenig, tokoe@kdab.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -*/ - -#ifndef DECLARATIVEDOUBLESPINBOX_P_H -#define DECLARATIVEDOUBLESPINBOX_P_H - -#include "declarativewidgetproxy_p.h" - -#include - -class DeclarativeDoubleSpinBox : public DeclarativeWidgetProxy -{ - DECLARATIVE_OBJECT - - public: - explicit DeclarativeDoubleSpinBox(QObject *parent = 0); -}; - -#endif diff --git a/lib/declarativewidgetsdocument.cpp b/lib/declarativewidgetsdocument.cpp index f01b192..bb536a4 100644 --- a/lib/declarativewidgetsdocument.cpp +++ b/lib/declarativewidgetsdocument.cpp @@ -31,7 +31,6 @@ #include "declarativedeclarativecontext_p.h" #include "declarativedeclarativeview_p.h" #include "declarativedial_p.h" -#include "declarativedoublespinbox_p.h" #include "declarativefiledialog_p.h" #include "declarativefontdialog_p.h" #include "declarativeformlayout_p.h" @@ -69,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -114,7 +114,6 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject qmlRegisterType("QtGui", 1, 0, "DeclarativeContextProperty"); qmlRegisterType("QtGui", 1, 0, "DeclarativeView"); qmlRegisterType("QtGui", 1, 0, "Dial"); - qmlRegisterType("QtGui", 1, 0, "DoubleSpinBox"); qmlRegisterType("QtGui", 1, 0, "Label"); qmlRegisterType("QtGui", 1, 0, "LCDNumber"); qmlRegisterType("QtGui", 1, 0, "ProgressBar"); @@ -150,6 +149,7 @@ DeclarativeWidgetsDocument::DeclarativeWidgetsDocument(const QUrl &url, QObject qmlRegisterExtendedType("QtGui", 1, 0, "CommandLinkButton"); qmlRegisterExtendedType("QtGui", 1, 0, "Dialog"); qmlRegisterExtendedType("QtGui", 1, 0, "DialogButtonBox"); + qmlRegisterExtendedType("QtGui", 1, 0, "DoubleSpinBox"); qmlRegisterExtendedType("QtGui", 1, 0, "FileDialog"); qmlRegisterExtendedType("QtGui", 1, 0, "Frame"); qmlRegisterExtendedType("QtGui", 1, 0, "FontDialog"); diff --git a/lib/lib.pro b/lib/lib.pro index d6cb795..36fed51 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -17,7 +17,6 @@ HEADERS = \ declarativedeclarativecontext_p.h \ declarativedeclarativeview_p.h \ declarativedial_p.h \ - declarativedoublespinbox_p.h \ declarativefiledialog_p.h \ declarativefontdialog_p.h \ declarativeformlayout_p.h \ @@ -67,7 +66,6 @@ SOURCES = \ declarativedeclarativecontext.cpp \ declarativedeclarativeview.cpp \ declarativedial.cpp \ - declarativedoublespinbox.cpp \ declarativefiledialog.cpp \ declarativefontdialog.cpp \ declarativeformlayout.cpp \