032654b · unity8 · git.iko.soy

Applications/Application.qml+1−1

compare with xenial

unifiedsplit

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import "applications.js" as ApplicationsModel

19−import Ubuntu.Application 0.1

19+import Unity.Application 0.1

20

21/* This class is temporary. It is meant to be API compatible with qthybris' Application

22 class.

Bottombar/Bottombar.qml+2−2

@@ -18,7 +18,7 @@ import QtQuick 2.0

18import "../Components"

19import "../Components/Math.js" as MathLocal

20import Unity 0.1

21−import Ubuntu.Application 0.1

21+import Unity.Application 0.1

22import Ubuntu.Gestures 0.1

23

24Item {

@@ -144,7 +144,7 @@ Item {

144

145 InputFilterArea {

146 anchors.fill: parent

147− blockInput: hudButton.visible

147+ blockInput: (hudButton.opacity == 1)

148 }

149

150 states: [

CMakeLists.txt+4

@@ -62,10 +62,13 @@ set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)

62

63configure_file(paths.h.in ${CMAKE_CURRENT_BINARY_DIR}/paths.h @ONLY)

64

65+pkg_check_modules(UNITY-MIR REQUIRED unity-mir)

66+

65include_directories(

67include_directories(

66 ${CMAKE_CURRENT_BINARY_DIR}

68 ${CMAKE_CURRENT_BINARY_DIR}

67 ${CMAKE_CURRENT_SOURCE_DIR}

69 ${CMAKE_CURRENT_SOURCE_DIR}

68 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

70 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

71+ ${UNITY-MIR_INCLUDE_DIRS}

69 )

72 )

70

73

71set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

74set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")

@@ -118,6 +121,7 @@ target_link_libraries(${SHELL_APP}

118 ${Qt5Qml_LIBRARIES}

121 ${Qt5Qml_LIBRARIES}

119 ${Qt5Quick_LIBRARIES}

122 ${Qt5Quick_LIBRARIES}

120 ${XCB_LDFLAGS}

123 ${XCB_LDFLAGS}

124+ ${CMAKE_DL_LIBS}

121 )

125 )

122

126

123# install binaries

127# install binaries

Components/ApplicationManagerWrapper.qml+89−42

@@ -15,15 +15,15 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Application 0.1

18+import Unity.Application 0.1

19

20Item {

21 id: applicationManager

22

23− property var mainStageApplications: ApplicationManager.mainStageApplications

23+ property alias mainStageApplications: mainStageModel

24− property var sideStageApplications: ApplicationManager.sideStageApplications

24+ property alias sideStageApplications: sideStageModel

25− property var mainStageFocusedApplication: ApplicationManager.mainStageFocusedApplication

25+ property variant mainStageFocusedApplication: null

26− property var sideStageFocusedApplication: ApplicationManager.sideStageFocusedApplication

26+ property variant sideStageFocusedApplication: null

27 property bool sideStageEnabled: true

28 signal focusRequested(string desktopFile)

29 property bool keyboardVisible: ApplicationManager.keyboardVisible

@@ -31,32 +31,76 @@ Item {

31

32 property bool fake: ApplicationManager.fake ? ApplicationManager.fake : false

33

34− Component.onCompleted: {

34+ ApplicationsModelStageFiltered {

35− // Start the watcher so that the ApplicationManager applications model can be populated.

35+ id: mainStageModel

36− ApplicationManager.startWatcher();

36+ stage: ApplicationInfo.MainStage

37+ }

38+

39+ ApplicationsModelStageFiltered {

40+ id: sideStageModel

41+ stage: ApplicationInfo.SideStage

42+ }

43+

44+ Connections {

45+ target: ApplicationManager

46+ onFocusedApplicationIdChanged: {

47+ var app = ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)

48+ if (!app) { //nothing at all focused, so clear all

49+ mainStageFocusedApplication = null;

50+ sideStageFocusedApplication = null;

51+ } else {

52+ if (app.stage == ApplicationInfo.MainStage) {

53+ mainStageFocusedApplication = app;

54+ // possible the side stage app being unfocused fired this signal, so check for it

55+ if (sideStageFocusedApplication && !sideStageFocusedApplication.focused)

56+ sideStageFocusedApplication = null;

57+ } else {

58+ sideStageFocusedApplication = app;

59+ // possible the main stage app being unfocused fired this signal, so check for it

60+ if (mainStageFocusedApplication && !mainStageFocusedApplication.focused)

61+ mainStageFocusedApplication = null;

62+ }

63+ }

64+ }

37 }

65 }

38

66

39 function activateApplication(desktopFile, argument) {

67 function activateApplication(desktopFile, argument) {

40− var application;

68+ var appId;

41− application = getApplicationFromDesktopFile(desktopFile, ApplicationInfo.MainStage);

69+

42− if (application == null) {

70+ // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.

43− application = getApplicationFromDesktopFile(desktopFile, ApplicationInfo.SideStage);

71+ // TODO: convert entire shell to use appId only.

72+ if (desktopFile.indexOf(".desktop") >= 0) {

73+ appId = desktopFileToAppId(desktopFile);

74+ } else {

75+ appId = desktopFile;

44 }

76 }

77+

78+ var application = ApplicationManager.findApplication(appId);

45− if (application != null) {

79+ if (application !== null) {

46 return application;

80 return application;

47 }

81 }

48

82

49 var execFlags = sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;

83 var execFlags = sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;

50

84

51 if (argument) {

85 if (argument) {

52− return ApplicationManager.startProcess(desktopFile, execFlags, [argument]);

86+ return ApplicationManager.startApplication(appId, execFlags, [argument]);

53 } else {

87 } else {

54− return ApplicationManager.startProcess(desktopFile, execFlags);

88+ return ApplicationManager.startApplication(appId, execFlags);

55 }

89 }

56 }

90 }

57

91

58− function stopProcess(application) {

92+ function stopApplication(application) {

93+ var appId;

94+

95+ // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.

96+ // TODO: convert entire shell to use appId only.

97+ if (typeof application == "string") {

98+ appId = application;

99+ } else {

100+ appId = desktopFileToAppId(application.desktopFile);

101+ }

102+

59− ApplicationManager.stopProcess(application)

103+ ApplicationManager.stopApplication(appId);

60 }

104 }

61

105

62 function focusApplication(application) {

106 function focusApplication(application) {

@@ -64,51 +108,54 @@ Item {

64 return;

108 return;

65 }

109 }

66

110

67− ApplicationManager.focusApplication(application.handle);

111+ ApplicationManager.focusApplication(application.appId);

68 }

112 }

69

113

70 function unfocusCurrentApplication() {

114 function unfocusCurrentApplication() {

71− ApplicationManager.unfocusCurrentApplication(ApplicationInfo.MainStage);

115+ ApplicationManager.unfocusCurrentApplication();

72 }

116 }

73

117

74 function moveRunningApplicationStackPosition(from, to, stage) {

118 function moveRunningApplicationStackPosition(from, to, stage) {

75− var applications;

119+ if (from == to || from < 0 || to < 0) return;

120+

76 if (stage == ApplicationInfo.SideStage) {

121 if (stage == ApplicationInfo.SideStage) {

77− applications = ApplicationManager.sideStageApplications;

122+ sideStageModel.move(from, to);

78 } else {

123 } else {

79− applications = ApplicationManager.mainStageApplications;

124+ mainStageModel.move(from, to);

80 }

125 }

81− // FIXME: applications.move(0, 0) crashes

82− if (from !== to && from >= 0 && to >= 0) applications.move(from, to);

83 }

126 }

84

127

85 function getApplicationFromDesktopFile(desktopFile, stage) {

128 function getApplicationFromDesktopFile(desktopFile, stage) {

86− var foundSideStageApp, foundMainStageApp;

129+ var appId;

87

130

88− foundMainStageApp = __find(desktopFile, ApplicationManager.mainStageApplications)

131+ // HACK: Applications identified sometimes with with appId, but mostly with desktopFile.

89− if (stage == ApplicationInfo.MainStage) {

132+ // TODO: convert entire shell to use appId only.

90− return foundMainStageApp;

133+ if (desktopFile.indexOf(".desktop") >= 0) {

91− }

134+ appId = desktopFileToAppId(desktopFile);

92− foundSideStageApp = __find(desktopFile, ApplicationManager.sideStageApplications)

135+ } else {

93− if (stage == ApplicationInfo.SideStage) {

136+ appId = desktopFile;

94− return foundSideStageApp;

95 }

137 }

96

138

97− // if stage not specified, return whichever app running on either stage

139+ for (var i = 0, len = ApplicationManager.count; i < len; i++ ) {

98− return (foundMainStageApp) ? foundMainStageApp : foundSideStageApp;

140+ var app = ApplicationManager.get(i);

99−

100

141

101− function __find(desktopFile, applications) {

142+ // if stage not specified, return whichever app running on either stage

102− for (var i = 0; i < applications.count; i++ ) {

143+ if (app.appId == appId && (stage == undefined || app.stage == stage)) {

103− var application = applications.get(i);

104− if (application.desktopFile == desktopFile) {

105− return application;

144+ return app;

106− }

107 }

145 }

108− return null;

109 }

146 }

110 }

147 }

111

148

149+ function desktopFileToAppId(desktopFile) {

150+ var right = desktopFile.lastIndexOf(".desktop");

151+ var left = desktopFile.lastIndexOf("/");

152+ if (left == -1 || right == -1 || left == right) {

153+ console.log("ApplicationManagerWrapper: unable to extract appId from '" + desktopFile + "'");

154+ return "";

155+ }

156+ return desktopFile.substring(left+1, right);

157+ }

158+

112 Connections {

159 Connections {

113 target: ApplicationManager

160 target: ApplicationManager

114 onFocusRequested: {

161 onFocusRequested: {

Components/ApplicationScreenshot.qml+2−2

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19−import Ubuntu.Application 0.1

19+import Unity.Application 0.1

20

21Item {

22 id: applicationScreenshot

@@ -56,6 +56,6 @@ Item {

56 width: applicationScreenshot.application ? parent.width : 0

57 height: applicationScreenshot.application ? parent.height : 0

58 visible: applicationScreenshot.application != null && ready

59− source: applicationScreenshot.application

59+ source: ApplicationManager.findApplication((application) ? application.appId : "")

60 }

61}

Components/ApplicationsModelStageFiltered.qmlnew file+49

@@ -0,0 +1,49 @@

1+/*

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+import QtQuick 2.0

18+import Utils 0.1

19+import Unity.Application 0.1

20+

21+SortFilterProxyModel {

22+ id: root

23+ property int stage

24+

25+ function get(index) {

26+ return model.get(mapRowToSource(index));

27+ }

28+

29+ function move(from, to) {

30+ var realFrom = mapRowToSource(from);

31+ if (realFrom == -1) {

32+ console.log("ERROR; invalid from=" + from + " index in move operation");

33+ return;

34+ }

35+ var realTo = mapRowToSource(to);

36+ if (realTo == -1) {

37+ // assuming wanting to move to end of list

38+ realTo = model.count - 1;

39+ }

40+

41+ if (realFrom == realTo) return;

42+ model.move(realFrom, realTo);

43+ }

44+

45+ model: ApplicationManager

46+ dynamicSortFilter: true

47+ filterRole: ApplicationManager.RoleStage

48+ filterRegExp: RegExp(stage)

49+}

Components/EdgeDemo.qml+26−20

@@ -43,15 +43,12 @@ Item {

43 }

44

45 function hideEdgeDemoInShell() {

46− var user = LightDM.Users.data(greeter.currentIndex, LightDM.UserRoles.NameRole);

46+ AccountsService.demoEdges = false;

47− AccountsService.setUserProperty(user, "demo-edges", false);

48− d.showEdgeDemo = false;

49 stopDemo();

47 stopDemo();

50 }

48 }

51

49

52 function hideEdgeDemoInGreeter() {

50 function hideEdgeDemoInGreeter() {

53− // TODO: AccountsService.setUserProperty("lightdm", "demo-edges", false);

51+ // TODO: AccountsService.demoEdges = false as lightdm user

54− d.showEdgeDemoInGreeter = false;

55 }

52 }

56

53

57 function hideEdgeDemos() {

54 function hideEdgeDemos() {

@@ -71,6 +68,24 @@ Item {

71 if (d.finalEdgeDemo) d.finalEdgeDemo.destroy()

68 if (d.finalEdgeDemo) d.finalEdgeDemo.destroy()

72 }

69 }

73

70

71+ function startDemo() {

72+ if (!d.overlay) {

73+ d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")

74+ }

75+

76+ launcherEnabled = false;

77+ dashEnabled = false;

78+ panelEnabled = false;

79+ panelContentEnabled = false;

80+

81+ // Begin with either greeter or dash, depending on which is visible

82+ if (greeter && greeter.shown) {

83+ startRightEdgeDemo()

84+ } else {

85+ startTopEdgeDemo()

86+ }

87+ }

88+

74 QtObject {

89 QtObject {

75 id: d

90 id: d

76 property Component overlay

91 property Component overlay

@@ -79,22 +94,18 @@ Item {

79 property QtObject bottomEdgeDemo

94 property QtObject bottomEdgeDemo

80 property QtObject leftEdgeDemo

95 property QtObject leftEdgeDemo

81 property QtObject finalEdgeDemo

96 property QtObject finalEdgeDemo

82− property bool showEdgeDemo: false

97+ property bool showEdgeDemo: AccountsService.demoEdges

83− property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.getUserProperty("lightdm", "demo-edges")

98+ property bool showEdgeDemoInGreeter: AccountsService.demoEdges // TODO: AccountsService.demoEdges as lightdm user

84

99

85− onShowEdgeDemoInGreeterChanged: {

100+ onShowEdgeDemoChanged: {

86− if (!d.overlay && d.showEdgeDemoInGreeter) {

101+ stopDemo()

87− d.overlay = Qt.createComponent("EdgeDemoOverlay.qml")

102+ if (d.showEdgeDemo) {

88− startRightEdgeDemo()

103+ startDemo()

89 }

104 }

90 }

105 }

91 }

106 }

92

107

93 function startRightEdgeDemo() {

108 function startRightEdgeDemo() {

94− launcherEnabled = false;

95− demo.dashEnabled = false;

96− demo.panelEnabled = false;

97− demo.panelContentEnabled = false;

98 if (demo.greeter) {

109 if (demo.greeter) {

99 d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {

110 d.rightEdgeDemo = d.overlay.createObject(demo.greeter, {

100 "edge": "right",

111 "edge": "right",

@@ -123,11 +134,6 @@ Item {

123

134

124 onUnlocked: hide()

135 onUnlocked: hide()

125 onShownChanged: if (!greeter.shown) hide()

136 onShownChanged: if (!greeter.shown) hide()

126−

127− onSelected: {

128− var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole)

129− d.showEdgeDemo = AccountsService.getUserProperty(user, "demo-edges")

130− }

131 }

137 }

132

138

133 function startTopEdgeDemo() {

139 function startTopEdgeDemo() {

Components/EdgeDemoOverlay.qml+1−1

@@ -17,7 +17,7 @@

17import Powerd 0.1

18import QtQuick 2.0

19import QtGraphicalEffects 1.0

20−import Ubuntu.Application 0.1

20+import Unity.Application 0.1

21import Ubuntu.Components 0.1

22

23Showable {

Components/Stage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Application 0.1

18+import Unity.Application 0.1

19import Ubuntu.Components 0.1

20import Ubuntu.Gestures 0.1

21

Dash/Apps/RunningApplicationTile.qml+2−3

@@ -16,7 +16,7 @@

16

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19−import Ubuntu.Application 0.1

19+import Unity.Application 0.1

20import "../../Components/"

21import "../../Components/ListItems"

22

@@ -76,10 +76,9 @@ AbstractButton {

76

77 ApplicationImage {

78 id: applicationImage

79− source: application

79+ source: ApplicationManager.findApplication((application) ? application.appId : "")

80 width: shapedApplicationImage.width

81 height: shapedApplicationImage.height

82− fillMode: ApplicationImage.PreserveAspectCrop

83 }

82 }

84

83

85 UbuntuShape {

84 UbuntuShape {

Dash/Apps/RunningApplicationsGrid.qml+4−4

@@ -52,22 +52,22 @@ ResponsiveFlowView {

52

53 RunningApplicationTile {

54 id: runningAppTile

55− objectName: "runningAppTile " + model.application.name

55+ objectName: "runningAppTile " + model.name

56 anchors {

57 top: parent.top

58 horizontalCenter: parent.horizontalCenter

59 }

60− application: model.application

60+ application: model

61 onRequestedActivationMode: { root.terminationModeEnabled = false }

62 onRequestedTerminationMode: {

63 if (canEnableTerminationMode)

64 root.terminationModeEnabled = true

65 }

66 onRequestedApplicationTermination: {

67− shell.applicationManager.stopProcess(application)

67+ shell.applicationManager.stopApplication(model.appId)

68 }

69 onRequestedApplicationActivation: {

70− shell.activateApplication(application.desktopFile)

70+ shell.activateApplication(model.appId)

71 }

72

73 terminationModeEnabled: root.terminationModeEnabled

Greeter/GreeterContent.qml+19−2

@@ -15,6 +15,7 @@

15 */

16

17import QtQuick 2.0

18+import AccountsService 0.1

18import Ubuntu.Components 0.1

19import Ubuntu.Components 0.1

19import LightDM 0.1 as LightDM

20import LightDM 0.1 as LightDM

20import "../Components"

21import "../Components"

@@ -39,14 +40,30 @@ MouseArea {

39 color: "black"

40 color: "black"

40 }

41 }

41

42

43+ property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : shell.defaultBackground

44+ onBackgroundValueChanged: wallpaper.source = backgroundValue

45+

42 CrossFadeImage {

46 CrossFadeImage {

43 id: wallpaper

47 id: wallpaper

44−

45− source: shell.background

46 anchors.fill: parent

48 anchors.fill: parent

47 fadeInFirst: false

49 fadeInFirst: false

48 }

50 }

49

51

52+ // See Shell.qml's backgroundSettings treatment for why we need a separate

53+ // Image, but it boils down to avoiding binding loop detection.

54+ Image {

55+ source: wallpaper.source

56+ height: 0

57+ width: 0

58+ sourceSize.height: 0

59+ sourceSize.width: 0

60+ onStatusChanged: {

61+ if (status == Image.Error && source != shell.defaultBackground) {

62+ wallpaper.source = shell.defaultBackground

63+ }

64+ }

65+ }

66+

