diff options
author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2011-04-27 14:24:15 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2011-06-14 10:31:50 +0200 |
commit | a2c1ae8a584adb4042cf66e0536dca3dce01b51b (patch) | |
tree | 005bb3f385df8346d30d9c37a2ff84d00e0b14f3 | |
parent | 1f05dec2fc041dc4c13a0a3064cefa14ec58d28e (diff) |
QmlDesigner.itemLibrary: adding plugin for extra components
A new extra component plugin.
(cherry picked from commit fbcbac5a65b26da281404f63885dff884afaba78)
(cherry picked from commit 0e3f13e921f3812f8944a22375131b4e2fd87f87)
Change-Id: Ifbcbac5a65b26da281404f63885dff884afaba78q
Reviewed-on: http://codereview.qt.nokia.com/467
Reviewed-by: hjk <qthjk@ovi.com>
34 files changed, 232 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/extrasplugin/extras.metainfo b/src/plugins/qmldesigner/extrasplugin/extras.metainfo new file mode 100644 index 0000000000..d074cefe05 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extras.metainfo @@ -0,0 +1,54 @@ +<metainfo> + <node name="CountBubble" icon=":/extrasplugin/images/count-bubble-16.png"> + <itemlibraryentry name="CountBubble" category="Components Extras" libraryIcon=":/extrasplugin/images/count-bubble-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="DatePickerDialog" icon=":/extrasplugin/images/date-picker-16.png"> + <itemlibraryentry name="DatePickerDialog" category="Components Extras" libraryIcon=":/extrasplugin/images/date-picker-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="InfoBanner" icon=":/extrasplugin/images/info-banner-16.png"> + <itemlibraryentry name="InfoBanner" category="Components Extras" libraryIcon=":/extrasplugin/images/info-banner-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="ListButton" icon=":/extrasplugin/images/list-button-16.png"> + <itemlibraryentry name="ListButton" category="Components Extras" libraryIcon=":/extrasplugin/images/list-button-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="ListDelegate" icon=":/extrasplugin/images/list-delegate-16.png"> + <itemlibraryentry name="ListDelegate" category="Components Extras" libraryIcon=":/extrasplugin/images/list-delegate-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="MoreIndicator" icon=":/extrasplugin/images/more-indicator-16.png"> + <itemlibraryentry name="MoreIndicator" category="Components Extras" libraryIcon=":/extrasplugin/images/more-indicator-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="PageIndicator" icon=":/extrasplugin/images/page-indicator-16.png"> + <itemlibraryentry name="PageIndicator" category="Components Extras" libraryIcon=":/extrasplugin/images/page-indicator-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="RatingIndicator" icon=":/extrasplugin/images/rating-indicator-16.png"> + <itemlibraryentry name="RatingIndicator" category="Components Extras" libraryIcon=":/extrasplugin/images/rating-indicator-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="TimePickerDialog" icon=":/extrasplugin/images/time-picker-16.png"> + <itemlibraryentry name="TimePickerDialog" category="Components Extras" libraryIcon=":/extrasplugin/images/time-picker-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="Tumbler" icon=":/extrasplugin/images/tumbler-16.png"> + <itemlibraryentry name="Tumbler" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="TumblerButton" icon=":/extrasplugin/images/tumbler-button-16.png"> + <itemlibraryentry name="TumblerButton" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-button-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="TumblerColumn" icon=":/extrasplugin/images/tumbler-column-16.png"> + <itemlibraryentry name="TumblerColumn" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-column-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> + <node name="TumblerDialog" icon=":/extrasplugin/images/tumbler-dialog-16.png"> + <itemlibraryentry name="TumblerDialog" category="Components Extras" libraryIcon=":/extrasplugin/images/tumbler-dialog-24.png" version="1.0" requiredImport="com.nokia.extras"> + </itemlibraryentry> + </node> +</metainfo> diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp new file mode 100644 index 0000000000..f4fd844abb --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp @@ -0,0 +1,58 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#include "extrasplugin.h" +#include <widgetplugin_helper.h> +#include <QtCore/QtPlugin> + +namespace QmlDesigner { + + +ExtrasPlugin::ExtrasPlugin() +{ +} + +QString ExtrasPlugin::pluginName() +{ + return ("ExtrasPlugin"); +} + +QString ExtrasPlugin::metaInfo() +{ + return QString(":/extrasplugin/extras.metainfo"); +} + +} + +Q_EXPORT_PLUGIN(QmlDesigner::ExtrasPlugin) + diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.h b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h new file mode 100644 index 0000000000..db069308bc --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.h @@ -0,0 +1,62 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** No Commercial Usage +** +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#ifndef EXTRASPLUGIN_H +#define EXTRASPLUGIN_H + +#include <iwidgetplugin.h> +#include <QtDeclarative/qdeclarative.h> + +QT_BEGIN_NAMESPACE +QT_END_NAMESPACE + +namespace QmlDesigner { + +class ExtrasPlugin : public QObject, QmlDesigner::IWidgetPlugin +{ + Q_OBJECT + Q_DISABLE_COPY(ExtrasPlugin) + Q_INTERFACES(QmlDesigner::IWidgetPlugin) +public: + ExtrasPlugin(); + ~ExtrasPlugin() {} + + QString metaInfo(); + QString pluginName(); + +}; + +} // namespace QmlDesigner + + +#endif // EXTRASPLUGIN_H diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri new file mode 100644 index 0000000000..12f923cb1e --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri @@ -0,0 +1,17 @@ +TARGET = extrasplugin +TEMPLATE = lib +CONFIG += plugin + +QT += script \ + declarative + +include (../designercore/iwidgetplugin.pri) + +DEFINES += SYMBIAN_LIBRARY +SOURCES += $$PWD/extrasplugin.cpp + +HEADERS += $$PWD/extrasplugin.h $$PWD/../designercore/include/iwidgetplugin.h + +RESOURCES += $$PWD/extrasplugin.qrc + +OTHER_FILES += $$PWD/extras.metainfo diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro new file mode 100644 index 0000000000..8fffeb6776 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pro @@ -0,0 +1,4 @@ +include(../../../../qtcreator.pri) +include(../../../private_headers.pri) +include(extrasplugin.pri) +include(plugindestdir.pri) diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc b/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc new file mode 100644 index 0000000000..ae97ba05e9 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.qrc @@ -0,0 +1,31 @@ +<RCC> + <qresource prefix="/extrasplugin"> + <file>extras.metainfo</file> + <file>images/count-bubble-16.png</file> + <file>images/count-bubble-24.png</file> + <file>images/date-picker-16.png</file> + <file>images/date-picker-24.png</file> + <file>images/info-banner-16.png</file> + <file>images/info-banner-24.png</file> + <file>images/list-button-16.png</file> + <file>images/list-button-24.png</file> + <file>images/list-delegate-16.png</file> + <file>images/list-delegate-24.png</file> + <file>images/more-indicator-16.png</file> + <file>images/more-indicator-24.png</file> + <file>images/page-indicator-16.png</file> + <file>images/page-indicator-24.png</file> + <file>images/rating-indicator-16.png</file> + <file>images/rating-indicator-24.png</file> + <file>images/time-picker-16.png</file> + <file>images/time-picker-24.png</file> + <file>images/tumbler-16.png</file> + <file>images/tumbler-24.png</file> + <file>images/tumbler-button-16.png</file> + <file>images/tumbler-button-24.png</file> + <file>images/tumbler-column-16.png</file> + <file>images/tumbler-column-24.png</file> + <file>images/tumbler-dialog-16.png</file> + <file>images/tumbler-dialog-24.png</file> + </qresource> +</RCC> diff --git a/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png Binary files differnew file mode 100644 index 0000000000..2ac1430602 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png Binary files differnew file mode 100644 index 0000000000..ba444822d5 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/count-bubble-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png b/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png Binary files differnew file mode 100644 index 0000000000..b8eb95b737 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/date-picker-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png b/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png Binary files differnew file mode 100644 index 0000000000..a8ee7e0847 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/date-picker-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png b/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png Binary files differnew file mode 100644 index 0000000000..379413808b --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/info-banner-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png b/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png Binary files differnew file mode 100644 index 0000000000..bf8aa614d0 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/info-banner-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png b/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png Binary files differnew file mode 100644 index 0000000000..2b1ce900b8 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/list-button-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png b/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png Binary files differnew file mode 100644 index 0000000000..d432090f9c --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/list-button-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png Binary files differnew file mode 100644 index 0000000000..3c97433f08 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png Binary files differnew file mode 100644 index 0000000000..c4d9886920 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/list-delegate-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png Binary files differnew file mode 100644 index 0000000000..81eff7306c --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png Binary files differnew file mode 100644 index 0000000000..f5d8dedbfb --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/more-indicator-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png Binary files differnew file mode 100644 index 0000000000..29a8933751 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png Binary files differnew file mode 100644 index 0000000000..60dda334fc --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/page-indicator-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png Binary files differnew file mode 100644 index 0000000000..2df5418a84 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png Binary files differnew file mode 100644 index 0000000000..393b2ffa69 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/rating-indicator-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png b/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png Binary files differnew file mode 100644 index 0000000000..1ee49cafbd --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/time-picker-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png b/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png Binary files differnew file mode 100644 index 0000000000..979981bd31 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/time-picker-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png Binary files differnew file mode 100644 index 0000000000..afcf864744 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png Binary files differnew file mode 100644 index 0000000000..43783e6ee2 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png Binary files differnew file mode 100644 index 0000000000..4368493c3e --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png Binary files differnew file mode 100644 index 0000000000..6b0b71a65a --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-button-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png Binary files differnew file mode 100644 index 0000000000..36e2d27608 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png Binary files differnew file mode 100644 index 0000000000..8a043798f1 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-column-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png Binary files differnew file mode 100644 index 0000000000..5a105a76db --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-16.png diff --git a/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png Binary files differnew file mode 100644 index 0000000000..a6bbc2d795 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/images/tumbler-dialog-24.png diff --git a/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri b/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri new file mode 100644 index 0000000000..24f0c19b72 --- /dev/null +++ b/src/plugins/qmldesigner/extrasplugin/plugindestdir.pri @@ -0,0 +1,5 @@ +macx { + DESTDIR = $$IDE_LIBRARY_PATH/QmlDesigner +} else { + DESTDIR = $$IDE_BUILD_TREE/lib/qmldesigner +} diff --git a/src/plugins/qmldesigner/qmldesigner.pro b/src/plugins/qmldesigner/qmldesigner.pro index 1c1a3735f3..bab7341b1f 100644 --- a/src/plugins/qmldesigner/qmldesigner.pro +++ b/src/plugins/qmldesigner/qmldesigner.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin +SUBDIRS = qmldesignerplugin.pro qtquickplugin symbianplugin meegoplugin extrasplugin |