Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/separatePlugins into lp:ubuntu-ui-toolkit/staging

  1. separatePlugins
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Benjamin Zeller
Approved revision: 2022
Merged at revision: 2019
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/separatePlugins
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 179 lines (+87/-8)
8 files modified
debian/qml-module-ubuntu-components.install (+2/-0)
src/Ubuntu/Components/Styles/Styles.pro (+6/-1)
src/Ubuntu/Components/Styles/plugin/plugin.cpp (+40/-0)
src/Ubuntu/Components/Styles/plugin/plugin.pri (+8/-0)
src/Ubuntu/Components/Styles/qmldir (+2/-0)
src/Ubuntu/Components/qmldir (+1/-0)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+21/-7)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h (+7/-0)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/separatePlugins
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Benjamin Zeller Approve
Review via email: mp+298199@code.launchpad.net

Commit message

Create separate plugin for Ubuntu.Components.Styles

Description of the change

Create separate plugin for Ubuntu.Components.Styles

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/760/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4015/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/760/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/979/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4016/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/979/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/949/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4017/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/949/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/734/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4018/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/734/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/484/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/949
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/979
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/760
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/734
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4019/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4017
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4016
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4015
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4018

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/484/rebuild

review: Approve (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

LGTM

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/980/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4020/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/980/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/761/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4021/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/761/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/735/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4022/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/735/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2022
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/950/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4023/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/950/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/qml-module-ubuntu-components.install'
2--- debian/qml-module-ubuntu-components.install 2016-03-04 11:58:12 +0000
3+++ debian/qml-module-ubuntu-components.install 2016-06-23 09:14:02 +0000
4@@ -17,6 +17,8 @@
5 usr/lib/*/qt5/qml/Ubuntu/Components/Popups/qmldir
6 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.2/*.qml
7 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/1.3/*.qml
8+usr/lib/*/qt5/qml/Ubuntu/Components/Styles/libUbuntuComponentsStyles.so
9+usr/lib/*/qt5/qml/Ubuntu/Components/Styles/plugins.qmltypes
10 usr/lib/*/qt5/qml/Ubuntu/Components/Styles/qmldir
11 usr/lib/*/qt5/qml/Ubuntu/Components/artwork
12 usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
13
14=== modified file 'src/Ubuntu/Components/Styles/Styles.pro'
15--- src/Ubuntu/Components/Styles/Styles.pro 2016-06-14 10:08:13 +0000
16+++ src/Ubuntu/Components/Styles/Styles.pro 2016-06-23 09:14:02 +0000
17@@ -1,4 +1,9 @@
18+CXX_MODULE = qml
19+TARGET = UbuntuComponentsStyles
20 TARGETPATH = Ubuntu/Components/Styles
21+IMPORT_VERSION = 1.1
22+
23+include(plugin/plugin.pri)
24
25 QML_FILES += 1.2/ComboButtonStyle.qml \
26 1.2/PageHeadStyle.qml \
27@@ -9,6 +14,6 @@
28 1.3/ToolbarStyle.qml \
29 1.3/SectionsStyle.qml \
30
31-load(ubuntu_qml_module)
32+load(ubuntu_qml_plugin)
33
34 OTHER_FILES+=qmldir
35
36=== added directory 'src/Ubuntu/Components/Styles/plugin'
37=== added file 'src/Ubuntu/Components/Styles/plugin/plugin.cpp'
38--- src/Ubuntu/Components/Styles/plugin/plugin.cpp 1970-01-01 00:00:00 +0000
39+++ src/Ubuntu/Components/Styles/plugin/plugin.cpp 2016-06-23 09:14:02 +0000
40@@ -0,0 +1,40 @@
41+/*
42+ * Copyright 2016 Canonical Ltd.
43+ *
44+ * This program is free software; you can redistribute it and/or modify
45+ * it under the terms of the GNU Lesser General Public License as published by
46+ * the Free Software Foundation; version 3.
47+ *
48+ * This program is distributed in the hope that it will be useful,
49+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
50+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
51+ * GNU Lesser General Public License for more details.
52+ *
53+ * You should have received a copy of the GNU Lesser General Public License
54+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
55+ *
56+ * Author: Zsombor Egri <zsombor.egri@canonical.com>
57+ */
58+
59+#include <QtQml/QQmlExtensionPlugin>
60+#include <ubuntutoolkitmodule.h>
61+
62+class UbuntuComponentsStylesPlugin : public QQmlExtensionPlugin
63+{
64+ Q_OBJECT
65+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
66+
67+public:
68+ void registerTypes(const char *uri) override
69+ {
70+ Q_ASSERT(uri == QLatin1String("Ubuntu.Components.Styles"));
71+ UT_PREPEND_NAMESPACE(UbuntuStylesModule)::defineModule(uri);
72+ }
73+
74+ ~UbuntuComponentsStylesPlugin()
75+ {
76+ UT_PREPEND_NAMESPACE(UbuntuStylesModule)::undefineModule();
77+ }
78+};
79+
80+#include "plugin.moc"
81
82=== added file 'src/Ubuntu/Components/Styles/plugin/plugin.pri'
83--- src/Ubuntu/Components/Styles/plugin/plugin.pri 1970-01-01 00:00:00 +0000
84+++ src/Ubuntu/Components/Styles/plugin/plugin.pri 2016-06-23 09:14:02 +0000
85@@ -0,0 +1,8 @@
86+QT *= qml quick UbuntuToolkit UbuntuToolkit_private
87+
88+CONFIG += no_keywords c++11
89+
90+INCLUDEPATH+=$$PWD
91+
92+SOURCES += \
93+ $$PWD/plugin.cpp
94
95=== modified file 'src/Ubuntu/Components/Styles/qmldir'
96--- src/Ubuntu/Components/Styles/qmldir 2016-06-13 15:57:20 +0000
97+++ src/Ubuntu/Components/Styles/qmldir 2016-06-23 09:14:02 +0000
98@@ -1,4 +1,6 @@
99 module Ubuntu.Components.Styles
100+plugin UbuntuComponentsStyles
101+typeinfo plugins.qmltypes
102 ComboButtonStyle 1.1 1.2/ComboButtonStyle.qml
103 PullToRefreshStyle 1.1 1.2/PullToRefreshStyle.qml
104 PageHeadStyle 1.1 1.2/PageHeadStyle.qml
105
106=== modified file 'src/Ubuntu/Components/qmldir'
107--- src/Ubuntu/Components/qmldir 2016-02-16 11:39:32 +0000
108+++ src/Ubuntu/Components/qmldir 2016-06-23 09:14:02 +0000
109@@ -1,5 +1,6 @@
110 module Ubuntu.Components
111 plugin UbuntuComponents
112+typeinfo plugins.qmltypes
113 ActionList 0.1 1.2/ActionList.qml
114 ToolbarItems 0.1 1.2/ToolbarItems.qml
115 ToolbarButton 0.1 1.2/ToolbarButton.qml
116
117=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp'
118--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp 2016-06-20 08:31:39 +0000
119+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp 2016-06-23 09:14:02 +0000
120@@ -175,11 +175,6 @@
121 void UbuntuToolkitModule::initializeModule(QQmlEngine *engine, const QUrl &pluginBaseUrl)
122 {
123 UbuntuToolkitModule *module = create(engine, pluginBaseUrl);
124- // register internal styles
125- const char *styleUri = "Ubuntu.Components.Styles";
126- qmlRegisterType<UCListItemStyle>(styleUri, 1, 2, "ListItemStyle");
127- qmlRegisterType<UCListItemStyle, 1>(styleUri, 1, 3, "ListItemStyle");
128- qmlRegisterType<UCBottomEdgeStyle>(styleUri, 1, 3, "BottomEdgeStyle");
129
130 // Register private types.
131 const char *privateUri = "Ubuntu.Components.Private";
132@@ -270,8 +265,27 @@
133
134 void UbuntuToolkitModule::undefineModule()
135 {
136-
137-}
138+ // nothing yet
139+}
140+
141+/******************************************************************************
142+ * Styles module
143+ */
144+void UbuntuStylesModule::defineModule(const char *uri)
145+{
146+ // 1.2 styles
147+ qmlRegisterType<UCListItemStyle>(uri, 1, 2, "ListItemStyle");
148+
149+ // 1.3 styles
150+ qmlRegisterType<UCListItemStyle, 1>(uri, 1, 3, "ListItemStyle");
151+ qmlRegisterType<UCBottomEdgeStyle>(uri, 1, 3, "BottomEdgeStyle");
152+}
153+
154+void UbuntuStylesModule::undefineModule()
155+{
156+ // nothing yet
157+}
158+
159
160
161 UT_NAMESPACE_END
162
163=== modified file 'src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h'
164--- src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h 2016-06-22 15:51:38 +0000
165+++ src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.h 2016-06-23 09:14:02 +0000
166@@ -68,6 +68,13 @@
167 QUrl m_baseUrl;
168 };
169
170+class UBUNTUTOOLKIT_EXPORT UbuntuStylesModule
171+{
172+public:
173+ static void defineModule(const char *uri);
174+ static void undefineModule();
175+};
176+
177 UT_NAMESPACE_END
178
179 #endif // UBUNTUTOOLKITMODULE_H

Subscribers

People subscribed via source and target branches