50 Rectangle {

67 Rectangle {

51 anchors.fill: parent

68 anchors.fill: parent

52 color: "black"

69 color: "black"

Launcher/Launcher.qml+4−4

@@ -35,7 +35,7 @@ Item {

35 readonly property bool shown: panel.x > -panel.width

36

37 // emitted when an application is selected

38− signal launcherApplicationSelected(string desktopFile)

38+ signal launcherApplicationSelected(string appId)

39

40 // emitted when the apps dash should be shown because of a swipe gesture

41 signal dash()

@@ -159,7 +159,7 @@ Item {

159

160 onApplicationSelected: {

161 root.state = ""

162− launcherApplicationSelected(desktopFile)

162+ launcherApplicationSelected(appId)

163 }

164 onDashItemSelected: {

165 root.state = ""

@@ -192,12 +192,12 @@ Item {

192

193 direction: Direction.Rightwards

194

195− enabled: root.available && root.state !== "visible"

195+ enabled: root.available

196 width: root.dragAreaWidth

197 height: root.height

198

199 onTouchXChanged: {

200− if (status !== DirectionalDragArea.Recognized)

200+ if (status !== DirectionalDragArea.Recognized || launcher.state == "visible")

201 return;

202

203 // When the gesture finally gets recognized, the finger will likely be

Launcher/LauncherPanel.qml+3−3

@@ -34,7 +34,7 @@ Item {

34 property bool preventHiding: moving || dndArea.draggedIndex >= 0 || dndArea.quickListPopover !== null || dndArea.pressed

35 property int highlightIndex: -1

36

37− signal applicationSelected(string desktopFile)

37+ signal applicationSelected(string appId)

38 signal dashItemSelected(int index)

39

40 BorderImage {

@@ -300,7 +300,7 @@ Item {

300 } else if (clickedItem.angle < -12) {

301 launcherListView.flick(0, launcherListView.clickFlickSpeed);

302 } else {

303− root.applicationSelected(LauncherModel.get(index).desktopFile);

303+ root.applicationSelected(LauncherModel.get(index).appId);

304 }

305 return;

306 }

@@ -311,7 +311,7 @@ Item {

311 } else if (clickedItem.angle < -30) {

312 launcherListView.flick(0, launcherListView.clickFlickSpeed);

313 } else {

314− root.applicationSelected(LauncherModel.get(index).desktopFile);

314+ root.applicationSelected(LauncherModel.get(index).appId);

315 }

316 }

317

Panel/Indicators/DefaultIndicatorWidget.qml+1−1

@@ -75,7 +75,7 @@ Indicators.IndicatorWidget {

75 }

76

77 label = action.state[Indicators.ActionState.Label];

78− iconSource = "image://gicon/" + action.state[Indicators.ActionState.IconSource];

78+ iconSource = "image://theme/" + action.state[Indicators.ActionState.IconSource];

79 enabled = action.state[Indicators.ActionState.Visible];

80 }

81}

Panel/Indicators/MessagingIndicatorWidget.qml+1−1

@@ -21,5 +21,5 @@ import QtQuick 2.0

21

22DefaultIndicatorWidget {

23 // default the icon so we have something to show when we don't have the bus.

24− iconSource: "image://gicon/indicator-messages"

24+ iconSource: "image://theme/indicator-messages"

25}

Panel/Indicators/NetworkIndicatorWidget.qml+6−6

@@ -97,16 +97,16 @@ Indicators.IndicatorWidget {

97 function get_icon_for_signal(con_state, value) {

98 if (con_state >= Indicators.NetworkConnection.Activating && con_state <= Indicators.NetworkConnection.Deactivating) {

99 if (value == 0) {

100− return "image://gicon/nm-signal-00";

100+ return "image://theme/nm-signal-00";

101 } else if (value <= 25) {

102− return "image://gicon/nm-signal-25";

102+ return "image://theme/nm-signal-25";

103 } else if (value <= 50) {

104− return "image://gicon/nm-signal-50";

104+ return "image://theme/nm-signal-50";

105 } else if (value <= 75) {

106− return "image://gicon/nm-signal-75";

106+ return "image://theme/nm-signal-75";

107 }

108− return "image://gicon/nm-signal-100";

108+ return "image://theme/nm-signal-100";

109 }

110− return "image://gicon/wifi-none";

110+ return "image://theme/wifi-none";

111 }

112}

Panel/Indicators/SoundIndicatorWidget.qml+1−1

@@ -21,6 +21,6 @@ import QtQuick 2.0

21

22DefaultIndicatorWidget {

23 // default the icon so we have something to show when we don't have the bus.

24− iconSource: "image://gicon/audio-volume-high"

24+ iconSource: "image://theme/audio-volume-high"

25 enabled: true

26}

Shell.qml+30−26

@@ -15,8 +15,9 @@

15 */

16

17import QtQuick 2.0

18+import AccountsService 0.1

18import GSettings 1.0

19import GSettings 1.0

19−import Ubuntu.Application 0.1

20+import Unity.Application 0.1

20import Ubuntu.Components 0.1

21import Ubuntu.Components 0.1

21import Ubuntu.Gestures 0.1

22import Ubuntu.Gestures 0.1

22import Unity.Launcher 0.1

23import Unity.Launcher 0.1

@@ -64,6 +65,12 @@ FocusScope {

64

65

65 property var applicationManager: ApplicationManagerWrapper {}

66 property var applicationManager: ApplicationManagerWrapper {}

66

67

68+ Binding {

69+ target: LauncherModel

70+ property: "applicationManager"

71+ value: ApplicationManager

72+ }

73+

67 Component.onCompleted: {

74 Component.onCompleted: {

68 Theme.name = "Ubuntu.Components.Themes.SuruGradient"

75 Theme.name = "Ubuntu.Components.Themes.SuruGradient"

69

76

@@ -74,6 +81,9 @@ FocusScope {

74 applicationManager.unfocusCurrentApplication();

81 applicationManager.unfocusCurrentApplication();

75 }

82 }

76

83

84+ readonly property bool applicationFocused: !!applicationManager.mainStageFocusedApplication

85+ || !!applicationManager.sideStageFocusedApplication

86+

77 readonly property bool fullscreenMode: {

87 readonly property bool fullscreenMode: {

78 if (greeter.shown || lockscreen.shown) {

88 if (greeter.shown || lockscreen.shown) {

79 return false;

89 return false;

@@ -95,15 +105,6 @@ FocusScope {

95 greeter.hide();

105 greeter.hide();

96 shell.activateApplication(desktopFile);

106 shell.activateApplication(desktopFile);

97 }

107 }

98−

99− onMainStageFocusedApplicationChanged: {

100− var app = applicationManager.mainStageFocusedApplication

101− if (app != null) {

102− LauncherModel.applicationFocused(app.desktopFile);

103− } else {

104− LauncherModel.applicationFocused("");

105− }

106− }

107 }

108 }

108

109

109 function activateApplication(desktopFile, argument) {

110 function activateApplication(desktopFile, argument) {

@@ -156,6 +157,10 @@ FocusScope {

156 }

157 }

158 }

158

159

160+ OSKController {

161+ anchors.fill: parent // as needs to know the geometry of the shell

162+ }

163+

159 VolumeControl {

164 VolumeControl {

160 id: volumeControl

165 id: volumeControl

161 }

166 }

@@ -254,7 +259,7 @@ FocusScope {

254 property bool fullyShown: shown && x == 0 && parent.x == 0

259 property bool fullyShown: shown && x == 0 && parent.x == 0

255 property bool fullyHidden: !shown && x == width

260 property bool fullyHidden: !shown && x == width

256 available: !greeter.shown

261 available: !greeter.shown

257− hides: [launcher, panel.indicators]

262+ hides: [panel.indicators]

258 shown: false

263 shown: false

259 opacity: 1.0

264 opacity: 1.0

260 showAnimation: StandardAnimation { property: "x"; duration: 350; to: 0; easing.type: Easing.OutCubic }

265 showAnimation: StandardAnimation { property: "x"; duration: 350; to: 0; easing.type: Easing.OutCubic }

@@ -478,6 +483,7 @@ FocusScope {

478 onSelected: {

483 onSelected: {

479 // Update launcher items for new user

484 // Update launcher items for new user

480 var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

485 var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

486+ AccountsService.user = user;

481 LauncherModel.setUser(user);

487 LauncherModel.setUser(user);

482 }

488 }

483

489

@@ -490,7 +496,8 @@ FocusScope {

490

496

491 InputFilterArea {

497 InputFilterArea {

492 anchors.fill: parent

498 anchors.fill: parent

493− blockInput: greeter.shown || lockscreen.shown

499+ blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown

500+ || panel.indicators.shown || hud.shown

494 }

501 }

495

502

496 Connections {

503 Connections {

@@ -502,10 +509,8 @@ FocusScope {

502

509

503 function setFocused(focused) {

510 function setFocused(focused) {

504 if (!focused) {

511 if (!focused) {

505− // FIXME: *FocusedApplication are not updated when unfocused, hence the need to check whether

506− // the stage was actually shown

507− if (mainStage.fullyShown) powerConnection.previousMainApp = applicationManager.mainStageFocusedApplication;

512+ powerConnection.previousMainApp = applicationManager.mainStageFocusedApplication;

508− if (sideStage.fullyShown) powerConnection.previousSideApp = applicationManager.sideStageFocusedApplication;

513+ powerConnection.previousSideApp = applicationManager.sideStageFocusedApplication;

509 applicationManager.unfocusCurrentApplication();

514 applicationManager.unfocusCurrentApplication();

510 } else {

515 } else {

511 if (powerConnection.previousMainApp) {

516 if (powerConnection.previousMainApp) {

@@ -556,8 +561,13 @@ FocusScope {

556 searchVisible: !greeter.shown && !lockscreen.shown

561 searchVisible: !greeter.shown && !lockscreen.shown

557

562

558 InputFilterArea {

563 InputFilterArea {

559− anchors.fill: parent

564+ anchors {

565+ top: parent.top

566+ left: parent.left

567+ right: parent.right

568+ }

569+ height: (panel.fullscreenMode) ? shell.edgeSize : panel.panelHeight

560− blockInput: panel.indicators.shown

570+ blockInput: true

561 }

571 }

562 }

572 }

563

573

@@ -577,11 +587,6 @@ FocusScope {

577 onMainStageFocusedApplicationChanged: hud.hide()

587 onMainStageFocusedApplicationChanged: hud.hide()

578 onSideStageFocusedApplicationChanged: hud.hide()

588 onSideStageFocusedApplicationChanged: hud.hide()

579 }

589 }

580−

581− InputFilterArea {

582− anchors.fill: parent

583− blockInput: hud.shown

584− }

585 }

590 }

586

591

587 Revealer {

592 Revealer {

@@ -604,8 +609,7 @@ FocusScope {

604 theHud: hud

609 theHud: hud

605 anchors.fill: parent

610 anchors.fill: parent

606 enabled: !panel.indicators.shown

611 enabled: !panel.indicators.shown

607− applicationIsOnForeground: applicationManager.mainStageFocusedApplication

612+ applicationIsOnForeground: applicationFocused

608− || applicationManager.sideStageFocusedApplication

609 }

613 }

610

614

611 InputFilterArea {

615 InputFilterArea {

@@ -645,7 +649,7 @@ FocusScope {

645 }

649 }

646 onLauncherApplicationSelected:{

650 onLauncherApplicationSelected:{

647 greeter.hide()

651 greeter.hide()

648− shell.activateApplication(desktopFile)

652+ shell.activateApplication(appId)

649 }

653 }

650 onShownChanged: {

654 onShownChanged: {

651 if (shown) {

655 if (shown) {

SideStage/SideStage.qml+1−1

@@ -15,7 +15,7 @@

15 */

16

17import QtQuick 2.0

18−import Ubuntu.Application 0.1

18+import Unity.Application 0.1

19import Ubuntu.Components 0.1

20import "../Components"

21

debian/changelog+88

@@ -1,3 +1,91 @@

1+unity8 (7.81.3+13.10.20130912-0ubuntu1) saucy; urgency=low

2+

3+ [ Michael Zanetti ]

4+ * add support for finding icons from click package apps in the

5+ launcher.

6+ * update to latest launcher API for better integration with the

7+ AppManager.

8+

9+ [ Ricardo Mendoza ]

10+ * Fixes problems related to image 20130912.0, amongst: * Fix autopilot

11+ tests by preventing blocking of input during HUD button animations,

12+ only when fully visible * Fix loading of unity-mir library, major

13+ version wasn't specified so unless the dev package was there it

14+ would fail.

15+

16+ [ Ubuntu daily release ]

17+ * Automatic snapshot from revision 316

18+

19+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 12 Sep 2013 13:47:59 +0000

20+

21+unity8 (7.81.3+13.10.20130911.1-0ubuntu1) saucy; urgency=low

22+

23+ [ Michael Terry ]

24+ * Switch from deprecated image://gicon/ to new image://theme/.

25+

26+ [ Gerry Boland ]

27+ * Add OSKController so shell can control OSK correctly on Mir.

28+ * Remove InputFilterArea for bottom edge swipes, as applications also

29+ listen for such swipes for Toolbar reveal.

30+

31+ [ Ricardo Mendoza ]

32+ * Select the backend to use dynamically on runtime according to the

33+ QPA selected by the system.

34+

35+ [ Ubuntu daily release ]

36+ * Automatic snapshot from revision 311

37+

38+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 11 Sep 2013 16:22:55 +0000

39+

40+unity8 (7.81.3+13.10.20130911-0ubuntu1) saucy; urgency=low

41+

42+ [ Michal Hruby ]

43+ * Hide all gicon strings from the shell and use the image://theme icon

44+ provider that was recently added to the SDK.

45+

46+ [ Gerry Boland ]

47+ * Convert to new ApplicationManager API.

48+

49+ [ Nick Dedekind ]

50+ * Updated access point design as per spec.

51+ * Indicator visibility based on connection with backend service.

52+

53+ [ Albert Astals ]

54+ * Dash: Make assignments bindings This way if the model changes the

55+ item value also changes.

56+

57+ [ Michael Zanetti ]

58+ * adds support for highlighting the currently focused application in

59+ the launcher, adds tests.

60+ * include ~/.local/share/applications in launcher's .desktop file

61+ search path.

62+ * shrink size of area for revealing the HUD button and make it

63+ disappear on release again. fixes 1219035. (LP: #1219035)

64+ * revert revision 304 as it makes the Shell crash.

65+

66+ [ Michael Terry ]

67+ * Allow testers to set custom password or pin in demo mode, rather

68+ than hardcoding them.

69+ * Have the greeter use AccountsService to determine its background.

70+ (LP: #1218402)

71+ * Listen to changes in the "show edge demo" AccountsService setting.

72+

73+ [ Daniel d'Andrada ]

74+ * Update fake/mock plugins so that "./run --fake" works well again -

75+ You can now see the thumbnails of the fake running applications once

76+ again. - You no longer get hundreds of warnings due to icons not

77+ found.

78+ * Reset apps scope when returning from app to dash (LP #1193419) If an

79+ app is on foreground and you perform a long left-edge swipe to

80+ minimize it, and therefore return to the dash, the dash should be in

81+ the Applications scope and showing the running/recents applications.

82+ (LP: #1193419)

83+

84+ [ Ubuntu daily release ]

85+ * Automatic snapshot from revision 306

86+

87+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 11 Sep 2013 00:54:31 +0000

88+

1unity8 (7.81.3+13.10.20130905.2-0ubuntu1) saucy; urgency=low

89unity8 (7.81.3+13.10.20130905.2-0ubuntu1) saucy; urgency=low

2

90

3 [ Michael Zanetti ]

91 [ Michael Zanetti ]

debian/control+9−7

@@ -23,6 +23,7 @@ Build-Depends: cmake,

23 libunity-api-dev (>= 7.80.3),

24 libunity-core-6.0-dev (<< 7.80),

25 libunity-dev (>= 7.0.12),

26+ libunity-mir-dev,

26 libunity-scopes-json-def-phone,

27 libunity-scopes-json-def-phone,

27 libupstart-dev,

28 libupstart-dev,

28 libusermetricsoutput1-dev,

29 libusermetricsoutput1-dev,

@@ -54,7 +55,7 @@ Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk

54Package: indicators-client

55Package: indicators-client

55Architecture: amd64 armhf i386

56Architecture: amd64 armhf i386

56Depends: qmenumodel-qml (>= 0.2.7),

57Depends: qmenumodel-qml (>= 0.2.7),

57− qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,

58+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+13.10.20130829.1-0ubuntu1),

58 unity8 (= ${binary:Version}),

59 unity8 (= ${binary:Version}),

59 ${misc:Depends},

60 ${misc:Depends},

60 ${shlibs:Depends},

61 ${shlibs:Depends},

@@ -65,13 +66,14 @@ Package: unity8

65Architecture: any

66Architecture: any

66Provides: indicator-renderer,

67Provides: indicator-renderer,

67Depends: gsettings-desktop-schemas,

68Depends: gsettings-desktop-schemas,

69+ libunity-mir1,

68 qmenumodel-qml (>= 0.2.7),

70 qmenumodel-qml (>= 0.2.7),

69 qtdeclarative5-dee-plugin,

71 qtdeclarative5-dee-plugin,

70 qtdeclarative5-gsettings1.0,

72 qtdeclarative5-gsettings1.0,

71− qtdeclarative5-ubuntu-ui-toolkit-plugin,

73+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+13.10.20130829.1-0ubuntu1),

72 qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,

74 qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,

73 qtdeclarative5-xmllistmodel-plugin,

75 qtdeclarative5-xmllistmodel-plugin,

74− unity-launcher-impl-2,

76+ unity-launcher-impl-3,

75 unity-notifications-impl-1,

77 unity-notifications-impl-1,

76 unity8-fake-env | qtubuntu-shell,

78 unity8-fake-env | qtubuntu-shell,

77 unity8-private (= ${binary:Version}),

79 unity8-private (= ${binary:Version}),

@@ -87,18 +89,18 @@ Description: Unity 8 shell

87

89

88Package: unity8-autopilot

90Package: unity8-autopilot

89Architecture: all

91Architecture: all

92+Depends: gir1.2-glib-2.0,

90−Depends: indicators-client (>= ${source:Version}),

93+ indicators-client (>= ${source:Version}),

91 libautopilot-qt,

94 libautopilot-qt,

92 libqt5test5,

95 libqt5test5,

93 libqt5widgets5,

96 libqt5widgets5,

94 python-evdev,

97 python-evdev,

98+ python-gi,

95 unity8 (>= ${source:Version}),

99 unity8 (>= ${source:Version}),

96 unity8-fake-env (>= ${source:Version}),

100 unity8-fake-env (>= ${source:Version}),

97 ${misc:Depends},

101 ${misc:Depends},

98 ${python:Depends},

102 ${python:Depends},

99 ${shlibs:Depends},

103 ${shlibs:Depends},

100−Recommends: gir1.2-glib-2.0,

101− python-gi,

102Description: Test package for Unity 8 shell

104Description: Test package for Unity 8 shell

103 Autopilot tests for the unity8 package

105 Autopilot tests for the unity8 package

104

106

@@ -120,7 +122,7 @@ Pre-Depends: ${misc:Pre-Depends},

120Depends: ${misc:Depends},

122Depends: ${misc:Depends},

121 ${shlibs:Depends},

123 ${shlibs:Depends},

122Provides: unity-launcher-impl,

124Provides: unity-launcher-impl,

123− unity-launcher-impl-2,

125+ unity-launcher-impl-3,

124Description: Unity 8 private libs

126Description: Unity 8 private libs

125 The Unity 8 shell is the primary user interface for Ubuntu devices.

127 The Unity 8 shell is the primary user interface for Ubuntu devices.

126 .

128 .

main.cpp+73−6

@@ -25,13 +25,17 @@

25#include <QtQml/QQmlContext>

26#include <qpa/qplatformnativeinterface.h>

27#include <QLibrary>

28+#include <QDebug>

28#include <libintl.h>

29#include <libintl.h>

30+#include <dlfcn.h>

29

31

30// local

32// local

31#include "paths.h"

33#include "paths.h"

32#include "MouseTouchAdaptor.h"

34#include "MouseTouchAdaptor.h"

33#include "ApplicationArguments.h"

35#include "ApplicationArguments.h"

34

36

37+#include <unity-mir/qmirserver.h>

38+

35namespace {

39namespace {

36

40

37void prependImportPaths(QQmlEngine *engine, const QStringList &paths)

41void prependImportPaths(QQmlEngine *engine, const QStringList &paths)

@@ -72,7 +76,7 @@ void resolveIconTheme() {

72}

76}

73} // namespace {

77} // namespace {

74

78

75−int main(int argc, char** argv)

79+int startShell(int argc, const char** argv, void* server)

76{

80{

77 /* Workaround Qt platform integration plugin not advertising itself

81 /* Workaround Qt platform integration plugin not advertising itself

78 as having the following capabilities:

82 as having the following capabilities:

@@ -82,12 +86,29 @@ int main(int argc, char** argv)

82 setenv("QML_FORCE_THREADED_RENDERER", "1", 1);

86 setenv("QML_FORCE_THREADED_RENDERER", "1", 1);

83 setenv("QML_FIXED_ANIMATION_STEP", "1", 1);

87 setenv("QML_FIXED_ANIMATION_STEP", "1", 1);

84

88

89+ const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";

90+

85 QGuiApplication::setApplicationName("Unity 8");

91 QGuiApplication::setApplicationName("Unity 8");

86− QGuiApplication application(argc, argv);

92+ QGuiApplication *application;

93+ if (isUbuntuMirServer) {

94+ QLibrary unityMir("unity-mir", 1);

95+ unityMir.load();

96+

97+ typedef QGuiApplication* (*createServerApplication_t)(int&, const char **, void*);

98+ createServerApplication_t createQMirServerApplication = (createServerApplication_t) unityMir.resolve("createQMirServerApplication");

99+ if (!createQMirServerApplication) {

100+ qDebug() << "unable to resolve symbol: createQMirServerApplication";

101+ return 4;

102+ }

103+

104+ application = createQMirServerApplication(argc, argv, server);

105+ } else {

106+ application = new QGuiApplication(argc, (char**)argv);

107+ }

87

108

88 resolveIconTheme();

109 resolveIconTheme();

89

110

90− QStringList args = application.arguments();

111+ QStringList args = application->arguments();

91 ApplicationArguments qmlArgs(args);

112 ApplicationArguments qmlArgs(args);

92

113

93 // The testability driver is only loaded by QApplication but not by QGuiApplication.

114 // The testability driver is only loaded by QApplication but not by QGuiApplication.

@@ -124,7 +145,7 @@ int main(int argc, char** argv)

124 if (args.contains(QLatin1String("-mousetouch"))) {

145 if (args.contains(QLatin1String("-mousetouch"))) {

125 mouseTouchAdaptor = new MouseTouchAdaptor;

146 mouseTouchAdaptor = new MouseTouchAdaptor;

126 mouseTouchAdaptor->setTargetWindow(view);

147 mouseTouchAdaptor->setTargetWindow(view);

127− application.installNativeEventFilter(mouseTouchAdaptor);

148+ application->installNativeEventFilter(mouseTouchAdaptor);

128 }

149 }

129

150

130 QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();

151 QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();

@@ -139,18 +160,64 @@ int main(int argc, char** argv)

139 QUrl source("Shell.qml");

160 QUrl source("Shell.qml");

140 prependImportPaths(view->engine(), ::overrideImportPaths());

161 prependImportPaths(view->engine(), ::overrideImportPaths());

141 appendImportPaths(view->engine(), ::fallbackImportPaths());

162 appendImportPaths(view->engine(), ::fallbackImportPaths());

163+

164+ QStringList importPath = view->engine()->importPathList().filter("qt5/imports");

165+ if (isUbuntuMirServer) {

166+ importPath.first().append("/Unity-Mir");

167+ view->engine()->addImportPath(importPath.first());

168+ }

169+

142 view->setSource(source);

170 view->setSource(source);

143 view->setColor("transparent");

171 view->setColor("transparent");

144

172

145− if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || args.contains(QLatin1String("-fullscreen"))) {

173+ if (qgetenv("QT_QPA_PLATFORM") == "ubuntu" || isUbuntuMirServer || args.contains(QLatin1String("-fullscreen"))) {

146 view->showFullScreen();

174 view->showFullScreen();

147 } else {

175 } else {

148 view->show();

176 view->show();

149 }

177 }

150

178

151− int result = application.exec();

179+ int result = application->exec();

152

180

153 delete mouseTouchAdaptor;

181 delete mouseTouchAdaptor;

182+ delete application;

154

183

155 return result;

184 return result;

156}

185}

186+

187+int main(int argc, const char *argv[])

188+{

189+ // For ubuntumirserver/ubuntumirclient

190+ if (qgetenv("QT_QPA_PLATFORM").startsWith("ubuntumir")) {

191+ setenv("QT_QPA_PLATFORM", "ubuntumirserver", 1);

192+

193+ // If we use unity-mir directly, we automatically link to the Mir-server

194+ // platform-api bindings, which result in unexpected behaviour when

195+ // running the non-Mir scenario.

196+ QLibrary unityMir("unity-mir", 1);

197+ unityMir.load();

198+ if (!unityMir.isLoaded()) {

199+ qDebug() << "Library unity-mir not found/loaded";

200+ return 1;

201+ }

202+

203+ typedef QMirServer* (*createServer_t)(int, const char **);

204+ createServer_t createQMirServer = (createServer_t) unityMir.resolve("createQMirServer");

205+ if (!createQMirServer) {

206+ qDebug() << "unable to resolve symbol: createQMirServer";

207+ return 2;

208+ }

209+

210+ QMirServer* mirServer = createQMirServer(argc, argv);

211+

212+ typedef int (*runWithClient_t)(QMirServer*, std::function<int(int, const char**, void*)>);

213+ runWithClient_t runWithClient = (runWithClient_t) unityMir.resolve("runQMirServerWithClient");

214+ if (!runWithClient) {

215+ qDebug() << "unable to resolve symbol: runWithClient";

216+ return 3;

217+ }

218+

219+ return runWithClient(mirServer, startShell);

220+ } else {

221+ return startShell(argc, argv, nullptr);

222+ }

223+}

plugins/AccountsService/AccountsService.cpp+67−37

@@ -17,58 +17,88 @@

17 */

18

19#include "AccountsService.h"

20−#include <QDBusConnection>

20+#include "AccountsServiceDBusAdaptor.h"

21−#include <QDBusConnectionInterface>

21+

22−#include <QDBusMessage>

22+#include <QStringList>

23−#include <QDBusVariant>

24

23

25AccountsService::AccountsService(QObject* parent)

24AccountsService::AccountsService(QObject* parent)

26 : QObject(parent),

25 : QObject(parent),

27− accounts_manager(NULL),

26+ m_service(new AccountsServiceDBusAdaptor(this)),

28− users()

27+ m_user(qgetenv("USER"))

29{

28{

30− auto connection = QDBusConnection::SM_BUSNAME();

29+ connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),

31− auto interface = connection.interface();

30+ this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));

32− interface->startService("org.freedesktop.Accounts");

31+ connect(m_service, SIGNAL(maybeChanged(const QString &)),

33− accounts_manager = new QDBusInterface("org.freedesktop.Accounts",

32+ this, SLOT(maybeChanged(const QString &)));

34− "/org/freedesktop/Accounts",

35− "org.freedesktop.Accounts",

36− connection, this);

37}

33}

38

34

39−QVariant AccountsService::getUserProperty(const QString &user, const QString &property)

35+QString AccountsService::getUser()

40{

36{

41− auto iface = getUserInterface(user);

37+ return m_user;

42− if (iface != nullptr && iface->isValid()) {

38+}

43− auto answer = iface->call("Get", "com.canonical.unity.AccountsService", property);

39+

44− if (answer.type() == QDBusMessage::ReplyMessage) {

40+void AccountsService::setUser(const QString &user)

45− return answer.arguments()[0].value<QDBusVariant>().variant();

41+{

46− }

42+ m_user = user;

43+ Q_EMIT userChanged();

44+

45+ updateDemoEdges();

46+ updateBackgroundFile();

47+}

48+

49+bool AccountsService::getDemoEdges()

50+{

51+ return m_demoEdges;

52+}

53+

54+void AccountsService::setDemoEdges(bool demoEdges)

55+{

56+ m_demoEdges = demoEdges;

57+ m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);

58+}

59+

60+QString AccountsService::getBackgroundFile()

61+{

62+ return m_backgroundFile;

63+}

64+

65+void AccountsService::updateDemoEdges()

66+{

67+ auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();

68+ if (m_demoEdges != demoEdges) {

69+ m_demoEdges = demoEdges;

70+ Q_EMIT demoEdgesChanged();

47 }

71 }

48− return QVariant();

49}

72}

50

73

51−void AccountsService::setUserProperty(const QString &user, const QString &property, const QVariant &value)

74+void AccountsService::updateBackgroundFile()

52{

75{

53− auto iface = getUserInterface(user);

76+ auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();

54− if (iface != nullptr && iface->isValid()) {

77+ if (m_backgroundFile != backgroundFile) {

55− // The value needs to be carefully wrapped

78+ m_backgroundFile = backgroundFile;

56− iface->call("Set", "com.canonical.unity.AccountsService", property, QVariant::fromValue(QDBusVariant(value)));

79+ Q_EMIT backgroundFileChanged();

57 }

80 }

58}

81}

59

82

60−QDBusInterface *AccountsService::getUserInterface(const QString &user)

83+void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

61{

84{

62− auto iface = users.value(user);

85+ if (m_user != user) {

63− if (iface == nullptr && accounts_manager->isValid()) {

86+ return;

64− auto answer = accounts_manager->call("FindUserByName", user);

87+ }

65− if (answer.type() == QDBusMessage::ReplyMessage) {

88+

66− iface = new QDBusInterface("org.freedesktop.Accounts",

89+ if (interface == "com.canonical.unity.AccountsService") {

67− answer.arguments()[0].value<QDBusObjectPath>().path(),

90+ if (changed.contains("demo-edges")) {

68− "org.freedesktop.DBus.Properties",

91+ updateDemoEdges();

69− accounts_manager->connection(), this);

70− users.insert(user, iface);

71 }

92 }

72 }

93 }

94+}

95+

96+void AccountsService::maybeChanged(const QString &user)

97+{

98+ if (m_user != user) {

73− return iface;

99+ return;

100+ }

101+

102+ // Standard properties might have changed

103+ updateBackgroundFile();

74}

104}

plugins/AccountsService/AccountsService.h+34−8

@@ -1,5 +1,5 @@

1/*

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

@@ -19,26 +19,52 @@

19#ifndef UNITY_ACCOUNTSSERVICE_H

20#define UNITY_ACCOUNTSSERVICE_H

21

22−#include <QDBusInterface>

23−#include <QMap>

24#include <QObject>

22#include <QObject>

25#include <QString>

23#include <QString>

26

24

25+class AccountsServiceDBusAdaptor;

26+

27class AccountsService: public QObject

28{

29 Q_OBJECT

30+ Q_PROPERTY (QString user

31+ READ getUser

32+ WRITE setUser

33+ NOTIFY userChanged)

34+ Q_PROPERTY (bool demoEdges

35+ READ getDemoEdges

36+ WRITE setDemoEdges

37+ NOTIFY demoEdgesChanged)

38+ Q_PROPERTY (QString backgroundFile

39+ READ getBackgroundFile

40+ NOTIFY backgroundFileChanged)

30

41

31public:

42public:

32 explicit AccountsService(QObject *parent = 0);

43 explicit AccountsService(QObject *parent = 0);

33

44

34− Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);

45+ QString getUser();

46+ void setUser(const QString &user);

47+ bool getDemoEdges();

48+ void setDemoEdges(bool demoEdges);

49+ QString getBackgroundFile();

50+

51+Q_SIGNALS:

52+ void userChanged();

53+ void demoEdgesChanged();

54+ void backgroundFileChanged();

55+

56+private Q_SLOTS:

35− Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);

57+ void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

58+ void maybeChanged(const QString &user);

36

59

37private:

60private:

38− QDBusInterface *getUserInterface(const QString &user);

61+ void updateDemoEdges();

62+ void updateBackgroundFile();

39

63

40− QDBusInterface *accounts_manager;

64+ AccountsServiceDBusAdaptor *m_service;

41− QMap<QString, QDBusInterface *> users;

65+ QString m_user;

66+ bool m_demoEdges;

67+ QString m_backgroundFile;

42};

68};

43

69

44#endif

70#endif

plugins/AccountsService/AccountsServiceDBusAdaptor.cppnew file+126

@@ -0,0 +1,126 @@

1+/*

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: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#include "AccountsServiceDBusAdaptor.h"

20+#include <QDBusConnection>

21+#include <QDBusConnectionInterface>

22+#include <QDBusMessage>

23+#include <QDBusVariant>

24+

25+AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)

26+ : QObject(parent),

27+ accounts_manager(NULL),

28+ users()

29+{

30+ auto connection = QDBusConnection::SM_BUSNAME();

31+ auto interface = connection.interface();

32+ interface->startService("org.freedesktop.Accounts");

33+ accounts_manager = new QDBusInterface("org.freedesktop.Accounts",

34+ "/org/freedesktop/Accounts",

35+ "org.freedesktop.Accounts",

36+ connection, this);

37+}

38+

39+QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const QString &interface, const QString &property)

40+{

41+ auto iface = getUserInterface(user);

42+ if (iface != nullptr && iface->isValid()) {

43+ auto answer = iface->call("Get", interface, property);

44+ if (answer.type() == QDBusMessage::ReplyMessage) {

45+ return answer.arguments()[0].value<QDBusVariant>().variant();

46+ }

47+ }

48+ return QVariant();

49+}

50+

51+void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)

52+{

53+ auto iface = getUserInterface(user);

54+ if (iface != nullptr && iface->isValid()) {

55+ // The value needs to be carefully wrapped

56+ iface->call("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));

57+ }

58+}

59+

60+void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)

61+{

62+ // Merge changed and invalidated together

63+ QStringList combined;

64+ combined << invalid;

65+ combined << changed.keys();

66+ combined.removeDuplicates();

67+

68+ Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);

69+}

70+

71+void AccountsServiceDBusAdaptor::maybeChangedSlot()

72+{

73+ Q_EMIT maybeChanged(getUserForPath(message().path()));

74+}

75+

76+QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)

77+{

78+ QMap<QString, QDBusInterface *>::const_iterator i;

79+ for (i = users.constBegin(); i != users.constEnd(); ++i) {

80+ if (i.value()->path() == path) {

81+ return i.key();

82+ }

83+ }

84+ return QString();

85+}

86+

87+QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user)

88+{

89+ auto iface = users.value(user);

90+ if (iface == nullptr && accounts_manager->isValid()) {

91+ auto answer = accounts_manager->call("FindUserByName", user);

92+ if (answer.type() == QDBusMessage::ReplyMessage) {

93+ auto path = answer.arguments()[0].value<QDBusObjectPath>().path();

94+

95+ iface = new QDBusInterface("org.freedesktop.Accounts",

96+ path,

97+ "org.freedesktop.DBus.Properties",

98+ accounts_manager->connection(), this);

99+

100+ // With its own pre-defined properties, AccountsService is oddly

101+ // close-lipped. It won't send out proper DBus.Properties notices,

102+ // but it does have one catch-all Changed() signal. So let's

103+ // listen to that.

104+ iface->connection().connect(

105+ iface->service(),

106+ path,

107+ "org.freedesktop.Accounts.User",

108+ "Changed",

109+ this,

110+ SLOT(maybeChangedSlot()));

111+

112+ // But custom properties do send out the right notifications, so

113+ // let's still listen there.

114+ iface->connection().connect(

115+ iface->service(),

116+ path,

117+ "org.freedesktop.DBus.Properties",

118+ "PropertiesChanged",

119+ this,

120+ SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));

121+

122+ users.insert(user, iface);

123+ }

124+ }

125+ return iface;

126+}

plugins/AccountsService/AccountsServiceDBusAdaptor.hnew file+54

@@ -0,0 +1,54 @@

1+/*

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+ * Authors: Michael Terry <michael.terry@canonical.com>

17+ */

18+

19+#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

20+#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H

21+

22+#include <QDBusContext>

23+#include <QDBusInterface>

24+#include <QMap>

25+#include <QObject>

26+#include <QString>

27+

28+class AccountsServiceDBusAdaptor: public QObject, public QDBusContext

29+{

30+ Q_OBJECT

31+

32+public:

33+ explicit AccountsServiceDBusAdaptor(QObject *parent = 0);

34+

35+ Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);

36+ Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);

37+

38+Q_SIGNALS:

39+ void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

40+ void maybeChanged(const QString &user); // Standard properties might have changed

41+

42+private Q_SLOTS:

43+ void propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid);

44+ void maybeChangedSlot();

45+

46+private:

47+ QDBusInterface *getUserInterface(const QString &user);

48+ QString getUserForPath(const QString &path);

49+

50+ QDBusInterface *accounts_manager;

51+ QMap<QString, QDBusInterface *> users;

52+};

53+

54+#endif

plugins/AccountsService/CMakeLists.txt+1

@@ -4,6 +4,7 @@ add_definitions(-DSM_BUSNAME=systemBus)

4

5add_library(AccountsService-qml MODULE

6 AccountsService.cpp

7+ AccountsServiceDBusAdaptor.cpp

7 plugin.cpp

8 plugin.cpp

8 )

9 )

9

10

plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+6−6

@@ -68,8 +68,8 @@ Indicators.BaseMenuItem {

68 time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""

69 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

70 // icons

71− avatar: menu && menu.ext.xCanonicalIcon ? "image://gicon/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"

71+ avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"

72− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://gicon/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""

72+ appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""

73

74 onActivateApp: {

75 menuItem.model.activate(modelIndex, true);

@@ -94,8 +94,8 @@ Indicators.BaseMenuItem {

94 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

95 replyButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Send"

96 // icons

97− avatar: menu && menu.ext.xCanonicalIcon ? "image://gicon/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"

97+ avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"

98− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://gicon/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""

98+ appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""

99 // actions

100 replyEnabled: replyAction.valid && replyAction.enabled

101

@@ -132,8 +132,8 @@ Indicators.BaseMenuItem {

132 replyButtonText: actionsDescription && actionsDescription[1].label ? actionsDescription[1].label : "Send"

133 replyMessages: actionsDescription && actionsDescription[1]["parameter-hint"] ? actionsDescription[1]["parameter-hint"] : ""

134 // icons

135− avatar: menu && menu.ext.xCanonicalIcon ? "image://gicon/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"

135+ avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"

136− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://gicon/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""

136+ appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""

137 // actions

138 activateEnabled: activateAction.valid && activateAction.enabled

139 replyEnabled: replyAction.valid && replyAction.enabled

plugins/Unity/Indicators/qml/MenuItemFactory.qml+1−1

@@ -217,7 +217,7 @@ Item {

217

218 title: menu && menu.label ? menu.label : ""

219 count: menu && menu.actionState[0] ? menu.actionState[0] : "0"

220− appIcon: menu && (menu.ext.xCanonicalIcon.length > 0) ? "image://gicon/" + encodeURI(menu.ext.xCanonicalIcon) :

220+ appIcon: menu && (menu.ext.xCanonicalIcon.length > 0) ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) :

221 "qrc:/indicators/artwork/messaging/default_app.svg"

222

223 Component.onCompleted: {

plugins/Unity/Indicators/rootactionstate.cpp+8−8

@@ -148,15 +148,15 @@ static QString iconUri(GIcon *icon)

148 QString uri;

149

150 if (G_IS_THEMED_ICON (icon)) {

151−

152 const gchar* const* iconNames = g_themed_icon_get_names (G_THEMED_ICON (icon));

151 const gchar* const* iconNames = g_themed_icon_get_names (G_THEMED_ICON (icon));

153− guint index = 0;

152+

153+ QStringList iconNameList;

154− while(iconNames[index] != NULL) {

154+ for (uint index = 0; iconNames[index] != NULL; index++) {

155− if (QIcon::hasThemeIcon(iconNames[index])) {

155+ iconNameList << iconNames[index];

156+ }

157+

158+ if (!iconNameList.empty()) {

156− uri = QString("image://theme/%1").arg(iconNames[index]);

159+ uri = QString("image://theme/%1").arg(iconNameList.join(","));

157− break;

158− }

159− index++;

160 }

161 }

162 else if (G_IS_FILE_ICON (icon)) {

plugins/Unity/IndicatorsLegacy/Network/qml/AccessPoint.qml+2−2

@@ -47,10 +47,10 @@ Indicators.MenuItem {

47 imageName += "-secure";

48 }

49

50− return "image://gicon/" + imageName;

50+ return "image://theme/" + imageName;

51 }

52

53− icon: menu && wifiApStrength ? getNetworkIcon(menu) : "image://gicon/wifi-none"

53+ icon: menu && wifiApStrength ? getNetworkIcon(menu) : "image://theme/wifi-none"

54 iconFrame: false

55 control: CheckBox {

56 id: checkBoxActive

plugins/Unity/Launcher/CMakeLists.txt+3−2

@@ -1,5 +1,6 @@

1include(FindPkgConfig)

2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)

2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)

3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)

3pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

4pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

4

5

5add_definitions(-DSM_BUSNAME=systemBus)

6add_definitions(-DSM_BUSNAME=systemBus)

@@ -17,7 +18,7 @@ set(QMLLAUNCHERPLUGIN_SRC

17 quicklistmodel.cpp

18 quicklistmodel.cpp

18 common/quicklistentry.cpp

19 common/quicklistentry.cpp

19 backend/launcherbackend.cpp

20 backend/launcherbackend.cpp

20− ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

21+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

21 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

22 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

22 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

23 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

23 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

24 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

plugins/Unity/Launcher/backend/launcherbackend.cpp+10−5

@@ -18,7 +18,7 @@

18 * along with this program. If not, see <http://www.gnu.org/licenses/>.

19 */

20

21−#include "AccountsService.h"

21+#include "AccountsServiceDBusAdaptor.h"

22#include "launcherbackend.h"

23

24#include <QDir>

@@ -43,7 +43,7 @@ LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):

43 m_accounts(nullptr)

44{

45 if (useStorage) {

46− m_accounts = new AccountsService(this);

46+ m_accounts = new AccountsServiceDBusAdaptor(this);

47 }

48 m_user = qgetenv("USER");

49 syncFromAccounts();

@@ -214,7 +214,7 @@ void LauncherBackend::syncFromAccounts()

214 m_storedApps.clear();

215

216 if (m_accounts && !m_user.isEmpty()) {

217− QVariant variant = m_accounts->getUserProperty(m_user, "launcher-items");

217+ QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");

218 apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());

219 defaults = isDefaultsItem(apps);

220 }

@@ -257,7 +257,7 @@ void LauncherBackend::syncToAccounts()

257 items << itemToVariant(appId);

258 }

259

260− m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));

260+ m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));

261 }

262}

263

@@ -300,7 +300,12 @@ LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFil

300 LauncherBackendItem* item = new LauncherBackendItem();

301 item->desktopFile = desktopFile;

302 item->displayName = settings.value("Desktop Entry/Name").toString();

303+

304+ if (settings.contains("Desktop Entry/Path")) {

303− item->icon = settings.value("Desktop Entry/Icon").toString();

305+ item->icon = settings.value("Desktop Entry/Path").toString() + "/" + settings.value("Desktop Entry/Icon").toString();

306+ } else {

307+ item->icon = settings.value("Desktop Entry/Icon").toString();

308+ }

304 item->pinned = false;

309 item->pinned = false;

305 return item;

310 return item;

306}

311}

plugins/Unity/Launcher/backend/launcherbackend.h+2−2

@@ -25,7 +25,7 @@

25#include <QSettings>

26#include <QStringList>

27

28−class AccountsService;

28+class AccountsServiceDBusAdaptor;

29

30/**

31 * @brief An interface that provides all the data needed by the launcher.

@@ -156,7 +156,7 @@ private:

156 QList<QString> m_storedApps;

157 mutable QHash<QString, LauncherBackendItem*> m_itemCache;

158

159− AccountsService *m_accounts;

159+ AccountsServiceDBusAdaptor *m_accounts;

160 QString m_user;

161};

162

plugins/Unity/Launcher/launcheritem.cpp+1−7

@@ -20,10 +20,9 @@

20#include "launcheritem.h"

21#include "quicklistmodel.h"

22

23−LauncherItem::LauncherItem(const QString &appId, const QString &desktopFile, const QString &name, const QString &icon, QObject *parent) :

23+LauncherItem::LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent) :

24 LauncherItemInterface(parent),

25 m_appId(appId),

26− m_desktopFile(desktopFile),

27 m_name(name),

26 m_name(name),

28 m_icon(icon),

27 m_icon(icon),

29 m_pinned(false),

28 m_pinned(false),

@@ -48,11 +47,6 @@ QString LauncherItem::appId() const

48 return m_appId;

47 return m_appId;

49}

48}

50

49

51−QString LauncherItem::desktopFile() const

52−{

53− return m_desktopFile;

54−}

55−

56QString LauncherItem::name() const

50QString LauncherItem::name() const

57{

51{

58 return m_name;

52 return m_name;

plugins/Unity/Launcher/launcheritem.h+1−3

@@ -32,10 +32,9 @@ class LauncherItem: public LauncherItemInterface

32{

33 Q_OBJECT

34public:

35− LauncherItem(const QString &appId, const QString &desktopFile, const QString &name, const QString &icon, QObject *parent = 0);

35+ LauncherItem(const QString &appId, const QString &name, const QString &icon, QObject *parent = 0);

36

37 QString appId() const;

38− QString desktopFile() const;

39 QString name() const;

38 QString name() const;

40 QString icon() const;

39 QString icon() const;

41

40

@@ -65,7 +64,6 @@ Q_SIGNALS:

65

64

66private:

65private:

67 QString m_appId;

66 QString m_appId;

68− QString m_desktopFile;

69 QString m_name;

67 QString m_name;

70 QString m_icon;

68 QString m_icon;

71 bool m_pinned;

69 bool m_pinned;

plugins/Unity/Launcher/launchermodel.cpp+94−46

@@ -21,16 +21,20 @@

21#include "launcheritem.h"

22#include "backend/launcherbackend.h"

23

24+#include <unity/shell/application/ApplicationInfoInterface.h>

25+

26+using namespace unity::shell::application;

27+

24LauncherModel::LauncherModel(QObject *parent):

28LauncherModel::LauncherModel(QObject *parent):

25 LauncherModelInterface(parent),

29 LauncherModelInterface(parent),

26− m_backend(new LauncherBackend(true, this))

30+ m_backend(new LauncherBackend(true, this)),

31+ m_appManager(0)

27{

32{

28 connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));

33 connect(m_backend, SIGNAL(countChanged(QString,int)), SLOT(countChanged(QString,int)));

29 connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));

34 connect(m_backend, SIGNAL(progressChanged(QString,int)), SLOT(progressChanged(QString,int)));

30

35

31 Q_FOREACH (const QString &entry, m_backend->storedApplications()) {

36 Q_FOREACH (const QString &entry, m_backend->storedApplications()) {

32 LauncherItem *item = new LauncherItem(entry,

37 LauncherItem *item = new LauncherItem(entry,

33− m_backend->desktopFile(entry),

34 m_backend->displayName(entry),

38 m_backend->displayName(entry),

35 m_backend->icon(entry),

39 m_backend->icon(entry),

36 this);

40 this);

@@ -61,9 +65,7 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

61 LauncherItem *item = m_list.at(index.row());

65 LauncherItem *item = m_list.at(index.row());

62 switch(role) {

66 switch(role) {

63 case RoleAppId:

67 case RoleAppId:

64− return item->desktopFile();

68+ return item->appId();

65− case RoleDesktopFile:

66− return item->desktopFile();

67 case RoleName:

69 case RoleName:

68 return item->name();

70 return item->name();

69 case RoleIcon:

71 case RoleIcon:

@@ -137,7 +139,6 @@ void LauncherModel::pin(const QString &appId, int index)

137 }

139 }

138 beginInsertRows(QModelIndex(), index, index);

140 beginInsertRows(QModelIndex(), index, index);

139 LauncherItem *item = new LauncherItem(appId,

141 LauncherItem *item = new LauncherItem(appId,

140− m_backend->desktopFile(appId),

141 m_backend->displayName(appId),

142 m_backend->displayName(appId),

142 m_backend->icon(appId));

143 m_backend->icon(appId));

143 item->setPinned(true);

144 item->setPinned(true);

@@ -193,45 +194,21 @@ void LauncherModel::setUser(const QString &username)

193 m_backend->setUser(username);

194 m_backend->setUser(username);

194}

195}

195

196

196−void LauncherModel::applicationFocused(const QString &appId)

197+ApplicationManagerInterface *LauncherModel::applicationManager() const

197{

198{

198− // Unfocus all apps

199− for(int i = 0; i < m_list.count(); ++i) {

200− LauncherItem *item = m_list.at(i);

201− if (item->focused()) {

202− item->setFocused(false);

203− Q_EMIT dataChanged(this->index(i), this->index(i), QVector<int>() << RoleFocused);

204− }

205− }

206−

207− if (appId.isEmpty()) {

208− return;

199+ return m_appManager;

209− }

200+}

210−

211− // FIXME: drop this once we get real appIds from the AppManager

212− QString helper = appId.split('/').last();

213− if (helper.endsWith(".desktop")) {

214− helper.chop(8);

215− }

216−

217− int index = findApplication(helper);

218− if (index >= 0) {

219− m_list.at(index)->setFocused(true);

220− Q_EMIT dataChanged(this->index(index), this->index(index), QVector<int>() << RoleFocused);

221− } else {

222− // Add app to recent apps

223− QString desktopFile = m_backend->desktopFile(helper);

224− QString appName = m_backend->displayName(helper);

225− QString icon = m_backend->icon(helper);

226−

227− LauncherItem *item = new LauncherItem(helper, desktopFile, appName, icon);

228− item->setRecent(true);

229− item->setFocused(true);

230− beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

231− m_list.append(item);

232− endInsertRows();

233

201

234− // Clean up old recent apps

202+void LauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager)

203+{

204+ // Is there already another appmanager set?

205+ if (m_appManager) {

206+ // Disconnect any signals

207+ disconnect(this, SLOT(applicationAdded(QModelIndex,int)));

208+ disconnect(this, SLOT(applicationRemoved(QModelIndex,int)));

209+ disconnect(this, SLOT(focusedAppIdChanged()));

210+

211+ // remove any recent/running apps from the launcher

235 QList<int> recentAppIndices;

212 QList<int> recentAppIndices;

236 for (int i = 0; i < m_list.count(); ++i) {

213 for (int i = 0; i < m_list.count(); ++i) {

237 if (m_list.at(i)->recent()) {

214 if (m_list.at(i)->recent()) {

@@ -239,22 +216,33 @@ void LauncherModel::applicationFocused(const QString &appId)

239 }

216 }

240 }

217 }

241 int run = 0;

218 int run = 0;

242− while (recentAppIndices.count() > 5) {

219+ while (recentAppIndices.count() > 0) {

243 beginRemoveRows(QModelIndex(), recentAppIndices.first() - run, recentAppIndices.first() - run);

220 beginRemoveRows(QModelIndex(), recentAppIndices.first() - run, recentAppIndices.first() - run);

244 m_list.takeAt(recentAppIndices.first() - run)->deleteLater();

221 m_list.takeAt(recentAppIndices.first() - run)->deleteLater();

245 endRemoveRows();

222 endRemoveRows();

246 recentAppIndices.takeFirst();

223 recentAppIndices.takeFirst();

247 ++run;

224 ++run;

248 }

225 }

249− storeAppList();

226+ }

227+

228+ m_appManager = appManager;

229+ connect(m_appManager, SIGNAL(rowsInserted(QModelIndex, int, int)), SLOT(applicationAdded(QModelIndex,int)));

230+ connect(m_appManager, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), SLOT(applicationRemoved(QModelIndex,int)));

231+ connect(m_appManager, SIGNAL(focusedApplicationIdChanged()), SLOT(focusedAppIdChanged()));

232+

233+ Q_EMIT applicationManagerChanged();

234+

235+ for (int i = 0; i < appManager->count(); ++i) {

236+ applicationAdded(QModelIndex(), i);

250 }

237 }

251}

238}

252

239

240+

253void LauncherModel::storeAppList()

241void LauncherModel::storeAppList()

254{

242{

255 QStringList appIds;

243 QStringList appIds;

256 Q_FOREACH(LauncherItem *item, m_list) {

244 Q_FOREACH(LauncherItem *item, m_list) {

257− if (item->pinned() || item->recent()) {

245+ if (item->pinned()) {

258 appIds << item->appId();

246 appIds << item->appId();

259 }

247 }

260 }

248 }

@@ -292,3 +280,63 @@ void LauncherModel::countChanged(const QString &appId, int count)

292 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);

280 Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleCount);

293 }

281 }

294}

282}

283+

284+void LauncherModel::applicationAdded(const QModelIndex &parent, int row)

285+{

286+ Q_UNUSED(parent);

287+

288+ ApplicationInfoInterface *app = m_appManager->get(row);

289+

290+ bool found = false;

291+ Q_FOREACH(LauncherItem *item, m_list) {

292+ if (app->appId() == item->appId()) {

293+ found = true;

294+ break;

295+ }

296+ }

297+ if (found) {

298+ // Shall we paint some running/recent app highlight? If yes, do it here.

299+ } else {

300+ LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString());

301+ item->setRecent(true);

302+ item->setFocused(app->focused());

303+

304+ beginInsertRows(QModelIndex(), m_list.count(), m_list.count());

305+ m_list.append(item);

306+ endInsertRows();

307+ }

308+}

309+

310+void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)

311+{

312+ Q_UNUSED(parent)

313+

314+ int appIndex = -1;

315+ for (int i = 0; i < m_list.count(); ++i) {

316+ if (m_list.at(i)->appId() == m_appManager->get(row)->appId()) {

317+ appIndex = i;

318+ break;

319+ }

320+ }

321+

322+ if (appIndex > -1 && !m_list.at(appIndex)->pinned()) {

323+ beginRemoveRows(QModelIndex(), appIndex, appIndex);

324+ m_list.takeAt(appIndex)->deleteLater();

325+ endRemoveRows();

326+ }

327+}

328+

329+void LauncherModel::focusedAppIdChanged()

330+{

331+ QString appId = m_appManager->focusedApplicationId();

332+ for (int i = 0; i < m_list.count(); ++i) {

333+ LauncherItem *item = m_list.at(i);

334+ if (!item->focused() && item->appId() == appId) {

335+ item->setFocused(true);

336+ Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);

337+ } else if (item->focused() && item->appId() != appId) {

338+ item->setFocused(false);

339+ Q_EMIT dataChanged(index(i), index(i), QVector<int>() << RoleFocused);

340+ }

341+ }

342+}

plugins/Unity/Launcher/launchermodel.h+10−1

@@ -22,6 +22,7 @@

22

23// unity-api

24#include <unity/shell/launcher/LauncherModelInterface.h>

25+#include <unity/shell/application/ApplicationManagerInterface.h>

25

26

26// Qt

27// Qt

27#include <QAbstractListModel>

28#include <QAbstractListModel>

@@ -30,6 +31,7 @@ class LauncherItem;

30class LauncherBackend;

31class LauncherBackend;

31

32

32using namespace unity::shell::launcher;

33using namespace unity::shell::launcher;

34+using namespace unity::shell::application;

33

35

34class LauncherModel: public LauncherModelInterface

36class LauncherModel: public LauncherModelInterface

35{

37{

@@ -49,7 +51,9 @@ public:

49 Q_INVOKABLE void requestRemove(const QString &appId);

51 Q_INVOKABLE void requestRemove(const QString &appId);

50 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

52 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

51 Q_INVOKABLE void setUser(const QString &username);

53 Q_INVOKABLE void setUser(const QString &username);

52− Q_INVOKABLE void applicationFocused(const QString &appId);

54+

55+ unity::shell::application::ApplicationManagerInterface* applicationManager() const;

56+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);

53

57

54private:

58private:

55 void storeAppList();

59 void storeAppList();

@@ -59,9 +63,14 @@ private Q_SLOTS:

59 void progressChanged(const QString &appId, int progress);

63 void progressChanged(const QString &appId, int progress);

60 void countChanged(const QString &appId, int count);

64 void countChanged(const QString &appId, int count);

61

65

66+ void applicationAdded(const QModelIndex &parent, int row);

67+ void applicationRemoved(const QModelIndex &parent, int row);

68+ void focusedAppIdChanged();

69+

62private:

70private:

63 QList<LauncherItem*> m_list;

71 QList<LauncherItem*> m_list;

64 LauncherBackend *m_backend;

72 LauncherBackend *m_backend;

73+ ApplicationManagerInterface *m_appManager;

65};

74};

66

75

67#endif // LAUNCHERMODEL_H

76#endif // LAUNCHERMODEL_H

plugins/Utils/qsortfilterproxymodelqml.cpp+13−1

@@ -29,6 +29,17 @@ QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)

29 connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(countChanged()));

30}

31

32+/*

33+ * Enter row index of filtered/sorted model, returns row index of source model

34+ */

35+int QSortFilterProxyModelQML::mapRowToSource(int row)

36+{

37+ if (sourceModel() == NULL)

38+ return -1;

39+

40+ return QSortFilterProxyModel::mapToSource(index(row, 0)).row();

41+}

42+

32QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const

43QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const

33{

44{

34 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();

45 return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();

@@ -51,6 +62,7 @@ QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)

51 connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));

62 connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));

52 connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));

63 connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));

53 connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));

64 connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));

65+

54 Q_EMIT totalCountChanged();

66 Q_EMIT totalCountChanged();

55 Q_EMIT modelChanged();

67 Q_EMIT modelChanged();

56 }

68 }

