git.iko.soy/unity8
on xenial help sign in
renamed IndicatorsClient to Unity.Indicators
7da7d3bNick Dedekind
Panel/IndicatorItem.qml+7−14
compare with xenial
unifiedsplit
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import IndicatorsClient 0.1 as IndicatorsClient
19+import Unity.Indicators 0.1 as Indicators
20
20
21Item {
21Item {
22 id: indicatorItem
22 id: indicatorItem
@@ -29,30 +29,23 @@ Item {
29 opacity: dimmed ? 0.4 : 1
29 opacity: dimmed ? 0.4 : 1
30
30
31 // only visible when non-empty
31 // only visible when non-empty
32− visible: loader.item != undefined && loader.status == Loader.Ready
32+ visible: loader.item != undefined && loader.status == Loader.Ready ? loader.item.enabled : false
33 width: visible ? loader.item.width : 0
33 width: visible ? loader.item.width : 0
34
34
35 Loader {
35 Loader {
36 id: loader
36 id: loader
37
37
38− onStatusChanged: {
38+ onLoaded: {
39− if (status == Loader.Ready) {
40− item.height = Qt.binding(function() { return indicatorItem.height; })
39+ item.height = Qt.binding(function() { return indicatorItem.height; })
41
40
42− for(var pName in indicatorProperties) {
41+ for(var pName in indicatorProperties) {
43− if (item.hasOwnProperty(pName)) {
42+ if (item.hasOwnProperty(pName)) {
44− item[pName] = indicatorProperties[pName]
43+ item[pName] = indicatorProperties[pName]
45− }
46 }
44 }
47 }
45 }
48 }
46 }
49 }
47 }
50
48
51− Connections {
52− target: loader.item
53− onVisibleChanged: { visible = loader.item.visible }
54− }
55−
56 Rectangle {
49 Rectangle {
57 color: "#dd4814"
50 color: "#dd4814"
58 objectName: "highlight"
51 objectName: "highlight"
Panel/Indicators/DatetimeIndicatorIcon.qml+8−10
@@ -19,15 +19,14 @@
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
23
23
24−IndicatorsClient.IndicatorIcon {
24+Indicators.IndicatorIcon {
25 id: indicatorIcon
25 id: indicatorIcon
26
26
27 width: timeLabel.width + units.gu(1)
27 width: timeLabel.width + units.gu(1)
28
28
29 property alias label: timeLabel.text
29 property alias label: timeLabel.text
30− property date __date
31
30
32 Label {
31 Label {
33 id: timeLabel
32 id: timeLabel
@@ -36,20 +35,19 @@ IndicatorsClient.IndicatorIcon {
36 opacity: 0.8
35 opacity: 0.8
37 font.family: "Ubuntu"
36 font.family: "Ubuntu"
38 fontSize: "medium"
37 fontSize: "medium"
39− anchors {
38+ anchors.centerIn: parent
40− verticalCenter: parent.verticalCenter
41− horizontalCenter: parent.horizontalCenter
42− }
43− text: Qt.formatTime(__date)
39+ text: Qt.formatTime(timer.dateNow)
44 }
40 }
45
41
46 Timer {
42 Timer {
47 id: timer
43 id: timer
48− interval: 1000 * 60
44+ interval: 1000 * 10
49 running: indicatorIcon.visible
45 running: indicatorIcon.visible
50 repeat: true
46 repeat: true
51 triggeredOnStart: true
47 triggeredOnStart: true
48+ property date dateNow
49+
52− onTriggered: __date = new Date
50+ onTriggered: dateNow = new Date
53 }
51 }
54
52
55 onActionStateChanged: {
53 onActionStateChanged: {
Panel/Indicators/DatetimeIndicatorPage.qml+6−7
@@ -47,7 +47,7 @@ Flickable {
47 height: units.gu(30)
47 height: units.gu(30)
48
48
49 Label {
49 Label {
50− id: __time
50+ id: timeLabel
51 anchors {
51 anchors {
52 horizontalCenter: parent.horizontalCenter
52 horizontalCenter: parent.horizontalCenter
53 verticalCenter: parent.verticalCenter
53 verticalCenter: parent.verticalCenter
@@ -60,7 +60,7 @@ Flickable {
60 }
60 }
61
61
62 Label {
62 Label {
63− id: __date
63+ id: dateLabel
64
64
65 anchors {
65 anchors {
66 left: parent.left
66 left: parent.left
@@ -75,20 +75,19 @@ Flickable {
75 }
75 }
76
76
77 Timer {
77 Timer {
78− interval: 1000 * 60 // one minute
78+ interval: 1000 * 10 // 10 seconds
79 running: true
79 running: true
80 repeat: true
80 repeat: true
81+ triggeredOnStart: true
81 onTriggered: updateTime();
82 onTriggered: updateTime();
82−
83− Component.onCompleted: updateTime();
84 }
83 }
85
84
86 function updateTime() {
85 function updateTime() {
87 var dt = new Date()
86 var dt = new Date()
88 var time = Qt.formatTime(dt)
87 var time = Qt.formatTime(dt)
89 var space = time.indexOf(" ")
88 var space = time.indexOf(" ")
90− __time.text = time.substr(0, space > 0 ? space : 5)
89+ timeLabel.text = time.substr(0, space > 0 ? space : 5)
91− __date.text = Qt.formatDateTime(dt, "dddd,\ndd MMMM")
90+ dateLabel.text = Qt.formatDateTime(dt, "dddd,\ndd MMMM")
92 }
91 }
93
92
94 // Make it compatible with the PluginItem interface
93 // Make it compatible with the PluginItem interface
Panel/Indicators/DefaultIndicatorIcon.qml+4−6
@@ -19,9 +19,9 @@
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
23
23
24−IndicatorsClient.IndicatorIcon {
24+Indicators.IndicatorIcon {
25 id: indicatorIcon
25 id: indicatorIcon
26
26
27 width: itemRow.width + units.gu(1)
27 width: itemRow.width + units.gu(1)
@@ -68,12 +68,10 @@ IndicatorsClient.IndicatorIcon {
68 if (action.state == undefined) {
68 if (action.state == undefined) {
69 label = "";
69 label = "";
70 iconSource = "";
70 iconSource = "";
71− visible = false;
72 return
71 return
73 }
72 }
74
73
75− label = action.state[0]
74+ label = action.state[Indicators.ActionState.Label]
76− iconSource = "image://gicon/" + action.state[1]
75+ iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource]
77− indicatorIcon.visible = action.state[3]
78 }
76 }
79}
77}
Panel/Indicators/DefaultIndicatorPage.qml+2−2
@@ -18,8 +18,8 @@
18 */
18 */
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21−import IndicatorsClient 0.1 as IndicatorsClient
21+import Unity.Indicators 0.1 as Indicators
22
22
23−IndicatorsClient.IndicatorPage {
23+Indicators.IndicatorPage {
24 anchors.fill: parent
24 anchors.fill: parent
25}
25}
Panel/Indicators/MessagingIndicatorPage.qml+2−2
@@ -19,9 +19,9 @@
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
23
23
24−IndicatorsClient.IndicatorPage {
24+Indicators.IndicatorPage {
25 anchors.fill: parent
25 anchors.fill: parent
26
26
27 highlightFollowsCurrentItem: false
27 highlightFollowsCurrentItem: false
Panel/Indicators/NetworkIndicatorIcon.qml+2−2
@@ -19,9 +19,9 @@
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
23
23
24−IndicatorsClient.IndicatorIcon {
24+Indicators.IndicatorIcon {
25 id: indicatorIcon
25 id: indicatorIcon
26
26
27 width: networkIcon.width + units.gu(1)
27 width: networkIcon.width + units.gu(1)
Panel/Indicators/NetworkIndicatorPage.qml+3−3
@@ -18,8 +18,8 @@
18 */
18 */
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21−import IndicatorsClient 0.1 as IndicatorsClient
21+import Unity.Indicators 0.1 as Indicators
22−import IndicatorsClient.Network 0.1 as ICNetwork
22+import Unity.Indicators.Network 0.1 as ICNetwork
23import Ubuntu.Components 0.1
23import Ubuntu.Components 0.1
24
24
25PageStack {
25PageStack {
@@ -38,7 +38,7 @@ PageStack {
38 Page {
38 Page {
39 id: _mainPage
39 id: _mainPage
40
40
41− IndicatorsClient.IndicatorPage {
41+ Indicators.IndicatorPage {
42 id: _pluginItem
42 id: _pluginItem
43 anchors.fill: parent
43 anchors.fill: parent
44 }
44 }
Panel/Indicators/client/IndicatorsList.qml+2−2
@@ -20,7 +20,7 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
24import "../.."
24import "../.."
25
25
26Page {
26Page {
@@ -38,7 +38,7 @@ Page {
38 anchors.fill: parent
38 anchors.fill: parent
39 model: indicatorsModel
39 model: indicatorsModel
40
40
41− delegate: IndicatorsClient.Menu {
41+ delegate: Indicators.Menu {
42 anchors.left: parent.left
42 anchors.left: parent.left
43 anchors.right: parent.right
43 anchors.right: parent.right
44 height: implicitHeight
44 height: implicitHeight
Panel/IndicatorsDataModel.qml+2−2
@@ -18,10 +18,10 @@
18 */
18 */
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21−import IndicatorsClient 0.1
21+import Unity.Indicators 0.1 as Indicators
22import Utils 0.1
22import Utils 0.1
23
23
24−IndicatorsModel {
24+Indicators.IndicatorsModel {
25 id: ic_model
25 id: ic_model
26
26
27 Component.onCompleted: load()
27 Component.onCompleted: load()
debian/unity8.install+1−1
@@ -13,7 +13,7 @@
13/usr/share/unity8/Shell.qml
13/usr/share/unity8/Shell.qml
14/usr/share/unity8/SideStage/*
14/usr/share/unity8/SideStage/*
15/usr/share/unity8/graphics/*
15/usr/share/unity8/graphics/*
16−/usr/share/unity8/modules/IndicatorsClient/*
16+/usr/share/unity8/modules/Unity/Indicators/*
17/usr/share/unity8/plugins/HudClient/*
17/usr/share/unity8/plugins/HudClient/*
18/usr/share/unity8/plugins/LightDM/*
18/usr/share/unity8/plugins/LightDM/*
19/usr/share/unity8/plugins/Ubuntu/*
19/usr/share/unity8/plugins/Ubuntu/*
modules/CMakeLists.txt+1−1
@@ -1 +1 @@
1−add_subdirectory(IndicatorsClient)
1+add_subdirectory(Unity)
modules/IndicatorsClient/qml/CMakeLists.txtdeleted−24
@@ -1,24 +0,0 @@
1−file(GLOB IndicatorsClient_QMLFILES
2− *.qml
3−)
4−
5−# copy qmldir file into build directory for shadow builds
6−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient
8−)
9−
10−# copy qmldir file into build directory for shadow builds
11−file(COPY ${IndicatorsClient_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient
13−)
14−
15−install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient
17−)
18−
19−install(FILES ${IndicatorsClient_QMLFILES}
20− DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
21−)
22−
23−add_subdirectory(messaging)
24−add_subdirectory(network)
modules/IndicatorsClient/qml/messaging/CMakeLists.txtdeleted−22
@@ -1,22 +0,0 @@
1−file(GLOB IndicatorsClient_QMLFILES
2− *.qml
3− *.js
4−)
5−
6−# copy qmldir file into build directory for shadow builds
7−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
8− DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Messaging
9−)
10−
11−# copy qmldir file into build directory for shadow builds
12−file(COPY ${IndicatorsClient_QMLFILES}
13− DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Messaging
14−)
15−
16−install(FILES qmldir
17− DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Messaging
18−)
19−
20−install(FILES ${IndicatorsClient_QMLFILES}
21− DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Messaging
22−)
modules/IndicatorsClient/qml/network/CMakeLists.txtdeleted−21
@@ -1,21 +0,0 @@
1−file(GLOB IndicatorsClient_QMLFILES
2− *.qml
3−)
4−
5−# copy qmldir file into build directory for shadow builds
6−file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7− DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Network
8−)
9−
10−# copy qmldir file into build directory for shadow builds
11−file(COPY ${IndicatorsClient_QMLFILES}
12− DESTINATION ${CMAKE_BINARY_DIR}/modules/IndicatorsClient/Network
13−)
14−
15−install(FILES qmldir
16− DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
17−)
18−
19−install(FILES ${IndicatorsClient_QMLFILES}
20− DESTINATION ${SHELL_APP_DIR}/modules/IndicatorsClient/Network
21−)
modules/Unity/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(Indicators)
modules/IndicatorsClient/CMakeLists.txt → modules/Unity/Indicators/CMakeLists.txtrenamed+17−12
@@ -1,4 +1,4 @@
1−project(IndicatorsClientQml)
1+project(IndicatorsQml)
2
2
3pkg_check_modules(GLIB glib-2.0>=2.32)
3pkg_check_modules(GLIB glib-2.0>=2.32)
4pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
4pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
@@ -31,37 +31,42 @@ include_directories(
31 ${QMENUMODEL_INCLUDE_DIRS}
31 ${QMENUMODEL_INCLUDE_DIRS}
32)
32)
33
33
34−set(IndicatorsClientQML_SOURCES
34+set(IndicatorsQML_SOURCES
35 flatmenuproxymodel.cpp
35 flatmenuproxymodel.cpp
36 indicator.cpp
36 indicator.cpp
37+ indicators.h
37 indicatorsmanager.cpp
38 indicatorsmanager.cpp
38 indicatorsmodel.cpp
39 indicatorsmodel.cpp
39 plugin.cpp
40 plugin.cpp
40)
41)
41
42
42−set(IndicatorsClientQML_RESOURCES
43+set(IndicatorsQML_RESOURCES
43− resources/indicatorclient.qrc
44+ resources/indicators.qrc
44)
45)
45
46
46−qt5_add_resources(IndicatorsClientQML_RESOURCES_RCC
47+qt5_add_resources(IndicatorsQML_RESOURCES_RCC
47− ${IndicatorsClientQML_RESOURCES}
48+ ${IndicatorsQML_RESOURCES}
48)
49)
49
50
50−add_library(IndicatorsClientQml SHARED
51+add_library(IndicatorsQml SHARED
51− ${IndicatorsClientQML_RESOURCES_RCC}
52+ ${IndicatorsQML_RESOURCES_RCC}
52− ${IndicatorsClientQML_SOURCES}
53+ ${IndicatorsQML_SOURCES}
53)
54)
54# Because this is an internal support library, we want
55# Because this is an internal support library, we want
55# to expose all symbols in it. Consider changing this
56# to expose all symbols in it. Consider changing this
56# either to a static library or just using the
57# either to a static library or just using the
57# files directly in targets.
58# files directly in targets.
58−set_target_properties(IndicatorsClientQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
59+set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
59
60
60−target_link_libraries(IndicatorsClientQml
61+target_link_libraries(IndicatorsQml
61 ${Qt5Core_LIBRARIES}
62 ${Qt5Core_LIBRARIES}
62 ${Qt5Quick_LIBRARIES}
63 ${Qt5Quick_LIBRARIES}
63 ${GOBJECT_LDFLAGS}
64 ${GOBJECT_LDFLAGS}
64 ${QMENUMODEL_LDFLAGS}
65 ${QMENUMODEL_LDFLAGS}
65)
66)
66
67
67−qt5_use_modules(IndicatorsClientQml Qml)
68+qt5_use_modules(IndicatorsQml Qml)
69+
70+install(TARGETS IndicatorsQml
71+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators
72+ )
modules/IndicatorsClient/Network/CMakeLists.txt → modules/Unity/Indicators/Network/CMakeLists.txtrenamed+7−7
@@ -1,18 +1,18 @@
1−project(IndicatorsClientNetworkQml)
1+project(IndicatorsNetworkQml)
2
2
3−set(INDICATORCLIENT_NETWORK_SRC
3+set(INDICATORS_NETWORK_SRC
4 networkagent.cpp
4 networkagent.cpp
5 plugin.cpp
5 plugin.cpp
6 secret-agent.c
6 secret-agent.c
7)
7)
8
8
9−add_library(IndicatorsClientNetworkQml MODULE
9+add_library(IndicatorsNetworkQml MODULE
10− ${INDICATORCLIENT_NETWORK_SRC}
10+ ${INDICATORS_NETWORK_SRC}
11)
11)
12
12
13−qt5_use_modules(IndicatorsClientNetworkQml Core Qml Widgets)
13+qt5_use_modules(IndicatorsNetworkQml Core Qml Widgets)
14
14
15−set_target_properties(IndicatorsClientNetworkQml PROPERTIES COMPILE_FLAGS -fPIC)
15+set_target_properties(IndicatorsNetworkQml PROPERTIES COMPILE_FLAGS -fPIC)
16
16
17include_directories(
17include_directories(
18 ${CMAKE_CURRENT_SOURCE_DIR}
18 ${CMAKE_CURRENT_SOURCE_DIR}
@@ -22,7 +22,7 @@ include_directories(
22 ${LIBNM_UTIL_INCLUDE_DIRS}
22 ${LIBNM_UTIL_INCLUDE_DIRS}
23)
23)
24
24
25−target_link_libraries(IndicatorsClientNetworkQml
25+target_link_libraries(IndicatorsNetworkQml
26 ${GLIB_LIBRARIES}
26 ${GLIB_LIBRARIES}
27 ${QMENUMODEL_LDFLAGS}
27 ${QMENUMODEL_LDFLAGS}
28 ${LIBNM_GLIB_LIBRARIES}
28 ${LIBNM_GLIB_LIBRARIES}
modules/IndicatorsClient/Network/networkagent.cpp → modules/Unity/Indicators/Network/networkagent.cpprenamed

The content is the same.

modules/IndicatorsClient/Network/networkagent.h → modules/Unity/Indicators/Network/networkagent.hrenamed

The content is the same.

modules/IndicatorsClient/Network/plugin.cpp → modules/Unity/Indicators/Network/plugin.cpprenamed+1−1
@@ -25,7 +25,7 @@
25// local
25// local
26#include "networkagent.h"
26#include "networkagent.h"
27
27
28−void IndicatorsClientNetworkPlugin::registerTypes(const char *uri)
28+void IndicatorsNetworkPlugin::registerTypes(const char *uri)
29{
29{
30 qmlRegisterType<NetworkAgent>(uri, 0, 1, "NetworkAgent");
30 qmlRegisterType<NetworkAgent>(uri, 0, 1, "NetworkAgent");
31}
31}
modules/IndicatorsClient/Network/plugin.h → modules/Unity/Indicators/Network/plugin.hrenamed+4−4
@@ -16,12 +16,12 @@
16 * Author: Nick Dedekind <nick.dedekind@canonical.com>
16 * Author: Nick Dedekind <nick.dedekind@canonical.com>
17 */
17 */
18
18
19−#ifndef INDICATORSCLIENT_NETWORK_PLUGIN_H
19+#ifndef INDICATORS_NETWORK_PLUGIN_H
20−#define INDICATORSCLIENT_NETWORK_PLUGIN_H
20+#define INDICATORS_NETWORK_PLUGIN_H
21
21
22#include <QtQml/QQmlExtensionPlugin>
22#include <QtQml/QQmlExtensionPlugin>
23
23
24−class IndicatorsClientNetworkPlugin : public QQmlExtensionPlugin
24+class IndicatorsNetworkPlugin : public QQmlExtensionPlugin
25{
25{
26 Q_OBJECT
26 Q_OBJECT
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +29,4 @@ public:
29 void registerTypes(const char *uri);
29 void registerTypes(const char *uri);
30};
30};
31
31
32−#endif // INDICATORSCLIENT_NETWORK_PLUGIN_H
32+#endif // INDICATORS_NETWORK_PLUGIN_H
modules/IndicatorsClient/Network/secret-agent.c → modules/Unity/Indicators/Network/secret-agent.crenamed

The content is the same.

modules/IndicatorsClient/Network/secret-agent.h → modules/Unity/Indicators/Network/secret-agent.hrenamed

The content is the same.

modules/IndicatorsClient/flatmenuproxymodel.cpp → modules/Unity/Indicators/flatmenuproxymodel.cpprenamed

The content is the same.

modules/IndicatorsClient/flatmenuproxymodel.h → modules/Unity/Indicators/flatmenuproxymodel.hrenamed

The content is the same.

modules/IndicatorsClient/indicator.cpp → modules/Unity/Indicators/indicator.cpprenamed

The content is the same.

modules/IndicatorsClient/indicator.h → modules/Unity/Indicators/indicator.hrenamed

The content is the same.

modules/Unity/Indicators/indicators.hnew file+37
@@ -0,0 +1,37 @@
1+/*
2+ * Copyright (C) 2012 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ *
16+ * Author: Nick Dedekind <nick.dedekind@canonical.com>
17+ */
18+
19+#ifndef INDICATORS_H
20+#define INDICATORS_H
21+
22+class ActionState : public QObject
23+{
24+ Q_OBJECT
25+public:
26+ Q_ENUMS(ActionStates)
27+ enum ActionStates {
28+ Label = 0x00,
29+ IconSource = 0x01,
30+ AccessableName = 0x02,
31+ Visible = 0x03,
32+ };
33+
34+ ActionState(QObject*parent=0):QObject(parent) {}
35+};
36+
37+#endif // INDICATORS_H
modules/IndicatorsClient/indicatorsmanager.cpp → modules/Unity/Indicators/indicatorsmanager.cpprenamed

The content is the same.

modules/IndicatorsClient/indicatorsmanager.h → modules/Unity/Indicators/indicatorsmanager.hrenamed

The content is the same.

modules/IndicatorsClient/indicatorsmodel.cpp → modules/Unity/Indicators/indicatorsmodel.cpprenamed

The content is the same.

modules/IndicatorsClient/indicatorsmodel.h → modules/Unity/Indicators/indicatorsmodel.hrenamed

The content is the same.

modules/IndicatorsClient/plugin.cpp → modules/Unity/Indicators/plugin.cpprenamed+4−2
@@ -26,12 +26,14 @@
26#include "flatmenuproxymodel.h"
26#include "flatmenuproxymodel.h"
27#include "indicatorsmanager.h"
27#include "indicatorsmanager.h"
28#include "indicatorsmodel.h"
28#include "indicatorsmodel.h"
29+#include "indicators.h"
29
30
30−void IndicatorsClientPlugin::registerTypes(const char *uri)
31+void IndicatorsPlugin::registerTypes(const char *uri)
31{
32{
32− Q_INIT_RESOURCE(indicatorclient);
33+ Q_INIT_RESOURCE(indicators);
33
34
34 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
35 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
35 qmlRegisterType<FlatMenuProxyModel>(uri, 0, 1, "FlatMenuProxyModel");
36 qmlRegisterType<FlatMenuProxyModel>(uri, 0, 1, "FlatMenuProxyModel");
36 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
37 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
38+ qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");
37}
39}
tests/qmltests/modules/IndicatorsClient/plugin.h → modules/Unity/Indicators/plugin.hrenamed+4−4
@@ -16,12 +16,12 @@
16 * Author: Nick Dedekind <nick.dedekind@canonical.com>
16 * Author: Nick Dedekind <nick.dedekind@canonical.com>
17 */
17 */
18
18
19−#ifndef INDICATORSCLIENT_PLUGIN_H
19+#ifndef INDICATORS_PLUGIN_H
20−#define INDICATORSCLIENT_PLUGIN_H
20+#define INDICATORS_PLUGIN_H
21
21
22#include <QtQml/QQmlExtensionPlugin>
22#include <QtQml/QQmlExtensionPlugin>
23
23
24−class IndicatorsClientPlugin : public QQmlExtensionPlugin
24+class IndicatorsPlugin : public QQmlExtensionPlugin
25{
25{
26 Q_OBJECT
26 Q_OBJECT
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +29,4 @@ public:
29 void registerTypes(const char *uri);
29 void registerTypes(const char *uri);
30};
30};
31
31
32−#endif // INDICATORSCLIENT_PLUGIN_H
32+#endif // INDICATORS_PLUGIN_H
modules/IndicatorsClient/qml/BasicMenu.qml → modules/Unity/Indicators/qml/BasicMenu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/ButtonMenu.qml → modules/Unity/Indicators/qml/ButtonMenu.qmlrenamed

The content is the same.

modules/Unity/Indicators/qml/CMakeLists.txtnew file+24
@@ -0,0 +1,24 @@
1+file(GLOB Indicators_QMLFILES
2+ *.qml
3+)
4+
5+# copy qmldir file into build directory for shadow builds
6+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7+ DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators
8+)
9+
10+# copy qmldir file into build directory for shadow builds
11+file(COPY ${Indicators_QMLFILES}
12+ DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators
13+)
14+
15+install(FILES qmldir
16+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators
17+)
18+
19+install(FILES ${Indicators_QMLFILES}
20+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Network
21+)
22+
23+add_subdirectory(messaging)
24+add_subdirectory(network)
modules/IndicatorsClient/qml/DBusActionState.qml → modules/Unity/Indicators/qml/DBusActionState.qmlrenamed+1−1
@@ -21,7 +21,7 @@ import QtQuick 2.0
21
21
22/*!
22/*!
23 \qmltype DBusActionState
23 \qmltype DBusActionState
24− \inqmlmodule IndicatorsClient 0.1
24+ \inqmlmodule Indicators 0.1
25 \brief Helper class to connect dbus action state with qml components property
25 \brief Helper class to connect dbus action state with qml components property
26
26
27 Exampiles:
27 Exampiles:
modules/IndicatorsClient/qml/DivMenu.qml → modules/Unity/Indicators/qml/DivMenu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/HLine.qml → modules/Unity/Indicators/qml/HLine.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/IndicatorBase.qml → modules/Unity/Indicators/qml/IndicatorBase.qmlrenamed+2−2
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Ubuntu.Components.ListItems 0.1 as ListItem
23import Ubuntu.Components.ListItems 0.1 as ListItem
24−import IndicatorsClient 0.1 as IndicatorsClient
24+import Unity.Indicators 0.1 as Indicators
25
25
26Item {
26Item {
27 id: indicatorItem
27 id: indicatorItem
@@ -47,7 +47,7 @@ Item {
47 onActionAppear: indicatorItem.actionGroupUpdated();
47 onActionAppear: indicatorItem.actionGroupUpdated();
48 }
48 }
49
49
50− property var proxyModel : IndicatorsClient.FlatMenuProxyModel {
50+ property var proxyModel : Indicators.FlatMenuProxyModel {
51 busType: indicatorItem.busType
51 busType: indicatorItem.busType
52 busName: indicatorItem.busName
52 busName: indicatorItem.busName
53 objectPath: indicatorItem.deviceMenuObjectPath
53 objectPath: indicatorItem.deviceMenuObjectPath
modules/IndicatorsClient/qml/IndicatorIcon.qml → modules/Unity/Indicators/qml/IndicatorIcon.qmlrenamed+14
@@ -21,6 +21,7 @@ import QtQuick 2.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Ubuntu.Components.ListItems 0.1 as ListItem
23import Ubuntu.Components.ListItems 0.1 as ListItem
24+import Unity.Indicators 0.1 as Indicators
24
25
25IndicatorBase {
26IndicatorBase {
26 id: indicatorIcon
27 id: indicatorIcon
@@ -71,4 +72,17 @@ IndicatorBase {
71 onStateChanged: actionStateChanged()
72 onStateChanged: actionStateChanged()
72 onValidChanged: actionStateChanged()
73 onValidChanged: actionStateChanged()
73 }
74 }
75+
76+ onActionStateChanged: {
77+ if (action == undefined || !action.valid) {
78+ return
79+ }
80+
81+ if (action.state == undefined) {
82+ enabled = false
83+ return
84+ }
85+
86+ enabled = action.state[Indicators.ActionState.Visible]
87+ }
74}
88}
modules/IndicatorsClient/qml/IndicatorPage.qml → modules/Unity/Indicators/qml/IndicatorPage.qmlrenamed+1−1
@@ -21,7 +21,7 @@ import QtQuick 2.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23import Ubuntu.Components.ListItems 0.1 as ListItem
23import Ubuntu.Components.ListItems 0.1 as ListItem
24−import IndicatorsClient 0.1 as IndicatorsClient
24+import Unity.Indicators 0.1 as Indicators
25
25
26IndicatorBase {
26IndicatorBase {
27 id: main
27 id: main
modules/IndicatorsClient/qml/Menu.qml → modules/Unity/Indicators/qml/Menu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/MenuFactory.qml → modules/Unity/Indicators/qml/MenuFactory.qmlrenamed+10−10
@@ -18,9 +18,9 @@
18 */
18 */
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21−import IndicatorsClient 0.1 as IC
21+import Unity.Indicators 0.1 as Indicators
22−import IndicatorsClient.Messaging 0.1 as ICMessaging
22+import Unity.Indicators.Messaging 0.1 as ICMessaging
23−import IndicatorsClient.Network 0.1 as ICNetwork
23+import Unity.Indicators.Network 0.1 as ICNetwork
24
24
25Item {
25Item {
26 id: __menuFactory
26 id: __menuFactory
@@ -55,18 +55,18 @@ Item {
55 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
55 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
56 }
56 }
57
57
58− Component { id: sliderMenu; IC.SliderMenu {} }
58+ Component { id: sliderMenu; Indicators.SliderMenu {} }
59− Component { id: switchMenu; IC.SwitchMenu {} }
59+ Component { id: switchMenu; Indicators.SwitchMenu {} }
60− Component { id: buttonMenu; IC.ButtonMenu {} }
60+ Component { id: buttonMenu; Indicators.ButtonMenu {} }
61− Component { id: divMenu; IC.DivMenu {} }
61+ Component { id: divMenu; Indicators.DivMenu {} }
62− Component { id: sectionMenu; IC.SectionMenu {} }
62+ Component { id: sectionMenu; Indicators.SectionMenu {} }
63− Component { id: progressMenu; IC.ProgressMenu {} }
63+ Component { id: progressMenu; Indicators.ProgressMenu {} }
64 Component { id: messageItem; ICMessaging.MessageItem {} }
64 Component { id: messageItem; ICMessaging.MessageItem {} }
65 Component { id: snapDecision; ICMessaging.SnapDecision {} }
65 Component { id: snapDecision; ICMessaging.SnapDecision {} }
66 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
66 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
67 Component { id: wifiSection; ICNetwork.WifiSection {} }
67 Component { id: wifiSection; ICNetwork.WifiSection {} }
68 Component { id: accessPoint; ICNetwork.AccessPoint {} }
68 Component { id: accessPoint; ICNetwork.AccessPoint {} }
69− Component { id: indicatorMenu; IC.Menu {} }
69+ Component { id: indicatorMenu; Indicators.Menu {} }
70
70
71 Loader {
71 Loader {
72 id: __loader
72 id: __loader
modules/IndicatorsClient/qml/ProgressMenu.qml → modules/Unity/Indicators/qml/ProgressMenu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/RemoveBackground.qml → modules/Unity/Indicators/qml/RemoveBackground.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/SectionMenu.qml → modules/Unity/Indicators/qml/SectionMenu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/SliderMenu.qml → modules/Unity/Indicators/qml/SliderMenu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/SwitchMenu.qml → modules/Unity/Indicators/qml/SwitchMenu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/TextMenu.qml → modules/Unity/Indicators/qml/TextMenu.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/messaging/ActionButton.qml → modules/Unity/Indicators/qml/messaging/ActionButton.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/messaging/ActionTextField.qml → modules/Unity/Indicators/qml/messaging/ActionTextField.qmlrenamed

The content is the same.

modules/Unity/Indicators/qml/messaging/CMakeLists.txtnew file+22
@@ -0,0 +1,22 @@
1+file(GLOB IndicatorsMessaging_QMLFILES
2+ *.qml
3+ *.js
4+)
5+
6+# copy qmldir file into build directory for shadow builds
7+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
8+ DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Messaging
9+)
10+
11+# copy qmldir file into build directory for shadow builds
12+file(COPY ${IndicatorsMessaging_QMLFILES}
13+ DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Messaging
14+)
15+
16+install(FILES qmldir
17+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Messaging
18+)
19+
20+install(FILES ${IndicatorsMessaging_QMLFILES}
21+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Messaging
22+)
modules/IndicatorsClient/qml/messaging/GroupedMessage.qml → modules/Unity/Indicators/qml/messaging/GroupedMessage.qmlrenamed+5−5
@@ -20,9 +20,9 @@
20
20
21import QtQuick 2.0
21import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
24
24
25−IndicatorsClient.BasicMenu {
25+Indicators.BasicMenu {
26 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
26 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
27 property alias count: label.text
27 property alias count: label.text
28
28
@@ -38,7 +38,7 @@ IndicatorsClient.BasicMenu {
38 height: units.gu(6)
38 height: units.gu(6)
39 width: units.gu(6)
39 width: units.gu(6)
40 image: Image {
40 image: Image {
41− source: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicatorsclient/artwork/messaging/default_app.svg"
41+ source: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_app.svg"
42 fillMode: Image.PreserveAspectFit
42 fillMode: Image.PreserveAspectFit
43 }
43 }
44 }
44 }
@@ -63,12 +63,12 @@ IndicatorsClient.BasicMenu {
63 }
63 }
64 }
64 }
65
65
66− IndicatorsClient.HLine {
66+ Indicators.HLine {
67 anchors.top: parent.top
67 anchors.top: parent.top
68 color: "#403b37"
68 color: "#403b37"
69 }
69 }
70
70
71− IndicatorsClient.HLine {
71+ Indicators.HLine {
72 anchors.bottom: parent.bottom
72 anchors.bottom: parent.bottom
73 color: "#060606"
73 color: "#060606"
74 }
74 }
modules/IndicatorsClient/qml/messaging/HeroMessage.qml → modules/Unity/Indicators/qml/messaging/HeroMessage.qmlrenamed+5−5
@@ -20,9 +20,9 @@
20
20
21import QtQuick 2.0
21import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
24
24
25−IndicatorsClient.BasicMenu {
25+Indicators.BasicMenu {
26 id: __heroMessage
26 id: __heroMessage
27
27
28 property variant actionsDescription: null
28 property variant actionsDescription: null
@@ -43,7 +43,7 @@ IndicatorsClient.BasicMenu {
43 anchors.left: parent.left
43 anchors.left: parent.left
44 anchors.right: parent.right
44 anchors.right: parent.right
45
45
46− avatar: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicatorsclient/artwork/messaging/default_contact.png"
46+ avatar: menu && (menu.extra.canonical_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_icon) : "qrc:/indicators/artwork/messaging/default_contact.png"
47 icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
47 icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
48 appIcon: icon
48 appIcon: icon
49
49
@@ -65,13 +65,13 @@ IndicatorsClient.BasicMenu {
65 }
65 }
66 }
66 }
67
67
68− IndicatorsClient.HLine {
68+ Indicators.HLine {
69 id: __topHLine
69 id: __topHLine
70 anchors.top: parent.top
70 anchors.top: parent.top
71 color: "#403b37"
71 color: "#403b37"
72 }
72 }
73
73
74− IndicatorsClient.HLine {
74+ Indicators.HLine {
75 id: __bottomHLine
75 id: __bottomHLine
76 anchors.bottom: parent.bottom
76 anchors.bottom: parent.bottom
77 color: "#060606"
77 color: "#060606"
modules/IndicatorsClient/qml/messaging/HeroMessageHeader.qml → modules/Unity/Indicators/qml/messaging/HeroMessageHeader.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/messaging/MessageItem.qml → modules/Unity/Indicators/qml/messaging/MessageItem.qmlrenamed+2−2
@@ -20,9 +20,9 @@
20
20
21import QtQuick 2.0
21import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
24
24
25−IndicatorsClient.BasicMenu {
25+Indicators.BasicMenu {
26 id: __messageItem
26 id: __messageItem
27
27
28 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
28 property variant actionsDescription: menu ? menu.extra.canonical_message_actions : undefined
modules/IndicatorsClient/qml/messaging/QuickReply.qml → modules/Unity/Indicators/qml/messaging/QuickReply.qmlrenamed+6−6
@@ -20,7 +20,7 @@
20
20
21import QtQuick 2.0
21import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
24
24
25Item {
25Item {
26 property alias action: __actionTextField.action
26 property alias action: __actionTextField.action
@@ -47,7 +47,7 @@ Item {
47 width: units.gu(2)
47 width: units.gu(2)
48 height: width
48 height: width
49 fillMode: Image.PreserveAspectFit
49 fillMode: Image.PreserveAspectFit
50− source: "qrc:/indicatorsclient/artwork/messaging/message_sms01_54px.png"
50+ source: "qrc:/indicators/artwork/messaging/message_sms01_54px.png"
51 }
51 }
52
52
53 Label {
53 Label {
@@ -59,7 +59,7 @@ Item {
59 }
59 }
60 }
60 }
61
61
62− IndicatorsClient.HLine {
62+ Indicators.HLine {
63 anchors.bottom: parent.bottom
63 anchors.bottom: parent.bottom
64 color: "#20201F"
64 color: "#20201F"
65 }
65 }
@@ -94,12 +94,12 @@ Item {
94 text: modelData
94 text: modelData
95 }
95 }
96
96
97− IndicatorsClient.HLine {
97+ Indicators.HLine {
98 anchors.top: parent.top
98 anchors.top: parent.top
99 color: "#464543"
99 color: "#464543"
100 }
100 }
101
101
102− IndicatorsClient.HLine {
102+ Indicators.HLine {
103 anchors.bottom: parent.bottom
103 anchors.bottom: parent.bottom
104 color: "#20201F"
104 color: "#20201F"
105 }
105 }
@@ -144,7 +144,7 @@ Item {
144 anchors.margins: units.gu(1)
144 anchors.margins: units.gu(1)
145 }
145 }
146
146
147− IndicatorsClient.HLine {
147+ Indicators.HLine {
148 anchors.top: parent.top
148 anchors.top: parent.top
149 color: "#464543"
149 color: "#464543"
150 }
150 }
modules/IndicatorsClient/qml/messaging/SimpleTextMessage.qml → modules/Unity/Indicators/qml/messaging/SimpleTextMessage.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/messaging/SnapDecision.qml → modules/Unity/Indicators/qml/messaging/SnapDecision.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/messaging/TextMessage.qml → modules/Unity/Indicators/qml/messaging/TextMessage.qmlrenamed

The content is the same.

modules/IndicatorsClient/qml/messaging/qmldir → modules/Unity/Indicators/qml/messaging/qmldirrenamed+1−1
@@ -1,4 +1,4 @@
1−module IndicatorsClient.Messaging
1+module Unity.Indicators.Messaging
2
2
3ActionButton 0.1 ActionButton.qml
3ActionButton 0.1 ActionButton.qml
4ActionTextField 0.1 ActionTextField.qml
4ActionTextField 0.1 ActionTextField.qml
modules/IndicatorsClient/qml/messaging/utils.js → modules/Unity/Indicators/qml/messaging/utils.jsrenamed

The content is the same.

modules/IndicatorsClient/qml/network/AccessPoint.qml → modules/Unity/Indicators/qml/network/AccessPoint.qmlrenamed+3−3
@@ -20,9 +20,9 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
24
24
25−IndicatorsClient.Menu {
25+Indicators.Menu {
26 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
26 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
27 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
27 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
28
28
@@ -61,7 +61,7 @@ IndicatorsClient.Menu {
61 anchors.verticalCenter: parent.verticalCenter
61 anchors.verticalCenter: parent.verticalCenter
62 }
62 }
63
63
64− IndicatorsClient.DBusActionState {
64+ Indicators.DBusActionState {
65 action: menu ? menu.action : ""
65 action: menu ? menu.action : ""
66 target: checkBoxActive
66 target: checkBoxActive
67 property: "checked"
67 property: "checked"
modules/Unity/Indicators/qml/network/CMakeLists.txtnew file+21
@@ -0,0 +1,21 @@
1+file(GLOB IndicatorsNetwork_QMLFILES
2+ *.qml
3+)
4+
5+# copy qmldir file into build directory for shadow builds
6+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
7+ DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Network
8+)
9+
10+# copy qmldir file into build directory for shadow builds
11+file(COPY ${IndicatorsNetwork_QMLFILES}
12+ DESTINATION ${CMAKE_BINARY_DIR}/modules/Unity/Indicators/Network
13+)
14+
15+install(FILES qmldir
16+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Network
17+)
18+
19+install(FILES ${IndicatorsNetwork_QMLFILES}
20+ DESTINATION ${SHELL_APP_DIR}/modules/Unity/Indicators/Network
21+)
modules/IndicatorsClient/qml/network/PasswordPage.qml → modules/Unity/Indicators/qml/network/PasswordPage.qmlrenamed+4−4
@@ -20,7 +20,7 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
24
24
25Page {
25Page {
26 id: pagePassword
26 id: pagePassword
@@ -37,17 +37,17 @@ Page {
37 right: parent.right
37 right: parent.right
38 }
38 }
39
39
40− IndicatorsClient.SectionMenu {
40+ Indicators.SectionMenu {
41 label: "Authentication"
41 label: "Authentication"
42 }
42 }
43
43
44− IndicatorsClient.TextMenu {
44+ Indicators.TextMenu {
45 id: _password
45 id: _password
46
46
47 password: true
47 password: true
48 }
48 }
49
49
50− IndicatorsClient.Menu {
50+ Indicators.Menu {
51 Row {
51 Row {
52 anchors {
52 anchors {
53 right: parent.right
53 right: parent.right
modules/IndicatorsClient/qml/network/WifiSection.qml → modules/Unity/Indicators/qml/network/WifiSection.qmlrenamed+2−2
@@ -19,9 +19,9 @@
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
23
23
24−IndicatorsClient.SectionMenu {
24+Indicators.SectionMenu {
25 property variant busyAction : actionGroup ? actionGroup.action(menu.extra.canonical_busy_action) : undefined
25 property variant busyAction : actionGroup ? actionGroup.action(menu.extra.canonical_busy_action) : undefined
26 busy: busyAction && busyAction.valid ? busyAction.state : false
26 busy: busyAction && busyAction.valid ? busyAction.state : false
27}
27}
modules/IndicatorsClient/qml/network/qmldir → modules/Unity/Indicators/qml/network/qmldirrenamed+2−2
@@ -1,5 +1,5 @@
1−module IndicatorsClient.Network
1+module Unity.Indicators.Network
2−plugin IndicatorsClientNetworkQml
2+plugin IndicatorsNetworkQml
3
3
4NetworkPage 0.1 NetworkPage.qml
4NetworkPage 0.1 NetworkPage.qml
5AccessPoint 0.1 AccessPoint.qml
5AccessPoint 0.1 AccessPoint.qml
modules/IndicatorsClient/qml/qmldir → modules/Unity/Indicators/qml/qmldirrenamed+2−2
@@ -1,5 +1,5 @@
1−module IndicatorsClient
1+module Unity.Indicators
2−plugin IndicatorsClientQml
2+plugin IndicatorsQml
3
3
4IndicatorItem 0.1 IndicatorItem.qml
4IndicatorItem 0.1 IndicatorItem.qml
5IndicatorIcon 0.1 IndicatorIcon.qml
5IndicatorIcon 0.1 IndicatorIcon.qml
modules/IndicatorsClient/resources/artwork/messaging/default_app.svg → modules/Unity/Indicators/resources/artwork/messaging/default_app.svgrenamed

The content is the same.

modules/IndicatorsClient/resources/artwork/messaging/default_contact.png → modules/Unity/Indicators/resources/artwork/messaging/default_contact.pngrenamed

Binary file not shown.

modules/IndicatorsClient/resources/artwork/messaging/message_sms01_54px.png → modules/Unity/Indicators/resources/artwork/messaging/message_sms01_54px.pngrenamed

Binary file not shown.

modules/IndicatorsClient/resources/indicatorclient.qrc → modules/Unity/Indicators/resources/indicators.qrcrenamed+1−1
@@ -1,5 +1,5 @@
1<RCC>
1<RCC>
2− <qresource prefix="/indicatorsclient">
2+ <qresource prefix="/indicators">
3 <file>artwork/messaging/default_contact.png</file>
3 <file>artwork/messaging/default_contact.png</file>
4 <file>artwork/messaging/default_app.svg</file>
4 <file>artwork/messaging/default_app.svg</file>
5 <file>artwork/messaging/message_sms01_54px.png</file>
5 <file>artwork/messaging/message_sms01_54px.png</file>
run+1−1
@@ -1,7 +1,7 @@
1#!/bin/sh
1#!/bin/sh
2
2
3QML_PHONE_SHELL_PATH=./builddir/unity8
3QML_PHONE_SHELL_PATH=./builddir/unity8
4−export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib
4+export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib:$PWD/../unity_build/build/lib/libunity
5GDB=false
5GDB=false
6FAKE=false
6FAKE=false
7PINLOCK=false
7PINLOCK=false
tests/modules/CMakeLists.txt+1−1
@@ -1 +1 @@
1−add_subdirectory(IndicatorsClient)
1+add_subdirectory(Unity)
tests/modules/Unity/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(Indicators)
tests/modules/IndicatorsClient/CMakeLists.txt → tests/modules/Unity/Indicators/CMakeLists.txtrenamed+2−3
@@ -1,7 +1,6 @@
1include_directories(
1include_directories(
2 ${CMAKE_CURRENT_BINARY_DIR}
2 ${CMAKE_CURRENT_BINARY_DIR}
3− ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient
3+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../modules/Unity/Indicators
4− ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient/indicators/common
5 )
4 )
6
5
7macro(run_tests)
6macro(run_tests)
@@ -16,7 +15,7 @@ macro(run_tests)
16 )
15 )
17 qt5_use_modules(${_test}Exec Test Core Qml)
16 qt5_use_modules(${_test}Exec Test Core Qml)
18 target_link_libraries(${_test}Exec
17 target_link_libraries(${_test}Exec
19− IndicatorsClientQml
18+ IndicatorsQml
20 )
19 )
21 set(_test_list "${_test_list};${_test}")
20 set(_test_list "${_test_list};${_test}")
22 endforeach()
21 endforeach()
tests/modules/IndicatorsClient/indicatorsmanagertest.cpp → tests/modules/Unity/Indicators/indicatorsmanagertest.cpprenamed

The content is the same.

tests/modules/IndicatorsClient/indicatorsmodeltest.cpp → tests/modules/Unity/Indicators/indicatorsmodeltest.cpprenamed

The content is the same.

tests/qmltests/Panel/tst_IndicatorRow.qml+2−2
@@ -19,7 +19,7 @@ import QtTest 1.0
19import Unity.Test 0.1 as UT
19import Unity.Test 0.1 as UT
20import ".."
20import ".."
21import "../../../Panel"
21import "../../../Panel"
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
23
23
24/*
24/*
25 This tests the IndicatorRow component by using a fake model to stage data in the indicators
25 This tests the IndicatorRow component by using a fake model to stage data in the indicators
@@ -51,7 +51,7 @@ Item {
51 indicatorsModel: indicatorModel
51 indicatorsModel: indicatorModel
52 }
52 }
53
53
54− IndicatorsClient.IndicatorsModel {
54+ Indicators.IndicatorsModel {
55 id: indicatorModel
55 id: indicatorModel
56 Component.onCompleted: load()
56 Component.onCompleted: load()
57 }
57 }
tests/qmltests/Panel/tst_MenuContent.qml+2−2
@@ -19,7 +19,7 @@ import QtTest 1.0
19import Unity.Test 0.1 as UT
19import Unity.Test 0.1 as UT
20import ".."
20import ".."
21import "../../../Panel"
21import "../../../Panel"
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
23
23
24Item {
24Item {
25 id: shell
25 id: shell
@@ -39,7 +39,7 @@ Item {
39 Item { id: handle }
39 Item { id: handle }
40
40
41
41
42− IndicatorsClient.IndicatorsModel {
42+ Indicators.IndicatorsModel {
43 id: indicatorsModel
43 id: indicatorsModel
44 Component.onCompleted: load()
44 Component.onCompleted: load()
45 }
45 }
tests/qmltests/Panel/tst_Overview.qml+1−1
@@ -20,7 +20,7 @@ import ".."
20import "../../../Panel/Menus"
20import "../../../Panel/Menus"
21import "../../../Components"
21import "../../../Components"
22import Unity.Test 0.1 as UT
22import Unity.Test 0.1 as UT
23−import IndicatorsClient 0.1
23+import Unity.Indicators 0.1 as Indicators
24
24
25Rectangle {
25Rectangle {
26 id: shell
26 id: shell
tests/qmltests/modules/CMakeLists.txt+1−1
@@ -1 +1 @@
1−add_subdirectory(IndicatorsClient)
1+add_subdirectory(Unity)
tests/qmltests/modules/Unity/CMakeLists.txtnew file+1
@@ -0,0 +1 @@
1+add_subdirectory(Indicators)
tests/qmltests/modules/IndicatorsClient/CMakeLists.txt → tests/qmltests/modules/Unity/Indicators/CMakeLists.txtrenamed+14−14
@@ -1,4 +1,4 @@
1−project(IndicatorsClientFakeQml)
1+project(IndicatorsFakeQml)
2
2
3find_package(Qt5Core REQUIRED)
3find_package(Qt5Core REQUIRED)
4find_package(Qt5Quick REQUIRED)
4find_package(Qt5Quick REQUIRED)
@@ -10,40 +10,40 @@ include_directories(
10 ${Qt5Quick_INCLUDE_DIRS}
10 ${Qt5Quick_INCLUDE_DIRS}
11)
11)
12
12
13−set(IndicatorsClientFakeQml_SOURCES
13+set(IndicatorsFakeQml_SOURCES
14 plugin.cpp
14 plugin.cpp
15)
15)
16
16
17−set(IndicatorsClientFakeQml_RESOURCES
17+set(IndicatorsFakeQml_RESOURCES
18− indicatorsclient_fake.qrc
18+ indicators_fake.qrc
19)
19)
20
20
21−qt5_add_resources(IndicatorsClientFakeQml_RESOURCES_RCC
21+qt5_add_resources(IndicatorsFakeQml_RESOURCES_RCC
22− ${IndicatorsClientFakeQml_RESOURCES}
22+ ${IndicatorsFakeQml_RESOURCES}
23)
23)
24
24
25−add_library(IndicatorsClientFakeQml SHARED
25+add_library(IndicatorsFakeQml SHARED
26− ${IndicatorsClientFakeQml_RESOURCES_RCC}
26+ ${IndicatorsFakeQml_RESOURCES_RCC}
27− ${IndicatorsClientFakeQml_SOURCES}
27+ ${IndicatorsFakeQml_SOURCES}
28)
28)
29# Because this is an internal support library, we want
29# Because this is an internal support library, we want
30# to expose all symbols in it. Consider changing this
30# to expose all symbols in it. Consider changing this
31# either to a static library or just using the
31# either to a static library or just using the
32# files directly in targets.
32# files directly in targets.
33−set_target_properties(IndicatorsClientFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
33+set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
34
34
35−target_link_libraries(IndicatorsClientFakeQml
35+target_link_libraries(IndicatorsFakeQml
36 ${Qt5Core_LIBRARIES}
36 ${Qt5Core_LIBRARIES}
37 ${Qt5Quick_LIBRARIES}
37 ${Qt5Quick_LIBRARIES}
38 ${GOBJECT_LDFLAGS}
38 ${GOBJECT_LDFLAGS}
39 ${QMENUMODEL_LDFLAGS}
39 ${QMENUMODEL_LDFLAGS}
40)
40)
41
41
42−qt5_use_modules(IndicatorsClientFakeQml Qml)
42+qt5_use_modules(IndicatorsFakeQml Qml)
43
43
44
44
45
45
46−file(GLOB IndicatorsClientFake_QMLFILES
46+file(GLOB IndicatorsFake_QMLFILES
47 *.qml
47 *.qml
48 qml/FakeMenuPage.qml
48 qml/FakeMenuPage.qml
49)
49)
@@ -54,6 +54,6 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
54)
54)
55
55
56# copy qmldir file into build directory for shadow builds
56# copy qmldir file into build directory for shadow builds
57−file(COPY ${IndicatorsClientFake_QMLFILES}
57+file(COPY ${IndicatorsFake_QMLFILES}
58 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
58 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
59)
59)
tests/qmltests/modules/IndicatorsClient/IndicatorsModel.qml → tests/qmltests/modules/Unity/Indicators/IndicatorsModel.qmlrenamed+10−10
@@ -27,8 +27,8 @@ ListModel {
27 priority: 0
27 priority: 0
28 title: "Menu1";
28 title: "Menu1";
29 description: "";
29 description: "";
30− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon1.qml";
30+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon1.qml";
31− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page1.qml";
31+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page1.qml";
32 indicatorProperties: "";
32 indicatorProperties: "";
33 isValid: "";
33 isValid: "";
34 }
34 }
@@ -37,8 +37,8 @@ ListModel {
37 priority: 1
37 priority: 1
38 title: "Menu2";
38 title: "Menu2";
39 description: "";
39 description: "";
40− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon2.qml";
40+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon2.qml";
41− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page2.qml";
41+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page2.qml";
42 indicatorProperties: "";
42 indicatorProperties: "";
43 isValid: "";
43 isValid: "";
44 }
44 }
@@ -47,8 +47,8 @@ ListModel {
47 priority: 2
47 priority: 2
48 title: "Menu3";
48 title: "Menu3";
49 description: "";
49 description: "";
50− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon3.qml";
50+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon3.qml";
51− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page3.qml";
51+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page3.qml";
52 indicatorProperties: "";
52 indicatorProperties: "";
53 isValid: "";
53 isValid: "";
54 }
54 }
@@ -57,8 +57,8 @@ ListModel {
57 priority: 3
57 priority: 3
58 title: "Menu4";
58 title: "Menu4";
59 description: "";
59 description: "";
60− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon4.qml";
60+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon4.qml";
61− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page4.qml";
61+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page4.qml";
62 indicatorProperties: "";
62 indicatorProperties: "";
63 isValid: "";
63 isValid: "";
64 }
64 }
@@ -67,8 +67,8 @@ ListModel {
67 priority: 4
67 priority: 4
68 title: "Menu5";
68 title: "Menu5";
69 description: "";
69 description: "";
70− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon5.qml";
70+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon5.qml";
71− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page5.qml";
71+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page5.qml";
72 indicatorProperties: "";
72 indicatorProperties: "";
73 isValid: "";
73 isValid: "";
74 }
74 }
tests/qmltests/modules/IndicatorsClient/indicatorsclient_fake.qrc → tests/qmltests/modules/Unity/Indicators/indicators_fake.qrcrenamed+1−1
@@ -1,5 +1,5 @@
1<RCC>
1<RCC>
2− <qresource prefix="/tests/indciatorsclient">
2+ <qresource prefix="/tests/indciators">
3 <file>qml/fake_menu_icon1.qml</file>
3 <file>qml/fake_menu_icon1.qml</file>
4 <file>qml/fake_menu_icon2.qml</file>
4 <file>qml/fake_menu_icon2.qml</file>
5 <file>qml/fake_menu_icon3.qml</file>
5 <file>qml/fake_menu_icon3.qml</file>
tests/qmltests/modules/IndicatorsClient/plugin.cpp → tests/qmltests/modules/Unity/Indicators/plugin.cpprenamed+2−2
@@ -24,7 +24,7 @@
24
24
25// local
25// local
26
26
27−void IndicatorsClientPlugin::registerTypes(const char *)
27+void IndicatorsFakePlugin::registerTypes(const char *)
28{
28{
29− Q_INIT_RESOURCE(indicatorsclient_fake);
29+ Q_INIT_RESOURCE(indicators_fake);
30}
30}
modules/IndicatorsClient/plugin.h → tests/qmltests/modules/Unity/Indicators/plugin.hrenamed+4−4
@@ -16,12 +16,12 @@
16 * Author: Nick Dedekind <nick.dedekind@canonical.com>
16 * Author: Nick Dedekind <nick.dedekind@canonical.com>
17 */
17 */
18
18
19−#ifndef INDICATORSCLIENT_PLUGIN_H
19+#ifndef INDICATORS_FAKE_PLUGIN_H
20−#define INDICATORSCLIENT_PLUGIN_H
20+#define INDICATORS_FAKE_PLUGIN_H
21
21
22#include <QtQml/QQmlExtensionPlugin>
22#include <QtQml/QQmlExtensionPlugin>
23
23
24−class IndicatorsClientPlugin : public QQmlExtensionPlugin
24+class IndicatorsFakePlugin : public QQmlExtensionPlugin
25{
25{
26 Q_OBJECT
26 Q_OBJECT
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
27 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +29,4 @@ public:
29 void registerTypes(const char *uri);
29 void registerTypes(const char *uri);
30};
30};
31
31
32−#endif // INDICATORSCLIENT_PLUGIN_H
32+#endif // INDICATORS_FAKE_PLUGIN_H
tests/qmltests/modules/IndicatorsClient/qml/FakeMenuPage.qml → tests/qmltests/modules/Unity/Indicators/qml/FakeMenuPage.qmlrenamed

The content is the same.

tests/qmltests/modules/IndicatorsClient/qml/fake_menu_icon1.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon1.qmlrenamed

The content is the same.

tests/qmltests/modules/IndicatorsClient/qml/fake_menu_icon2.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon2.qmlrenamed

The content is the same.

tests/qmltests/modules/IndicatorsClient/qml/fake_menu_icon3.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon3.qmlrenamed

The content is the same.

tests/qmltests/modules/IndicatorsClient/qml/fake_menu_icon4.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon4.qmlrenamed

The content is the same.

tests/qmltests/modules/IndicatorsClient/qml/fake_menu_icon5.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_icon5.qmlrenamed

The content is the same.

tests/qmltests/modules/IndicatorsClient/qml/fake_menu_page1.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_page1.qmlrenamed+2−2
@@ -15,9 +15,9 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Indicators 0.1 as Indicators
19
19
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
21 id: menu_plugin1
21 id: menu_plugin1
22 objectName: "menu_page1"
22 objectName: "menu_page1"
23
23
tests/qmltests/modules/IndicatorsClient/qml/fake_menu_page2.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_page2.qmlrenamed+2−2
@@ -15,9 +15,9 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
19
19
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
21 id: menu_plugin2
21 id: menu_plugin2
22 objectName: "menu_page2"
22 objectName: "menu_page2"
23
23
tests/qmltests/modules/IndicatorsClient/qml/fake_menu_page3.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_page3.qmlrenamed+2−2
@@ -15,9 +15,9 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
19
19
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
21 id: menu_plugin3
21 id: menu_plugin3
22 objectName: "menu_page3"
22 objectName: "menu_page3"
23
23
tests/qmltests/modules/IndicatorsClient/qml/fake_menu_page4.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_page4.qmlrenamed+2−2
@@ -15,9 +15,9 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
19
19
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
21 id: menu_plugin4
21 id: menu_plugin4
22 objectName: "menu_page4"
22 objectName: "menu_page4"
23
23
tests/qmltests/modules/IndicatorsClient/qml/fake_menu_page5.qml → tests/qmltests/modules/Unity/Indicators/qml/fake_menu_page5.qmlrenamed+2−2
@@ -15,9 +15,9 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
19
19
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
21 id: menu_plugin5
21 id: menu_plugin5
22 objectName: "menu_page5"
22 objectName: "menu_page5"
23
23
tests/qmltests/modules/IndicatorsClient/qmldir → tests/qmltests/modules/Unity/Indicators/qmldirrenamed+2−2
@@ -1,5 +1,5 @@
1−module IndicatorsClient
1+module Unity.Indicators
2−plugin IndicatorsClientFakeQml
2+plugin IndicatorsFakeQml
3
3
4IndicatorsModel 0.1 IndicatorsModel.qml
4IndicatorsModel 0.1 IndicatorsModel.qml
5FakeMenuPage 0.1 FakeMenuPage.qml
5FakeMenuPage 0.1 FakeMenuPage.qml