git.iko.soy/unity8
on xenial help sign in
Merged with trunk
8265a51Mirco Müller
Applications/applications.js+2−2
compare with xenial
unifiedsplit
@@ -70,10 +70,10 @@ var __availableApplications = {
70 'exec': '/usr/bin/qmlscene /usr/share/notes-app/NotesApp.qml',
70 'exec': '/usr/bin/qmlscene /usr/share/notes-app/NotesApp.qml',
71 'stage': SideStage
71 'stage': SideStage
72 },
72 },
73− '/usr/share/applications/ubuntu-calendar-app.desktop': {
73+ '/usr/share/applications/calendar-app.desktop': {
74 'name': i18n.tr("Calendar"),
74 'name': i18n.tr("Calendar"),
75 'icon': 'calendar',
75 'icon': 'calendar',
76− 'exec': '/usr/bin/qmlscene /usr/share/ubuntu-calendar-app/calendar.qml',
76+ 'exec': '/usr/bin/qmlscene /usr/share/calendar-app/calendar.qml',
77 'stage': SideStage
77 'stage': SideStage
78 },
78 },
79 '/usr/share/applications/mediaplayer-app.desktop': {
79 '/usr/share/applications/mediaplayer-app.desktop': {
Components/ApplicationScreenshot.qml+1−1
@@ -46,7 +46,7 @@ Item {
46 Rectangle {
46 Rectangle {
47 id: background
47 id: background
48 anchors.fill: parent
48 anchors.fill: parent
49− color: "white"
49+ color: "white" // FIXME should use normal background color of Suru theme
50 visible: applicationScreenshot.withBackground
50 visible: applicationScreenshot.withBackground
51 }
51 }
52
52
Components/FilterGrid.qml+2−2
@@ -99,7 +99,7 @@ Item {
99
99
100 UbuntuShape {
100 UbuntuShape {
101 anchors.fill: parent
101 anchors.fill: parent
102− color: "#33ffffff"
102+ color: "#33ffffff" // FIXME no palette
103 radius: "small"
103 radius: "small"
104 }
104 }
105
105
@@ -123,7 +123,7 @@ Item {
123 }
123 }
124 text: (filter) ? "+ View all (" + model.count + ")" : "- Show fewer"
124 text: (filter) ? "+ View all (" + model.count + ")" : "- Show fewer"
125 fontSize: "small"
125 fontSize: "small"
126− color: "#f3f3e7"
126+ color: Theme.palette.selected.backgroundText
127 opacity: 0.6
127 opacity: 0.6
128 style: Text.Raised
128 style: Text.Raised
129 styleColor: "black"
129 styleColor: "black"
Components/ListItems/Header.qml+1−1
@@ -45,7 +45,7 @@ Item {
45 verticalCenter: parent.verticalCenter
45 verticalCenter: parent.verticalCenter
46 }
46 }
47
47
48− color: "#f3f3e7" //at 60%
48+ color: Theme.palette.selected.backgroundText //at 60%
49 opacity: 0.6
49 opacity: 0.6
50 font.family: "Ubuntu"
50 font.family: "Ubuntu"
51 fontSize: "medium"
51 fontSize: "medium"
Components/PageHeader.qml+1−1
@@ -90,7 +90,7 @@ Item {
90 verticalCenter: parent.verticalCenter
90 verticalCenter: parent.verticalCenter
91 }
91 }
92
92
93− color: "#f3f3e7"
93+ color: Theme.palette.selected.backgroundText
94 opacity: 0.8
94 opacity: 0.8
95 font.family: "Ubuntu"
95 font.family: "Ubuntu"
96 font.weight: Font.Light
96 font.weight: Font.Light
Components/Tile.qml+1−1
@@ -75,7 +75,7 @@ AbstractButton {
75 rightMargin: units.gu(1)
75 rightMargin: units.gu(1)
76 }
76 }
77
77
78− color: "#f3f3e7"
78+ color: Theme.palette.selected.backgroundText
79 opacity: 0.9
79 opacity: 0.9
80 style: Text.Raised
80 style: Text.Raised
81 styleColor: "black"
81 styleColor: "black"
Dash/Apps/RunningApplicationTile.qml+1−1
@@ -113,7 +113,7 @@ AbstractButton {
113 }
113 }
114 text: (application) ? application.name : ""
114 text: (application) ? application.name : ""
115
115
116− color: "#f3f3e7"
116+ color: Theme.palette.selected.backgroundText
117 opacity: 0.9
117 opacity: 0.9
118 style: Text.Raised
118 style: Text.Raised
119 styleColor: "black"
119 styleColor: "black"
Dash/DashBar.qml+1−1
@@ -117,7 +117,7 @@ Item {
117
117
118 Rectangle {
118 Rectangle {
119 id: highlightLine
119 id: highlightLine
120− color: "#dd4814"
120+ color: Theme.palette.selected.foreground
121 height: parent.height
121 height: parent.height
122 anchors.bottom: parent.bottom
122 anchors.bottom: parent.bottom
123 z: 1
123 z: 1
Dash/DashPreview.qml+1−1
@@ -92,7 +92,7 @@ Rectangle {
92 elide: Text.ElideRight
92 elide: Text.ElideRight
93 fontSize: "x-large"
93 fontSize: "x-large"
94 font.weight: Font.Light
94 font.weight: Font.Light
95− color: "#f3f3e7"
95+ color: Theme.palette.selected.backgroundText
96 opacity: 0.9
96 opacity: 0.9
97 text: root.title
97 text: root.title
98 style: Text.Raised
98 style: Text.Raised
Dash/Music/AlbumTile.qml+2−2
@@ -69,7 +69,7 @@ AbstractButton {
69 rightMargin: units.gu(1)
69 rightMargin: units.gu(1)
70 }
70 }
71
71
72− color: "#f3f3e7"
72+ color: Theme.palette.selected.backgroundText
73 opacity: 0.9
73 opacity: 0.9
74 style: Text.Raised
74 style: Text.Raised
75 styleColor: "black"
75 styleColor: "black"
@@ -97,7 +97,7 @@ AbstractButton {
97 rightMargin: units.gu(1)
97 rightMargin: units.gu(1)
98 }
98 }
99
99
100− color: "#f3f3e7"
100+ color: Theme.palette.selected.backgroundText
101 opacity: 0.9
101 opacity: 0.9
102 style: Text.Raised
102 style: Text.Raised
103 styleColor: "black"
103 styleColor: "black"
Dash/Video/VideoPreview.qml+3−3
@@ -48,7 +48,7 @@ DashPreview {
48 property int buttonWidth: Math.min(units.gu(22), (width - spacing) / 2)
48 property int buttonWidth: Math.min(units.gu(22), (width - spacing) / 2)
49 Button {
49 Button {
50 width: parent.buttonWidth
50 width: parent.buttonWidth
51− color: "#dd4814"
51+ color: Theme.palette.selected.foreground
52 text: nfo.ready && nfo.video.buyPrice != "" ? "Buy for " + nfo.video.buyPrice : ""
52 text: nfo.ready && nfo.video.buyPrice != "" ? "Buy for " + nfo.video.buyPrice : ""
53 visible: text != ""
53 visible: text != ""
54 iconSource: "graphics/icon_button_amazon.png"
54 iconSource: "graphics/icon_button_amazon.png"
@@ -56,7 +56,7 @@ DashPreview {
56 }
56 }
57 Button {
57 Button {
58 width: parent.buttonWidth
58 width: parent.buttonWidth
59− color: "#dd4814"
59+ color: Theme.palette.selected.foreground
60 text: nfo.ready && nfo.video.buyPrice != "" ? "Rent for " + nfo.video.rentPrice : ""
60 text: nfo.ready && nfo.video.buyPrice != "" ? "Rent for " + nfo.video.rentPrice : ""
61 visible: text != ""
61 visible: text != ""
62 iconSource: "graphics/icon_button_u1.png"
62 iconSource: "graphics/icon_button_u1.png"
@@ -73,7 +73,7 @@ DashPreview {
73
73
74 Label {
74 Label {
75 text: nfo.ready ? nfo.video.plot : ""
75 text: nfo.ready ? nfo.video.plot : ""
76− color: "#f3f3e7"
76+ color: Theme.palette.selected.backgroundText
77 opacity: .6
77 opacity: .6
78 fontSize: "medium"
78 fontSize: "medium"
79 width: parent.width
79 width: parent.width
Notifications/Notification.qml+2−2
@@ -118,7 +118,7 @@ UbuntuShape {
118 }
118 }
119 fontSize: "medium"
119 fontSize: "medium"
120 font.bold: true
120 font.bold: true
121− color: "#f3f3e7"
121+ color: Theme.palette.selected.backgroundText
122 elide: Text.ElideRight
122 elide: Text.ElideRight
123 }
123 }
124
124
@@ -132,7 +132,7 @@ UbuntuShape {
132 }
132 }
133 visible: body != ""
133 visible: body != ""
134 fontSize: "small"
134 fontSize: "small"
135− color: "#f3f3e7"
135+ color: Theme.palette.selected.backgroundText
136 opacity: 0.6
136 opacity: 0.6
137 wrapMode: Text.WordWrap
137 wrapMode: Text.WordWrap
138 maximumLineCount: 10
138 maximumLineCount: 10
Panel/IndicatorItem.qml+1−1
@@ -47,7 +47,7 @@ Item {
47 }
47 }
48
48
49 Rectangle {
49 Rectangle {
50− color: "#dd4814"
50+ color: Theme.palette.selected.foreground
51 objectName: "highlight"
51 objectName: "highlight"
52 height: units.dp(2)
52 height: units.dp(2)
53 width: parent.width
53 width: parent.width
Panel/Indicators/DatetimeIndicatorPage.qml+2−2
@@ -54,7 +54,7 @@ Flickable {
54 }
54 }
55
55
56 text: ""
56 text: ""
57− color: "#f3f3e7"
57+ color: Theme.palette.selected.backgroundText
58 font.weight: Font.Light
58 font.weight: Font.Light
59 font.pixelSize: units.gu(6)
59 font.pixelSize: units.gu(6)
60 }
60 }
@@ -69,7 +69,7 @@ Flickable {
69 bottomMargin: units.gu(1.5)
69 bottomMargin: units.gu(1.5)
70 }
70 }
71 text: ""
71 text: ""
72− color: "#f3f3e7"
72+ color: Theme.palette.selected.backgroundText
73 fontSize: "small"
73 fontSize: "small"
74 }
74 }
75 }
75 }
Panel/Indicators/DatetimeIndicatorWidget.qml+1−1
@@ -31,7 +31,7 @@ Indicators.IndicatorWidget {
31 Label {
31 Label {
32 id: timeLabel
32 id: timeLabel
33 objectName: "timeLabel"
33 objectName: "timeLabel"
34− color: "#f3f3e7"
34+ color: Theme.palette.selected.backgroundText
35 opacity: 0.8
35 opacity: 0.8
36 font.family: "Ubuntu"
36 font.family: "Ubuntu"
37 fontSize: "medium"
37 fontSize: "medium"
Panel/Indicators/DefaultIndicatorWidget.qml+1−1
@@ -52,7 +52,7 @@ Indicators.IndicatorWidget {
52 Label {
52 Label {
53 id: itemLabel
53 id: itemLabel
54 objectName: "itemLabel"
54 objectName: "itemLabel"
55− color: "#f3f3e7"
55+ color: Theme.palette.selected.backgroundText
56 opacity: 0.8
56 opacity: 0.8
57 font.family: "Ubuntu"
57 font.family: "Ubuntu"
58 fontSize: "medium"
58 fontSize: "medium"
Panel/MenuContent.qml+1−1
@@ -29,7 +29,7 @@ Rectangle {
29 property bool __shown: false
29 property bool __shown: false
30 property bool __contentActive: false
30 property bool __contentActive: false
31 property alias currentIndex : menus.currentIndex
31 property alias currentIndex : menus.currentIndex
32− property color backgroundColor: "#221e1c"
32+ property color backgroundColor: "#221e1c" // FIXME not in palette yet
33 property int contentReleaseInterval: 20000
33 property int contentReleaseInterval: 20000
34
34
35 width: units.gu(40)
35 width: units.gu(40)
Panel/Menus/Overview/FlightModeWidget.qml+1−1
@@ -40,7 +40,7 @@ Item {
40 verticalCenter: parent.verticalCenter
40 verticalCenter: parent.verticalCenter
41 }
41 }
42 text: i18n.tr("Flight mode")
42 text: i18n.tr("Flight mode")
43− color: "#f3f3e7"
43+ color: Theme.palette.selected.backgroundText
44 style: Text.Raised
44 style: Text.Raised
45 styleColor: "black"
45 styleColor: "black"
46 opacity: 0.6;
46 opacity: 0.6;
Panel/Menus/Overview/OverviewGrid.qml+2−2
@@ -29,7 +29,7 @@ Item {
29 UbuntuShape {
29 UbuntuShape {
30 id: gridBackground
30 id: gridBackground
31 anchors.fill: grid
31 anchors.fill: grid
32− color: "#282421"
32+ color: "#282421" // FIXME missing palette
33 radius: "medium"
33 radius: "medium"
34 }
34 }
35
35
@@ -80,7 +80,7 @@ Item {
80
80
81 Label {
81 Label {
82 text: title
82 text: title
83− color: "#f3f3e7"
83+ color: Theme.palette.selected.backgroundText
84 fontSize: "small"
84 fontSize: "small"
85 anchors {
85 anchors {
86 left: parent.left
86 left: parent.left
Shell.qml+2
@@ -62,6 +62,8 @@ FocusScope {
62 property var applicationManager: ApplicationManagerWrapper {}
62 property var applicationManager: ApplicationManagerWrapper {}
63
63
64 Component.onCompleted: {
64 Component.onCompleted: {
65+ Theme.name = "Ubuntu.Components.Themes.SuruGradient"
66+
65 applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })
67 applicationManager.sideStageEnabled = Qt.binding(function() { return sideStage.enabled })
66
68
67 // FIXME: if application focused before shell starts, shell draws on top of it only.
69 // FIXME: if application focused before shell starts, shell draws on top of it only.
debian/changelog+19
@@ -1,3 +1,22 @@
1+unity8 (7.81.3+13.10.20130718ubuntu.unity.next-0ubuntu1) saucy; urgency=low
2+
3+ [ Andrea Cimitan ]
4+ * Add support for the colour palette.
5+
6+ [ Omer Akram ]
7+ * fix the calendar icon in the launcher. (LP: #1201905)
8+
9+ [ Nick Dedekind ]
10+ * Export indicator plugin symbols using Q_DECL_EXPORT.
11+
12+ [ Ying-Chun Liu ]
13+ * Don't include .moc in previewbindingstest.cpp.
14+
15+ [ Ubuntu daily release ]
16+ * Automatic snapshot from revision 118 (ubuntu-unity/next)
17+
18+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 18 Jul 2013 06:07:00 +0000
19+
1unity8 (7.81.3+13.10.20130717ubuntu.unity.next-0ubuntu1) saucy; urgency=low
20unity8 (7.81.3+13.10.20130717ubuntu.unity.next-0ubuntu1) saucy; urgency=low
2
21
3 [ Daniel d'Andrada ]
22 [ Daniel d'Andrada ]
plugins/Unity/Indicators/CMakeLists.txt+1−5
@@ -25,6 +25,7 @@ set(IndicatorsQML_SOURCES
25 indicatorsmodel.cpp
25 indicatorsmodel.cpp
26 plugin.cpp
26 plugin.cpp
27)
27)
28+add_definitions(-DUNITYINDICATORS_LIBRARY)
28
29
29set(IndicatorsQML_RESOURCES
30set(IndicatorsQML_RESOURCES
30 resources/indicators.qrc
31 resources/indicators.qrc
@@ -38,11 +39,6 @@ add_library(IndicatorsQml SHARED
38 ${IndicatorsQML_RESOURCES_RCC}
39 ${IndicatorsQML_RESOURCES_RCC}
39 ${IndicatorsQML_SOURCES}
40 ${IndicatorsQML_SOURCES}
40)
41)
41−# Because this is an internal support library, we want
42−# to expose all symbols in it. Consider changing this
43−# either to a static library or just using the
44−# files directly in targets.
45−set_target_properties(IndicatorsQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
46
42
47target_link_libraries(IndicatorsQml
43target_link_libraries(IndicatorsQml
48 ${QMENUMODEL_LDFLAGS}
44 ${QMENUMODEL_LDFLAGS}
plugins/Unity/Indicators/flatmenuproxymodel.h+3−1
@@ -20,12 +20,14 @@
20#ifndef FLATMENUPROXYMODEL_H
20#ifndef FLATMENUPROXYMODEL_H
21#define FLATMENUPROXYMODEL_H
21#define FLATMENUPROXYMODEL_H
22
22
23+#include "unityindicatorsglobal.h"
24+
23#include <QAbstractProxyModel>
25#include <QAbstractProxyModel>
24#include <qdbusmenumodel.h>
26#include <qdbusmenumodel.h>
25
27
26class SectionInfo;
28class SectionInfo;
27
29
28−class FlatMenuProxyModel : public QAbstractProxyModel
30+class UNITYINDICATORS_EXPORT FlatMenuProxyModel : public QAbstractProxyModel
29{
31{
30 Q_OBJECT
32 Q_OBJECT
31 Q_PROPERTY(int count READ count NOTIFY countChanged)
33 Q_PROPERTY(int count READ count NOTIFY countChanged)
plugins/Unity/Indicators/indicator.h+3−1
@@ -21,10 +21,12 @@
21#ifndef INDICATOR_H
21#ifndef INDICATOR_H
22#define INDICATOR_H
22#define INDICATOR_H
23
23
24+#include "unityindicatorsglobal.h"
25+
24#include <QObject>
26#include <QObject>
25#include <QSettings>
27#include <QSettings>
26
28
27−class Indicator : public QObject
29+class UNITYINDICATORS_EXPORT Indicator : public QObject
28{
30{
29 Q_OBJECT
31 Q_OBJECT
30 Q_PROPERTY(QString identifier READ identifier NOTIFY identifierChanged)
32 Q_PROPERTY(QString identifier READ identifier NOTIFY identifierChanged)
plugins/Unity/Indicators/indicators.h+7−5
@@ -19,9 +19,11 @@
19#ifndef INDICATORS_H
19#ifndef INDICATORS_H
20#define INDICATORS_H
20#define INDICATORS_H
21
21
22+#include "unityindicatorsglobal.h"
23+
22#include <QObject>
24#include <QObject>
23
25
24−class ActionState : public QObject
26+class UNITYINDICATORS_EXPORT ActionState : public QObject
25{
27{
26 Q_OBJECT
28 Q_OBJECT
27public:
29public:
@@ -36,7 +38,7 @@ public:
36 ActionState(QObject*parent=0):QObject(parent) {}
38 ActionState(QObject*parent=0):QObject(parent) {}
37};
39};
38
40
39−class NetworkActionState : public QObject
41+class UNITYINDICATORS_EXPORT NetworkActionState : public QObject
40{
42{
41 Q_OBJECT
43 Q_OBJECT
42public:
44public:
@@ -49,7 +51,7 @@ public:
49 NetworkActionState(QObject*parent=0):QObject(parent) {}
51 NetworkActionState(QObject*parent=0):QObject(parent) {}
50};
52};
51
53
52−class NetworkConnection : public QObject
54+class UNITYINDICATORS_EXPORT NetworkConnection : public QObject
53{
55{
54 Q_OBJECT
56 Q_OBJECT
55public:
57public:
@@ -64,7 +66,7 @@ public:
64 NetworkConnection(QObject*parent=0):QObject(parent) {}
66 NetworkConnection(QObject*parent=0):QObject(parent) {}
65};
67};
66
68
67−class IndicatorsModelRole : public QObject
69+class UNITYINDICATORS_EXPORT IndicatorsModelRole : public QObject
68{
70{
69 Q_OBJECT
71 Q_OBJECT
70public:
72public:
@@ -83,7 +85,7 @@ public:
83 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
85 IndicatorsModelRole(QObject*parent=0):QObject(parent) {}
84};
86};
85
87
86−class FlatMenuProxyModelRole : public QObject
88+class UNITYINDICATORS_EXPORT FlatMenuProxyModelRole : public QObject
87{
89{
88 Q_OBJECT
90 Q_OBJECT
89public:
91public:
plugins/Unity/Indicators/indicatorsmanager.h+4−3
@@ -19,15 +19,16 @@
19#ifndef INDICATORS_MANAGER_H
19#ifndef INDICATORS_MANAGER_H
20#define INDICATORS_MANAGER_H
20#define INDICATORS_MANAGER_H
21
21
22+#include "indicator.h"
23+#include "unityindicatorsglobal.h"
24+
22#include <QObject>
25#include <QObject>
23#include <QFileSystemWatcher>
26#include <QFileSystemWatcher>
24#include <QDir>
27#include <QDir>
25#include <QHash>
28#include <QHash>
26#include <QSharedPointer>
29#include <QSharedPointer>
27
30
28−#include "indicator.h"
29−
30−class IndicatorsManager : public QObject
31+class UNITYINDICATORS_EXPORT IndicatorsManager : public QObject
31{
32{
32 Q_OBJECT
33 Q_OBJECT
33 Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)
34 Q_PROPERTY(bool loaded READ isLoaded NOTIFY loadedChanged)
plugins/Unity/Indicators/indicatorsmodel.h+2−1
@@ -22,13 +22,14 @@
22#define INDICATORSMODEL_H
22#define INDICATORSMODEL_H
23
23
24#include "indicator.h"
24#include "indicator.h"
25+#include "unityindicatorsglobal.h"
25
26
26#include <QAbstractListModel>
27#include <QAbstractListModel>
27#include <QQmlEngine>
28#include <QQmlEngine>
28
29
29class IndicatorsManager;
30class IndicatorsManager;
30
31
31−class IndicatorsModel : public QAbstractListModel
32+class UNITYINDICATORS_EXPORT IndicatorsModel : public QAbstractListModel
32{
33{
33 Q_OBJECT
34 Q_OBJECT
34 Q_ENUMS(Roles)
35 Q_ENUMS(Roles)
plugins/Unity/Indicators/unityindicatorsglobal.hnew file+23
@@ -0,0 +1,23 @@
1+/*
2+ * Copyright (C) 2013 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+
17+#include <QtCore/QtGlobal>
18+
19+#if defined(UNITYINDICATORS_LIBRARY)
20+# define UNITYINDICATORS_EXPORT Q_DECL_EXPORT
21+#else
22+# define UNITYINDICATORS_EXPORT Q_DECL_IMPORT
23+#endif
plugins/Unity/Launcher/backend/launcherbackend.cpp+3−3
@@ -37,7 +37,7 @@ LauncherBackend::LauncherBackend(QObject *parent):
37 QLatin1String("gmail-webapp.desktop") <<
37 QLatin1String("gmail-webapp.desktop") <<
38 QLatin1String("ubuntu-weather-app.desktop") <<
38 QLatin1String("ubuntu-weather-app.desktop") <<
39 QLatin1String("notes-app.desktop") <<
39 QLatin1String("notes-app.desktop") <<
40− QLatin1String("ubuntu-calendar-app.desktop");
40+ QLatin1String("calendar-app.desktop");
41
41
42 // TODO: get stuff from desktop files instead this hardcoded map
42 // TODO: get stuff from desktop files instead this hardcoded map
43 m_displayNameMap.insert("phone-app.desktop", "Phone");
43 m_displayNameMap.insert("phone-app.desktop", "Phone");
@@ -49,7 +49,7 @@ LauncherBackend::LauncherBackend(QObject *parent):
49 m_displayNameMap.insert("gmail-webapp.desktop", "GMail");
49 m_displayNameMap.insert("gmail-webapp.desktop", "GMail");
50 m_displayNameMap.insert("ubuntu-weather-app.desktop", "Weather");
50 m_displayNameMap.insert("ubuntu-weather-app.desktop", "Weather");
51 m_displayNameMap.insert("notes-app.desktop", "Notes");
51 m_displayNameMap.insert("notes-app.desktop", "Notes");
52− m_displayNameMap.insert("ubuntu-calendar-app.desktop", "Calendar");
52+ m_displayNameMap.insert("calendar-app.desktop", "Calendar");
53
53
54 // TODO: get stuff from desktop files instead this hardcoded map
54 // TODO: get stuff from desktop files instead this hardcoded map
55 m_iconMap.insert("phone-app.desktop", "phone-app");
55 m_iconMap.insert("phone-app.desktop", "phone-app");
@@ -61,7 +61,7 @@ LauncherBackend::LauncherBackend(QObject *parent):
61 m_iconMap.insert("gmail-webapp.desktop", "gmail");
61 m_iconMap.insert("gmail-webapp.desktop", "gmail");
62 m_iconMap.insert("ubuntu-weather-app.desktop", "weather");
62 m_iconMap.insert("ubuntu-weather-app.desktop", "weather");
63 m_iconMap.insert("notes-app.desktop", "notepad");
63 m_iconMap.insert("notes-app.desktop", "notepad");
64− m_iconMap.insert("ubuntu-calendar-app.desktop", "calendar");
64+ m_iconMap.insert("calendar-app.desktop", "calendar");
65
65
66}
66}
67
67
tests/mocks/Ubuntu/Application/ApplicationManager.cpp+2−2
@@ -321,10 +321,10 @@ void ApplicationManager::buildListOfAvailableApplications()
321 m_availableApplications.append(application);
321 m_availableApplications.append(application);
322
322
323 application = new ApplicationInfo(this);
323 application = new ApplicationInfo(this);
324− application->setDesktopFile("/usr/share/applications/ubuntu-calendar-app.desktop");
324+ application->setDesktopFile("/usr/share/applications/calendar-app.desktop");
325 application->setName("Calendar");
325 application->setName("Calendar");
326 application->setIcon("calendar");
326 application->setIcon("calendar");
327− application->setExec("/usr/bin/qmlscene /usr/share/ubuntu-calendar-app/calendar.qml");
327+ application->setExec("/usr/bin/qmlscene /usr/share/calendar-app/calendar.qml");
328 application->setStage(ApplicationInfo::SideStage);
328 application->setStage(ApplicationInfo::SideStage);
329 application->setHandle(nextHandle++);
329 application->setHandle(nextHandle++);
330 m_availableApplications.append(application);
330 m_availableApplications.append(application);
tests/mocks/Unity/Indicators/CMakeLists.txt+1−5
@@ -26,11 +26,7 @@ add_library(IndicatorsFakeQml SHARED
26 ${IndicatorsFakeQml_RESOURCES_RCC}
26 ${IndicatorsFakeQml_RESOURCES_RCC}
27 ${IndicatorsFakeQml_SOURCES}
27 ${IndicatorsFakeQml_SOURCES}
28)
28)
29−# Because this is an internal support library, we want
29+add_definitions(-DUNITYINDICATORS_LIBRARY)
30−# to expose all symbols in it. Consider changing this
31−# either to a static library or just using the
32−# files directly in targets.
33−set_target_properties(IndicatorsFakeQml PROPERTIES COMPILE_FLAGS -fvisibility=default)
34
30
35target_link_libraries(IndicatorsFakeQml)
31target_link_libraries(IndicatorsFakeQml)
36
32
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+1−1
@@ -40,7 +40,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa
40 m_list.append(item);
40 m_list.append(item);
41 item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
41 item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad");
42 m_list.append(item);
42 m_list.append(item);
43− item = new MockLauncherItem("ubuntu-calendar-app", "/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar");
43+ item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar");
44 m_list.append(item);
44 m_list.append(item);
45}
45}
46
46
tests/plugins/Unity/previewbindingstest.cpp−2
@@ -165,5 +165,3 @@ void PreviewBindingsTest::testSocialPreview()
165}
165}
166
166
167QTEST_MAIN(PreviewBindingsTest)
167QTEST_MAIN(PreviewBindingsTest)
168−
169−#include "previewbindingstest.moc"