@@ -140,4 +152,4 @@ QSortFilterProxyModelQML::mapToSource(int row)

140 } else {

152 } else {

141 return -1;

153 return -1;

142 }

154 }

143−}

155+}

plugins/Utils/qsortfilterproxymodelqml.h+1

@@ -34,6 +34,7 @@ public:

34 Q_INVOKABLE QVariant data(int row, int role);

35 Q_INVOKABLE int count();

36 Q_INVOKABLE int findFirst(int role, const QVariant& value) const;

37+ Q_INVOKABLE int mapRowToSource(int row);

37 virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;

38 virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;

38

39

39 /* getters */

40 /* getters */

po/ca.po+32−32

@@ -8,83 +8,83 @@ msgstr ""

8"Project-Id-Version: unity\n"

9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2013-08-27 13:36-0400\n"

11−"PO-Revision-Date: 2013-06-27 00:24+0000\n"

11+"PO-Revision-Date: 2013-09-11 10:30+0000\n"

12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

12+"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

13"Language-Team: Catalan <ca@li.org>\n"

14"MIME-Version: 1.0\n"

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2013-08-30 05:37+0000\n"

18+"X-Launchpad-Export-Date: 2013-09-12 08:06+0000\n"

19−"X-Generator: Launchpad (build 16750)\n"

