export .indicators files from unity
commit331bab55eb14be00d5da17b47b79bf1676f28fdd
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateFri 7 Jun 2013, 14:48 (13 years ago)
parenta4713ff
paths.h.in+9
@@ -20,6 +20,7 @@
2020// Qt
2121#include <QtCore/QCoreApplication>
2222#include <QtCore/QDir>
23+#include <QStandardPaths>
2324
2425inline bool isRunningInstalled() {
2526 static bool installed = (QCoreApplication::applicationDirPath() ==
@@ -59,6 +60,14 @@ inline QString fakePluginsImportPath() {
5960 }
6061}
6162
63+inline QStringList shellDataDirs() {
64+ QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
65+ if (!isRunningInstalled()) {
66+ dirs.prepend("@CMAKE_BINARY_DIR@/share");
67+ }
68+ return dirs;
69+}
70+
6271inline QString sourceDirectory() {
6372 return QString("@CMAKE_SOURCE_DIR@/");
6473}
plugins/IndicatorsClient/indicators/datetime/CMakeLists.txt+13
@@ -27,3 +27,16 @@ target_link_libraries(indicatorclient_datetime
2727 ${QMENUMODEL_LDFLAGS}
2828)
2929
30+set(INDICATOR_FILES
31+ ${CMAKE_CURRENT_SOURCE_DIR}/indicator-datetime.indicator
32+)
33+
34+# copy indicators file into build directory for shadow builds
35+file(COPY ${INDICATOR_FILES}
36+ DESTINATION ${CMAKE_BINARY_DIR}/share/unity/indicators
37+)
38+
39+# install indicator file
40+install(FILES ${INDICATOR_FILES}
41+ DESTINATION ${CMAKE_INSTALL_DATADIR}/unity/indicators
42+)
plugins/IndicatorsClient/indicators/datetime/indicator-datetime.indicatornew file+4
@@ -0,0 +1,4 @@
1+[Indicator Service]
2+Name=indicator-datetime
3+DBusName=com.canonical.indicator.time
4+ObjectPath=/com/canonical/indicator/time
plugins/IndicatorsClient/indicators/messaging/CMakeLists.txt+13
@@ -26,3 +26,16 @@ target_link_libraries(indicatorclient_messaging
2626 ${QMENUMODEL_LDFLAGS}
2727)
2828
29+set(INDICATOR_FILES
30+ ${CMAKE_CURRENT_SOURCE_DIR}/indicator-messaging.indicator
31+)
32+
33+# copy indicators file into build directory for shadow builds
34+file(COPY ${INDICATOR_FILES}
35+ DESTINATION ${CMAKE_BINARY_DIR}/share/unity/indicators
36+)
37+
38+# install indicator file
39+install(FILES ${INDICATOR_FILES}
40+ DESTINATION ${CMAKE_INSTALL_DATADIR}/unity/indicators
41+)
plugins/IndicatorsClient/indicators/messaging/indicator-messaging.indicatornew file+4
@@ -0,0 +1,4 @@
1+[Indicator Service]
2+Name=indicator-messaging
3+DBusName=com.canonical.indicator.messages
4+ObjectPath=/com/canonical/indicator/messages
plugins/IndicatorsClient/indicators/network/CMakeLists.txt+14
@@ -34,3 +34,17 @@ target_link_libraries(indicatorclient_network
3434 ${LIBNM_UTIL_LIBRARIES}
3535 ${QMENUMODEL_LDFLAGS}
3636)
37+
38+set(INDICATOR_FILES
39+ ${CMAKE_CURRENT_SOURCE_DIR}/indicator-network.indicator
40+)
41+
42+# copy indicators file into build directory for shadow builds
43+file(COPY ${INDICATOR_FILES}
44+ DESTINATION ${CMAKE_BINARY_DIR}/share/unity/indicators
45+)
46+
47+# install indicator file
48+install(FILES ${INDICATOR_FILES}
49+ DESTINATION ${CMAKE_INSTALL_DATADIR}/unity/indicators
50+)
plugins/IndicatorsClient/indicators/network/indicator-network.indicatornew file+4
@@ -0,0 +1,4 @@
1+[Indicator Service]
2+Name=indicator-network
3+DBusName=com.canonical.settings.network
4+ObjectPath=/com/canonical/settings/network
plugins/IndicatorsClient/indicators/power/CMakeLists.txt+13
@@ -26,3 +26,16 @@ target_link_libraries(indicatorclient_power
2626 ${QMENUMODEL_LDFLAGS}
2727)
2828
29+set(INDICATOR_FILES
30+ ${CMAKE_CURRENT_SOURCE_DIR}/indicator-power.indicator
31+)
32+
33+# copy indicators file into build directory for shadow builds
34+file(COPY ${INDICATOR_FILES}
35+ DESTINATION ${CMAKE_BINARY_DIR}/share/unity/indicators
36+)
37+
38+# install indicator file
39+install(FILES ${INDICATOR_FILES}
40+ DESTINATION ${CMAKE_INSTALL_DATADIR}/unity/indicators
41+)
plugins/IndicatorsClient/indicators/power/indicator-power.indicatornew file+4
@@ -0,0 +1,4 @@
1+[Indicator Service]
2+Name=indicator-power
3+DBusName=com.canonical.indicator.battery
4+ObjectPath=/com/canonical/indicator/battery
plugins/IndicatorsClient/indicators/sound/CMakeLists.txt+13
@@ -30,3 +30,16 @@ target_link_libraries(indicatorclient_sound
3030 ${QMENUMODEL_LDFLAGS}
3131)
3232
33+set(INDICATOR_FILES
34+ ${CMAKE_CURRENT_SOURCE_DIR}/indicator-sound.indicator
35+)
36+
37+# copy indicators file into build directory for shadow builds
38+file(COPY ${INDICATOR_FILES}
39+ DESTINATION ${CMAKE_BINARY_DIR}/share/unity/indicators
40+)
41+
42+# install indicator file
43+install(FILES ${INDICATOR_FILES}
44+ DESTINATION ${CMAKE_INSTALL_DATADIR}/unity/indicators
45+)
plugins/IndicatorsClient/indicators/sound/indicator-sound.indicatornew file+4
@@ -0,0 +1,4 @@
1+[Indicator Service]
2+Name=indicator-sound
3+DBusName=com.canonical.settings.sound
4+ObjectPath=/com/canonical/settings/sound
plugins/IndicatorsClient/indicatorsmanager.cpp+3−2
@@ -20,10 +20,11 @@
2020#include "indicatorsmanager.h"
2121#include "indicatorsfactory.h"
2222
23−#include <QStandardPaths>
2423#include <QSettings>
2524#include <QDebug>
2625
26+#include "paths.h"
27+
2728
2829class IndicatorsManager::IndicatorData
2930{
@@ -55,7 +56,7 @@ IndicatorsManager::~IndicatorsManager()
5556void IndicatorsManager::load()
5657{
5758 unload();
58− QStringList xdgLocations = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
59+ QStringList xdgLocations = shellDataDirs();//QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
5960
6061 m_fsWatcher.reset(new QFileSystemWatcher(this));
6162