renamed IndicatorsClient to Unity.Indicators
commit7da7d3b75484ff9d8bbf4d22f42111d8d58a1563
authorNick Dedekind <nicholas.dedekind@gmail.com>
dateMon 17 Jun 2013, 09:14 (13 years ago)
parent4787a4f
103 files changed+298−250
Panel/IndicatorItem.qml+7−14
@@ -16,7 +16,7 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 0.1
19−import IndicatorsClient 0.1 as IndicatorsClient
19+import Unity.Indicators 0.1 as Indicators
2020
2121Item {
2222 id: indicatorItem
@@ -29,30 +29,23 @@ Item {
2929 opacity: dimmed ? 0.4 : 1
3030
3131 // 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
3333 width: visible ? loader.item.width : 0
3434
3535 Loader {
3636 id: loader
3737
38− onStatusChanged: {
39− if (status == Loader.Ready) {
40− item.height = Qt.binding(function() { return indicatorItem.height; })
38+ onLoaded: {
39+ item.height = Qt.binding(function() { return indicatorItem.height; })
4140
42− for(var pName in indicatorProperties) {
43− if (item.hasOwnProperty(pName)) {
44− item[pName] = indicatorProperties[pName]
45− }
41+ for(var pName in indicatorProperties) {
42+ if (item.hasOwnProperty(pName)) {
43+ item[pName] = indicatorProperties[pName]
4644 }
4745 }
4846 }
4947 }
5048
51− Connections {
52− target: loader.item
53− onVisibleChanged: { visible = loader.item.visible }
54− }
55−
5649 Rectangle {
5750 color: "#dd4814"
5851 objectName: "highlight"
Panel/Indicators/DatetimeIndicatorIcon.qml+8−10
@@ -19,15 +19,14 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
2323
24−IndicatorsClient.IndicatorIcon {
24+Indicators.IndicatorIcon {
2525 id: indicatorIcon
2626
2727 width: timeLabel.width + units.gu(1)
2828
2929 property alias label: timeLabel.text
30− property date __date
3130
3231 Label {
3332 id: timeLabel
@@ -36,20 +35,19 @@ IndicatorsClient.IndicatorIcon {
3635 opacity: 0.8
3736 font.family: "Ubuntu"
3837 fontSize: "medium"
39− anchors {
40− verticalCenter: parent.verticalCenter
41− horizontalCenter: parent.horizontalCenter
42− }
43− text: Qt.formatTime(__date)
38+ anchors.centerIn: parent
39+ text: Qt.formatTime(timer.dateNow)
4440 }
4541
4642 Timer {
4743 id: timer
48− interval: 1000 * 60
44+ interval: 1000 * 10
4945 running: indicatorIcon.visible
5046 repeat: true
5147 triggeredOnStart: true
52− onTriggered: __date = new Date
48+ property date dateNow
49+
50+ onTriggered: dateNow = new Date
5351 }
5452
5553 onActionStateChanged: {
Panel/Indicators/DatetimeIndicatorPage.qml+6−7
@@ -47,7 +47,7 @@ Flickable {
4747 height: units.gu(30)
4848
4949 Label {
50− id: __time
50+ id: timeLabel
5151 anchors {
5252 horizontalCenter: parent.horizontalCenter
5353 verticalCenter: parent.verticalCenter
@@ -60,7 +60,7 @@ Flickable {
6060 }
6161
6262 Label {
63− id: __date
63+ id: dateLabel
6464
6565 anchors {
6666 left: parent.left
@@ -75,20 +75,19 @@ Flickable {
7575 }
7676
7777 Timer {
78− interval: 1000 * 60 // one minute
78+ interval: 1000 * 10 // 10 seconds
7979 running: true
8080 repeat: true
81+ triggeredOnStart: true
8182 onTriggered: updateTime();
82−
83− Component.onCompleted: updateTime();
8483 }
8584
8685 function updateTime() {
8786 var dt = new Date()
8887 var time = Qt.formatTime(dt)
8988 var space = time.indexOf(" ")
90− __time.text = time.substr(0, space > 0 ? space : 5)
91− __date.text = Qt.formatDateTime(dt, "dddd,\ndd MMMM")
89+ timeLabel.text = time.substr(0, space > 0 ? space : 5)
90+ dateLabel.text = Qt.formatDateTime(dt, "dddd,\ndd MMMM")
9291 }
9392
9493 // Make it compatible with the PluginItem interface
Panel/Indicators/DefaultIndicatorIcon.qml+4−6
@@ -19,9 +19,9 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
2323
24−IndicatorsClient.IndicatorIcon {
24+Indicators.IndicatorIcon {
2525 id: indicatorIcon
2626
2727 width: itemRow.width + units.gu(1)
@@ -68,12 +68,10 @@ IndicatorsClient.IndicatorIcon {
6868 if (action.state == undefined) {
6969 label = "";
7070 iconSource = "";
71− visible = false;
7271 return
7372 }
7473
75− label = action.state[0]
76− iconSource = "image://gicon/" + action.state[1]
77− indicatorIcon.visible = action.state[3]
74+ label = action.state[Indicators.ActionState.Label]
75+ iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource]
7876 }
7977}
Panel/Indicators/DefaultIndicatorPage.qml+2−2
@@ -18,8 +18,8 @@
1818 */
1919
2020import QtQuick 2.0
21−import IndicatorsClient 0.1 as IndicatorsClient
21+import Unity.Indicators 0.1 as Indicators
2222
23−IndicatorsClient.IndicatorPage {
23+Indicators.IndicatorPage {
2424 anchors.fill: parent
2525}
Panel/Indicators/MessagingIndicatorPage.qml+2−2
@@ -19,9 +19,9 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
2323
24−IndicatorsClient.IndicatorPage {
24+Indicators.IndicatorPage {
2525 anchors.fill: parent
2626
2727 highlightFollowsCurrentItem: false
Panel/Indicators/NetworkIndicatorIcon.qml+2−2
@@ -19,9 +19,9 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
2323
24−IndicatorsClient.IndicatorIcon {
24+Indicators.IndicatorIcon {
2525 id: indicatorIcon
2626
2727 width: networkIcon.width + units.gu(1)
Panel/Indicators/NetworkIndicatorPage.qml+3−3
@@ -18,8 +18,8 @@
1818 */
1919
2020import QtQuick 2.0
21−import IndicatorsClient 0.1 as IndicatorsClient
22−import IndicatorsClient.Network 0.1 as ICNetwork
21+import Unity.Indicators 0.1 as Indicators
22+import Unity.Indicators.Network 0.1 as ICNetwork
2323import Ubuntu.Components 0.1
2424
2525PageStack {
@@ -38,7 +38,7 @@ PageStack {
3838 Page {
3939 id: _mainPage
4040
41− IndicatorsClient.IndicatorPage {
41+ Indicators.IndicatorPage {
4242 id: _pluginItem
4343 anchors.fill: parent
4444 }
Panel/Indicators/client/IndicatorsList.qml+2−2
@@ -20,7 +20,7 @@
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
2222import Ubuntu.Components.ListItems 0.1 as ListItem
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
2424import "../.."
2525
2626Page {
@@ -38,7 +38,7 @@ Page {
3838 anchors.fill: parent
3939 model: indicatorsModel
4040
41− delegate: IndicatorsClient.Menu {
41+ delegate: Indicators.Menu {
4242 anchors.left: parent.left
4343 anchors.right: parent.right
4444 height: implicitHeight
Panel/IndicatorsDataModel.qml+2−2
@@ -18,10 +18,10 @@
1818 */
1919
2020import QtQuick 2.0
21−import IndicatorsClient 0.1
21+import Unity.Indicators 0.1 as Indicators
2222import Utils 0.1
2323
24−IndicatorsModel {
24+Indicators.IndicatorsModel {
2525 id: ic_model
2626
2727 Component.onCompleted: load()
debian/unity8.install+1−1
@@ -13,7 +13,7 @@
1313/usr/share/unity8/Shell.qml
1414/usr/share/unity8/SideStage/*
1515/usr/share/unity8/graphics/*
16−/usr/share/unity8/modules/IndicatorsClient/*
16+/usr/share/unity8/modules/Unity/Indicators/*
1717/usr/share/unity8/plugins/HudClient/*
1818/usr/share/unity8/plugins/LightDM/*
1919/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)
22
33pkg_check_modules(GLIB glib-2.0>=2.32)
44pkg_check_modules(LIBNM_GLIB libnm-glib>=0.9.6)
@@ -31,37 +31,42 @@ include_directories(
3131 ${QMENUMODEL_INCLUDE_DIRS}
3232)
3333
34−set(IndicatorsClientQML_SOURCES
34+set(IndicatorsQML_SOURCES
3535 flatmenuproxymodel.cpp
3636 indicator.cpp
37+ indicators.h
3738 indicatorsmanager.cpp
3839 indicatorsmodel.cpp
3940 plugin.cpp
4041)
4142
42−set(IndicatorsClientQML_RESOURCES
43− resources/indicatorclient.qrc
43+set(IndicatorsQML_RESOURCES
44+ resources/indicators.qrc
4445)
4546
46−qt5_add_resources(IndicatorsClientQML_RESOURCES_RCC
47− ${IndicatorsClientQML_RESOURCES}
47+qt5_add_resources(IndicatorsQML_RESOURCES_RCC
48+ ${IndicatorsQML_RESOURCES}
4849)
4950
50−add_library(IndicatorsClientQml SHARED
51− ${IndicatorsClientQML_RESOURCES_RCC}
52− ${IndicatorsClientQML_SOURCES}
51+add_library(IndicatorsQml SHARED
52+ ${IndicatorsQML_RESOURCES_RCC}
53+ ${IndicatorsQML_SOURCES}
5354)
5455# Because this is an internal support library, we want
5556# to expose all symbols in it. Consider changing this
5657# either to a static library or just using the
5758# files directly in targets.
58−set_target_properties(IndicatorsClientQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
59+set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
5960
60−target_link_libraries(IndicatorsClientQml
61+target_link_libraries(IndicatorsQml
6162 ${Qt5Core_LIBRARIES}
6263 ${Qt5Quick_LIBRARIES}
6364 ${GOBJECT_LDFLAGS}
6465 ${QMENUMODEL_LDFLAGS}
6566)
6667
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)
22
3−set(INDICATORCLIENT_NETWORK_SRC
3+set(INDICATORS_NETWORK_SRC
44 networkagent.cpp
55 plugin.cpp
66 secret-agent.c
77)
88
9−add_library(IndicatorsClientNetworkQml MODULE
10− ${INDICATORCLIENT_NETWORK_SRC}
9+add_library(IndicatorsNetworkQml MODULE
10+ ${INDICATORS_NETWORK_SRC}
1111)
1212
13−qt5_use_modules(IndicatorsClientNetworkQml Core Qml Widgets)
13+qt5_use_modules(IndicatorsNetworkQml Core Qml Widgets)
1414
15−set_target_properties(IndicatorsClientNetworkQml PROPERTIES COMPILE_FLAGS -fPIC)
15+set_target_properties(IndicatorsNetworkQml PROPERTIES COMPILE_FLAGS -fPIC)
1616
1717include_directories(
1818 ${CMAKE_CURRENT_SOURCE_DIR}
@@ -22,7 +22,7 @@ include_directories(
2222 ${LIBNM_UTIL_INCLUDE_DIRS}
2323)
2424
25−target_link_libraries(IndicatorsClientNetworkQml
25+target_link_libraries(IndicatorsNetworkQml
2626 ${GLIB_LIBRARIES}
2727 ${QMENUMODEL_LDFLAGS}
2828 ${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 @@
2525// local
2626#include "networkagent.h"
2727
28−void IndicatorsClientNetworkPlugin::registerTypes(const char *uri)
28+void IndicatorsNetworkPlugin::registerTypes(const char *uri)
2929{
3030 qmlRegisterType<NetworkAgent>(uri, 0, 1, "NetworkAgent");
3131}
modules/IndicatorsClient/Network/plugin.h → modules/Unity/Indicators/Network/plugin.hrenamed+4−4
@@ -16,12 +16,12 @@
1616 * Author: Nick Dedekind <nick.dedekind@canonical.com>
1717 */
1818
19−#ifndef INDICATORSCLIENT_NETWORK_PLUGIN_H
20−#define INDICATORSCLIENT_NETWORK_PLUGIN_H
19+#ifndef INDICATORS_NETWORK_PLUGIN_H
20+#define INDICATORS_NETWORK_PLUGIN_H
2121
2222#include <QtQml/QQmlExtensionPlugin>
2323
24−class IndicatorsClientNetworkPlugin : public QQmlExtensionPlugin
24+class IndicatorsNetworkPlugin : public QQmlExtensionPlugin
2525{
2626 Q_OBJECT
2727 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +29,4 @@ public:
2929 void registerTypes(const char *uri);
3030};
3131
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 @@
2626#include "flatmenuproxymodel.h"
2727#include "indicatorsmanager.h"
2828#include "indicatorsmodel.h"
29+#include "indicators.h"
2930
30−void IndicatorsClientPlugin::registerTypes(const char *uri)
31+void IndicatorsPlugin::registerTypes(const char *uri)
3132{
32− Q_INIT_RESOURCE(indicatorclient);
33+ Q_INIT_RESOURCE(indicators);
3334
3435 qmlRegisterType<IndicatorsManager>(uri, 0, 1, "IndicatorsManager");
3536 qmlRegisterType<FlatMenuProxyModel>(uri, 0, 1, "FlatMenuProxyModel");
3637 qmlRegisterType<IndicatorsModel>(uri, 0, 1, "IndicatorsModel");
38+ qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");
3739}
tests/qmltests/modules/IndicatorsClient/plugin.h → modules/Unity/Indicators/plugin.hrenamed+4−4
@@ -16,12 +16,12 @@
1616 * Author: Nick Dedekind <nick.dedekind@canonical.com>
1717 */
1818
19−#ifndef INDICATORSCLIENT_PLUGIN_H
20−#define INDICATORSCLIENT_PLUGIN_H
19+#ifndef INDICATORS_PLUGIN_H
20+#define INDICATORS_PLUGIN_H
2121
2222#include <QtQml/QQmlExtensionPlugin>
2323
24−class IndicatorsClientPlugin : public QQmlExtensionPlugin
24+class IndicatorsPlugin : public QQmlExtensionPlugin
2525{
2626 Q_OBJECT
2727 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +29,4 @@ public:
2929 void registerTypes(const char *uri);
3030};
3131
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
2121
2222/*!
2323 \qmltype DBusActionState
24− \inqmlmodule IndicatorsClient 0.1
24+ \inqmlmodule Indicators 0.1
2525 \brief Helper class to connect dbus action state with qml components property
2626
2727 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
2121import QMenuModel 0.1
2222import Ubuntu.Components 0.1
2323import Ubuntu.Components.ListItems 0.1 as ListItem
24−import IndicatorsClient 0.1 as IndicatorsClient
24+import Unity.Indicators 0.1 as Indicators
2525
2626Item {
2727 id: indicatorItem
@@ -47,7 +47,7 @@ Item {
4747 onActionAppear: indicatorItem.actionGroupUpdated();
4848 }
4949
50− property var proxyModel : IndicatorsClient.FlatMenuProxyModel {
50+ property var proxyModel : Indicators.FlatMenuProxyModel {
5151 busType: indicatorItem.busType
5252 busName: indicatorItem.busName
5353 objectPath: indicatorItem.deviceMenuObjectPath
modules/IndicatorsClient/qml/IndicatorIcon.qml → modules/Unity/Indicators/qml/IndicatorIcon.qmlrenamed+14
@@ -21,6 +21,7 @@ import QtQuick 2.0
2121import QMenuModel 0.1
2222import Ubuntu.Components 0.1
2323import Ubuntu.Components.ListItems 0.1 as ListItem
24+import Unity.Indicators 0.1 as Indicators
2425
2526IndicatorBase {
2627 id: indicatorIcon
@@ -71,4 +72,17 @@ IndicatorBase {
7172 onStateChanged: actionStateChanged()
7273 onValidChanged: actionStateChanged()
7374 }
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+ }
7488}
modules/IndicatorsClient/qml/IndicatorPage.qml → modules/Unity/Indicators/qml/IndicatorPage.qmlrenamed+1−1
@@ -21,7 +21,7 @@ import QtQuick 2.0
2121import QMenuModel 0.1
2222import Ubuntu.Components 0.1
2323import Ubuntu.Components.ListItems 0.1 as ListItem
24−import IndicatorsClient 0.1 as IndicatorsClient
24+import Unity.Indicators 0.1 as Indicators
2525
2626IndicatorBase {
2727 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 @@
1818 */
1919
2020import QtQuick 2.0
21−import IndicatorsClient 0.1 as IC
22−import IndicatorsClient.Messaging 0.1 as ICMessaging
23−import IndicatorsClient.Network 0.1 as ICNetwork
21+import Unity.Indicators 0.1 as Indicators
22+import Unity.Indicators.Messaging 0.1 as ICMessaging
23+import Unity.Indicators.Network 0.1 as ICNetwork
2424
2525Item {
2626 id: __menuFactory
@@ -55,18 +55,18 @@ Item {
5555 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
5656 }
5757
58− Component { id: sliderMenu; IC.SliderMenu {} }
59− Component { id: switchMenu; IC.SwitchMenu {} }
60− Component { id: buttonMenu; IC.ButtonMenu {} }
61− Component { id: divMenu; IC.DivMenu {} }
62− Component { id: sectionMenu; IC.SectionMenu {} }
63− Component { id: progressMenu; IC.ProgressMenu {} }
58+ Component { id: sliderMenu; Indicators.SliderMenu {} }
59+ Component { id: switchMenu; Indicators.SwitchMenu {} }
60+ Component { id: buttonMenu; Indicators.ButtonMenu {} }
61+ Component { id: divMenu; Indicators.DivMenu {} }
62+ Component { id: sectionMenu; Indicators.SectionMenu {} }
63+ Component { id: progressMenu; Indicators.ProgressMenu {} }
6464 Component { id: messageItem; ICMessaging.MessageItem {} }
6565 Component { id: snapDecision; ICMessaging.SnapDecision {} }
6666 Component { id: groupedMessage; ICMessaging.GroupedMessage {} }
6767 Component { id: wifiSection; ICNetwork.WifiSection {} }
6868 Component { id: accessPoint; ICNetwork.AccessPoint {} }
69− Component { id: indicatorMenu; IC.Menu {} }
69+ Component { id: indicatorMenu; Indicators.Menu {} }
7070
7171 Loader {
7272 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 @@
2020
2121import QtQuick 2.0
2222import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
2424
25−IndicatorsClient.BasicMenu {
25+Indicators.BasicMenu {
2626 property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
2727 property alias count: label.text
2828
@@ -38,7 +38,7 @@ IndicatorsClient.BasicMenu {
3838 height: units.gu(6)
3939 width: units.gu(6)
4040 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"
4242 fillMode: Image.PreserveAspectFit
4343 }
4444 }
@@ -63,12 +63,12 @@ IndicatorsClient.BasicMenu {
6363 }
6464 }
6565
66− IndicatorsClient.HLine {
66+ Indicators.HLine {
6767 anchors.top: parent.top
6868 color: "#403b37"
6969 }
7070
71− IndicatorsClient.HLine {
71+ Indicators.HLine {
7272 anchors.bottom: parent.bottom
7373 color: "#060606"
7474 }
modules/IndicatorsClient/qml/messaging/HeroMessage.qml → modules/Unity/Indicators/qml/messaging/HeroMessage.qmlrenamed+5−5
@@ -20,9 +20,9 @@
2020
2121import QtQuick 2.0
2222import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
2424
25−IndicatorsClient.BasicMenu {
25+Indicators.BasicMenu {
2626 id: __heroMessage
2727
2828 property variant actionsDescription: null
@@ -43,7 +43,7 @@ IndicatorsClient.BasicMenu {
4343 anchors.left: parent.left
4444 anchors.right: parent.right
4545
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"
4747 icon: menu && (menu.extra.canonical_app_icon.length > 0) ? "image://gicon/" + encodeURI(menu.extra.canonical_app_icon) : ""
4848 appIcon: icon
4949
@@ -65,13 +65,13 @@ IndicatorsClient.BasicMenu {
6565 }
6666 }
6767
68− IndicatorsClient.HLine {
68+ Indicators.HLine {
6969 id: __topHLine
7070 anchors.top: parent.top
7171 color: "#403b37"
7272 }
7373
74− IndicatorsClient.HLine {
74+ Indicators.HLine {
7575 id: __bottomHLine
7676 anchors.bottom: parent.bottom
7777 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 @@
2020
2121import QtQuick 2.0
2222import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
2424
25−IndicatorsClient.BasicMenu {
25+Indicators.BasicMenu {
2626 id: __messageItem
2727
2828 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 @@
2020
2121import QtQuick 2.0
2222import Ubuntu.Components 0.1
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
2424
2525Item {
2626 property alias action: __actionTextField.action
@@ -47,7 +47,7 @@ Item {
4747 width: units.gu(2)
4848 height: width
4949 fillMode: Image.PreserveAspectFit
50− source: "qrc:/indicatorsclient/artwork/messaging/message_sms01_54px.png"
50+ source: "qrc:/indicators/artwork/messaging/message_sms01_54px.png"
5151 }
5252
5353 Label {
@@ -59,7 +59,7 @@ Item {
5959 }
6060 }
6161
62− IndicatorsClient.HLine {
62+ Indicators.HLine {
6363 anchors.bottom: parent.bottom
6464 color: "#20201F"
6565 }
@@ -94,12 +94,12 @@ Item {
9494 text: modelData
9595 }
9696
97− IndicatorsClient.HLine {
97+ Indicators.HLine {
9898 anchors.top: parent.top
9999 color: "#464543"
100100 }
101101
102− IndicatorsClient.HLine {
102+ Indicators.HLine {
103103 anchors.bottom: parent.bottom
104104 color: "#20201F"
105105 }
@@ -144,7 +144,7 @@ Item {
144144 anchors.margins: units.gu(1)
145145 }
146146
147− IndicatorsClient.HLine {
147+ Indicators.HLine {
148148 anchors.top: parent.top
149149 color: "#464543"
150150 }
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
22
33ActionButton 0.1 ActionButton.qml
44ActionTextField 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 @@
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
2222import Ubuntu.Components.ListItems 0.1 as ListItem
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
2424
25−IndicatorsClient.Menu {
25+Indicators.Menu {
2626 property variant actionWifiApStrength : menu && actionGroup ? actionGroup.action(menu.extra.canonical_wifi_ap_strength_action) : null
2727 property variant wifiApStrength : actionWifiApStrength && actionWifiApStrength.valid ? actionWifiApStrength.state : "0"
2828
@@ -61,7 +61,7 @@ IndicatorsClient.Menu {
6161 anchors.verticalCenter: parent.verticalCenter
6262 }
6363
64− IndicatorsClient.DBusActionState {
64+ Indicators.DBusActionState {
6565 action: menu ? menu.action : ""
6666 target: checkBoxActive
6767 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 @@
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
2222import Ubuntu.Components.ListItems 0.1 as ListItem
23−import IndicatorsClient 0.1 as IndicatorsClient
23+import Unity.Indicators 0.1 as Indicators
2424
2525Page {
2626 id: pagePassword
@@ -37,17 +37,17 @@ Page {
3737 right: parent.right
3838 }
3939
40− IndicatorsClient.SectionMenu {
40+ Indicators.SectionMenu {
4141 label: "Authentication"
4242 }
4343
44− IndicatorsClient.TextMenu {
44+ Indicators.TextMenu {
4545 id: _password
4646
4747 password: true
4848 }
4949
50− IndicatorsClient.Menu {
50+ Indicators.Menu {
5151 Row {
5252 anchors {
5353 right: parent.right
modules/IndicatorsClient/qml/network/WifiSection.qml → modules/Unity/Indicators/qml/network/WifiSection.qmlrenamed+2−2
@@ -19,9 +19,9 @@
1919
2020import QtQuick 2.0
2121import Ubuntu.Components 0.1
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
2323
24−IndicatorsClient.SectionMenu {
24+Indicators.SectionMenu {
2525 property variant busyAction : actionGroup ? actionGroup.action(menu.extra.canonical_busy_action) : undefined
2626 busy: busyAction && busyAction.valid ? busyAction.state : false
2727}
modules/IndicatorsClient/qml/network/qmldir → modules/Unity/Indicators/qml/network/qmldirrenamed+2−2
@@ -1,5 +1,5 @@
1−module IndicatorsClient.Network
2−plugin IndicatorsClientNetworkQml
1+module Unity.Indicators.Network
2+plugin IndicatorsNetworkQml
33
44NetworkPage 0.1 NetworkPage.qml
55AccessPoint 0.1 AccessPoint.qml
modules/IndicatorsClient/qml/qmldir → modules/Unity/Indicators/qml/qmldirrenamed+2−2
@@ -1,5 +1,5 @@
1−module IndicatorsClient
2−plugin IndicatorsClientQml
1+module Unity.Indicators
2+plugin IndicatorsQml
33
44IndicatorItem 0.1 IndicatorItem.qml
55IndicatorIcon 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 @@
11<RCC>
2− <qresource prefix="/indicatorsclient">
2+ <qresource prefix="/indicators">
33 <file>artwork/messaging/default_contact.png</file>
44 <file>artwork/messaging/default_app.svg</file>
55 <file>artwork/messaging/message_sms01_54px.png</file>
run+1−1
@@ -1,7 +1,7 @@
11#!/bin/sh
22
33QML_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
55GDB=false
66FAKE=false
77PINLOCK=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 @@
11include_directories(
22 ${CMAKE_CURRENT_BINARY_DIR}
3− ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient
4− ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/IndicatorsClient/indicators/common
3+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../modules/Unity/Indicators
54 )
65
76macro(run_tests)
@@ -16,7 +15,7 @@ macro(run_tests)
1615 )
1716 qt5_use_modules(${_test}Exec Test Core Qml)
1817 target_link_libraries(${_test}Exec
19− IndicatorsClientQml
18+ IndicatorsQml
2019 )
2120 set(_test_list "${_test_list};${_test}")
2221 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
1919import Unity.Test 0.1 as UT
2020import ".."
2121import "../../../Panel"
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
2323
2424/*
2525 This tests the IndicatorRow component by using a fake model to stage data in the indicators
@@ -51,7 +51,7 @@ Item {
5151 indicatorsModel: indicatorModel
5252 }
5353
54− IndicatorsClient.IndicatorsModel {
54+ Indicators.IndicatorsModel {
5555 id: indicatorModel
5656 Component.onCompleted: load()
5757 }
tests/qmltests/Panel/tst_MenuContent.qml+2−2
@@ -19,7 +19,7 @@ import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
2121import "../../../Panel"
22−import IndicatorsClient 0.1 as IndicatorsClient
22+import Unity.Indicators 0.1 as Indicators
2323
2424Item {
2525 id: shell
@@ -39,7 +39,7 @@ Item {
3939 Item { id: handle }
4040
4141
42− IndicatorsClient.IndicatorsModel {
42+ Indicators.IndicatorsModel {
4343 id: indicatorsModel
4444 Component.onCompleted: load()
4545 }
tests/qmltests/Panel/tst_Overview.qml+1−1
@@ -20,7 +20,7 @@ import ".."
2020import "../../../Panel/Menus"
2121import "../../../Components"
2222import Unity.Test 0.1 as UT
23−import IndicatorsClient 0.1
23+import Unity.Indicators 0.1 as Indicators
2424
2525Rectangle {
2626 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)
22
33find_package(Qt5Core REQUIRED)
44find_package(Qt5Quick REQUIRED)
@@ -10,40 +10,40 @@ include_directories(
1010 ${Qt5Quick_INCLUDE_DIRS}
1111)
1212
13−set(IndicatorsClientFakeQml_SOURCES
13+set(IndicatorsFakeQml_SOURCES
1414 plugin.cpp
1515)
1616
17−set(IndicatorsClientFakeQml_RESOURCES
18− indicatorsclient_fake.qrc
17+set(IndicatorsFakeQml_RESOURCES
18+ indicators_fake.qrc
1919)
2020
21−qt5_add_resources(IndicatorsClientFakeQml_RESOURCES_RCC
22− ${IndicatorsClientFakeQml_RESOURCES}
21+qt5_add_resources(IndicatorsFakeQml_RESOURCES_RCC
22+ ${IndicatorsFakeQml_RESOURCES}
2323)
2424
25−add_library(IndicatorsClientFakeQml SHARED
26− ${IndicatorsClientFakeQml_RESOURCES_RCC}
27− ${IndicatorsClientFakeQml_SOURCES}
25+add_library(IndicatorsFakeQml SHARED
26+ ${IndicatorsFakeQml_RESOURCES_RCC}
27+ ${IndicatorsFakeQml_SOURCES}
2828)
2929# Because this is an internal support library, we want
3030# to expose all symbols in it. Consider changing this
3131# either to a static library or just using the
3232# files directly in targets.
33−set_target_properties(IndicatorsClientFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
33+set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
3434
35−target_link_libraries(IndicatorsClientFakeQml
35+target_link_libraries(IndicatorsFakeQml
3636 ${Qt5Core_LIBRARIES}
3737 ${Qt5Quick_LIBRARIES}
3838 ${GOBJECT_LDFLAGS}
3939 ${QMENUMODEL_LDFLAGS}
4040)
4141
42−qt5_use_modules(IndicatorsClientFakeQml Qml)
42+qt5_use_modules(IndicatorsFakeQml Qml)
4343
4444
4545
46−file(GLOB IndicatorsClientFake_QMLFILES
46+file(GLOB IndicatorsFake_QMLFILES
4747 *.qml
4848 qml/FakeMenuPage.qml
4949)
@@ -54,6 +54,6 @@ file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
5454)
5555
5656# copy qmldir file into build directory for shadow builds
57−file(COPY ${IndicatorsClientFake_QMLFILES}
57+file(COPY ${IndicatorsFake_QMLFILES}
5858 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
5959)
tests/qmltests/modules/IndicatorsClient/IndicatorsModel.qml → tests/qmltests/modules/Unity/Indicators/IndicatorsModel.qmlrenamed+10−10
@@ -27,8 +27,8 @@ ListModel {
2727 priority: 0
2828 title: "Menu1";
2929 description: "";
30− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon1.qml";
31− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page1.qml";
30+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon1.qml";
31+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page1.qml";
3232 indicatorProperties: "";
3333 isValid: "";
3434 }
@@ -37,8 +37,8 @@ ListModel {
3737 priority: 1
3838 title: "Menu2";
3939 description: "";
40− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon2.qml";
41− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page2.qml";
40+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon2.qml";
41+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page2.qml";
4242 indicatorProperties: "";
4343 isValid: "";
4444 }
@@ -47,8 +47,8 @@ ListModel {
4747 priority: 2
4848 title: "Menu3";
4949 description: "";
50− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon3.qml";
51− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page3.qml";
50+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon3.qml";
51+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page3.qml";
5252 indicatorProperties: "";
5353 isValid: "";
5454 }
@@ -57,8 +57,8 @@ ListModel {
5757 priority: 3
5858 title: "Menu4";
5959 description: "";
60− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon4.qml";
61− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page4.qml";
60+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon4.qml";
61+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page4.qml";
6262 indicatorProperties: "";
6363 isValid: "";
6464 }
@@ -67,8 +67,8 @@ ListModel {
6767 priority: 4
6868 title: "Menu5";
6969 description: "";
70− iconQml: "qrc:/tests/indciatorsclient/qml/fake_menu_icon5.qml";
71− pageQml: "qrc:/tests/indciatorsclient/qml/fake_menu_page5.qml";
70+ iconQml: "qrc:/tests/indciators/qml/fake_menu_icon5.qml";
71+ pageQml: "qrc:/tests/indciators/qml/fake_menu_page5.qml";
7272 indicatorProperties: "";
7373 isValid: "";
7474 }
tests/qmltests/modules/IndicatorsClient/indicatorsclient_fake.qrc → tests/qmltests/modules/Unity/Indicators/indicators_fake.qrcrenamed+1−1
@@ -1,5 +1,5 @@
11<RCC>
2− <qresource prefix="/tests/indciatorsclient">
2+ <qresource prefix="/tests/indciators">
33 <file>qml/fake_menu_icon1.qml</file>
44 <file>qml/fake_menu_icon2.qml</file>
55 <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 @@
2424
2525// local
2626
27−void IndicatorsClientPlugin::registerTypes(const char *)
27+void IndicatorsFakePlugin::registerTypes(const char *)
2828{
29− Q_INIT_RESOURCE(indicatorsclient_fake);
29+ Q_INIT_RESOURCE(indicators_fake);
3030}
modules/IndicatorsClient/plugin.h → tests/qmltests/modules/Unity/Indicators/plugin.hrenamed+4−4
@@ -16,12 +16,12 @@
1616 * Author: Nick Dedekind <nick.dedekind@canonical.com>
1717 */
1818
19−#ifndef INDICATORSCLIENT_PLUGIN_H
20−#define INDICATORSCLIENT_PLUGIN_H
19+#ifndef INDICATORS_FAKE_PLUGIN_H
20+#define INDICATORS_FAKE_PLUGIN_H
2121
2222#include <QtQml/QQmlExtensionPlugin>
2323
24−class IndicatorsClientPlugin : public QQmlExtensionPlugin
24+class IndicatorsFakePlugin : public QQmlExtensionPlugin
2525{
2626 Q_OBJECT
2727 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -29,4 +29,4 @@ public:
2929 void registerTypes(const char *uri);
3030};
3131
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 @@
1515 */
1616
1717import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Indicators 0.1 as Indicators
1919
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
2121 id: menu_plugin1
2222 objectName: "menu_page1"
2323
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 @@
1515 */
1616
1717import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
1919
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
2121 id: menu_plugin2
2222 objectName: "menu_page2"
2323
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 @@
1515 */
1616
1717import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
1919
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
2121 id: menu_plugin3
2222 objectName: "menu_page3"
2323
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 @@
1515 */
1616
1717import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
1919
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
2121 id: menu_plugin4
2222 objectName: "menu_page4"
2323
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 @@
1515 */
1616
1717import QtQuick 2.0
18−import IndicatorsClient 0.1 as IndicatorsClient
18+import Unity.Indicators 0.1 as Indicators
1919
20−IndicatorsClient.FakeMenuPage {
20+Indicators.FakeMenuPage {
2121 id: menu_plugin5
2222 objectName: "menu_page5"
2323
tests/qmltests/modules/IndicatorsClient/qmldir → tests/qmltests/modules/Unity/Indicators/qmldirrenamed+2−2
@@ -1,5 +1,5 @@
1−module IndicatorsClient
2−plugin IndicatorsClientFakeQml
1+module Unity.Indicators
2+plugin IndicatorsFakeQml
33
44IndicatorsModel 0.1 IndicatorsModel.qml
55FakeMenuPage 0.1 FakeMenuPage.qml