19+"X-Generator: Launchpad (build 16761)\n"

20

21#: Applications/applications.js:23

22msgid "Phone"

23−msgstr ""

23+msgstr "Telèfon"

24

25#: Applications/applications.js:29

26msgid "Camera"

27−msgstr ""

27+msgstr "Càmera"

28

29#: Applications/applications.js:35

30msgid "Gallery"

31−msgstr ""

31+msgstr "Galeria"

32

33#: Applications/applications.js:40

34msgid "Facebook"

35−msgstr ""

35+msgstr "Facebook"

36

37#: Applications/applications.js:46

38msgid "Browser"

39−msgstr ""

39+msgstr "Navegador"

40

41#: Applications/applications.js:51

42msgid "Twitter"

43−msgstr ""

43+msgstr "Twitter"

44

45#: Applications/applications.js:57

46msgid "GMail"

47−msgstr ""

47+msgstr "GMail"

48

49#: Applications/applications.js:62

50msgid "Weather"

51−msgstr ""

51+msgstr "El temps"

52

53#: Applications/applications.js:68

54msgid "Notepad"

55−msgstr ""

55+msgstr "Bloc de notes"

56

57#: Applications/applications.js:74

58msgid "Calendar"

59−msgstr ""

59+msgstr "Calendari"

60

