git.iko.soy/unity8
on xenial help sign in
moved indicator cpp source to src folder.
1290955Nick Dedekind
CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -133,7 +133,7 @@ install(FILES ${QML_JS_FILES}
133# add subdirectories to build
133# add subdirectories to build
134add_subdirectory(modules)
134add_subdirectory(modules)
135add_subdirectory(plugins)
135add_subdirectory(plugins)
136−add_subdirectory(Panel)
136+add_subdirectory(src)
137
137
138# install subdirectories
138# install subdirectories
139set(QML_DIRS
139set(QML_DIRS
debian/unity8.install+1−1
@@ -19,4 +19,4 @@
19/usr/share/unity8/plugins/Ubuntu/*
19/usr/share/unity8/plugins/Ubuntu/*
20/usr/share/unity8/plugins/Unity/*
20/usr/share/unity8/plugins/Unity/*
21/usr/share/unity8/plugins/Utils/*
21/usr/share/unity8/plugins/Utils/*
22−/usr/share/unity/indicators/*
22+/usr/share/unity8/unity/indicators/*
paths.h.in+7−2
@@ -69,8 +69,13 @@ inline QString fakePluginsImportPath() {
69
69
70inline QStringList shellDataDirs() {
70inline QStringList shellDataDirs() {
71 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
71 QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
72+ if (!isRunningInstalled()) {
72− if (!isRunningInstalled() && getenv("UNITY_TEST_ENV")==NULL) {
73+ if (getenv("UNITY_TEST_ENV")==NULL) {
73− dirs.prepend("@CMAKE_BINARY_DIR@/share");
74+ dirs.prepend("@CMAKE_BINARY_DIR@/share");
75+ }
76+ }
77+ else {
78+ dirs.prepend(shellAppDirectory());
74 }
79 }
75 return dirs;
80 return dirs;
76}
81}
src/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(Panel)
Panel/CMakeLists.txt → src/Panel/CMakeLists.txtrenamed

The content is the same.

Panel/Indicators/CMakeLists.txt → src/Panel/Indicators/CMakeLists.txtrenamed

The content is the same.

Panel/Indicators/client/CMakeLists.txt → src/Panel/Indicators/client/CMakeLists.txtrenamed+9
@@ -23,3 +23,12 @@ set_target_properties(${INDICATORS_CLIENT_APP} PROPERTIES COMPILE_FLAGS -fPIC)
23
23
24install(TARGETS ${INDICATORS_CLIENT_APP}
24install(TARGETS ${INDICATORS_CLIENT_APP}
25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
25 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
26+
27+file(GLOB IndicatorsClient_QMLFILES
28+ *.qml
29+ *.js
30+)
31+
32+install(FILES ${IndicatorsClient_QMLFILES}
33+ DESTINATION ${SHELL_APP_DIR}/Panel/Indicators/client
34+)
Panel/Indicators/client/indicatorsclient.cpp → src/Panel/Indicators/client/indicatorsclient.cpprenamed

The content is the same.

Panel/Indicators/client/indicatorsclient.h → src/Panel/Indicators/client/indicatorsclient.hrenamed

The content is the same.

Panel/Indicators/client/main.cpp → src/Panel/Indicators/client/main.cpprenamed

The content is the same.

Panel/Indicators/servicefiles/CMakeLists.txt → src/Panel/Indicators/servicefiles/CMakeLists.txtrenamed+1−1
@@ -13,5 +13,5 @@ file(COPY ${INDICATOR_FILES}
13
13
14# install indicator file
14# install indicator file
15install(FILES ${INDICATOR_FILES}
15install(FILES ${INDICATOR_FILES}
16− DESTINATION ${CMAKE_INSTALL_DATADIR}/unity/indicators
16+ DESTINATION ${SHELL_APP_DIR}/unity/indicators
17)
17)
Panel/Indicators/servicefiles/com.canonical.indicator.battery → src/Panel/Indicators/servicefiles/com.canonical.indicator.batteryrenamed

The content is the same.

Panel/Indicators/servicefiles/com.canonical.indicator.messages → src/Panel/Indicators/servicefiles/com.canonical.indicator.messagesrenamed

The content is the same.

Panel/Indicators/servicefiles/com.canonical.indicator.time → src/Panel/Indicators/servicefiles/com.canonical.indicator.timerenamed

The content is the same.

Panel/Indicators/servicefiles/com.canonical.settings.network → src/Panel/Indicators/servicefiles/com.canonical.settings.networkrenamed

The content is the same.

Panel/Indicators/servicefiles/com.canonical.settings.sound → src/Panel/Indicators/servicefiles/com.canonical.settings.soundrenamed

The content is the same.

tests/autopilot/indicators_client/tests/__init__.py+1−1
@@ -46,7 +46,7 @@ class IndicatorsTestCase(AutopilotTestCase):
46 def launch_test_local(self):
46 def launch_test_local(self):
47 os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib"
47 os.environ['LD_LIBRARY_PATH'] = "../../../unity_build/build/lib"
48 os.environ['QML2_IMPORT_PATH'] = "../../builddir/plugins:../../builddir/modules:../../builddir/tests/mocks"
48 os.environ['QML2_IMPORT_PATH'] = "../../builddir/plugins:../../builddir/modules:../../builddir/tests/mocks"
49− self.app = self.launch_test_application("../../builddir/Panel/Indicators/client/indicators-client")
49+ self.app = self.launch_test_application("../../builddir/src/Panel/Indicators/client/indicators-client")
50
50
51 def skipWrapper(*args, **kwargs):
51 def skipWrapper(*args, **kwargs):
52 pass
52 pass
tests/qmltests/Panel/tst_Overview.qml+3−3
@@ -48,9 +48,9 @@ Rectangle {
48
48
49 ListModel {
49 ListModel {
50 id: mockModel
50 id: mockModel
51− ListElement {title: "fake1"; widgetSource: "qrc:/tests/indciatorsclient/qml/fake_menu_widget1.qml"; indicatorProperties: ""}
51+ ListElement {title: "fake1"; widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget1.qml"; indicatorProperties: ""}
52− ListElement {title: "fake2"; widgetSource: "qrc:/tests/indciatorsclient/qml/fake_menu_widget2.qml"; indicatorProperties: ""}
52+ ListElement {title: "fake2"; widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget2.qml"; indicatorProperties: ""}
53− ListElement {title: "fake3"; widgetSource: "qrc:/tests/indciatorsclient/qml/fake_menu_widget3.qml"; indicatorProperties: ""}
53+ ListElement {title: "fake3"; widgetSource: "qrc:/tests/indciators/qml/fake_menu_widget3.qml"; indicatorProperties: ""}
54 }
54 }
55
55
56 ListModel {
56 ListModel {