moved IndicatorsClient to modules. Fixed debian/control&install for indicators-client
commitbd55217b479a98f34c1a0babf550cc2481bcd301
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateTue 11 Jun 2013, 14:31 (13 years ago)
parentfa42372
CMakeLists.txt+1
@@ -131,6 +131,7 @@ install(FILES ${QML_JS_FILES}
131131 )
132132
133133# add subdirectories to build
134+add_subdirectory(modules)
134135add_subdirectory(plugins)
135136add_subdirectory(Panel)
136137
Panel/Indicators/client/indicatorsclient.cpp+9−1
@@ -26,6 +26,14 @@
2626#include <QQmlEngine>
2727#include <QDebug>
2828
29+void prependImportPaths(QQmlEngine *engine, const QStringList &paths)
30+{
31+ QStringList importPathList = engine->importPathList();
32+ for (int i = paths.count()-1; i >= 0; i--)
33+ importPathList.prepend(paths[i]);
34+ engine->setImportPathList(importPathList);
35+}
36+
2937IndicatorsClient::IndicatorsClient(int &argc, char **argv)
3038 : QObject(0),
3139 m_view(0)
@@ -46,7 +54,7 @@ void IndicatorsClient::setupUI()
4654{
4755 m_view = new QQuickView;
4856 m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::shellAppDirectory()+"Panel/Indicators/client/"));
49− m_view->engine()->addImportPath(::shellImportPath());
57+ prependImportPaths(m_view->engine(), ::shellImportPaths());
5058
5159 m_view->setSource(QUrl("IndicatorsClient.qml"));
5260 m_view->setResizeMode(QQuickView::SizeRootObjectToView);
debian/control+13−1
@@ -56,6 +56,17 @@ Architecture: all
5656Description: transitional dummy package
5757 This is a transitional dummy package. It can safely be removed.
5858
59+Package: indicators-client
60+Architecture: amd64 armhf i386
61+Depends: ${shlibs:Depends},
62+ ${misc:Depends},
63+ qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
64+ qmenumodel-qml,
65+ unity8 (= ${source:Version}),
66+Description: Indicators and system settings client application
67+ This package contains the client application for indicators and system
68+ settings.
69+
5970Package: unity8-fake-env
6071Replaces: qml-phone-shell-fake-env (<< 7.80~)
6172Breaks: qml-phone-shell-fake-env (<< 7.80~)
@@ -75,7 +86,8 @@ Package: unity8-autopilot
7586Replaces: qml-phone-shell-autopilot (<< 7.80~)
7687Breaks: qml-phone-shell-autopilot (<< 7.80~)
7788Architecture: all
78−Depends: libautopilot-qt,
89+Depends: indicators-client (= ${source:Version}),
90+ libautopilot-qt,
7991 libqt5test5,
8092 libqt5widgets5,
8193 python-evdev,
debian/indicators-client.installnew file+1
@@ -0,0 +1 @@
1+/usr/bin/indicators-client
debian/unity8.install+1
@@ -13,6 +13,7 @@
1313/usr/share/unity8/Shell.qml
1414/usr/share/unity8/SideStage/*
1515/usr/share/unity8/graphics/*
16+/usr/share/unity8/modules/IndicatorsClient/*
1617/usr/share/unity8/plugins/HudClient/*
1718/usr/share/unity8/plugins/LightDM/*
1819/usr/share/unity8/plugins/Ubuntu/*
main.cpp+14−5
@@ -32,13 +32,22 @@
3232#include "paths.h"
3333
3434namespace {
35+
36+void prependImportPaths(QQmlEngine *engine, const QStringList &paths)
37+{
38+ QStringList importPathList = engine->importPathList();
39+ for (int i = paths.count() -1; i >= 0; i--)
40+ importPathList.prepend(paths[i]);
41+ engine->setImportPathList(importPathList);
42+}
43+
3544/* When you append and import path to the list of import paths it will be the *last*
3645 place where Qt will search for QML modules.
3746 The usual QQmlEngine::addImportPath() actually prepends the given path.*/
38−void appendImportPath(QQmlEngine *engine, const QString &path)
47+void appendImportPaths(QQmlEngine *engine, const QStringList &paths)
3948{
4049 QStringList importPathList = engine->importPathList();
41− importPathList.append(path);
50+ importPathList.append(paths);
4251 engine->setImportPathList(importPathList);
4352}
4453
@@ -113,9 +122,9 @@ int main(int argc, char** argv)
113122 view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
114123
115124 QUrl source("Shell.qml");
116− view->engine()->addImportPath(::shellAppDirectory());
117− view->engine()->addImportPath(::shellImportPath());
118− appendImportPath(view->engine(), ::fakePluginsImportPath());
125+ prependImportPaths(view->engine(), QStringList() << ::shellAppDirectory());
126+ prependImportPaths(view->engine(), ::shellImportPaths());
127+ appendImportPaths(view->engine(), QStringList() << ::fakePluginsImportPath());
119128 view->setSource(source);
120129 view->setColor("transparent");
121130
modules/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(IndicatorsClient)
plugins/IndicatorsClient/CMakeLists.txt → modules/IndicatorsClient/CMakeLists.txtrenamed
The content is the same.
plugins/IndicatorsClient/Network/CMakeLists.txt → modules/IndicatorsClient/Network/CMakeLists.txtrenamed
The content is the same.
plugins/IndicatorsClient/Network/networkagent.cpp → modules/IndicatorsClient/Network/networkagent.cpprenamed
The content is the same.
plugins/IndicatorsClient/Network/networkagent.h → modules/IndicatorsClient/Network/networkagent.hrenamed
The content is the same.
plugins/IndicatorsClient/Network/plugin.cpp → modules/IndicatorsClient/Network/plugin.cpprenamed
The content is the same.
plugins/IndicatorsClient/Network/plugin.h → modules/IndicatorsClient/Network/plugin.hrenamed
The content is the same.
plugins/IndicatorsClient/Network/secret-agent.c → modules/IndicatorsClient/Network/secret-agent.crenamed
The content is the same.
plugins/IndicatorsClient/Network/secret-agent.h → modules/IndicatorsClient/Network/secret-agent.hrenamed
The content is the same.
plugins/IndicatorsClient/flatmenuproxymodel.cpp → modules/IndicatorsClient/flatmenuproxymodel.cpprenamed
The content is the same.
plugins/IndicatorsClient/flatmenuproxymodel.h → modules/IndicatorsClient/flatmenuproxymodel.hrenamed
The content is the same.
plugins/IndicatorsClient/indicator.cpp → modules/IndicatorsClient/indicator.cpprenamed
The content is the same.
plugins/IndicatorsClient/indicator.h → modules/IndicatorsClient/indicator.hrenamed
The content is the same.
plugins/IndicatorsClient/indicatorsmanager.cpp → modules/IndicatorsClient/indicatorsmanager.cpprenamed
The content is the same.
plugins/IndicatorsClient/indicatorsmanager.h → modules/IndicatorsClient/indicatorsmanager.hrenamed
The content is the same.
plugins/IndicatorsClient/indicatorsmodel.cpp → modules/IndicatorsClient/indicatorsmodel.cpprenamed
The content is the same.
plugins/IndicatorsClient/indicatorsmodel.h → modules/IndicatorsClient/indicatorsmodel.hrenamed
The content is the same.
plugins/IndicatorsClient/plugin.cpp → modules/IndicatorsClient/plugin.cpprenamed
The content is the same.
plugins/IndicatorsClient/plugin.h → modules/IndicatorsClient/plugin.hrenamed
The content is the same.
plugins/IndicatorsClient/qml/BasicMenu.qml → modules/IndicatorsClient/qml/BasicMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/ButtonMenu.qml → modules/IndicatorsClient/qml/ButtonMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/CMakeLists.txt → modules/IndicatorsClient/qml/CMakeLists.txtrenamed+4−4
@@ -4,20 +4,20 @@ file(GLOB IndicatorsClient_QMLFILES
44
55# copy qmldir file into build directory for shadow builds
66file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient
7+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient
88)
99
1010# copy qmldir file into build directory for shadow builds
1111file(COPY ${IndicatorsClient_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient
12+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient
1313)
1414
1515install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient
16+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient
1717)
1818
1919install(FILES ${IndicatorsClient_QMLFILES}
20− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Network
20+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
2121)
2222
2323add_subdirectory(messaging)
plugins/IndicatorsClient/qml/DBusActionState.qml → modules/IndicatorsClient/qml/DBusActionState.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/DivMenu.qml → modules/IndicatorsClient/qml/DivMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/HLine.qml → modules/IndicatorsClient/qml/HLine.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/IndicatorBase.qml → modules/IndicatorsClient/qml/IndicatorBase.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/IndicatorIcon.qml → modules/IndicatorsClient/qml/IndicatorIcon.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/IndicatorPage.qml → modules/IndicatorsClient/qml/IndicatorPage.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/Menu.qml → modules/IndicatorsClient/qml/Menu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/MenuFactory.qml → modules/IndicatorsClient/qml/MenuFactory.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/ProgressMenu.qml → modules/IndicatorsClient/qml/ProgressMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/RemoveBackground.qml → modules/IndicatorsClient/qml/RemoveBackground.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/SectionMenu.qml → modules/IndicatorsClient/qml/SectionMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/SliderMenu.qml → modules/IndicatorsClient/qml/SliderMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/SwitchMenu.qml → modules/IndicatorsClient/qml/SwitchMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/TextMenu.qml → modules/IndicatorsClient/qml/TextMenu.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/ActionButton.qml → modules/IndicatorsClient/qml/messaging/ActionButton.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/ActionTextField.qml → modules/IndicatorsClient/qml/messaging/ActionTextField.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/CMakeLists.txt → modules/IndicatorsClient/qml/messaging/CMakeLists.txtrenamed+4−4
@@ -5,18 +5,18 @@ file(GLOB IndicatorsClient_QMLFILES
55
66# copy qmldir file into build directory for shadow builds
77file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
8− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Messaging
8+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Messaging
99)
1010
1111# copy qmldir file into build directory for shadow builds
1212file(COPY ${IndicatorsClient_QMLFILES}
13− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Messaging
13+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Messaging
1414)
1515
1616install(FILES qmldir
17− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Messaging
17+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Messaging
1818)
1919
2020install(FILES ${IndicatorsClient_QMLFILES}
21− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Messaging
21+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Messaging
2222)
plugins/IndicatorsClient/qml/messaging/GroupedMessage.qml → modules/IndicatorsClient/qml/messaging/GroupedMessage.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/HeroMessage.qml → modules/IndicatorsClient/qml/messaging/HeroMessage.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/HeroMessageHeader.qml → modules/IndicatorsClient/qml/messaging/HeroMessageHeader.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/MessageItem.qml → modules/IndicatorsClient/qml/messaging/MessageItem.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/QuickReply.qml → modules/IndicatorsClient/qml/messaging/QuickReply.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/SimpleTextMessage.qml → modules/IndicatorsClient/qml/messaging/SimpleTextMessage.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/SnapDecision.qml → modules/IndicatorsClient/qml/messaging/SnapDecision.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/TextMessage.qml → modules/IndicatorsClient/qml/messaging/TextMessage.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/qmldir → modules/IndicatorsClient/qml/messaging/qmldirrenamed
The content is the same.
plugins/IndicatorsClient/qml/messaging/utils.js → modules/IndicatorsClient/qml/messaging/utils.jsrenamed
The content is the same.
plugins/IndicatorsClient/qml/network/AccessPoint.qml → modules/IndicatorsClient/qml/network/AccessPoint.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/network/CMakeLists.txt → modules/IndicatorsClient/qml/network/CMakeLists.txtrenamed+4−4
@@ -4,18 +4,18 @@ file(GLOB IndicatorsClient_QMLFILES
44
55# copy qmldir file into build directory for shadow builds
66file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Network
7+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Network
88)
99
1010# copy qmldir file into build directory for shadow builds
1111file(COPY ${IndicatorsClient_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/plugins/IndicatorsClient/Network
12+ DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Network
1313)
1414
1515install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Network
16+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
1717)
1818
1919install(FILES ${IndicatorsClient_QMLFILES}
20− DESTINATION ${SHELL_APP_DIR}/plugins/IndicatorsClient/Network
20+ DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
2121)
plugins/IndicatorsClient/qml/network/PasswordPage.qml → modules/IndicatorsClient/qml/network/PasswordPage.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/network/WifiSection.qml → modules/IndicatorsClient/qml/network/WifiSection.qmlrenamed
The content is the same.
plugins/IndicatorsClient/qml/network/qmldir → modules/IndicatorsClient/qml/network/qmldirrenamed
The content is the same.
plugins/IndicatorsClient/qml/qmldir → modules/IndicatorsClient/qml/qmldirrenamed
The content is the same.
plugins/IndicatorsClient/resources/artwork/datetime/time_and_date@18.png → modules/IndicatorsClient/resources/artwork/datetime/time_and_date@18.pngrenamed
Binary file not shown.
plugins/IndicatorsClient/resources/artwork/messaging/default_app.svg → modules/IndicatorsClient/resources/artwork/messaging/default_app.svgrenamed
The content is the same.
plugins/IndicatorsClient/resources/artwork/messaging/default_contact.png → modules/IndicatorsClient/resources/artwork/messaging/default_contact.pngrenamed
Binary file not shown.
plugins/IndicatorsClient/resources/artwork/messaging/message_sms01_54px.png → modules/IndicatorsClient/resources/artwork/messaging/message_sms01_54px.pngrenamed
Binary file not shown.
plugins/IndicatorsClient/resources/indicatorclient.qrc → modules/IndicatorsClient/resources/indicatorclient.qrcrenamed
The content is the same.
paths.h.in+7−3
@@ -47,12 +47,16 @@ inline QString shellAppDirectory() {
4747 }
4848}
4949
50−inline QString shellImportPath() {
50+inline QStringList shellImportPaths() {
51+ QStringList paths;
5152 if (isRunningInstalled()) {
52− return QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
53+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/plugins");
54+ paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/modules");
5355 } else {
54− return QString("@CMAKE_BINARY_DIR@/plugins/");
56+ paths << QString("@CMAKE_BINARY_DIR@/plugins");
57+ paths << QString("@CMAKE_BINARY_DIR@/modules");
5558 }
59+ return paths;
5660}
5761
5862inline QString fakePluginsImportPath() {
plugins/CMakeLists.txt−1
@@ -2,5 +2,4 @@ add_subdirectory(Ubuntu)
22add_subdirectory(Utils)
33add_subdirectory(Unity)
44add_subdirectory(HudClient)
5−add_subdirectory(IndicatorsClient)
65add_subdirectory(LightDM)
plugins/Utils/applicationpaths.h+1−1
@@ -31,7 +31,7 @@ public:
3131
3232 Q_INVOKABLE bool isRunningInstalled() const { return ::isRunningInstalled(); }
3333 Q_INVOKABLE QString shellAppDirectory() const { return ::shellAppDirectory(); }
34− Q_INVOKABLE QString shellImportPath() const { return ::shellImportPath(); }
34+ Q_INVOKABLE QStringList shellImportPaths() const { return ::shellImportPaths(); }
3535 Q_INVOKABLE QString fakePluginsImportPath() const { return ::fakePluginsImportPath(); }
3636 Q_INVOKABLE QStringList shellDataDirs() const { return ::shellDataDirs(); }
3737 Q_INVOKABLE QString sourceDirectory() const { return ::sourceDirectory(); }
run+1−1
@@ -35,7 +35,7 @@ do
3535done
3636
3737if $FAKE; then
38− export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins
38+ export QML2_IMPORT_PATH=$PWD/builddir/tests/mocks:$PWD/builddir/plugins:$PWD/builddir/modules
3939 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/LightDM/single
4040fi
4141
tests/CMakeLists.txt+1
@@ -11,4 +11,5 @@ add_subdirectory(qmltests)
1111add_subdirectory(mocks)
1212add_subdirectory(whitespace)
1313add_subdirectory(plugins)
14+add_subdirectory(modules)
1415add_subdirectory(utils)
tests/modules/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(IndicatorsClient)
tests/plugins/IndicatorsClient/CMakeLists.txt → tests/modules/IndicatorsClient/CMakeLists.txtrenamed+2−2
@@ -1,7 +1,7 @@
11include_directories(
22 ${CMAKE_CURRENT_BINARY_DIR}
3− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/IndicatorsClient
4− ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/IndicatorsClient/indicators/common
3+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient
4+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient/indicators/common
55 )
66
77macro(run_tests)
tests/plugins/IndicatorsClient/indicatorsmanagertest.cpp → tests/modules/IndicatorsClient/indicatorsmanagertest.cpprenamed
The content is the same.
tests/plugins/IndicatorsClient/indicatorsmodeltest.cpp → tests/modules/IndicatorsClient/indicatorsmodeltest.cpprenamed
The content is the same.
tests/plugins/CMakeLists.txt−1
@@ -1,3 +1,2 @@
1−add_subdirectory(IndicatorsClient)
21add_subdirectory(Utils)
32add_subdirectory(Ubuntu)
tests/qmltests/CMakeLists.txt+1
@@ -5,6 +5,7 @@ add_subdirectory(plugins)
55
66set(qmltest_DEFAULT_IMPORT_PATHS
77 ${CMAKE_CURRENT_BINARY_DIR}/plugins
8+ ${CMAKE_CURRENT_BINARY_DIR}/modules
89 ${CMAKE_BINARY_DIR}/tests/utils/modules
910)
1011