61#: Applications/applications.js:80

62msgid "Media Player"

63−msgstr ""

63+msgstr "Reproductor multimèdia"

64

65#: Applications/applications.js:86

66msgid "Evernote"

67−msgstr ""

67+msgstr "Evernote"

68

69#: Applications/applications.js:91

70msgid "Map"

71−msgstr ""

71+msgstr "Mapa"

72

73#: Applications/applications.js:96

74msgid "Pinterest"

75−msgstr ""

75+msgstr "Pinterest"

76

77#: Applications/applications.js:101

78msgid "SoundCloud"

79−msgstr ""

79+msgstr "SoundCloud"

80

81#: Applications/applications.js:106

82msgid "Wikipedia"

83−msgstr ""

83+msgstr "Viquipèdia"

84

85#: Applications/applications.js:111

86msgid "YouTube"

87−msgstr ""

87+msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

@@ -92,7 +92,7 @@ msgstr ""

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

95−msgstr ""

95+msgstr "Vora dreta"

96

97#: Components/EdgeDemo.qml:99

98msgid "Try swiping from the right edge to unlock the phone"

@@ -100,7 +100,7 @@ msgstr ""

100

101#: Components/EdgeDemo.qml:135

102msgid "Top edge"

103−msgstr ""

103+msgstr "Vora superior"

104

105#: Components/EdgeDemo.qml:136

106msgid "Try swiping from the top edge to access the indicators"

@@ -116,7 +116,7 @@ msgstr ""

116

117#: Components/EdgeDemo.qml:189

118msgid "Left edge"

119−msgstr ""

119+msgstr "Vora esquerra"

120

121#: Components/EdgeDemo.qml:190

122msgid "Swipe from the left to reveal the launcher for quick access to apps"

@@ -124,7 +124,7 @@ msgstr ""

124

125#: Components/EdgeDemo.qml:217

126msgid "Well done"

127−msgstr ""

127+msgstr "Enhorabona!"

128

129#: Components/EdgeDemo.qml:218

130msgid "You have now mastered the edge gestures and can start using the phone"

@@ -138,7 +138,7 @@ msgstr "Cerques recents"

138#: Dash/Apps/AppInfo.qml:73

139#, qt-format

140msgid "(%1)"

141−msgstr ""

141+msgstr "(%1)"

142

143#. TRANSLATORS: Number of persons who wrote reviews for this app

144#: Dash/Apps/AppInfo.qml:85

@@ -158,7 +158,7 @@ msgstr ""

158

159#: Dash/Apps/AppReviews.qml:84

160msgid "Review"

161−msgstr ""

161+msgstr "Ressenya"

162

163#: Dash/Apps/AppReviews.qml:118

164msgid "Send"

@@ -166,15 +166,15 @@ msgstr ""

166

167#: Dash/Apps/AppReviews.qml:136

168msgid "Comments:"

169−msgstr ""

169+msgstr "Comentaris:"

170

171#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28

172msgid "Featured"

173−msgstr ""

173+msgstr "Destacats"

174

175#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29

176msgid "Recent"

177−msgstr ""

177+msgstr "Recents"

178

179#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30

180msgid "New Releases"

@@ -206,7 +206,7 @@ msgstr ""

206

207#: Dash/Video/VideoPreview.qml:176

208msgid "Author:"

209−msgstr ""

209+msgstr "Autor:"

210

211#: Greeter/Lockscreen.qml:134

212msgid "Emergency Call"

@@ -219,7 +219,7 @@ msgstr ""

219

220#: Greeter/PassphraseLockscreen.qml:59

221msgid "Hello"

222−msgstr ""

222+msgstr "Hola"

223

224#: Hud/HudParametrizedActionsPage.qml:132

225msgid "Confirm"

run_on_device+2−1

@@ -65,8 +65,9 @@ setup_adb_forwarding() {

65}

66

67install_dependencies() {

68+ exec_with_adb rm /etc/init/ssh.override

69+ exec_with_adb service ssh start

68 exec_with_adb apt-get update

70 exec_with_adb apt-get update

69− exec_with_adb apt-get -y install openssh-server

70 exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs

71 exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs

71}

72}

72

73

tests/mocks/AccountsService/AccountsService.cpp+19−3

@@ -23,11 +23,27 @@ AccountsService::AccountsService(QObject* parent)

23{

24}

25

26−QVariant AccountsService::getUserProperty(const QString &, const QString &)

26+QString AccountsService::getUser()

27{

28− return QVariant(false);

28+ return "testuser";

29}

30

31−void AccountsService::setUserProperty(const QString &, const QString &, const QVariant &)

31+void AccountsService::setUser(const QString &user)

32{

33+ Q_UNUSED(user)

34+}

35+

36+bool AccountsService::getDemoEdges()

37+{

38+ return false;

39+}

40+

41+void AccountsService::setDemoEdges(bool demoEdges)

42+{

43+ Q_UNUSED(demoEdges)

44+}

45+

46+QString AccountsService::getBackgroundFile()

47+{

48+ return TOP_SRCDIR "/graphics/phone_background.jpg";

33}

49}

tests/mocks/AccountsService/AccountsService.h+22−3

@@ -1,5 +1,5 @@

1/*

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

@@ -27,12 +27,31 @@

27class AccountsService: public QObject

28{

29 Q_OBJECT

30+ Q_PROPERTY (QString user

31+ READ getUser

32+ WRITE setUser

33+ NOTIFY userChanged)

34+ Q_PROPERTY (bool demoEdges

35+ READ getDemoEdges

36+ WRITE setDemoEdges

37+ NOTIFY demoEdgesChanged)

38+ Q_PROPERTY (QString backgroundFile

39+ READ getBackgroundFile

40+ NOTIFY backgroundFileChanged)

30

41

31public:

42public:

32 explicit AccountsService(QObject *parent = 0);

43 explicit AccountsService(QObject *parent = 0);

33

44

34− Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);

45+ QString getUser();

35− Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);

46+ void setUser(const QString &user);

47+ bool getDemoEdges();

48+ void setDemoEdges(bool demoEdges);

49+ QString getBackgroundFile();

50+

51+Q_SIGNALS:

52+ void userChanged();

53+ void demoEdgesChanged();

54+ void backgroundFileChanged();

36};

55};

37

56

38#endif

57#endif

tests/mocks/AccountsService/CMakeLists.txt+2

@@ -1,3 +1,5 @@

1+add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")

2+

1add_library(MockAccountsService-qml MODULE

3add_library(MockAccountsService-qml MODULE

2 AccountsService.cpp

4 AccountsService.cpp

3 plugin.cpp

5 plugin.cpp

tests/mocks/Ubuntu/Application/CMakeLists.txtdeleted−29

@@ -1,29 +0,0 @@

1−set(FakeUbuntuApplicationQml_SOURCES

2− plugin.cpp

3− ApplicationInfo.cpp

4− ApplicationImage.cpp

5− ApplicationListModel.cpp

6− ApplicationManager.cpp

7−)

8−

9−add_library(FakeUbuntuApplicationQml MODULE ${FakeUbuntuApplicationQml_SOURCES})

10−

11−qt5_use_modules(FakeUbuntuApplicationQml Core Quick)

12−

13−# copy files into build directory for shadow builds

14−add_custom_target(UbuntuAppQmlDirFile ALL

15− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}

16− DEPENDS qmldir

17−)

18−add_custom_target(InputFilterAreaQmlFile ALL

19− COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/InputFilterArea.qml" ${CMAKE_CURRENT_BINARY_DIR}

20− DEPENDS InputFilterArea.qml

21−)

22−

23−install(TARGETS FakeUbuntuApplicationQml

24− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application

25− )

26−

27−install(FILES qmldir InputFilterArea.qml

28− DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Ubuntu/Application

29− )

tests/mocks/Ubuntu/Application/qmldirdeleted−3

@@ -1,3 +0,0 @@

1−module Ubuntu.Application

2−plugin FakeUbuntuApplicationQml

3−InputFilterArea 0.1 InputFilterArea.qml

tests/mocks/Ubuntu/CMakeLists.txt−1

@@ -1,2 +1 @@

1−add_subdirectory(Application)

2add_subdirectory(DownloadDaemonListener)

1add_subdirectory(DownloadDaemonListener)

tests/mocks/Ubuntu/Application/ApplicationImage.cpp → tests/mocks/Unity/Application/ApplicationImage.cpprenamed

The content is the same.

tests/mocks/Ubuntu/Application/ApplicationImage.h → tests/mocks/Unity/Application/ApplicationImage.hrenamed

The content is the same.

tests/mocks/Ubuntu/Application/ApplicationInfo.cpp → tests/mocks/Unity/Application/ApplicationInfo.cpprenamed+15−2

@@ -21,11 +21,24 @@

21#include <QQuickView>

22#include <QQmlComponent>

23

24+ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)

25+ : ApplicationInfoInterface(appId, parent)

26+ ,m_appId(appId)

27+ ,m_stage(MainStage)

28+ ,m_state(Starting)

29+ ,m_focused(false)

30+ ,m_fullscreen(false)

31+ ,m_windowItem(0)

32+ ,m_windowComponent(0)

33+ ,m_parentItem(0)

34+{

35+}

36+

24ApplicationInfo::ApplicationInfo(QObject *parent)

37ApplicationInfo::ApplicationInfo(QObject *parent)

25− : QObject(parent)

38+ : ApplicationInfoInterface(QString(), parent)

26− ,m_handle(0)

27 ,m_stage(MainStage)

39 ,m_stage(MainStage)

28 ,m_state(Starting)

40 ,m_state(Starting)

41+ ,m_focused(false)

29 ,m_fullscreen(false)

42 ,m_fullscreen(false)

30 ,m_windowItem(0)

43 ,m_windowItem(0)

31 ,m_windowComponent(0)

44 ,m_windowComponent(0)

tests/mocks/Ubuntu/Application/ApplicationInfo.h → tests/mocks/Unity/Application/ApplicationInfo.hrenamed+12−18

@@ -22,21 +22,18 @@

22

23class QQuickItem;

24

25+// unity-api

26+#include <unity/shell/application/ApplicationInfoInterface.h>

27+

25// A pretty dumb file. Just a container for properties.

28// A pretty dumb file. Just a container for properties.

26// Implemented in C++ instead of QML just because of the enumerations

29// Implemented in C++ instead of QML just because of the enumerations

27// See QTBUG-14861

30// See QTBUG-14861

31+

32+using namespace unity::shell::application;

33+

28−class ApplicationInfo : public QObject {

34+class ApplicationInfo : public ApplicationInfoInterface {

29 Q_OBJECT

35 Q_OBJECT

30− Q_ENUMS(Stage)

36+

31− Q_ENUMS(State)

32− Q_PROPERTY(QString desktopFile READ desktopFile WRITE setDesktopFile NOTIFY desktopFileChanged)

33− Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)

34− Q_PROPERTY(QString comment READ comment WRITE setComment NOTIFY commentChanged)

35− Q_PROPERTY(QString icon READ icon WRITE setIcon NOTIFY iconChanged)

36− Q_PROPERTY(QString exec READ exec WRITE setExec NOTIFY execChanged)

37− Q_PROPERTY(qint64 handle READ handle WRITE setHandle NOTIFY handleChanged)

38− Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)

39− Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)

40 Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)

37 Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)

41

38

42 // Only exists in this fake implementation

39 // Only exists in this fake implementation

@@ -48,10 +45,8 @@ class ApplicationInfo : public QObject {

48 Q_PROPERTY(QString windowQml READ windowQml WRITE setWindowQml NOTIFY windowQmlChanged)

45 Q_PROPERTY(QString windowQml READ windowQml WRITE setWindowQml NOTIFY windowQmlChanged)

49

46

50 public:

47 public:

51− enum Stage { MainStage, SideStage };

52− enum State { Starting, Running };

53−

54 ApplicationInfo(QObject *parent = NULL);

48 ApplicationInfo(QObject *parent = NULL);

49+ ApplicationInfo(const QString &appId, QObject *parent = NULL);

55

50

56 #define IMPLEMENT_PROPERTY(name, Name, type) \

51 #define IMPLEMENT_PROPERTY(name, Name, type) \

57 public: \

52 public: \

@@ -68,14 +63,13 @@ class ApplicationInfo : public QObject {

68 private: \

63 private: \

69 type m_##name;

64 type m_##name;

70

65

71− IMPLEMENT_PROPERTY(desktopFile, DesktopFile, QString)

66+ IMPLEMENT_PROPERTY(appId, AppId, QString)

72 IMPLEMENT_PROPERTY(name, Name, QString)

67 IMPLEMENT_PROPERTY(name, Name, QString)

73 IMPLEMENT_PROPERTY(comment, Comment, QString)

68 IMPLEMENT_PROPERTY(comment, Comment, QString)

74− IMPLEMENT_PROPERTY(icon, Icon, QString)

69+ IMPLEMENT_PROPERTY(icon, Icon, QUrl)

75− IMPLEMENT_PROPERTY(exec, Exec, QString)

76− IMPLEMENT_PROPERTY(handle, Handle, qint64)

77 IMPLEMENT_PROPERTY(stage, Stage, Stage)

70 IMPLEMENT_PROPERTY(stage, Stage, Stage)

78 IMPLEMENT_PROPERTY(state, State, State)

71 IMPLEMENT_PROPERTY(state, State, State)

72+ IMPLEMENT_PROPERTY(focused, Focused, bool)

79 IMPLEMENT_PROPERTY(fullscreen, Fullscreen, bool)

73 IMPLEMENT_PROPERTY(fullscreen, Fullscreen, bool)

80 IMPLEMENT_PROPERTY(imageQml, ImageQml, QString)

74 IMPLEMENT_PROPERTY(imageQml, ImageQml, QString)

81 IMPLEMENT_PROPERTY(windowQml, WindowQml, QString)

75 IMPLEMENT_PROPERTY(windowQml, WindowQml, QString)

tests/mocks/Ubuntu/Application/ApplicationListModel.cpp → tests/mocks/Unity/Application/ApplicationListModel.cpprenamed

The content is the same.

tests/mocks/Ubuntu/Application/ApplicationListModel.h → tests/mocks/Unity/Application/ApplicationListModel.hrenamed

The content is the same.

tests/mocks/Ubuntu/Application/ApplicationManager.cpp → tests/mocks/Unity/Application/ApplicationManager.cpprenamed+185−153

@@ -16,7 +16,6 @@

16

17#include "ApplicationManager.h"

18#include "ApplicationInfo.h"

19−#include "ApplicationListModel.h"

20#include "paths.h"

19#include "paths.h"

21

20

22#include <QDir>

21#include <QDir>

@@ -26,11 +25,7 @@

26#include <QQmlComponent>

25#include <QQmlComponent>

27

26

28ApplicationManager::ApplicationManager(QObject *parent)

27ApplicationManager::ApplicationManager(QObject *parent)

29− : QObject(parent)

28+ : ApplicationManagerInterface(parent)

30− , m_mainStageApplications(new ApplicationListModel())

31− , m_sideStageApplications(new ApplicationListModel())

32− , m_mainStageFocusedApplication(0)

33− , m_sideStageFocusedApplication(0)

34 , m_mainStageComponent(0)

29 , m_mainStageComponent(0)

35 , m_mainStage(0)

30 , m_mainStage(0)

36 , m_sideStageComponent(0)

31 , m_sideStageComponent(0)

@@ -41,8 +36,84 @@ ApplicationManager::ApplicationManager(QObject *parent)

41

36

42ApplicationManager::~ApplicationManager()

37ApplicationManager::~ApplicationManager()

43{

38{

44− delete m_mainStageApplications;

39+}

45− delete m_sideStageApplications;

40+

41+int ApplicationManager::rowCount(const QModelIndex& parent) const {

42+ return !parent.isValid() ? m_runningApplications.size() : 0;

43+}

44+

45+QVariant ApplicationManager::data(const QModelIndex& index, int role) const {

46+ if (index.row() < 0 || index.row() >= m_runningApplications.size())

47+ return QVariant();

48+

49+ auto app = m_runningApplications.at(index.row());

50+ switch(role) {

51+ case RoleAppId:

52+ return app->appId();

53+ case RoleName:

54+ return app->name();

55+ case RoleComment:

56+ return app->comment();

57+ case RoleIcon:

58+ return app->icon();

59+ case RoleStage:

60+ return app->stage();

61+ case RoleState:

62+ return app->state();

63+ case RoleFocused:

64+ return app->focused();

65+ default:

66+ return QVariant();

67+ }

68+}

69+

70+ApplicationInfo *ApplicationManager::get(int row) const {

71+ if (row < 0 || row >= m_runningApplications.size())

72+ return nullptr;

73+ return m_runningApplications.at(row);

74+}

75+

76+ApplicationInfo *ApplicationManager::findApplication(const QString &appId) const {

77+ for (ApplicationInfo *app : m_runningApplications) {

78+ if (app->appId() == appId) {

79+ return app;

80+ }

81+ }

82+ return nullptr;

83+}

84+

85+void ApplicationManager::add(ApplicationInfo *application) {

86+ if (!application)

87+ return;

88+

89+ beginInsertRows(QModelIndex(), m_runningApplications.size(), m_runningApplications.size());

90+ m_runningApplications.append(application);

91+ endInsertRows();

92+ Q_EMIT countChanged();

93+}

94+

95+void ApplicationManager::remove(ApplicationInfo *application) {

96+ int i = m_runningApplications.indexOf(application);

97+ if (i != -1) {

98+ beginRemoveRows(QModelIndex(), i, i);

99+ m_runningApplications.removeAt(i);

100+ endRemoveRows();

101+ Q_EMIT countChanged();

102+ }

103+}

104+

105+void ApplicationManager::move(int from, int to) {

106+ if (from == to) return;

107+

108+ if (from >= 0 && from < m_runningApplications.size() && to >= 0 && to < m_runningApplications.size()) {

109+ QModelIndex parent;

110+ /* When moving an item down, the destination index needs to be incremented

111+ * by one, as explained in the documentation:

112+ * http://qt-project.org/doc/qt-5.0/qtcore/qabstractitemmodel.html#beginMoveRows */

113+ beginMoveRows(parent, from, from, parent, to + (to > from ? 1 : 0));

114+ m_runningApplications.move(from, to);

115+ endMoveRows();

116+ }

46}

117}

47

118

48int ApplicationManager::keyboardHeight() const

119int ApplicationManager::keyboardHeight() const

@@ -70,36 +141,21 @@ ApplicationManager::FormFactorHint ApplicationManager::formFactorHint() const

70 return PhoneFormFactor;

141 return PhoneFormFactor;

71}

142}

72

143

73−ApplicationListModel* ApplicationManager::mainStageApplications() const

144+ApplicationInfo* ApplicationManager::startApplication(const QString &appId,

74−{

145+ const QStringList &arguments)

75− return m_mainStageApplications;

76−}

77−

78−ApplicationListModel* ApplicationManager::sideStageApplications() const

79{

146{

80− return m_sideStageApplications;

147+ return startApplication(appId, NoFlag, arguments);

81}

148}

82

149

83−ApplicationInfo* ApplicationManager::mainStageFocusedApplication() const

150+ApplicationInfo* ApplicationManager::startApplication(const QString &appId,

84−{

85− return m_mainStageFocusedApplication;

86−}

87−

88−ApplicationInfo* ApplicationManager::sideStageFocusedApplication() const

89−{

90− return m_sideStageFocusedApplication;

91−}

92−

93−ApplicationInfo* ApplicationManager::startProcess(QString desktopFile,

94 ExecFlags flags,

151 ExecFlags flags,

95− QStringList arguments)

152+ const QStringList &arguments)

96{

153{

97 Q_UNUSED(arguments)

154 Q_UNUSED(arguments)

98 ApplicationInfo *application = 0;

155 ApplicationInfo *application = 0;

99

156

100− for (int i = 0; i < m_availableApplications.count(); ++i) {

101− ApplicationInfo *availableApp = m_availableApplications[i];

157+ for (ApplicationInfo *availableApp : m_availableApplications) {

102− if (availableApp->desktopFile() == desktopFile) {

158+ if (availableApp->appId() == appId) {

103 application = availableApp;

159 application = availableApp;

104 break;

160 break;

105 }

161 }

@@ -109,86 +165,91 @@ ApplicationInfo* ApplicationManager::startProcess(QString desktopFile,

109 return 0;

165 return 0;

110

166

111 if (flags.testFlag(ApplicationManager::ForceMainStage)

167 if (flags.testFlag(ApplicationManager::ForceMainStage)

112− || application->stage() == ApplicationInfo::MainStage) {

168+ && application->stage() == ApplicationInfo::SideStage) {

113− m_mainStageApplications->add(application);

169+ application->setStage(ApplicationInfo::MainStage);

114− } else {

115− m_sideStageApplications->add(application);

116 }

170 }

171+ add(application);

117

172

118 return application;

173 return application;

119}

174}

120

175

121−void ApplicationManager::stopProcess(ApplicationInfo* application)

176+bool ApplicationManager::stopApplication(const QString &appId)

122{

177{

178+ ApplicationInfo *application = findApplication(appId);

123− if (m_mainStageApplications->contains(application)) {

179+ if (application == nullptr)

124− m_mainStageApplications->remove(application);

180+ return false;

125

181

126− if (m_mainStageFocusedApplication == application) {

182+ remove(application);

127− m_mainStageFocusedApplication = 0;

183+ Q_EMIT focusedApplicationIdChanged();

128− Q_EMIT mainStageFocusedApplicationChanged();

184+ return true;

129− }

185+}

130− } else if (m_sideStageApplications->contains(application)){

131− m_sideStageApplications->remove(application);

132

186

133− if (m_sideStageFocusedApplication == application) {

187+QString ApplicationManager::focusedApplicationId() const {

134− m_sideStageFocusedApplication = 0;

188+ for (ApplicationInfo *app : m_runningApplications) {

135− Q_EMIT sideStageFocusedApplicationChanged();

189+ if (app->focused()) {

190+ return app->appId();

136 }

191 }

137 }

192 }

193+ return QString();

138}

194}

139

195

140−void ApplicationManager::focusApplication(int handle)

196+bool ApplicationManager::focusApplication(const QString &appId)

141{

197{

142− for (int i = 0; i < m_mainStageApplications->m_applications.count(); ++i) {

198+ ApplicationInfo *application = findApplication(appId);

143− ApplicationInfo *application = m_mainStageApplications->m_applications[i];

199+ if (application == nullptr)

144− if (application->handle() == handle) {

200+ return false;

145− if (m_mainStageFocusedApplication)

201+

146− m_mainStageFocusedApplication->hideWindow();

202+ if (application->stage() == ApplicationInfo::MainStage) {

147− m_mainStageFocusedApplication = application;

203+ // unfocus currently focused mainstage app

148− if (!m_mainStage)

204+ for (ApplicationInfo *app : m_runningApplications) {

149− createMainStage();

205+ if (app->focused() && app->stage() == ApplicationInfo::MainStage) {

150− application->showWindow(m_mainStage);

206+ app->setFocused(false);

151− m_mainStage->setZ(-1000);

207+ app->hideWindow();

152− if (m_sideStage)

208+ }

153− m_sideStage->setZ(-2000);

154− Q_EMIT mainStageFocusedApplicationChanged();

155− return;

156 }

209 }

157− }

158

210

159− for (int i = 0; i < m_sideStageApplications->m_applications.count(); ++i) {

211+ // focus this app

160− ApplicationInfo *application = m_sideStageApplications->m_applications[i];

212+ application->setFocused(true);

161− if (application->handle() == handle) {

213+ if (!m_mainStage)

162− if (m_sideStageFocusedApplication)

214+ createMainStage();

163− m_sideStageFocusedApplication->hideWindow();

215+ application->showWindow(m_mainStage);

164− m_sideStageFocusedApplication = application;

216+ m_mainStage->setZ(-1000);

165− if (!m_sideStage)

217+ if (m_sideStage)

166− createSideStage();

218+ m_sideStage->setZ(-2000);

167− application->showWindow(m_sideStage);

219+ } else if (application->stage() == ApplicationInfo::SideStage) {

168− m_sideStage->setZ(-1000);

220+ // unfocus currently focused sidestage app

169− if (m_mainStage)

221+ for (ApplicationInfo *app : m_runningApplications) {

170− m_mainStage->setZ(-2000);

222+ if (app->focused() && app->stage() == ApplicationInfo::SideStage) {

171− Q_EMIT sideStageFocusedApplicationChanged();

223+ app->setFocused(false);

172− return;

224+ app->hideWindow();

225+ }

173 }

226 }

227+

228+ // focus this app

229+ application->setFocused(true);

230+ if (!m_sideStage)

231+ createSideStage();

232+ application->showWindow(m_sideStage);

233+ m_sideStage->setZ(-1000);

234+ if (m_mainStage)

235+ m_mainStage->setZ(-2000);

174 }

236 }

237+

238+ // move app to top of stack

239+ move(m_runningApplications.indexOf(application), 0);

240+ Q_EMIT focusedApplicationIdChanged();

241+ return true;

175}

242}

176

243

177−void ApplicationManager::unfocusCurrentApplication(StageHint stageHint)

244+void ApplicationManager::unfocusCurrentApplication()

178{

245{

179− if (stageHint == SideStage) {

246+ for (ApplicationInfo *app : m_runningApplications) {

180− if (m_sideStageFocusedApplication) {

247+ if (app->focused()) {

181− m_sideStageFocusedApplication->hideWindow();

248+ app->hideWindow();

182− m_sideStageFocusedApplication = 0;

249+ app->setFocused(false);

183− Q_EMIT sideStageFocusedApplicationChanged();

184− }

185− } else {

186− if (m_mainStageFocusedApplication) {

187− m_mainStageFocusedApplication->hideWindow();

188− m_mainStageFocusedApplication = 0;

189− Q_EMIT mainStageFocusedApplicationChanged();

190 }

250 }

191 }

251 }

252+ Q_EMIT focusedApplicationIdChanged();

192}

253}

193

254

194void ApplicationManager::generateQmlStrings(ApplicationInfo *application)

255void ApplicationManager::generateQmlStrings(ApplicationInfo *application)

@@ -213,7 +274,7 @@ void ApplicationManager::generateQmlStrings(ApplicationInfo *application)

213 " fillMode: Image.PreserveAspectCrop\n"

274 " fillMode: Image.PreserveAspectCrop\n"

214 "}").arg(topMargin)

275 "}").arg(topMargin)

215 .arg(shellAppDirectory())

276 .arg(shellAppDirectory())

216− .arg(application->icon());

277+ .arg(application->icon().toString());

217 application->setWindowQml(windowQml);

278 application->setWindowQml(windowQml);

218

279

219 QString imageQml = QString(

280 QString imageQml = QString(

@@ -224,159 +285,130 @@ void ApplicationManager::generateQmlStrings(ApplicationInfo *application)

224 " smooth: true\n"

285 " smooth: true\n"

225 " fillMode: Image.PreserveAspectCrop\n"

286 " fillMode: Image.PreserveAspectCrop\n"

226 "}").arg(shellAppDirectory())

287 "}").arg(shellAppDirectory())

227− .arg(application->icon());

288+ .arg(application->icon().toString());

228 application->setImageQml(imageQml);

289 application->setImageQml(imageQml);

229}

290}

230

291

231void ApplicationManager::buildListOfAvailableApplications()

292void ApplicationManager::buildListOfAvailableApplications()

232{

293{

233 ApplicationInfo *application;

294 ApplicationInfo *application;

234− qint64 nextHandle = 1;

235

295

236 application = new ApplicationInfo(this);

296 application = new ApplicationInfo(this);

237− application->setDesktopFile("/usr/share/applications/phone-app.desktop");

297+ application->setAppId("phone-app");

238 application->setName("Phone");

298 application->setName("Phone");

239− application->setIcon("phone");

299+ application->setIcon(QUrl("phone"));

240− application->setExec("/usr/bin/phone-app");

241 application->setStage(ApplicationInfo::SideStage);

300 application->setStage(ApplicationInfo::SideStage);

242− application->setHandle(nextHandle++);

243 generateQmlStrings(application);

301 generateQmlStrings(application);

244 m_availableApplications.append(application);

302 m_availableApplications.append(application);

245

303

246 application = new ApplicationInfo(this);

304 application = new ApplicationInfo(this);

247− application->setDesktopFile("/usr/share/applications/camera-app.desktop");

305+ application->setAppId("camera-app");

248 application->setName("Camera");

306 application->setName("Camera");

249− application->setIcon("camera");

307+ application->setIcon(QUrl("camera"));

250 application->setFullscreen(true);

308 application->setFullscreen(true);

251− application->setExec("/usr/bin/camera-app --fullscreen");

252− application->setHandle(nextHandle++);

253 generateQmlStrings(application);

309 generateQmlStrings(application);

254 m_availableApplications.append(application);

310 m_availableApplications.append(application);

255

311

256 application = new ApplicationInfo(this);

312 application = new ApplicationInfo(this);

257− application->setDesktopFile("/usr/share/applications/gallery-app.desktop");

313+ application->setAppId("gallery-app");

258 application->setName("Gallery");

314 application->setName("Gallery");

259− application->setIcon("gallery");

315+ application->setIcon(QUrl("gallery"));

260− application->setExec("/usr/bin/gallery-app");

261− application->setHandle(nextHandle++);

262 generateQmlStrings(application);

316 generateQmlStrings(application);

263 m_availableApplications.append(application);

317 m_availableApplications.append(application);

264

318

265 application = new ApplicationInfo(this);

319 application = new ApplicationInfo(this);

266− application->setDesktopFile("/usr/share/applications/facebook-webapp.desktop");

320+ application->setAppId("facebook-webapp");

267 application->setName("Facebook");

321 application->setName("Facebook");

268− application->setIcon("facebook");

322+ application->setIcon(QUrl("facebook"));

269− application->setExec("/usr/bin/webbrowser-app --chromeless http://m.facebook.com");

270 application->setStage(ApplicationInfo::SideStage);

323 application->setStage(ApplicationInfo::SideStage);

271− application->setHandle(nextHandle++);

272 generateQmlStrings(application);

324 generateQmlStrings(application);

273 m_availableApplications.append(application);

325 m_availableApplications.append(application);

274

326

275 application = new ApplicationInfo(this);

327 application = new ApplicationInfo(this);

276− application->setDesktopFile("/usr/share/applications/webbrowser-app.desktop");

328+ application->setAppId("webbrowser-app");

277 application->setName("Browser");

329 application->setName("Browser");

278− application->setIcon("browser");

330+ application->setIcon(QUrl("browser"));

279− application->setExec("/usr/bin/webbrowser-app");

280− application->setHandle(nextHandle++);

281 generateQmlStrings(application);

331 generateQmlStrings(application);

282 m_availableApplications.append(application);

332 m_availableApplications.append(application);

283

333

284 application = new ApplicationInfo(this);

334 application = new ApplicationInfo(this);

285− application->setDesktopFile("/usr/share/applications/twitter-webapp.desktop");

335+ application->setAppId("twitter-webapp");

286 application->setName("Twitter");

336 application->setName("Twitter");

287− application->setIcon("twitter");

337+ application->setIcon(QUrl("twitter"));

288− application->setExec("/usr/bin/webbrowser-app --chromeless http://www.twitter.com");

289 application->setStage(ApplicationInfo::SideStage);

338 application->setStage(ApplicationInfo::SideStage);

290− application->setHandle(nextHandle++);

291 generateQmlStrings(application);

339 generateQmlStrings(application);

292 m_availableApplications.append(application);

340 m_availableApplications.append(application);

293

341

294 application = new ApplicationInfo(this);

342 application = new ApplicationInfo(this);

295− application->setDesktopFile("/usr/share/applications/gmail-webapp.desktop");

343+ application->setAppId("gmail-webapp");

296 application->setName("GMail");

344 application->setName("GMail");

297− application->setIcon("gmail");

345+ application->setIcon(QUrl("gmail"));

298− application->setExec("/usr/bin/webbrowser-app --chromeless http://m.gmail.com");

299− application->setHandle(nextHandle++);

300 m_availableApplications.append(application);

346 m_availableApplications.append(application);

301

347

302 application = new ApplicationInfo(this);

348 application = new ApplicationInfo(this);

303− application->setDesktopFile("/usr/share/applications/ubuntu-weather-app.desktop");

349+ application->setAppId("ubuntu-weather-app");

304 application->setName("Weather");

350 application->setName("Weather");

305− application->setIcon("weather");

351+ application->setIcon(QUrl("weather"));

306− application->setExec("/usr/bin/qmlscene /usr/share/ubuntu-weather-app/ubuntu-weather-app.qml");

307 application->setStage(ApplicationInfo::SideStage);

352 application->setStage(ApplicationInfo::SideStage);

308− application->setHandle(nextHandle++);

309 generateQmlStrings(application);

353 generateQmlStrings(application);

310 m_availableApplications.append(application);

354 m_availableApplications.append(application);

311

355

312 application = new ApplicationInfo(this);

356 application = new ApplicationInfo(this);

313− application->setDesktopFile("/usr/share/applications/notes-app.desktop");

357+ application->setAppId("notes-app");

314 application->setName("Notepad");

358 application->setName("Notepad");

315− application->setIcon("notepad");

359+ application->setIcon(QUrl("notepad"));

316− application->setExec("/usr/bin/qmlscene /usr/share/notes-app/NotesApp.qml");

317 application->setStage(ApplicationInfo::SideStage);

360 application->setStage(ApplicationInfo::SideStage);

318− application->setHandle(nextHandle++);

319 m_availableApplications.append(application);

361 m_availableApplications.append(application);

320

362

321 application = new ApplicationInfo(this);

363 application = new ApplicationInfo(this);

322− application->setDesktopFile("/usr/share/applications/calendar-app.desktop");

364+ application->setAppId("calendar-app");

323 application->setName("Calendar");

365 application->setName("Calendar");

324− application->setIcon("calendar");

366+ application->setIcon(QUrl("calendar"));

325− application->setExec("/usr/bin/qmlscene /usr/share/calendar-app/calendar.qml");

326 application->setStage(ApplicationInfo::SideStage);

367 application->setStage(ApplicationInfo::SideStage);

327− application->setHandle(nextHandle++);

328 m_availableApplications.append(application);

368 m_availableApplications.append(application);

329

369

330 application = new ApplicationInfo(this);

370 application = new ApplicationInfo(this);

331− application->setDesktopFile("/usr/share/applications/mediaplayer-app.desktop");

371+ application->setAppId("mediaplayer-app");

332 application->setName("Media Player");

372 application->setName("Media Player");

333− application->setIcon("mediaplayer-app");

373+ application->setIcon(QUrl("mediaplayer-app"));

334 application->setFullscreen(true);

374 application->setFullscreen(true);

335− application->setExec("/usr/bin/mediaplayer-app");

336− application->setHandle(nextHandle++);

337 m_availableApplications.append(application);

375 m_availableApplications.append(application);

338

376

339 application = new ApplicationInfo(this);

377 application = new ApplicationInfo(this);

340− application->setDesktopFile("/usr/share/applications/evernote.desktop");

378+ application->setAppId("evernote");

341 application->setName("Evernote");

379 application->setName("Evernote");

342− application->setIcon("evernote");

380+ application->setIcon(QUrl("evernote"));

343− application->setHandle(nextHandle++);

344 m_availableApplications.append(application);

381 m_availableApplications.append(application);

345

382

346 application = new ApplicationInfo(this);

383 application = new ApplicationInfo(this);

347− application->setDesktopFile("/usr/share/applications/map.desktop");

384+ application->setAppId("map");

348 application->setName("Map");

385 application->setName("Map");

349− application->setIcon("map");

386+ application->setIcon(QUrl("map"));

350− application->setHandle(nextHandle++);

351 generateQmlStrings(application);

387 generateQmlStrings(application);

352 m_availableApplications.append(application);

388 m_availableApplications.append(application);

353

389

354 application = new ApplicationInfo(this);

390 application = new ApplicationInfo(this);

355− application->setDesktopFile("/usr/share/applications/pinterest.desktop");

391+ application->setAppId("pinterest");

356 application->setName("Pinterest");

392 application->setName("Pinterest");

357− application->setIcon("pinterest");

393+ application->setIcon(QUrl("pinterest"));

358− application->setHandle(nextHandle++);

359 m_availableApplications.append(application);

394 m_availableApplications.append(application);

360

395

361 application = new ApplicationInfo(this);

396 application = new ApplicationInfo(this);

362− application->setDesktopFile("/usr/share/applications/soundcloud.desktop");

397+ application->setAppId("soundcloud");

363 application->setName("SoundCloud");

398 application->setName("SoundCloud");

364− application->setIcon("soundcloud");

399+ application->setIcon(QUrl("soundcloud"));

365− application->setHandle(nextHandle++);

366 m_availableApplications.append(application);

400 m_availableApplications.append(application);

367

401

368 application = new ApplicationInfo(this);

402 application = new ApplicationInfo(this);

369− application->setDesktopFile("/usr/share/applications/wikipedia.desktop");

403+ application->setAppId("wikipedia");

370 application->setName("Wikipedia");

404 application->setName("Wikipedia");

371− application->setIcon("wikipedia");

405+ application->setIcon(QUrl("wikipedia"));

372− application->setHandle(nextHandle++);

373 m_availableApplications.append(application);

406 m_availableApplications.append(application);

374

407

375 application = new ApplicationInfo(this);

408 application = new ApplicationInfo(this);

376− application->setDesktopFile("/usr/share/applications/youtube.desktop");

409+ application->setAppId("youtube");

377 application->setName("YouTube");

410 application->setName("YouTube");

378− application->setIcon("youtube");

411+ application->setIcon(QUrl("youtube"));

379− application->setHandle(nextHandle++);

380 m_availableApplications.append(application);

412 m_availableApplications.append(application);

381}

413}

382

414

tests/mocks/Ubuntu/Application/ApplicationManager.h → tests/mocks/Unity/Application/ApplicationManager.hrenamed+26−26

@@ -20,12 +20,15 @@

20#include <QObject>

21#include <QList>

22#include <QStringList>

23−#include "ApplicationListModel.h"

24#include "ApplicationInfo.h"

23#include "ApplicationInfo.h"

25

24

25+// unity-api

26+#include <unity/shell/application/ApplicationManagerInterface.h>

27+

26class QQuickItem;

28class QQuickItem;

29+using namespace unity::shell::application;

27

30

28−class ApplicationManager : public QObject {

31+class ApplicationManager : public ApplicationManagerInterface {

29 Q_OBJECT

32 Q_OBJECT

30 Q_ENUMS(Role)

33 Q_ENUMS(Role)

31 Q_ENUMS(StageHint)

34 Q_ENUMS(StageHint)

@@ -39,12 +42,6 @@ class ApplicationManager : public QObject {

39 Q_PROPERTY(int sideStageWidth READ sideStageWidth)

42 Q_PROPERTY(int sideStageWidth READ sideStageWidth)

40 Q_PROPERTY(StageHint stageHint READ stageHint)

43 Q_PROPERTY(StageHint stageHint READ stageHint)

41 Q_PROPERTY(FormFactorHint formFactorHint READ formFactorHint)

44 Q_PROPERTY(FormFactorHint formFactorHint READ formFactorHint)

42− Q_PROPERTY(ApplicationListModel* mainStageApplications READ mainStageApplications)

43− Q_PROPERTY(ApplicationListModel* sideStageApplications READ sideStageApplications)

44− Q_PROPERTY(ApplicationInfo* mainStageFocusedApplication READ mainStageFocusedApplication

45− NOTIFY mainStageFocusedApplicationChanged)

46− Q_PROPERTY(ApplicationInfo* sideStageFocusedApplication READ sideStageFocusedApplication

47− NOTIFY sideStageFocusedApplicationChanged)

48

45

49 Q_PROPERTY(bool fake READ fake CONSTANT)

46 Q_PROPERTY(bool fake READ fake CONSTANT)

50

47

@@ -64,7 +61,8 @@ class ApplicationManager : public QObject {

64 DesktopFormFactor, PhoneFormFactor, TabletFormFactor

61 DesktopFormFactor, PhoneFormFactor, TabletFormFactor

65 };

62 };

66 enum FavoriteApplication {

63 enum FavoriteApplication {

67− CameraApplication, GalleryApplication, BrowserApplication, ShareApplication

64+ CameraApplication, GalleryApplication, BrowserApplication, ShareApplication,

65+ PhoneApplication, DialerApplication, MessagingApplication, AddressbookApplication

68 };

66 };

69 enum Flag {

67 enum Flag {

70 NoFlag = 0x0,

68 NoFlag = 0x0,

@@ -77,29 +75,34 @@ class ApplicationManager : public QObject {

77 int sideStageWidth() const;

75 int sideStageWidth() const;

78 StageHint stageHint() const;

76 StageHint stageHint() const;

79 FormFactorHint formFactorHint() const;

77 FormFactorHint formFactorHint() const;

80− ApplicationListModel* mainStageApplications() const;

81− ApplicationListModel* sideStageApplications() const;

82− ApplicationInfo* mainStageFocusedApplication() const;

83− ApplicationInfo* sideStageFocusedApplication() const;

84

78

85 bool fake() { return true; }

79 bool fake() { return true; }

86

80

87− Q_INVOKABLE void focusApplication(int handle);

81+ // QAbstractItemModel methods.

82+ int rowCount(const QModelIndex& parent = QModelIndex()) const override;

83+ QVariant data(const QModelIndex& index, int role) const override;

84+ Q_INVOKABLE ApplicationInfo *get(int index) const override;

85+ Q_INVOKABLE ApplicationInfo *findApplication(const QString &appId) const override;

86+

87+ Q_INVOKABLE void move(int from, int to);

88+

89+ // Application control methods

90+ Q_INVOKABLE bool focusApplication(const QString &appId) override;

88− Q_INVOKABLE void unfocusCurrentApplication(StageHint stageHint);

91+ Q_INVOKABLE void unfocusCurrentApplication() override;

89− Q_INVOKABLE ApplicationInfo* startProcess(QString desktopFile,

92+ Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;

90− ExecFlags flags,

91− QStringList arguments = QStringList());

93+ Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());

92− Q_INVOKABLE void stopProcess(ApplicationInfo* application);

94+ Q_INVOKABLE bool stopApplication(const QString &appId) override;

93− Q_INVOKABLE void startWatcher() {}

95+

96+ QString focusedApplicationId() const override;

94

97

95 Q_SIGNALS:

98 Q_SIGNALS:

96 void keyboardHeightChanged();

99 void keyboardHeightChanged();

97 void keyboardVisibleChanged();

100 void keyboardVisibleChanged();

98− void mainStageFocusedApplicationChanged();

99− void sideStageFocusedApplicationChanged();

100 void focusRequested(FavoriteApplication favoriteApplication);

101 void focusRequested(FavoriteApplication favoriteApplication);

101

102

102 private:

103 private:

104+ void add(ApplicationInfo *application);

105+ void remove(ApplicationInfo* application);

103 void showApplicationWindow(ApplicationInfo *application);

106 void showApplicationWindow(ApplicationInfo *application);

104 void buildListOfAvailableApplications();

107 void buildListOfAvailableApplications();

105 void generateQmlStrings(ApplicationInfo *application);

108 void generateQmlStrings(ApplicationInfo *application);

@@ -109,10 +112,7 @@ class ApplicationManager : public QObject {

109 void createSideStage();

112 void createSideStage();

110 int m_keyboardHeight;

113 int m_keyboardHeight;

111 bool m_keyboardVisible;

114 bool m_keyboardVisible;

112− ApplicationListModel* m_mainStageApplications;

115+ QList<ApplicationInfo*> m_runningApplications;

113− ApplicationListModel* m_sideStageApplications;

114− ApplicationInfo* m_mainStageFocusedApplication;

115− ApplicationInfo* m_sideStageFocusedApplication;

116 QList<ApplicationInfo*> m_availableApplications;

117 QQmlComponent *m_mainStageComponent;

118 QQuickItem *m_mainStage;

tests/mocks/Unity/Application/CMakeLists.txtnew file+37

@@ -0,0 +1,37 @@

1+include(FindPkgConfig)

2+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application)

3+

4+set(FakeUnityApplicationQml_SOURCES

5+ plugin.cpp

6+ ApplicationInfo.cpp

7+ ApplicationImage.cpp

8+ ApplicationManager.cpp

9+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

10+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

11+)

12+

13+add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})

14+

15+qt5_use_modules(FakeUnityApplicationQml Core Quick)

16+

17+# copy files into build directory for shadow builds

18+add_custom_target(UnityAppQmlDirFile ALL

19+ COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" ${CMAKE_CURRENT_BINARY_DIR}

20+ DEPENDS qmldir

21+)

22+add_custom_target(InputFilterAreaQmlFile ALL

23+ COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/InputFilterArea.qml" ${CMAKE_CURRENT_BINARY_DIR}

24+ DEPENDS InputFilterArea.qml

25+)

26+add_custom_target(OSKControllerQmlFile ALL

27+ COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/OSKController.qml" ${CMAKE_CURRENT_BINARY_DIR}

28+ DEPENDS OSKController.qml

29+)

30+

31+install(TARGETS FakeUnityApplicationQml

32+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Unity/Application

33+ )

34+

35+install(FILES qmldir InputFilterArea.qml OSKController.qml

36+ DESTINATION ${SHELL_PRIVATE_LIBDIR}/qml/mocks/Unity/Application

37+ )

tests/mocks/Ubuntu/Application/InputFilterArea.qml → tests/mocks/Unity/Application/InputFilterArea.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/OSKController.qmlnew file+20

@@ -0,0 +1,20 @@

1+/*

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+import QtQuick 2.0;

18+

19+Item {

20+}

tests/mocks/Ubuntu/Application/plugin.cpp → tests/mocks/Unity/Application/plugin.cpprenamed+6−5

@@ -17,7 +17,6 @@

17#include "plugin.h"

18#include "ApplicationInfo.h"

19#include "ApplicationImage.h"

20−#include "ApplicationListModel.h"

21#include "ApplicationManager.h"

20#include "ApplicationManager.h"

22

21

23#include <qqml.h>

22#include <qqml.h>

@@ -28,11 +27,13 @@ static QObject* applicationManagerSingleton(QQmlEngine* engine, QJSEngine* scrip

28 return new ApplicationManager();

27 return new ApplicationManager();

29}

28}

30

29

31−void FakeUbuntuApplicationQmlPlugin::registerTypes(const char *uri)

30+void FakeUnityApplicationQmlPlugin::registerTypes(const char *uri)

32{

31{

33− qmlRegisterSingletonType<ApplicationManager>(

32+ qmlRegisterUncreatableType<unity::shell::application::ApplicationManagerInterface>(uri, 0, 1, "ApplicationManagerInterface", "Abstract interface. Cannot be created in QML");

34− uri, 0, 1, "ApplicationManager", applicationManagerSingleton);

33+ qmlRegisterSingletonType<ApplicationManager>(uri, 0, 1, "ApplicationManager", applicationManagerSingleton);

34+

35+ qmlRegisterUncreatableType<unity::shell::application::ApplicationInfoInterface>(uri, 0, 1, "ApplicationInfoInterface", "Abstract interface. Cannot be created in QML");

35 qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");

36 qmlRegisterType<ApplicationInfo>(uri, 0, 1, "ApplicationInfo");

37+

36 qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");

38 qmlRegisterType<ApplicationImage>(uri, 0, 1, "ApplicationImage");

37− qmlRegisterType<ApplicationListModel>(uri, 0, 1, "ApplicationListModel");

38}

39}

tests/mocks/Ubuntu/Application/plugin.h → tests/mocks/Unity/Application/plugin.hrenamed+1−1

@@ -19,7 +19,7 @@

19

20#include <QQmlExtensionPlugin>

21

22−class FakeUbuntuApplicationQmlPlugin : public QQmlExtensionPlugin

22+class FakeUnityApplicationQmlPlugin : public QQmlExtensionPlugin

23{

24 Q_OBJECT

25 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

tests/mocks/Unity/Application/qmldirnew file+4

@@ -0,0 +1,4 @@

1+module Unity.Application

2+plugin FakeUnityApplicationQml

3+InputFilterArea 0.1 InputFilterArea.qml

4+OSKController 0.1 OSKController.qml

tests/mocks/Unity/CMakeLists.txt+1

@@ -1,3 +1,4 @@

1+add_subdirectory(Application)

1add_subdirectory(Indicators)

2add_subdirectory(Indicators)

2

3

3pkg_search_module(DEE dee-1.0 REQUIRED)

4pkg_search_module(DEE dee-1.0 REQUIRED)

tests/mocks/Unity/Launcher/CMakeLists.txt+1−1

@@ -1,5 +1,5 @@

1include(FindPkgConfig)

2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)

2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)

3

4add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")

5

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+7−4

@@ -71,8 +71,6 @@ QVariant MockLauncherModel::data(const QModelIndex& index, int role) const

71 LauncherItemInterface *item = m_list.at(index.row());

72 switch(role)

73 {

74− case RoleDesktopFile:

75− return item->desktopFile();

76 case RoleName:

74 case RoleName:

77 return item->name();

75 return item->name();

78 case RoleIcon:

76 case RoleIcon:

@@ -185,7 +183,12 @@ void MockLauncherModel::setUser(const QString &username)

185 // TODO: implement this...

183 // TODO: implement this...

186}

184}

187

185

188−void MockLauncherModel::applicationFocused(const QString &appId)

186+void MockLauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager)

189{

187{

190− Q_UNUSED(appId)

188+ Q_UNUSED(applicationManager)

189+}

190+

191+unity::shell::application::ApplicationManagerInterface *MockLauncherModel::applicationManager() const

192+{

193+ return nullptr;

191}

194}

tests/mocks/Unity/Launcher/MockLauncherModel.h+3−1

@@ -44,7 +44,9 @@ public:

44 Q_INVOKABLE void requestRemove(const QString &appId);

45 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);

46 Q_INVOKABLE void setUser(const QString &username);

47− Q_INVOKABLE void applicationFocused(const QString &appId);

47+

48+ unity::shell::application::ApplicationManagerInterface *applicationManager() const;

49+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);

48

50

49Q_SIGNALS:

51Q_SIGNALS:

50 void quickListTriggered(const QString &appId, int index);

52 void quickListTriggered(const QString &appId, int index);

tests/plugins/AccountsService/CMakeLists.txt+1

@@ -25,6 +25,7 @@ qt5_use_modules(mock-server Core DBus)

25

26add_executable(test-accountsservice

27 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

28+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

28 client.cpp

29 client.cpp

29 )

30 )

30qt5_use_modules(test-accountsservice Core DBus Test)

31qt5_use_modules(test-accountsservice Core DBus Test)

tests/plugins/AccountsService/client.cpp+19−7

@@ -18,6 +18,7 @@

18 */

19

20#include "AccountsService.h"

21+#include "AccountsServiceDBusAdaptor.h"

21#include <QSignalSpy>

22#include <QSignalSpy>

22#include <QTest>

23#include <QTest>

23

24

@@ -30,17 +31,28 @@ private Q_SLOTS:

30 void testInvalids()

31 void testInvalids()

31 {

32 {

32 // Test various invalid calls

33 // Test various invalid calls

33− AccountsService session;

34+ AccountsServiceDBusAdaptor session;

34− QCOMPARE(session.getUserProperty("NOPE", "demo-edges"), QVariant());

35+ QCOMPARE(session.getUserProperty("NOPE", "com.canonical.unity.AccountsService", "demo-edges"), QVariant());

35− QCOMPARE(session.getUserProperty("testuser", "NOPE"), QVariant());

36+ QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "NOPE"), QVariant());

37+ }

38+

39+ void testGetSetServiceDBusAdaptor()

40+ {

41+ AccountsServiceDBusAdaptor session;

42+ session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(true));

43+ QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(true));

44+ session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(false));

45+ QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(false));

36 }

46 }

37

47

38− void testGetSet()

48+ void testGetSetService()

39 {

49 {

40 AccountsService session;

50 AccountsService session;

41− QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(true));

51+ session.setUser("testuser");

42− session.setUserProperty("testuser", "demo-edges", QVariant(false));

52+ session.setDemoEdges(true);

53+ QCOMPARE(session.getDemoEdges(), true);

54+ session.setDemoEdges(false);

43− QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(false));

55+ QCOMPARE(session.getDemoEdges(), false);

44 }

56 }

45};

57};

46

58

tests/plugins/Unity/Launcher/CMakeLists.txt+15−3

@@ -1,5 +1,6 @@

1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

2−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=2)

2+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)

3+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=1)

3

4

4include_directories(

5include_directories(

5 ${CMAKE_CURRENT_BINARY_DIR}

6 ${CMAKE_CURRENT_BINARY_DIR}

@@ -21,7 +22,7 @@ add_test(NAME launcherbackendtest COMMAND ${testBackendCommand})

21add_custom_target(launcherbackendtest ${testBackendCommand})

22add_custom_target(launcherbackendtest ${testBackendCommand})

22add_executable(launcherbackendtestExec

23add_executable(launcherbackendtestExec

23 launcherbackendtest.cpp

24 launcherbackendtest.cpp

24− ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

25+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

25 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

26 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

26 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

27 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

27 )

28 )

@@ -39,12 +40,14 @@ add_executable(launchermodeltestExec

39 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp

40 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp

40 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp

41 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp

41 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp

42 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp

42− ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

43+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

43 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

44 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

44 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

45 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

45 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

46 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

46 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

47 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

47 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

48 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

49+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

50+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

48 )

51 )

49target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS} )

52target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS} )

50qt5_use_modules(launchermodeltestExec Test Core DBus)

53qt5_use_modules(launchermodeltestExec Test Core DBus)

@@ -57,3 +60,12 @@ foreach(DESKTOP_FILE ${DESKTOP_FILES})

57 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}

60 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}

58 )

61 )

59endforeach()

62endforeach()

63+

64+# copy .svg files into build directory for shadow builds

65+file(GLOB DESKTOP_FILES *.svg)

66+

67+foreach(DESKTOP_FILE ${DESKTOP_FILES})

68+ file(COPY "${DESKTOP_FILE}"

69+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}

70+ )

71+endforeach()

tests/plugins/Unity/Launcher/click-icon.desktopnew file+4

@@ -0,0 +1,4 @@

1+[Desktop Entry]

2+Name=Click Package Icon

3+Icon=click-icon.svg

4+Path=/path/to/some/click/app

tests/plugins/Unity/Launcher/launcherbackendtest.cpp+25

@@ -54,6 +54,31 @@ private Q_SLOTS:

54 QCOMPARE(backend.isPinned("rel-icon"), true);

55 QCOMPARE(backend.isPinned("no-name"), false); // doesn't exist anymore!

56 }

57+

58+ void testIcon_data() {

59+ QTest::addColumn<QString>("appId");

60+ QTest::addColumn<QString>("expectedIcon");

61+

62+ // Needs to expand a relative icon to the absolute path

63+ QTest::newRow("relative icon path") << "rel-icon" << QDir::currentPath() + "/rel-icon.svg";

64+

65+ // In case an icon is not found on disk, it needs to fallback on image://theme/ for it

66+ QTest::newRow("fallback on theme") << "abs-icon" << "image://theme//path/to/icon.png";

67+

68+ // Click packages have a relative icon path but an absolute path as a separate entry

69+ // As we don't want to rely on a click app being installed for the test, accept it with the image://theme fallback

70+ QTest::newRow("click package icon") << "click-icon" << "image://theme//path/to/some/click/app/click-icon.svg";

71+ }

72+

73+ void testIcon() {

74+ QFETCH(QString, appId);

75+ QFETCH(QString, expectedIcon);

76+

77+ LauncherBackend backend(false);

78+ backend.setStoredApplications(QStringList() << appId);

79+

80+ QCOMPARE(backend.icon(appId), expectedIcon);

81+ }

57};

82};

58

83

59QTEST_GUILESS_MAIN(LauncherBackendTest)

84QTEST_GUILESS_MAIN(LauncherBackendTest)

tests/plugins/Unity/Launcher/launchermodeltest.cpp+88−18

@@ -19,38 +19,109 @@

19

20// unity-api

21#include <unity/shell/launcher/LauncherModelInterface.h>

22+#include <unity/shell/application/ApplicationInfoInterface.h>

22

23

23#include "launcheritem.h"

24#include "launcheritem.h"

24#include "launchermodel.h"

25#include "launchermodel.h"

25

26

26#include <QtTest>

27#include <QtTest>

27

28

29+// This is a mock, specifically to test the LauncherModel

30+class MockApp: public unity::shell::application::ApplicationInfoInterface

31+{

32+ Q_OBJECT

33+public:

34+ MockApp(const QString &appId, QObject *parent = 0): ApplicationInfoInterface(appId, parent), m_appId(appId), m_focused(false) { }

35+ QString appId() const { return m_appId; }

36+ QString name() const { return "mock"; }

37+ QString comment() const { return "this is a mock"; }

38+ QUrl icon() const { return QUrl(); }

39+ ApplicationInfoInterface::Stage stage() const { return ApplicationInfoInterface::MainStage; }

40+ ApplicationInfoInterface::State state() const { return ApplicationInfoInterface::Running; }

41+ bool focused() const { return m_focused; }

42+

43+ // Methods used for mocking (not in the interface)

44+ void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }

45+private:

46+ QString m_appId;

47+ bool m_focused;

48+};

49+

50+// This is a mock, specifically to test the LauncherModel

51+class MockAppManager: public unity::shell::application::ApplicationManagerInterface

52+{

53+ Q_OBJECT

54+public:

55+ MockAppManager(QObject *parent = 0): ApplicationManagerInterface(parent) {}

56+ int rowCount(const QModelIndex &) const { return m_list.count(); }

57+ QVariant data(const QModelIndex &, int ) const { return QVariant(); }

58+ QString focusedApplicationId() const {

59+ Q_FOREACH(MockApp *app, m_list) {

60+ if (app->focused()) return app->appId();

61+ }

62+ return QString();

63+ }

64+ unity::shell::application::ApplicationInfoInterface *get(int index) const { return m_list.at(index); }

65+ unity::shell::application::ApplicationInfoInterface *findApplication(const QString &) const { return nullptr; }

66+ unity::shell::application::ApplicationInfoInterface *startApplication(const QString &, const QStringList &) { return nullptr; }

67+ bool stopApplication(const QString &) { return false; }

68+ bool focusApplication(const QString &appId) {

69+ Q_FOREACH(MockApp* app, m_list) {

70+ app->setFocused(app->appId() == appId);

71+ }

72+ Q_EMIT focusedApplicationIdChanged();

73+ return true;

74+ }

75+

76+ void unfocusCurrentApplication() { }

77+

78+ void addApplication(MockApp *app) {

79+ beginInsertRows(QModelIndex(), count(), count());

80+ m_list.append(app);

81+ endInsertRows();

82+ }

83+ void removeApplication(int index) {

84+ beginRemoveRows(QModelIndex(), index, index);

85+ m_list.takeAt(index)->deleteLater();

86+ endRemoveRows();

87+ }

88+

89+private:

90+ QList<MockApp*> m_list;

91+};

92+

28class LauncherModelTest : public QObject

93class LauncherModelTest : public QObject

29{

94{

30 Q_OBJECT

95 Q_OBJECT

31

96

32private:

97private:

33 LauncherModel *launcherModel;

98 LauncherModel *launcherModel;

99+ MockAppManager *appManager;

34

100

35private Q_SLOTS:

101private Q_SLOTS:

36

102

37 void initTestCase() {

103 void initTestCase() {

38 launcherModel = new LauncherModel(this);

104 launcherModel = new LauncherModel(this);

39 QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);

105 QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);

106+

107+ appManager = new MockAppManager(this);

108+ launcherModel->setApplicationManager(appManager);

40 }

109 }

41

110

111+ // Adding 2 apps to the mock appmanager. Both should appear in the launcher.

42 void init() {

112 void init() {

43− qDebug() << "init";

113+ appManager->addApplication(new MockApp("abs-icon"));

44− launcherModel->applicationFocused("abs-icon");

45 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

114 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

46

115

47− launcherModel->applicationFocused("no-icon.desktop");

116+ appManager->addApplication(new MockApp("no-icon"));

48 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

117 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

49−

50− launcherModel->applicationFocused(QString());

51 }

118 }

52

119

120+ // Removing apps from appmanager and launcher as pinned ones would stick

53 void cleanup() {

121 void cleanup() {

122+ while (appManager->count() > 0) {

123+ appManager->removeApplication(0);

124+ }

54 while (launcherModel->rowCount(QModelIndex()) > 0) {

125 while (launcherModel->rowCount(QModelIndex()) > 0) {

55 launcherModel->requestRemove(launcherModel->get(0)->appId());

126 launcherModel->requestRemove(launcherModel->get(0)->appId());

56 }

127 }

@@ -118,27 +189,26 @@ private Q_SLOTS:

118 QCOMPARE(launcherModel->get(0)->focused(), false);

189 QCOMPARE(launcherModel->get(0)->focused(), false);

119 QCOMPARE(launcherModel->get(1)->focused(), false);

190 QCOMPARE(launcherModel->get(1)->focused(), false);

120

191

121− launcherModel->applicationFocused("abs-icon");

192+ appManager->focusApplication("abs-icon");

122 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

193 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

123 QCOMPARE(launcherModel->get(0)->focused(), true);

194 QCOMPARE(launcherModel->get(0)->focused(), true);

124 QCOMPARE(launcherModel->get(1)->focused(), false);

195 QCOMPARE(launcherModel->get(1)->focused(), false);

125

196

126− launcherModel->applicationFocused("no-icon");

197+ appManager->focusApplication("no-icon");

127 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

198 QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

128 QCOMPARE(launcherModel->get(0)->focused(), false);

199 QCOMPARE(launcherModel->get(0)->focused(), false);

129 QCOMPARE(launcherModel->get(1)->focused(), true);

200 QCOMPARE(launcherModel->get(1)->focused(), true);

201+ }

130

202

203+ void testClosingApps() {

204+ // At the start there are 2 items. Let's pin one.

131− launcherModel->applicationFocused("rel-icon");

205+ launcherModel->pin("abs-icon");

132− QCOMPARE(launcherModel->rowCount(QModelIndex()), 3);

206+ while (appManager->count() > 0) {

133− QCOMPARE(launcherModel->get(0)->focused(), false);

207+ appManager->removeApplication(0);

134− QCOMPARE(launcherModel->get(1)->focused(), false);

208+ }

135− QCOMPARE(launcherModel->get(2)->focused(), true);

209+ // The pinned one needs to stay, the other needs to disappear

136−

137− launcherModel->applicationFocused(QString());

138− QCOMPARE(launcherModel->rowCount(QModelIndex()), 3);

210+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

139− QCOMPARE(launcherModel->get(0)->focused(), false);

211+ QCOMPARE(launcherModel->get(0)->appId(), QLatin1String("abs-icon"));

140− QCOMPARE(launcherModel->get(1)->focused(), false);

141− QCOMPARE(launcherModel->get(2)->focused(), false);

142 }

212 }

143};

213};

144

214

tests/plugins/Unity/Launcher/rel-icon.desktop+1−1

@@ -1,3 +1,3 @@

1[Desktop Entry]

2Name=Relative Icon

3−Icon=rel-icon

3+Icon=rel-icon.svg

tests/plugins/Unity/Launcher/rel-icon.svgnew file

No changes to the content.

tests/qmltests/Components/tst_Stage.qml+1−1

@@ -18,7 +18,7 @@ import QtQuick 2.0

18import QtTest 1.0

19import ".."

20import "../../../Components"

21−import Ubuntu.Application 0.1

21+import Unity.Application 0.1

22import Ubuntu.Components 0.1

23import Unity.Test 0.1 as UT

24import "tst_Stage"

tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml+55−37

@@ -16,7 +16,6 @@

16

17import QtQuick 2.0

18import QtTest 1.0

19−import Ubuntu.Application 0.1

20import "../../../../Dash/Apps"

19import "../../../../Dash/Apps"

21import Unity.Test 0.1 as UT

20import Unity.Test 0.1 as UT

22

21

@@ -29,8 +28,12 @@ Item {

29

28

30 property bool sideStageEnabled: false

29 property bool sideStageEnabled: false

31

30

32− function stopProcess(application) {

31+ function stopApplication(appId) {

32+ for (var i=0, len=fakeRunningAppsModel.count; i<len; i++) {

33+ if (appId == fakeRunningAppsModel.get(i).appId) {

33− fakeRunningAppsModel.remove(application)

34+ fakeRunningAppsModel.remove(i)

35+ }

36+ }

34 }

37 }

35 }

38 }

36

39

@@ -40,47 +43,62 @@ Item {

40 property bool stageScreenshotsReady: false

43 property bool stageScreenshotsReady: false

41 property var applicationManager: fakeApplicationManager

44 property var applicationManager: fakeApplicationManager

42

45

43− function activateApplication(desktopFile) {

46+ function activateApplication(appId) {

44 }

47 }

45 }

48 }

46

49

50+ ListModel {

47− ApplicationListModel { id: fakeRunningAppsModel }

51+ id: fakeRunningAppsModel

48−

52+

49− ApplicationInfo {

53+ function contains(appId) {

50− id: phoneApp

54+ for (var i=0, len=fakeRunningAppsModel.count; i<len; i++) {

51− name: "Phone"

55+ if (appId == fakeRunningAppsModel.get(i).appId) {

52− icon: "phone-app"

56+ return true;

53− exec: "/usr/bin/phone-app"

57+ }

54− stage: ApplicationInfo.MainStage

58+ }

55− desktopFile: "phone.desktop"

59+ return false;

56− imageQml: "import QtQuick 2.0\n" +

60+ }

57− "Rectangle { \n" +

61+

58− " anchors.fill:parent \n" +

62+ function rePopulate() {

59− " color:'darkgreen' \n" +

63+ for (var i=0, len=availableAppsModel.count; i<len; i++) {

60− " Text { anchors.centerIn: parent; text: 'PHONE' } \n" +

64+ fakeRunningAppsModel.append(availableAppsModel.get(i));

65+ }

61− "}"

66+ }

62 }

67 }

63

68

64− ApplicationInfo {

69+ ListModel {

65− id: calendarApp

70+ id: availableAppsModel

71+ ListElement {

72+ name: "Phone"

73+ icon: "phone-app"

74+ exec: "/usr/bin/phone-app"

75+ appId: "phone"

76+ imageQml: "import QtQuick 2.0\n \

77+ Rectangle { \n \

78+ anchors.fill:parent \n \

79+ color:'darkgreen' \n \

80+ Text { anchors.centerIn: parent; text: 'PHONE' } \n \

81+ }"

82+ }

83+

84+ ListElement {

66− name: "Calendar"

85+ name: "Calendar"

67− icon: "calendar-app"

86+ icon: "calendar-app"

68− exec: "/usr/bin/calendar-app"

87+ exec: "/usr/bin/calendar-app"

69− stage: ApplicationInfo.MainStage

70− desktopFile: "calendar.desktop"

88+ appId: "calendar"

71− imageQml: "import QtQuick 2.0\n" +

89+ imageQml: "import QtQuick 2.0\n \

72− "Rectangle { \n" +

90+ Rectangle { \n \

73− " anchors.fill:parent \n" +

91+ anchors.fill:parent \n \

74− " color:'darkblue' \n" +

92+ color:'darkblue' \n \

75− " Text { anchors.centerIn: parent; text: 'CALENDAR'\n" +

93+ Text { anchors.centerIn: parent; text: 'CALENDAR'\n \

76− " color:'white'} \n" +

94+ color:'white'} \n \

77− "}"

95+ }"

96+ }

78 }

97 }

79

98

80 function resetRunningApplications() {

99 function resetRunningApplications() {

81 fakeRunningAppsModel.clear()

100 fakeRunningAppsModel.clear()

82− fakeRunningAppsModel.add(phoneApp)

101+ fakeRunningAppsModel.rePopulate()

83− fakeRunningAppsModel.add(calendarApp)

84 }

102 }

85

103

86 Component.onCompleted: {

104 Component.onCompleted: {

@@ -185,11 +203,11 @@ Item {

185 var calendarTile = findChild(runningApplicationsGrid, "runningAppTile Calendar")

203 var calendarTile = findChild(runningApplicationsGrid, "runningAppTile Calendar")

186 verify(calendarTile != undefined)

204 verify(calendarTile != undefined)

187

205

188− verify(fakeRunningAppsModel.contains(calendarApp))

206+ verify(fakeRunningAppsModel.contains("calendar"))

189

207

190 mouseClick(calendarTile, calendarTile.width/2, calendarTile.height/2)

208 mouseClick(calendarTile, calendarTile.width/2, calendarTile.height/2)

191

209

192− verify(!fakeRunningAppsModel.contains(calendarApp))

210+ verify(!fakeRunningAppsModel.contains("calendar"))

193

211

194 // The tile for the Calendar app should eventually vanish since the

212 // The tile for the Calendar app should eventually vanish since the

195 // application has been terminated

213 // application has been terminated

tests/qmltests/Launcher/tst_Launcher.qml+2−2

@@ -38,7 +38,7 @@ Item {

38 property string lastSelectedApplication

39

40 onLauncherApplicationSelected: {

41− lastSelectedApplication = desktopFile

41+ lastSelectedApplication = appId

42 }

43

44 property int dashItemSelected_count: 0

@@ -131,7 +131,7 @@ Item {

131 mouseClick(appIcon, appIcon.width/2, appIcon.height/2)

132

133 tryCompare(launcher, "lastSelectedApplication",

134− "/usr/share/applications/phone-app.desktop")

134+ "phone-app")

135

136 // Tapping on an application icon also dismisses the launcher

137 revealer.waitUntilLauncherDisappears()

tests/qmltests/tst_Shell.qml+33−9

@@ -20,7 +20,7 @@

20import QtQuick 2.0

21import QtTest 1.0

22import GSettings 1.0

23−import Ubuntu.Application 0.1

23+import Unity.Application 0.1

24import Unity.Test 0.1 as UT

25import Powerd 0.1

26

@@ -66,16 +66,16 @@ Item {

66 }

67

68 // kill all (fake) running apps

69− killApps(ApplicationManager.mainStageApplications);

69+ killApps(ApplicationManager);

70− killApps(ApplicationManager.sideStageApplications);

71

70

72 var dashHome = findChild(shell, "DashHome");

71 var dashHome = findChild(shell, "DashHome");

73 swipeUntilScopeViewIsReached(dashHome);

72 swipeUntilScopeViewIsReached(dashHome);

74 }

73 }

75

74

76 function killApps(apps) {

75 function killApps(apps) {

76+ if (!apps) return;

77 while (apps.count > 0) {

78− ApplicationManager.stopProcess(apps.get(0));

78+ ApplicationManager.stopApplication(apps.get(0).appId);

79 }

80 }

81

@@ -114,6 +114,26 @@ Item {

114 checkRightEdgeDragWithNoRunningApps();

115 }

116

117+ function test_leftEdgeDrag_data() {

118+ return [

119+ {tag: "without launcher", revealLauncher: false},

120+ {tag: "with launcher", revealLauncher: true},

121+ ];

122+ }

123+

124+ function test_leftEdgeDrag(data) {

125+ dragLauncherIntoView();

126+ tapOnAppIconInLauncher();

127+ waitUntilApplicationWindowIsFullyVisible();

128+

129+ if (data.revealLauncher) {

130+ dragLauncherIntoView();

131+ }

132+

133+ swipeFromLeftEdge();

134+ waitUntilApplicationWindowIsFullyHidden();

135+ }

136+

117 function test_suspend() {

137 function test_suspend() {

118 var greeter = findChild(shell, "greeter");

138 var greeter = findChild(shell, "greeter");

119

139

@@ -122,8 +142,8 @@ Item {

122 tapOnAppIconInLauncher();

142 tapOnAppIconInLauncher();

123 waitUntilApplicationWindowIsFullyVisible();

143 waitUntilApplicationWindowIsFullyVisible();

124

144

125− var mainApp = ApplicationManager.mainStageFocusedApplication;

145+ var mainApp = ApplicationManager.focusedApplicationId;

126− tryCompareFunction(function() { return mainApp != null; }, true);

146+ tryCompareFunction(function() { return mainApp != ""; }, true);

127

147

128 // Try to suspend while proximity is engaged...

148 // Try to suspend while proximity is engaged...

129 Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);

149 Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);

@@ -132,11 +152,11 @@ Item {

132 // Now really suspend

152 // Now really suspend

133 Powerd.displayPowerStateChange(Powerd.Off, 0);

153 Powerd.displayPowerStateChange(Powerd.Off, 0);

134 tryCompare(greeter, "showProgress", 1);

154 tryCompare(greeter, "showProgress", 1);

135− tryCompare(ApplicationManager, "mainStageFocusedApplication", null);

155+ tryCompare(ApplicationManager, "focusedApplicationId", "");

136

156

137 // And wake up

157 // And wake up

138 Powerd.displayPowerStateChange(Powerd.On, 0);

158 Powerd.displayPowerStateChange(Powerd.On, 0);

139− tryCompare(ApplicationManager, "mainStageFocusedApplication", mainApp);

159+ tryCompare(ApplicationManager, "focusedApplicationId", mainApp);

140 tryCompare(greeter, "showProgress", 1);

160 tryCompare(greeter, "showProgress", 1);

141 }

161 }

142

162

@@ -223,7 +243,11 @@ Item {

223 function dragLauncherIntoView() {

243 function dragLauncherIntoView() {

224 var launcherPanel = findChild(shell, "launcherPanel");

244 var launcherPanel = findChild(shell, "launcherPanel");

225 verify(launcherPanel.x = - launcherPanel.width);

245 verify(launcherPanel.x = - launcherPanel.width);

226− swipeFromLeftEdge();

246+

247+ var touchStartX = 2;

248+ var touchStartY = shell.height / 2;

249+ touchFlick(shell, touchStartX, touchStartY, launcherPanel.width + units.gu(1), touchStartY);

250+

227 tryCompare(launcherPanel, "x", 0);

251 tryCompare(launcherPanel, "x", 0);

228 }

252 }

229

253