39dc6f6 · unity8 · git.iko.soy

Components/EdgeDemo.qml+2−1

compare with xenial

unifiedsplit

@@ -161,8 +161,9 @@ Item {

161 d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {

162 "edge": "none",

163 "title": i18n.tr("Well done"),

164− "text": i18n.tr("You have now mastered the edge gestures and can start using the phone"),

164+ "text": i18n.tr("You have now mastered the edge gestures and can start using the phone Tap anywhere to start"),

165 "anchors.fill": demo.dash,

166+ "showSkip": false,

166 });

167 });

167 }

168 }

168 if (d.finalEdgeDemo) {

169 if (d.finalEdgeDemo) {

Components/EdgeDemoOverlay.qml+5

@@ -43,6 +43,11 @@ Showable {

43 */

44 property alias skipText: skipLabel.text

45

46+ /*

47+ * This is the visible status of the skip button.

48+ */

49+ property alias showSkip: skipLabel.visible

50+

46 /*

51 /*

47 * Whether this demo is running currently.

52 * Whether this demo is running currently.

48 */

53 */

Dash/DashBar.qml+2−3

@@ -83,9 +83,8 @@ Item {

83 }

84

85 delegate:

86− Item {

86+ // FIXME: Use Panel's integrated trigger() once that works again.

87− signal clicked()

87+ MouseArea {

88−

89 width: itemSize

88 width: itemSize

90 height: dashBar.height

89 height: dashBar.height

91 anchors.top: parent.top

90 anchors.top: parent.top

Dash/GenericScopeView.qml+4−4

@@ -74,12 +74,12 @@ ScopeView {

74 onLoaded: {

75 if (source.toString().indexOf("Apps/RunningApplicationsGrid.qml") != -1) {

76 // TODO: the running apps grid doesn't support standard scope results model yet

77− item.firstModel = results.firstModel

77+ item.firstModel = Qt.binding(function() { return results.firstModel })

78− item.secondModel = results.secondModel

78+ item.secondModel = Qt.binding(function() { return results.secondModel })

79 } else {

80− item.model = results

80+ item.model = Qt.binding(function() { return results })

81 }

82− item.objectName = categoryId

82+ item.objectName = Qt.binding(function() { return categoryId })

83 if (item.expandable) {

84 var shouldFilter = index != categoryView.expandedIndex;

85 if (shouldFilter != item.filter) {

Greeter/Infographics.qml+1−2

@@ -286,9 +286,8 @@ Item {

286 objectName: "backgroundCircle"

287

288 anchors.fill: parent

289− opacity: 0.9

290

289

291− source: "graphics/infographic_circle.png"

290+ source: "graphics/infographic_circle_back.png"

292 }

291 }

293

292

294 Timer {

293 Timer {

Greeter/graphics/infographic_circle.pngdeleted

Binary file not shown.

Greeter/graphics/infographic_circle_back.pngnew file

Binary file not shown.

Launcher/LauncherDelegate.qml+20−9

@@ -24,6 +24,7 @@ Item {

24 property int count: -1

25 property int progress: -1

26 property bool highlighted: false

27+ property bool itemFocused: false

27 property real maxAngle: 0

28 property real maxAngle: 0

28 property bool inverted: false

29 property bool inverted: false

29

30

@@ -43,17 +44,18 @@ Item {

43 onCountChanged: shaderEffectSource.scheduleUpdate();

44 onCountChanged: shaderEffectSource.scheduleUpdate();

44 onProgressChanged: shaderEffectSource.scheduleUpdate();

45 onProgressChanged: shaderEffectSource.scheduleUpdate();

45 onHighlightedChanged: shaderEffectSource.scheduleUpdate();

46 onHighlightedChanged: shaderEffectSource.scheduleUpdate();

47+ onItemFocusedChanged: shaderEffectSource.scheduleUpdate();

46

48

47 Item {

49 Item {

48 id: iconItem

50 id: iconItem

49− width: parent.itemWidth

51+ width: parent.itemWidth + units.gu(1)

50− height: parent.itemHeight

52+ height: parent.itemHeight + units.gu(1)

51 anchors.centerIn: parent

53 anchors.centerIn: parent

52

54

53 UbuntuShape {

55 UbuntuShape {

54 id: iconShape

56 id: iconShape

55 anchors.fill: parent

57 anchors.fill: parent

56− anchors.margins: units.gu(0.5)

58+ anchors.margins: units.gu(1)

57 radius: "medium"

59 radius: "medium"

58

60

59 image: Image {

61 image: Image {

@@ -78,7 +80,7 @@ Item {

78 anchors {

80 anchors {

79 right: parent.right

81 right: parent.right

80 top: parent.top

82 top: parent.top

81− margins: -units.dp(1)

83+ margins: units.dp(3)

82 }

84 }

83 width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))

85 width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))

84 height: units.gu(3)

86 height: units.gu(3)

@@ -105,9 +107,9 @@ Item {

105 left: iconItem.left

107 left: iconItem.left

106 right: iconItem.right

108 right: iconItem.right

107 bottom: iconItem.bottom

109 bottom: iconItem.bottom

108− leftMargin: units.gu(0.5)

110+ leftMargin: units.gu(1)

109− rightMargin: units.gu(0.5)

111+ rightMargin: units.gu(1)

110− bottomMargin: units.gu(0.5)

112+ bottomMargin: units.gu(1)

111 }

113 }

112 height: units.gu(1.5)

114 height: units.gu(1.5)

113 visible: root.progress > -1

115 visible: root.progress > -1

@@ -136,14 +138,23 @@ Item {

136 }

138 }

137 }

139 }

138 }

140 }

141+ Image {

142+ objectName: "focusedHighlight"

143+ anchors {

144+ right: parent.right

145+ verticalCenter: parent.verticalCenter

146+ }

147+ visible: root.itemFocused

148+ source: "graphics/focused_app_arrow.png"

149+ }

139 }

150 }

140

151

141 ShaderEffect {

152 ShaderEffect {

142 id: transformEffect

153 id: transformEffect

143 anchors.centerIn: parent

154 anchors.centerIn: parent

144 anchors.verticalCenterOffset: root.offset

155 anchors.verticalCenterOffset: root.offset

145− width: parent.itemWidth

156+ width: iconItem.width

146− height: parent.itemHeight

157+ height: iconItem.height

147 property real itemOpacity: root.itemOpacity

158 property real itemOpacity: root.itemOpacity

148 property real brightness: Math.max(-1, root.brightness)

159 property real brightness: Math.max(-1, root.brightness)

149 property real angle: root.angle

160 property real angle: root.angle

Launcher/LauncherPanel.qml+9−2

@@ -50,8 +50,6 @@ Item {

50 id: mainColumn

51 anchors {

52 fill: parent

53− leftMargin: units.gu(0.5)

54− rightMargin: units.gu(0.5)

55 }

53 }

56

54

57 MouseArea {

55 MouseArea {

@@ -94,6 +92,8 @@ Item {

94 fill: parent

92 fill: parent

95 topMargin: -extensionSize + units.gu(0.5)

93 topMargin: -extensionSize + units.gu(0.5)

96 bottomMargin: -extensionSize + units.gu(1)

94 bottomMargin: -extensionSize + units.gu(1)

95+ leftMargin: units.gu(0.5)

96+ rightMargin: units.gu(0.5)

97 }

98 topMargin: extensionSize

99 bottomMargin: extensionSize

@@ -156,6 +156,7 @@ Item {

156 iconName: model.icon

157 count: model.count

158 progress: model.progress

159+ itemFocused: model.focused

159 inverted: root.inverted

160 inverted: root.inverted

160 z: -Math.abs(offset)

161 z: -Math.abs(offset)

161 maxAngle: 55

162 maxAngle: 55

@@ -512,6 +513,12 @@ Item {

512 objectName: "quickListEntry" + index

513 objectName: "quickListEntry" + index

513 text: (model.clickable ? "" : "") + model.label + (model.clickable ? "" : "")

514 text: (model.clickable ? "" : "") + model.label + (model.clickable ? "" : "")

514 highlightWhenPressed: model.clickable

515 highlightWhenPressed: model.clickable

516+

517+ // FIXME: This is a workaround for the theme not being context sensitive. I.e. the

518+ // ListItems don't know that they are sitting in a themed Popover where the color

519+ // needs to be inverted.

520+ __foregroundColor: Theme.palette.selected.backgroundText

521+

515 onClicked: {

522 onClicked: {

516 if (!model.clickable) {

523 if (!model.clickable) {

517 return;

524 return;

Launcher/graphics/focused_app_arrow@30.pngnew file

Binary file not shown.

Panel/Indicators/DefaultIndicatorWidget.qml+1−1

@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators

24Indicators.IndicatorWidget {

25 id: indicatorWidget

26

27− width: itemRow.width + units.gu(1)

27+ width: itemRow.width + units.gu(0.5)

28

29 property alias label: itemLabel.text

30 property alias iconSource: itemImage.source

Panel/Indicators/DefaultIndicatorWidget2.qml+43−16

@@ -24,10 +24,11 @@ import Unity.Indicators 0.1 as Indicators

24Indicators.IndicatorWidget {

25 id: indicatorWidget

26

27− width: itemRow.width + units.gu(1)

27+ width: itemRow.width + units.gu(0.5)

28

29− property alias label: itemLabel.text

29+ property alias leftLabel: itemLeftLabel.text

30− property alias iconSource: itemImage.source

30+ property alias rightLabel: itemRightLabel.text

31+ property var icons: undefined

31

32

32 Row {

33 Row {

33 id: itemRow

34 id: itemRow

@@ -39,19 +40,43 @@ Indicators.IndicatorWidget {

39 }

40 }

40 spacing: units.gu(0.5)

41 spacing: units.gu(0.5)

41

42

42− // FIXME : Should us Ubuntu.Icon . results in low res images

43+ Label {

43− Image {

44+ id: itemLeftLabel

44− id: itemImage

45− objectName: "itemImage"

45+ objectName: "leftLabel"

46− visible: source != ""

46+ color: Theme.palette.selected.backgroundText

47− height: indicatorWidget.iconSize

47+ opacity: 0.8

48− width: indicatorWidget.iconSize

48+ font.family: "Ubuntu"

49+ fontSize: "medium"

49 anchors.verticalCenter: parent.verticalCenter

50 anchors.verticalCenter: parent.verticalCenter

51+ visible: text != ""

52+ }

53+

54+ Row {

55+ width: childrenRect.width

56+ anchors {

57+ top: parent.top

58+ bottom: parent.bottom

59+ }

60+ spacing: units.gu(0.5)

61+

62+ Repeater {

63+ model: indicatorWidget.icons

64+

65+ Image {

66+ id: itemImage

67+ objectName: "itemImage"

68+ visible: source != ""

69+ source: modelData

70+ height: indicatorWidget.iconSize

71+ width: indicatorWidget.iconSize

72+ anchors.verticalCenter: parent.verticalCenter

73+ }

74+ }

50 }

75 }

51

76

52 Label {

77 Label {

53− id: itemLabel

78+ id: itemRightLabel

54− objectName: "itemLabel"

79+ objectName: "rightLabel"

55 color: Theme.palette.selected.backgroundText

80 color: Theme.palette.selected.backgroundText

56 opacity: 0.8

81 opacity: 0.8

57 font.family: "Ubuntu"

82 font.family: "Ubuntu"

@@ -63,14 +88,16 @@ Indicators.IndicatorWidget {

63

88

64 onActionStateChanged: {

89 onActionStateChanged: {

65 if (actionState == undefined) {

90 if (actionState == undefined) {

66− label = "";

91+ leftLabel = "";

67− iconSource = "";

92+ rightLabel = "";

93+ icons = undefined;

68 enabled = false;

94 enabled = false;

69 return;

95 return;

70 }

96 }

71

97

72− label = actionState.label;

98+ leftLabel = actionState.leftLabel ? actionState.leftLabel : "";

99+ rightLabel = actionState.rightLabel ? actionState.rightLabel : "";

73− iconSource = actionState.icon;

100+ icons = actionState.icons;

74 enabled = actionState.visible;

101 enabled = actionState.visible;

75 }

102 }

76}

103}

Panel/Indicators/NetworkIndicatorWidget.qml+1−1

@@ -24,7 +24,7 @@ import Unity.IndicatorsLegacy 0.1 as Indicators

24Indicators.IndicatorWidget {

25 id: indicatorWidget

26

27− width: networkIcon.width + units.gu(1)

27+ width: networkIcon.width + units.gu(0.5)

28

29 property int signalStrength: 0

30 property int connectionState: Indicators.NetworkConnection.Initial

Shell.qml+9

@@ -80,6 +80,15 @@ BasicShell {

80 onFocusRequested: {

81 shell.activateApplication(desktopFile);

82 }

83+

84+ onMainStageFocusedApplicationChanged: {

85+ var app = applicationManager.mainStageFocusedApplication

86+ if (app != null) {

87+ LauncherModel.applicationFocused(app.desktopFile);

88+ } else {

89+ LauncherModel.applicationFocused("");

90+ }

91+ }

83 }

92 }

84

93

85 function activateApplication(desktopFile, argument) {

94 function activateApplication(desktopFile, argument) {

build+9

@@ -57,6 +57,15 @@ mk_build_deps() {

57 [ ! -f unity8-build-deps*deb -o $CODE_DIR/debian/control -nt unity8-build-deps*deb ] && mk-build-deps --install --root-cmd sudo $CODE_DIR/debian/control

58}

59

60+if [ -f "/usr/bin/ccache" ] ; then

61+ if [ "x$CC" = "x" ]; then

62+ export CC='ccache gcc'

63+ fi

64+ if [ "x$CXX" = "x" ] ; then

65+ export CXX='ccache g++'

66+ fi

67+fi

68+

60if [ -f "/usr/bin/ninja" ] ; then

69if [ -f "/usr/bin/ninja" ] ; then

61 GENERATOR="-G Ninja"

70 GENERATOR="-G Ninja"

62 # Ninja does not need -j, it parallelizes automatically.

71 # Ninja does not need -j, it parallelizes automatically.

debian/changelog+61

@@ -1,3 +1,64 @@

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

2+

3+ [ Michael Zanetti ]

4+ * Integrate Launcher with AppManager.

5+

6+ [ Nick Dedekind ]

7+ * Removed FIXME from slider int->double conversion.

8+

9+ [ Ubuntu daily release ]

10+ * Automatic snapshot from revision 291

11+

12+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 05 Sep 2013 10:48:02 +0000

13+

14+unity8 (7.81.3+13.10.20130904.1-0ubuntu1) saucy; urgency=low

15+

16+ [ Nicolas d'Offay ]

17+ * Switched infographic background at design's request.

18+

19+ [ Ubuntu daily release ]

20+ * Automatic snapshot from revision 287

21+

22+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 04 Sep 2013 07:34:57 +0000

23+

24+unity8 (7.81.3+13.10.20130904-0ubuntu1) saucy; urgency=low

25+

26+ [ mhall119 ]

27+ * Add a little bit of text to the last step of the tour telling the

28+ user how to end it and get to their phone.

29+

30+ [ Jussi Pakkanen ]

31+ * Use CCache if it is installed.

32+

33+ [ Nick Dedekind ]

34+ * Multiple icon/label support for indicators.

35+

36+ [ Albert Astals ]

37+ * Remove unneeded role.

38+

39+ [ Lars Uebernickel ]

40+ * Fall back to "ubuntu-mobile" icon theme if $UBUNTU_ICON_THEME is

41+ unset.

42+

43+ [ Michael Zanetti ]

44+ * Use MouseAreas in DashBar to enable clicking again.

45+ * load launcher default config from existing dconf key.

46+

47+ [ Ubuntu daily release ]

48+ * Automatic snapshot from revision 285

49+

50+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 04 Sep 2013 03:02:57 +0000

51+

52+unity8 (7.81.3+13.10.20130903.1-0ubuntu1) saucy; urgency=low

53+

54+ [ Michael Zanetti ]

55+ * workaround quicklist text color.

56+

57+ [ Ubuntu daily release ]

58+ * Automatic snapshot from revision 277

59+

60+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 03 Sep 2013 06:09:36 +0000

61+

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

62unity8 (7.81.3+13.10.20130830-0ubuntu1) saucy; urgency=low

2

63

3 [ Pawel Stolowski ]

64 [ Pawel Stolowski ]

debian/control+1

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

9 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],

10 libgl1-mesa-dri,

11 libgles2-mesa-dev[armhf],

12+ libgsettings-qt-dev,

12 libhud-client2-dev,

13 libhud-client2-dev,

13 libjson-perl,

14 libjson-perl,

14 libnih-dbus-dev,

15 libnih-dbus-dev,

main.cpp+3−2

@@ -66,9 +66,10 @@ void appendImportPaths(QQmlEngine *engine, const QStringList &paths)

66

67void resolveIconTheme() {

68 const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");

69− if (ubuntuIconTheme != NULL) {

69+ if (ubuntuIconTheme == NULL) {

70− QIcon::setThemeName(ubuntuIconTheme);

70+ ubuntuIconTheme = "ubuntu-mobile";

71 }

72+ QIcon::setThemeName(ubuntuIconTheme);

72}

73}

73} // namespace {

74} // namespace {

74

75

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

@@ -73,23 +73,8 @@ Item {

73 'max-icon': 'icon'});

74 }

75

76− // FIXME: The interval should be [0.0 - 1.0]. Unfortunately, when

77− // reaching the boundaries (0.0 or 1.0), the value is converted

78− // to an integer when automatically wrapped in a variant when

79− // passed to QStateAction::updateState(…). The server chokes on

80− // those values, complaining that they’re not of the right type…

81 onChangeState: {

76 onChangeState: {

82− if (value == Math.round(value)) {

83− if (value >= maximumValue) {

84− model.changeState(modelIndex, maximumValue - 0.000001);

85− } else if (value <= minimumValue) {

86− model.changeState(modelIndex, minimumValue + 0.000001);

77+ model.changeState(modelIndex, value);

87− } else {

88− model.changeState(modelIndex, value * 1.000001);

89− }

90− } else {

91− model.changeState(modelIndex, value);

92− }

93 }

78 }

94 }

79 }

95 }

80 }

plugins/Unity/Indicators/rootactionstate.cpp+44−14

@@ -108,25 +108,32 @@ bool RootActionState::isValid() const

108 return m_menu && m_menu->rowCount() > 0;

109}

110

111−QString RootActionState::label() const

111+QString RootActionState::leftLabel() const

112{

113 if (!isValid()) return QString();

114

115− return m_cachedState.value("label", QVariant::fromValue(QString())).toString();

115+ return m_cachedState.value("pre-label", QVariant::fromValue(QString())).toString();

116}

117

118−QString RootActionState::icon() const

118+QString RootActionState::rightLabel() const

119{

120 if (!isValid()) return QString();

121

122− return m_cachedState.value("icon", QVariant::fromValue(QString())).toString();

122+ return m_cachedState.value("label", QVariant::fromValue(QString())).toString();

123+}

124+

125+QStringList RootActionState::icons() const

126+{

127+ if (!isValid()) return QStringList();

128+

129+ return m_cachedState.value("icons", QVariant::fromValue(QStringList())).toStringList();

123}

130}

124

131

125QString RootActionState::accessibleName() const

132QString RootActionState::accessibleName() const

126{

133{

127 if (!isValid()) return QString();

134 if (!isValid()) return QString();

128

135

129− return m_cachedState.value("accessible-name", QVariant::fromValue(QString())).toString();

136+ return m_cachedState.value("accessible-desc", QVariant::fromValue(QString())).toString();

130}

137}

131

138

132bool RootActionState::isVisible() const

139bool RootActionState::isVisible() const

@@ -198,16 +205,39 @@ QVariant RootActionState::toQVariant(GVariant* state) const

198 while (g_variant_iter_loop (&iter, "{sv}", &key, &vvalue))

205 while (g_variant_iter_loop (&iter, "{sv}", &key, &vvalue))

199 {

206 {

200 QString str = QString::fromUtf8(key);

207 QString str = QString::fromUtf8(key);

201− if (str == "icon") {

208+ if (str == "icon" && !qmap.contains("icons")) {

209+ QStringList icons;

210+

202 // FIXME - should be sending a url.

211 // FIXME - should be sending a url.

203− GIcon *icon = g_icon_deserialize (vvalue);

212+ GIcon *gicon = g_icon_deserialize (vvalue);

204− if (icon) {

213+ if (gicon) {

205− qmap.insert(str, iconUri(icon));

214+ icons << iconUri(gicon);

206− g_object_unref (icon);

215+ g_object_unref (gicon);

207 }

216 }

208− else {

209− qmap.insert(str, QVariant(""));

217+ qmap.insert("icons", icons);

218+

219+ } else if (str == "icons") {

220+

221+ QStringList icons;

222+

223+ if (g_variant_type_is_array(g_variant_get_type(vvalue))) {

224+

225+

226+ for (int i = 0, iMax = g_variant_n_children(vvalue); i < iMax; i++) {

227+ GVariant *child = g_variant_get_child_value(vvalue, i);

228+

229+ // FIXME - should be sending a url.

230+ GIcon *gicon = g_icon_deserialize (child);

231+ if (gicon) {

232+ icons << iconUri(gicon);

233+ g_object_unref (gicon);

234+ }

235+ g_variant_unref(child);

236+ }

210 }

237 }

238+ // will overwrite icon.

239+ qmap.insert("icons", icons);

240+

211 } else {

241 } else {

212 qmap.insert(str, ActionStateParser::toQVariant(vvalue));

242 qmap.insert(str, ActionStateParser::toQVariant(vvalue));

213 }

243 }

@@ -230,12 +260,12 @@ QVariant RootActionState::toQVariant(GVariant* state) const

230 &visible);

260 &visible);

231

261

232 qmap["label"] = label ? QString::fromUtf8(label) : "";

262 qmap["label"] = label ? QString::fromUtf8(label) : "";

233− qmap["accessible-name"] = accessible_name ? QString::fromUtf8(accessible_name) : "";

263+ qmap["accessible-desc"] = accessible_name ? QString::fromUtf8(accessible_name) : "";

234 qmap["visible"] = visible;

264 qmap["visible"] = visible;

235

265

236 gicon = g_icon_new_for_string (icon, NULL);

266 gicon = g_icon_new_for_string (icon, NULL);

237 if (gicon) {

267 if (gicon) {

238− qmap["icon"] = iconUri(gicon);

268+ qmap["icons"] = QStringList() << iconUri(gicon);

239 g_object_unref (gicon);

269 g_object_unref (gicon);

240 }

270 }

241

271

plugins/Unity/Indicators/rootactionstate.h+9−6

@@ -32,8 +32,9 @@ class UNITYINDICATORS_EXPORT RootActionState : public ActionStateParser

32 Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)

33

34 Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)

35− Q_PROPERTY(QString label READ label NOTIFY labelChanged)

35+ Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)

36− Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)

36+ Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)

37+ Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)

37 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

38 Q_PROPERTY(QString accessibleName READ accessibleName NOTIFY accessibleNameChanged)

38 Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)

39 Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)

39public:

40public:

@@ -47,8 +48,9 @@ public:

47 void setIndex(int index);

48 void setIndex(int index);

48

49

49 bool isValid() const;

50 bool isValid() const;

50− QString label() const;

51+ QString leftLabel() const;

51− QString icon() const;

52+ QString rightLabel() const;

53+ QStringList icons() const;

52 QString accessibleName() const;

54 QString accessibleName() const;

53 bool isVisible() const;

55 bool isVisible() const;

54

56

@@ -62,8 +64,9 @@ Q_SIGNALS:

62 void indexChanged();

64 void indexChanged();

63

65

64 void validChanged();

66 void validChanged();

65− void labelChanged();

67+ void leftLabelChanged();

66− void iconChanged();

68+ void rightLabelChanged();

69+ void iconsChanged();

67 void accessibleNameChanged();

70 void accessibleNameChanged();

68 void visibleChanged();

71 void visibleChanged();

69

72

plugins/Unity/Launcher/CMakeLists.txt+4

@@ -1,11 +1,13 @@

1include(FindPkgConfig)

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

3+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

3

4

4add_definitions(-DSM_BUSNAME=systemBus)

5add_definitions(-DSM_BUSNAME=systemBus)

5

6

6include_directories(

7include_directories(

7 ${CMAKE_CURRENT_SOURCE_DIR}

8 ${CMAKE_CURRENT_SOURCE_DIR}

8 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

9 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

10+ ${GSETTINGS_QT_INCLUDE_DIRS}

9)

11)

10

12

11set(QMLLAUNCHERPLUGIN_SRC

13set(QMLLAUNCHERPLUGIN_SRC

@@ -25,6 +27,8 @@ add_library(UnityLauncher-qml MODULE

25 ${QMLLAUNCHERPLUGIN_SRC}

27 ${QMLLAUNCHERPLUGIN_SRC}

26 )

28 )

27

29

30+target_link_libraries(UnityLauncher-qml ${GSETTINGS_QT_LDFLAGS})

31+

28qt5_use_modules(UnityLauncher-qml DBus Qml)

32qt5_use_modules(UnityLauncher-qml DBus Qml)

29

33

30# export the qmldir and qmltypes files

34# export the qmldir and qmltypes files

plugins/Unity/Launcher/backend/launcherbackend.cpp+186−98

@@ -24,6 +24,19 @@

24#include <QDir>

25#include <QDBusArgument>

26#include <QFileInfo>

27+#include <QGSettings>

28+#include <QDebug>

29+

30+class LauncherBackendItem

31+{

32+public:

33+ LauncherBackendItem(): pinned(false) {}

34+

35+ QString desktopFile;

36+ QString displayName;

37+ QString icon;

38+ bool pinned;

39+};

27

40

28LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):

41LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):

29 QObject(parent),

42 QObject(parent),

@@ -32,95 +45,122 @@ LauncherBackend::LauncherBackend(bool useStorage, QObject *parent):

32 if (useStorage) {

45 if (useStorage) {

33 m_accounts = new AccountsService(this);

46 m_accounts = new AccountsService(this);

34 }

47 }

35− setUser(qgetenv("USER"));

48+ m_user = qgetenv("USER");

49+ syncFromAccounts();

36}

50}

37

51

38LauncherBackend::~LauncherBackend()

52LauncherBackend::~LauncherBackend()

39{

53{

40− clearItems();

54+ m_storedApps.clear();

41−}

42

55

43−void LauncherBackend::clearItems()

44−{

45− for (LauncherBackendItem &app: m_storedApps) {

56+ Q_FOREACH(LauncherBackendItem *item, m_itemCache) {

46− delete app.settings;

57+ delete item;

47 }

58 }

48− m_storedApps.clear();

59+ m_itemCache.clear();

49}

60}

50

61

51QStringList LauncherBackend::storedApplications() const

62QStringList LauncherBackend::storedApplications() const

52{

63{

53− auto files = QStringList();

54− for (const LauncherBackendItem &app: m_storedApps) {

55− files << app.settings->fileName();

56− }

57− return files;

64+ return m_storedApps;

58}

65}

59

66

60void LauncherBackend::setStoredApplications(const QStringList &appIds)

67void LauncherBackend::setStoredApplications(const QStringList &appIds)

61{

68{

62− // Record all existing pinned apps, so we can notice them in new list

69+ if (appIds.count() < m_storedApps.count()) {

63− auto pinnedItems = QStringList();

70+ Q_FOREACH(const QString &appId, m_storedApps) {

64− for (LauncherBackendItem &app: m_storedApps) {

71+ if (!appIds.contains(appId)) {

65− if (app.pinned) {

72+ delete m_itemCache.take(appId);

66− pinnedItems.append(app.settings->fileName());

73+ }

67 }

74 }

68 }

75 }

69−

76+ m_storedApps = appIds;

70− clearItems();

71−

72− for (const QString &appId: appIds) {

77+ Q_FOREACH(const QString &appId, appIds) {

73− loadApp(makeAppDetails(appId, pinnedItems.contains(desktopFile(appId))));

78+ if (!m_itemCache.contains(appId)) {

79+ QString df = findDesktopFile(appId);

80+ if (!df.isEmpty()) {

81+ LauncherBackendItem *item = parseDesktopFile(df);

82+ m_itemCache.insert(appId, item);

83+ } else {

84+ // Cannot find any data for that app... ignoring it.

85+ qWarning() << "cannot find desktop file for" << appId << ". discarding app.";

86+ m_storedApps.removeAll(appId);

87+ }

88+ }

74 }

89 }

75−

76 syncToAccounts();

90 syncToAccounts();

77}

91}

78

92

79QString LauncherBackend::desktopFile(const QString &appId) const

93QString LauncherBackend::desktopFile(const QString &appId) const

80{

94{

81− QFileInfo fileInfo(QDir("/usr/share/applications"), appId);

95+ LauncherBackendItem *item = m_itemCache.value(appId);

82− return fileInfo.absoluteFilePath();

96+ if (item) {

97+ return item->desktopFile;

98+ }

99+

100+ return findDesktopFile(appId);

83}

101}

84

102

85QString LauncherBackend::displayName(const QString &appId) const

103QString LauncherBackend::displayName(const QString &appId) const

86{

104{

87− auto desktopFile = parseDesktopFile(appId);

105+ LauncherBackendItem *item = m_itemCache.value(appId);

88− auto displayName = desktopFile->value("Desktop Entry/Name").toString();

106+ if (item) {

89− delete desktopFile;

107+ return item->displayName;

108+ }

109+

110+ QString df = findDesktopFile(appId);

111+ if (!df.isEmpty()) {

112+ LauncherBackendItem *item = parseDesktopFile(df);

113+ m_itemCache.insert(appId, item);

114+ return item->displayName;

115+ }

116+

90− return displayName;

117+ return QString();

91}

118}

92

119

93QString LauncherBackend::icon(const QString &appId) const

120QString LauncherBackend::icon(const QString &appId) const

94{

121{

95− auto desktopFile = parseDesktopFile(appId);

122+ QString iconName;

96− auto iconName = desktopFile->value("Desktop Entry/Icon").toString();

123+ LauncherBackendItem *item = m_itemCache.value(appId);

97− delete desktopFile;

124+ if (item) {

98−

125+ iconName = item->icon;

126+ } else {

127+ QString df = findDesktopFile(appId);

99− if (!iconName.isEmpty()) {

128+ if (!df.isEmpty()) {

100− QFileInfo iconFileInfo(iconName);

129+ LauncherBackendItem *item = parseDesktopFile(df);

101− if (iconFileInfo.isRelative()) {

130+ m_itemCache.insert(appId, item);

102− iconName = "image://gicon/" + iconName;

131+ iconName = item->icon;

103 }

132 }

104 }

133 }

105

134

135+ QFileInfo info(iconName);

136+ if (info.exists()) {

137+ return info.absoluteFilePath();

138+ }

106− return iconName;

139+ return "image://theme/" + iconName;

107}

140}

108

141

109bool LauncherBackend::isPinned(const QString &appId) const

142bool LauncherBackend::isPinned(const QString &appId) const

110{

143{

111− auto index = findItem(appId);

144+ LauncherBackendItem *item = m_itemCache.value(appId);

112− if (index < 0) {

145+ if (item) {

113− return false;

146+ return item->pinned;

114− } else {

115− return m_storedApps[index].pinned;

116 }

147 }

148+ return false;

117}

149}

118

150

119void LauncherBackend::setPinned(const QString &appId, bool pinned)

151void LauncherBackend::setPinned(const QString &appId, bool pinned)

120{

152{

121− auto index = findItem(appId);

153+ if (!m_storedApps.contains(appId)) {

122− if (index >= 0 && !m_storedApps[index].pinned) {

154+ return;

155+ }

156+

157+ LauncherBackendItem *item = m_itemCache.value(appId);

158+ if (!item) {

159+ item = new LauncherBackendItem();

160+ m_itemCache.insert(appId, item);

161+ }

162+ if (item->pinned != pinned) {

123− m_storedApps[index].pinned = pinned;

163+ item->pinned = pinned;

124 syncToAccounts();

164 syncToAccounts();

125 }

165 }

126}

166}

@@ -153,8 +193,10 @@ int LauncherBackend::count(const QString &appId) const

153

193

154void LauncherBackend::setUser(const QString &username)

194void LauncherBackend::setUser(const QString &username)

155{

195{

196+ if (qgetenv("USER") == "lightdm" && m_user != username) {

156− m_user = username;

197+ m_user = username;

157− syncFromAccounts();

198+ syncFromAccounts();

199+ }

158}

200}

159

201

160void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)

202void LauncherBackend::triggerQuickListAction(const QString &appId, const QString &quickListId)

@@ -169,75 +211,132 @@ void LauncherBackend::syncFromAccounts()

169 QList<QVariantMap> apps;

211 QList<QVariantMap> apps;

170 bool defaults = true;

212 bool defaults = true;

171

213

172− clearItems();

214+ m_storedApps.clear();

173

215

174− if (m_user != "" && m_accounts != nullptr) {

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

175− auto variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");

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

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

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

177 defaults = isDefaultsItem(apps);

219 defaults = isDefaultsItem(apps);

178 }

220 }

179

221

180− // TODO: load default pinned ones from default config, instead of hardcoding here...

222+ if (m_accounts && defaults) { // Checking accounts as it'll be null when !useStorage

181− if (defaults) {

223+ QGSettings gSettings("com.canonical.Unity.Launcher", "/com/canonical/unity/launcher/");

182− apps <<

224+ Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {

183− makeAppDetails("dialer-app.desktop", true) <<

225+ if (entry.startsWith("application://")) {

184− makeAppDetails("messaging-app.desktop", true) <<

226+ QString appId = entry;

185− makeAppDetails("address-book-app.desktop", true) <<

227+ // Transform "application://foobar.desktop" to "foobar"

186− makeAppDetails("camera-app.desktop", true) <<

228+ appId.remove("application://");

187− makeAppDetails("gallery-app.desktop", true) <<

229+ if (appId.endsWith(".desktop")) {

188− makeAppDetails("facebook-webapp.desktop", true) <<

230+ appId.chop(8);

189− makeAppDetails("webbrowser-app.desktop", true) <<

231+ }

190− makeAppDetails("twitter-webapp.desktop", true) <<

232+ QString df = findDesktopFile(appId);

191− makeAppDetails("gmail-webapp.desktop", true) <<

233+

192− makeAppDetails("ubuntu-weather-app.desktop", true) <<

234+ if (!df.isEmpty()) {

193− makeAppDetails("notes-app.desktop", true) <<

235+ m_storedApps << appId;

194− makeAppDetails("calendar-app.desktop", true);

236+

195− }

237+ if (!m_itemCache.contains(appId)) {

196−

238+ m_itemCache.insert(appId, parseDesktopFile(df));

239+ }

240+ m_itemCache.value(appId)->pinned = true;

241+ }

242+ }

243+ }

244+ } else {

197− for (const QVariant &app: apps) {

245+ for (const QVariant &app: apps) {

198− loadApp(app.toMap());

246+ loadFromVariant(app.toMap());

247+ }

199 }

248 }

200}

249}

201

250

202void LauncherBackend::syncToAccounts()

251void LauncherBackend::syncToAccounts()

203{

252{

204− if (m_user != "" && m_accounts != nullptr) {

253+ if (m_accounts && !m_user.isEmpty()) {

205 QList<QVariantMap> items;

254 QList<QVariantMap> items;

206

255

207− for (LauncherBackendItem &app: m_storedApps) {

256+ Q_FOREACH(const QString &appId, m_storedApps) {

208− items << makeAppDetails(app.settings->fileName(), app.pinned);

257+ items << itemToVariant(appId);

209 }

258 }

210

259

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

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

212 }

261 }

213}

262}

214

263

215−QSettings *LauncherBackend::parseDesktopFile(const QString &appId) const

264+QString LauncherBackend::findDesktopFile(const QString &appId) const

216{

265{

217− auto fullAppId = desktopFile(appId);

266+ int dashPos = -1;

218− return new QSettings(fullAppId, QSettings::IniFormat);

267+ QString helper = appId;

268+

269+ QStringList searchDirs;

270+ searchDirs << QDir::homePath() + "/.local/share/applications";

271+ searchDirs << "/usr/share/applications";

272+

273+#ifdef LAUNCHER_TESTING

274+ searchDirs << "";

275+#endif

276+

277+ do {

278+ if (dashPos != -1) {

279+ helper = helper.replace(dashPos, 1, '/');

280+ }

281+

282+ Q_FOREACH(const QString &searchDir, searchDirs) {

283+ QFileInfo fileInfo(QDir(searchDir), helper + ".desktop");

284+ if (fileInfo.exists()) {

285+ return fileInfo.absoluteFilePath();

286+ }

287+ }

288+

289+ dashPos = helper.indexOf("-");

290+ } while (dashPos != -1);

291+

292+ return QString();

219}

293}

220

294

221−void LauncherBackend::loadApp(const QVariantMap &details)

295+LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFile) const

222{

296{

223− auto appId = details.value("id").toString();

297+ QSettings settings(desktopFile, QSettings::IniFormat);

224− auto isPinned = details.value("is-pinned").toBool();

225

298

226− if (appId.isEmpty()) {

299+

300+ LauncherBackendItem* item = new LauncherBackendItem();

301+ item->desktopFile = desktopFile;

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

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

304+ item->pinned = false;

305+ return item;

306+}

307+

308+void LauncherBackend::loadFromVariant(const QVariantMap &details)

309+{

310+ if (!details.contains("id")) {

227 return;

311 return;

228 }

312 }

313+ QString appId = details.value("id").toString();

314+

315+ LauncherBackendItem *item = m_itemCache.value(appId);

316+ if (item) {

317+ delete item;

318+ }

319+

320+ item = new LauncherBackendItem();

229

321

230− LauncherBackendItem item;

322+ item->desktopFile = details.value("desktopFile").toString();

231− item.settings = parseDesktopFile(appId);

323+ item->displayName = details.value("name").toString();

232− item.pinned = isPinned;

324+ item->icon = details.value("icon").toString();

325+ item->pinned = details.value("is-pinned").toBool();

326+

327+ m_itemCache.insert(appId, item);

233− m_storedApps.append(item);

328+ m_storedApps.append(appId);

234}

329}

235

330

236−QVariantMap LauncherBackend::makeAppDetails(const QString &appId, bool pinned) const

331+QVariantMap LauncherBackend::itemToVariant(const QString &appId) const

237{

332{

333+ LauncherBackendItem *item = m_itemCache.value(appId);

238 QVariantMap details;

334 QVariantMap details;

239 details.insert("id", appId);

335 details.insert("id", appId);

336+ details.insert("name", item->displayName);

337+ details.insert("icon", item->icon);

338+ details.insert("desktopFile", item->desktopFile);

240− details.insert("is-pinned", pinned);

339+ details.insert("is-pinned", item->pinned);

241 return details;

340 return details;

242}

341}

243

342

@@ -248,14 +347,3 @@ bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const

248 // list of one item with the 'defaults' field set to true.

347 // list of one item with the 'defaults' field set to true.

249 return (apps.size() == 1 && apps[0].value("defaults").toBool());

348 return (apps.size() == 1 && apps[0].value("defaults").toBool());

250}

349}

251−

252−int LauncherBackend::findItem(const QString &appId) const

253−{

254− auto fullAppId = desktopFile(appId);

255− for (int i = 0; i < m_storedApps.size(); ++i) {

256− if (m_storedApps[i].settings->fileName() == fullAppId) {

257− return i;

258− }

259− }

260− return -1;

261−}

plugins/Unity/Launcher/backend/launcherbackend.h+10−12

@@ -31,6 +31,8 @@ class AccountsService;

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

32 */

33

34+class LauncherBackendItem;

35+

34class LauncherBackend : public QObject

36class LauncherBackend : public QObject

35{

37{

36 Q_OBJECT

38 Q_OBJECT

@@ -141,23 +143,19 @@ Q_SIGNALS:

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

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

142

144

143private:

145private:

146+ QString findDesktopFile(const QString &appId) const;

144− QSettings *parseDesktopFile(const QString &appId) const;

147+ LauncherBackendItem* parseDesktopFile(const QString &desktopFile) const;

148+

145− QVariantMap makeAppDetails(const QString &appId, bool pinned) const;

149+ QVariantMap itemToVariant(const QString &appId) const;

146− void loadApp(const QVariantMap &details);

150+ void loadFromVariant(const QVariantMap &details);

147− int findItem(const QString &appId) const;

151+

148 bool isDefaultsItem(const QList<QVariantMap> &apps) const;

152 bool isDefaultsItem(const QList<QVariantMap> &apps) const;

149 void syncFromAccounts();

153 void syncFromAccounts();

150 void syncToAccounts();

154 void syncToAccounts();

151− void clearItems();

152

155

156+ QList<QString> m_storedApps;

153− class LauncherBackendItem

157+ mutable QHash<QString, LauncherBackendItem*> m_itemCache;

154− {

155− public:

156− QSettings *settings;

157− bool pinned;

158− };

159

158

160− QList<LauncherBackendItem> m_storedApps;

161 AccountsService *m_accounts;

159 AccountsService *m_accounts;

162 QString m_user;

160 QString m_user;

163};

161};

plugins/Unity/Launcher/launcheritem.cpp+14

@@ -31,6 +31,7 @@ LauncherItem::LauncherItem(const QString &appId, const QString &desktopFile, con

31 m_recent(false),

32 m_progress(-1),

33 m_count(0),

34+ m_focused(false),

34 m_quickList(new QuickListModel(this))

35 m_quickList(new QuickListModel(this))

35{

36{

36 QuickListEntry nameAction;

37 QuickListEntry nameAction;

@@ -131,6 +132,19 @@ void LauncherItem::setCount(int count)

131 }

132 }

132}

133}

133

134

135+bool LauncherItem::focused() const

136+{

137+ return m_focused;

138+}

139+

140+void LauncherItem::setFocused(bool focused)

141+{

142+ if (m_focused != focused) {

143+ m_focused = focused;

144+ Q_EMIT focusedChanged(focused);

145+ }

146+}

147+

134unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

148unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

135{

149{

136 return m_quickList;

150 return m_quickList;

plugins/Unity/Launcher/launcheritem.h+4

@@ -54,6 +54,9 @@ public:

54 int count() const;

55 void setCount(int count);

56

57+ bool focused() const;

58+ void setFocused(bool focused);

59+

57 unity::shell::launcher::QuickListModelInterface *quickList() const;

60 unity::shell::launcher::QuickListModelInterface *quickList() const;

58

61

59Q_SIGNALS:

62Q_SIGNALS:

@@ -70,6 +73,7 @@ private:

70 bool m_recent;

73 bool m_recent;

71 int m_progress;

74 int m_progress;

72 int m_count;

75 int m_count;

76+ bool m_focused;

73 QuickListModel *m_quickList;

77 QuickListModel *m_quickList;

74};

78};

75

79

plugins/Unity/Launcher/launchermodel.cpp+59

@@ -74,6 +74,8 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

74 return item->count();

75 case RoleProgress:

76 return item->progress();

77+ case RoleFocused:

78+ return item->focused();

77 }

79 }

78

80

79 return QVariant();

81 return QVariant();

@@ -191,6 +193,63 @@ void LauncherModel::setUser(const QString &username)

191 m_backend->setUser(username);

193 m_backend->setUser(username);

192}

194}

193

195

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

197+{

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;

209+ }

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+

234+ // Clean up old recent apps

235+ QList<int> recentAppIndices;

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

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

238+ recentAppIndices << i;

239+ }

240+ }

241+ int run = 0;

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

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

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

245+ endRemoveRows();

246+ recentAppIndices.takeFirst();

247+ ++run;

248+ }

249+ storeAppList();

250+ }

251+}

252+

194void LauncherModel::storeAppList()

253void LauncherModel::storeAppList()

195{

254{

196 QStringList appIds;

255 QStringList appIds;

plugins/Unity/Launcher/launchermodel.h+1

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

49 Q_INVOKABLE void requestRemove(const QString &appId);

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

51 Q_INVOKABLE void setUser(const QString &username);

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

52

53

53private:

54private:

54 void storeAppList();

55 void storeAppList();

plugins/Unity/categories.cpp−3

@@ -43,7 +43,6 @@ Categories::Categories(QObject* parent)

43 m_roles[Categories::RoleHints] = "hints";

44 m_roles[Categories::RoleResults] = "results";

45 m_roles[Categories::RoleCount] = "count";

46− m_roles[Categories::RoleCategoryIndex] = "categoryIndex";

47

46

48 // TODO This should not be needed but accumulatting the count changes

47 // TODO This should not be needed but accumulatting the count changes

49 // makes the visualization more stable and also makes crashes on fast

48 // makes the visualization more stable and also makes crashes on fast

@@ -222,8 +221,6 @@ Categories::data(const QModelIndex& index, int role) const

222 return QVariant::fromValue(m_overriddenCategories[id]->rowCount());

221 return QVariant::fromValue(m_overriddenCategories[id]->rowCount());

223 }

222 }

224 return QVariant::fromValue(getResults(index.row())->rowCount());

223 return QVariant::fromValue(getResults(index.row())->rowCount());

225− case RoleCategoryIndex:

226− return QVariant::fromValue(index.row());

227 default:

224 default:

228 return QVariant();

225 return QVariant();

229 }

226 }

plugins/Unity/categories.h+1−2

@@ -50,8 +50,7 @@ public:

50 RoleProgressSource,

51 RoleHints,

52 RoleResults,

53− RoleCount,

53+ RoleCount

54− RoleCategoryIndex

55 };

54 };

56

55

57 Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);

56 Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);

po/es.po+24−22

@@ -8,15 +8,15 @@ 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-07-08 07:25+0000\n"

11+"PO-Revision-Date: 2013-09-04 22:12+0000\n"

12"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"

13"Language-Team: Spanish <es@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-05 05:35+0000\n"

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

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

20

21#: Applications/applications.js:23

22msgid "Phone"

@@ -88,47 +88,49 @@ msgstr "YouTube"

88

89#: Components/EdgeDemoOverlay.qml:145

90msgid "Skip intro"

91−msgstr ""

91+msgstr "Omitir la introducción"

92

93#: Components/EdgeDemo.qml:98

94msgid "Right edge"

95−msgstr ""

95+msgstr "Borde derecho"

96

97#: Components/EdgeDemo.qml:99

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

99−msgstr ""

99+msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"

100

101#: Components/EdgeDemo.qml:135

102msgid "Top edge"

103−msgstr ""

103+msgstr "Borde superior"

104

105#: Components/EdgeDemo.qml:136

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

107−msgstr ""

107+msgstr "Deslice el dedo desde el borde superior para acceder a los menús"

108

109#: Components/EdgeDemo.qml:161

110msgid "Close"

111−msgstr ""

111+msgstr "Cerrar"

112

113#: Components/EdgeDemo.qml:162

114msgid "Swipe up again to close the settings screen"

115−msgstr ""

115+msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"

116

117#: Components/EdgeDemo.qml:189

118msgid "Left edge"

119−msgstr ""

119+msgstr "Borde izquierdo"

120

121#: Components/EdgeDemo.qml:190

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

123msgstr ""

124+"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "

125+"rápidamente a las aplicaciones"

124

126

125#: Components/EdgeDemo.qml:217

127#: Components/EdgeDemo.qml:217

126msgid "Well done"

128msgid "Well done"

127−msgstr ""

129+msgstr "Bien hecho"

128

130

129#: Components/EdgeDemo.qml:218

131#: Components/EdgeDemo.qml:218

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

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

131−msgstr ""

133+msgstr "Ahora domina el uso de gestos de los bordes. Puede usar el teléfono"

132

134

133#: Components/PageHeader.qml:298

135#: Components/PageHeader.qml:298

134msgid "Recent searches"

136msgid "Recent searches"

@@ -138,35 +140,35 @@ msgstr "Búsquedas recientes"

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

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

139#, qt-format

141#, qt-format

140msgid "(%1)"

142msgid "(%1)"

141−msgstr ""

143+msgstr "(%1)"

142

144

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

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

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

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

145#, qt-format

147#, qt-format

146msgid "%1 review"

148msgid "%1 review"

147msgid_plural "%1 reviews"

149msgid_plural "%1 reviews"

148−msgstr[0] ""

150+msgstr[0] "%1 reseña"

149−msgstr[1] ""

151+msgstr[1] "%1 reseñas"

150

152

151#: Dash/Apps/AppPreview.qml:175

153#: Dash/Apps/AppPreview.qml:175

152msgid "Rate this"

154msgid "Rate this"

153−msgstr ""

155+msgstr "Valorar esto"

154

156

155#: Dash/Apps/AppReviews.qml:72

157#: Dash/Apps/AppReviews.qml:72

156msgid "Add a review"

158msgid "Add a review"

157−msgstr ""

159+msgstr "Añadir una reseña"

158

160

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

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

160msgid "Review"

162msgid "Review"

161−msgstr ""

163+msgstr "Reseñar"

162

164

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

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

164msgid "Send"

166msgid "Send"

165−msgstr ""

167+msgstr "Enviar"

166

168

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

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

168msgid "Comments:"

170msgid "Comments:"

169−msgstr ""

171+msgstr "Comentarios:"

170

172

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

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

172msgid "Featured"

174msgid "Featured"

@@ -210,7 +212,7 @@ msgstr "Autor:"

210

212

211#: Greeter/Lockscreen.qml:134

213#: Greeter/Lockscreen.qml:134

212msgid "Emergency Call"

214msgid "Emergency Call"

213−msgstr ""

215+msgstr "Llamada de emergencia"

214

216

215#: Greeter/PassphraseLockscreen.qml:59

217#: Greeter/PassphraseLockscreen.qml:59

216#, qt-format

218#, qt-format

tests/mocks/Unity/CMakeLists.txt+2

@@ -17,6 +17,8 @@ add_definitions(-DQT_NO_KEYWORDS)

17

18set(UnityQML_SOURCES

19 ${CMAKE_SOURCE_DIR}/plugins/Unity/categoryresults.cpp

20+ fake_applications_scope.cpp

21+ fake_preview.cpp

20 fake_scope.cpp

22 fake_scope.cpp

21 fake_scopes.cpp

23 fake_scopes.cpp

22 fake_categories.cpp

24 fake_categories.cpp

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+16

@@ -33,6 +33,7 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF

33 m_recent(false),

34 m_progress(-1),

35 m_count(0),

36+ m_focused(false),

36 m_quickList(new MockQuickListModel(this))

37 m_quickList(new MockQuickListModel(this))

37{

38{

38

39

@@ -128,6 +129,21 @@ void MockLauncherItem::setCount(int count)

128 }

129 }

129}

130}

130

131

132+bool MockLauncherItem::focused() const

133+{

134+ return m_focused;

135+}

136+

137+void MockLauncherItem::setFocused(bool focused)

138+{

139+ if (m_focused != focused)

140+ {

141+ m_focused = focused;

142+ Q_EMIT focusedChanged(focused);

143+ }

144+}

145+

146+

131unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const

147unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const

132{

148{

133 return m_quickList;

149 return m_quickList;

tests/mocks/Unity/Launcher/MockLauncherItem.h+4

@@ -52,6 +52,9 @@ public:

52 int count() const;

53 void setCount(int count);

54

55+ bool focused() const;

56+ void setFocused(bool focused);

57+

55 unity::shell::launcher::QuickListModelInterface *quickList() const;

58 unity::shell::launcher::QuickListModelInterface *quickList() const;

56

59

57private:

60private:

@@ -64,6 +67,7 @@ private:

64 bool m_recent;

67 bool m_recent;

65 int m_progress;

68 int m_progress;

66 int m_count;

69 int m_count;

70+ bool m_focused;

67 MockQuickListModel *m_quickList;

71 MockQuickListModel *m_quickList;

68};

72};

69

73

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+9

@@ -25,6 +25,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa

25 MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app", this);

26 item->setProgress(0);

27 m_list.append(item);

28+ item->setFocused(true);

28 item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);

29 item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);

29 item->setProgress(10);

30 item->setProgress(10);

30 m_list.append(item);

31 m_list.append(item);

@@ -49,6 +50,7 @@ MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(pa

49 item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);

50 item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);

50 item->setProgress(50);

51 item->setProgress(50);

51 item->setCount(5);

52 item->setCount(5);

53+ item->setFocused(true);

52 m_list.append(item);

54 m_list.append(item);

53 item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);

55 item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);

54 m_list.append(item);

56 m_list.append(item);

@@ -85,6 +87,8 @@ QVariant MockLauncherModel::data(const QModelIndex& index, int role) const

85 return item->progress();

87 return item->progress();

86 case RoleCount:

88 case RoleCount:

87 return item->count();

89 return item->count();

90+ case RoleFocused:

91+ return item->focused();

88 }

92 }

89

93

90 return QVariant();

94 return QVariant();

@@ -180,3 +184,8 @@ void MockLauncherModel::setUser(const QString &username)

180 Q_UNUSED(username)

184 Q_UNUSED(username)

181 // TODO: implement this...

185 // TODO: implement this...

182}

186}

187+

188+void MockLauncherModel::applicationFocused(const QString &appId)

189+{

190+ Q_UNUSED(appId)

191+}

tests/mocks/Unity/Launcher/MockLauncherModel.h+1

@@ -44,6 +44,7 @@ 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

48Q_SIGNALS:

49Q_SIGNALS:

49 void quickListTriggered(const QString &appId, int index);

50 void quickListTriggered(const QString &appId, int index);

tests/mocks/Unity/fake_applications_scope.cppnew file+68

@@ -0,0 +1,68 @@

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+#include "fake_applications_scope.h"

18+

19+static const gchar * categories_model_schema[] = {

20+ "s", //ID

21+ "s", // DISPLAY_NAME

22+ "s", // ICON_HINT

23+ "s", // RENDERER_NAME

24+ "a{sv}" // HINTS

25+};

26+

27+ApplicationsScope::ApplicationsScope(bool visible, QObject* parent)

28+ : Scope(parent)

29+{

30+ m_id = "applications.scope";

31+ m_name = "Applications";

32+ m_visible = visible;

33+ m_categories->setModel(createCategoriesModel());

34+}

35+

36+DeeModel* ApplicationsScope::createCategoriesModel()

37+{

38+ DeeModel* category_model = dee_sequence_model_new();

39+ dee_model_set_schema_full(category_model, categories_model_schema, G_N_ELEMENTS(categories_model_schema));

40+ GVariant* hints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), NULL, 0);

41+

42+ GVariant* children[1];

43+ children[0] = g_variant_new_dict_entry(g_variant_new_string("content-type"),

44+ g_variant_new_variant(g_variant_new_string("apps")));

45+ GVariant* recentHints = g_variant_new_array(g_variant_type_element(G_VARIANT_TYPE_VARDICT), children, 1);

46+ dee_model_append(category_model,

47+ "recent",

48+ "Recent",

49+ "gtk-apply",

50+ "special",

51+ recentHints);

52+

53+ dee_model_append(category_model,

54+ "installed",

55+ "Installed",

56+ "gtk-apply",

57+ "grid",

58+ hints);

59+

60+ dee_model_append(category_model,

61+ "suggested",

62+ "Suggested",

63+ "gtk-apply",

64+ "grid",

65+ hints);

66+

67+ return category_model;

68+}

tests/mocks/Unity/fake_applications_scope.hnew file+33

@@ -0,0 +1,33 @@

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+#ifndef FAKE_APPLICATIONS_SCOPE_H

18+#define FAKE_APPLICATIONS_SCOPE_H

19+

20+#include "fake_scope.h"

21+

22+class ApplicationsScope : public Scope

23+{

24+ Q_OBJECT

25+

26+public:

27+ ApplicationsScope(bool visible, QObject* parent = 0);

28+

29+private:

30+ DeeModel* createCategoriesModel();

31+};

32+

33+#endif // FAKE_APPLICATIONS_SCOPE_H

tests/mocks/Unity/fake_categories.cpp+84−12

@@ -24,11 +24,20 @@

24

25#define CATEGORY_COLUMN 2

26

27+// TODO: use something from libunity once it's public

28+enum CategoryColumn {

29+ ID,

30+ DISPLAY_NAME,

31+ ICON_HINT,

32+ RENDERER_NAME,

33+ HINTS

34+};

35+

27Categories::Categories(QObject* parent)

36Categories::Categories(QObject* parent)

28 : DeeListModel(parent)

37 : DeeListModel(parent)

29{

38{

30 // FIXME: need to clean up unused filters on countChanged

39 // FIXME: need to clean up unused filters on countChanged

31− m_roles[Categories::RoleId] = "id";

40+ m_roles[Categories::RoleCategoryId] = "categoryId";

32 m_roles[Categories::RoleName] = "name";

41 m_roles[Categories::RoleName] = "name";

33 m_roles[Categories::RoleIcon] = "icon";

42 m_roles[Categories::RoleIcon] = "icon";

34 m_roles[Categories::RoleRenderer] = "renderer";

43 m_roles[Categories::RoleRenderer] = "renderer";

@@ -36,7 +45,6 @@ Categories::Categories(QObject* parent)

36 m_roles[Categories::RoleHints] = "hints";

45 m_roles[Categories::RoleHints] = "hints";

37 m_roles[Categories::RoleResults] = "results";

46 m_roles[Categories::RoleResults] = "results";

38 m_roles[Categories::RoleCount] = "count";

47 m_roles[Categories::RoleCount] = "count";

39− m_roles[Categories::RoleCategoryIndex] = "categoryIndex";

40

48

41 // TODO This should not be needed but accumulatting the count changes

49 // TODO This should not be needed but accumulatting the count changes

42 // makes the visualization more stable and also makes crashes on fast

50 // makes the visualization more stable and also makes crashes on fast

@@ -74,6 +82,25 @@ Categories::onCountChanged()

74 }

82 }

75}

83}

76

84

85+void Categories::onRowCountChanged()

86+{

87+ QAbstractItemModel* model = qobject_cast<QAbstractItemModel*>(sender());

88+ // find the corresponding category index

89+ for (auto iter = m_overriddenCategories.begin(); iter != m_overriddenCategories.end(); ++iter) {

90+ if (iter.value() == model) {

91+ for (int i = 0; i < rowCount(); i++) {

92+ auto id = data(index(i), RoleCategoryId).toString();

93+ if (id != iter.key()) continue;

94+ QVector<int> roles;

95+ roles.append(RoleCount);

96+ QModelIndex changedIndex = index(i);

97+ Q_EMIT dataChanged(changedIndex, changedIndex, roles);

98+ break;

99+ }

100+ }

101+ }

102+}

103+

77void

104void

78Categories::onEmitCountChanged()

105Categories::onEmitCountChanged()

79{

106{

@@ -93,6 +120,41 @@ Categories::roleNames() const

93 return m_roles;

120 return m_roles;

94}

121}

95

122

123+void Categories::onOverrideModelDestroyed()

124+{

125+ QObject* model = sender();

126+ auto iter = m_overriddenCategories.begin();

127+ while (iter != m_overriddenCategories.end()) {

128+ if (iter.value() == model) {

129+ iter = m_overriddenCategories.erase(iter);

130+ continue;

131+ }

132+ ++iter;

133+ }

134+}

135+

136+void Categories::overrideResults(const QString& categoryId, QAbstractItemModel* model)

137+{

138+ m_overriddenCategories[categoryId] = model;

139+ // watch the model

140+ connect(model, &QObject::destroyed, this, &Categories::onOverrideModelDestroyed);

141+ connect(model, &QAbstractItemModel::rowsInserted, this, &Categories::onRowCountChanged);

142+ connect(model, &QAbstractItemModel::rowsRemoved, this, &Categories::onRowCountChanged);

143+ connect(model, &QAbstractItemModel::modelReset, this, &Categories::onRowCountChanged);

144+

145+ // emit the dataChanged signal if the category is already in the model

146+ for (int i = 0; i < rowCount(); i++) {

147+ auto id = data(index(i), RoleCategoryId).toString();

148+ if (id != categoryId) continue;

149+ QVector<int> roles;

150+ roles.append(RoleCount);

151+ roles.append(RoleResults);

152+ QModelIndex changedIndex = index(i);

153+ Q_EMIT dataChanged(changedIndex, changedIndex, roles);

154+ break;

155+ }

156+}

157+

96void Categories::setResultModel(DeeModel* model)

158void Categories::setResultModel(DeeModel* model)

97{

159{

98 // FIXME: should ref it

160 // FIXME: should ref it

@@ -154,27 +216,37 @@ Categories::data(const QModelIndex& index, int role) const

154 }

216 }

155

217

156 switch (role) {

218 switch (role) {

157− case RoleId:

219+ case RoleCategoryId:

158− return DeeListModel::data(index, 0); //ID

220+ return DeeListModel::data(index, CategoryColumn::ID);

159 case RoleName:

221 case RoleName:

160− return DeeListModel::data(index, 1); //DISPLAY_NAME

222+ return DeeListModel::data(index, CategoryColumn::DISPLAY_NAME);

161 case RoleIcon:

223 case RoleIcon:

162− return DeeListModel::data(index, 2); //ICON_HINT

224+ return DeeListModel::data(index, CategoryColumn::ICON_HINT);

163 case RoleRenderer:

225 case RoleRenderer:

164− return DeeListModel::data(index, 3); //RENDERER_NAME

226+ return DeeListModel::data(index, CategoryColumn::RENDERER_NAME);

165 case RoleContentType:

227 case RoleContentType:

166 {

228 {

167− auto hints = DeeListModel::data(index, 4).toHash();

229+ auto hints = DeeListModel::data(index, CategoryColumn::HINTS).toHash();

168− return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));

230+ return hints.contains("content-type") ? hints["content-type"] : QVariant(QString("default"));

169 }

231 }

170 case RoleHints:

232 case RoleHints:

171− return DeeListModel::data(index, 4); //HINTS

233+ return DeeListModel::data(index, CategoryColumn::HINTS);

172 case RoleResults:

234 case RoleResults:

235+ if (m_overriddenCategories.size() > 0)

236+ {

237+ auto id = DeeListModel::data(index, CategoryColumn::ID).toString();

238+ if (m_overriddenCategories.find(id) != m_overriddenCategories.end())

239+ return QVariant::fromValue(m_overriddenCategories[id]);

240+ }

173 return QVariant::fromValue(getFilter(index.row()));

241 return QVariant::fromValue(getFilter(index.row()));

174 case RoleCount:

242 case RoleCount:

243+ if (m_overriddenCategories.size() > 0)

244+ {

245+ auto id = DeeListModel::data(index, CategoryColumn::ID).toString();

246+ if (m_overriddenCategories.find(id) != m_overriddenCategories.end())

247+ return QVariant::fromValue(m_overriddenCategories[id]->rowCount());

248+ }

175 return QVariant::fromValue(getFilter(index.row())->rowCount());

249 return QVariant::fromValue(getFilter(index.row())->rowCount());

176− case RoleCategoryIndex:

177− return QVariant::fromValue(index.row());

178 default:

250 default:

179 return QVariant();

251 return QVariant();

180 }

252 }

tests/mocks/Unity/fake_categories.h+7−3

@@ -34,17 +34,18 @@ class Categories : public DeeListModel

34public:

35 Categories(QObject* parent = 0);

36 enum Roles {

37− RoleId,

37+ RoleCategoryId,

38 RoleName,

39 RoleIcon,

40 RoleRenderer,

41 RoleContentType,

42 RoleHints,

43 RoleResults,

44− RoleCount,

44+ RoleCount

45− RoleCategoryIndex

46 };

45 };

47

46

47+ Q_INVOKABLE void overrideResults(const QString& categoryId, QAbstractItemModel* model);

48+

48 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

49 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;

49

50

50 QHash<int, QByteArray> roleNames() const;

51 QHash<int, QByteArray> roleNames() const;

@@ -54,7 +55,9 @@ public:

54

55

55private Q_SLOTS:

56private Q_SLOTS:

56 void onCountChanged();

57 void onCountChanged();

58+ void onRowCountChanged();

57 void onEmitCountChanged();

59 void onEmitCountChanged();

60+ void onOverrideModelDestroyed();

58

61

59private:

62private:

60 DeeModel* getResultsForCategory(unsigned index) const;

63 DeeModel* getResultsForCategory(unsigned index) const;

@@ -64,6 +67,7 @@ private:

64 QTimer m_timer;

67 QTimer m_timer;

65 QSet<DeeListModel*> m_timerFilters;

68 QSet<DeeListModel*> m_timerFilters;

66 QHash<int, QByteArray> m_roles;

69 QHash<int, QByteArray> m_roles;

70+ QMap<QString, QAbstractItemModel*> m_overriddenCategories;

67 mutable QMap<int, DeeListModel*> m_filters;

71 mutable QMap<int, DeeListModel*> m_filters;

68};

72};

69

73

tests/mocks/Unity/fake_preview.cppnew file+66

@@ -0,0 +1,66 @@

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+#include "fake_preview.h"

18+

19+QString Preview::rendererName() const

20+{

21+ return "foo";

22+}

23+

24+QString Preview::title() const

25+{

26+ return "Title";

27+}

28+

29+QString Preview::subtitle() const

30+{

31+ return "Subtitle";

32+}

33+

34+QString Preview::description() const

35+{

36+ return "Description";

37+}

38+

39+QVariant Preview::actions()

40+{

41+ return QVariant();

42+}

43+

44+QVariant Preview::infoHints()

45+{

46+ return QVariant();

47+}

48+

49+QVariantMap Preview::infoHintsHash() const

50+{

51+ return QVariantMap();

52+}

53+

54+QString Preview::image() const

55+{

56+ return "";

57+}

58+

59+QString Preview::imageSourceUri() const

60+{

61+ return "";

62+}

63+

64+void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)

65+{

66+}

tests/mocks/Unity/fake_preview.hnew file+62

@@ -0,0 +1,62 @@

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+#ifndef FAKE_PREVIEW_H

18+#define FAKE_PREVIEW_H

19+

20+// Qt

21+#include <QObject>

22+#include <QString>

23+#include <QMetaType>

24+#include <QList>

25+#include <QVariantMap>

26+

27+class Q_DECL_EXPORT Preview : public QObject

28+{

29+ Q_OBJECT

30+

31+ Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)

32+ Q_PROPERTY(QString title READ title NOTIFY previewChanged)

33+ Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)

34+ Q_PROPERTY(QString description READ description NOTIFY previewChanged)

35+ Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)

36+ Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)

37+ Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)

38+ Q_PROPERTY(QString image READ image NOTIFY previewChanged)

39+ Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)

40+

41+public:

42+ explicit Preview(QObject *parent = 0);

43+

44+ QString rendererName() const;

45+ QString title() const;

46+ QString subtitle() const;

47+ QString description() const;

48+ QVariant actions();

49+ QVariant infoHints();

50+ QVariantMap infoHintsHash() const;

51+ QString image() const;

52+ QString imageSourceUri() const;

53+

54+ Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);

55+

56+Q_SIGNALS:

57+ void previewChanged();

58+};

59+

60+Q_DECLARE_METATYPE(Preview *)

61+

62+#endif // FAKE_PREVIEW_H

tests/mocks/Unity/fake_scope.cpp+33−9

@@ -20,6 +20,8 @@

20#include <dee.h>

21#include "paths.h"

22

23+#include "fake_preview.h"

24+

23static DeeModel* create_categories_model(unsigned category_count);

25static DeeModel* create_categories_model(unsigned category_count);

24static DeeModel* create_results_model(unsigned category_count, unsigned result_count);

26static DeeModel* create_results_model(unsigned category_count, unsigned result_count);

25

27

@@ -127,6 +129,36 @@ void Scope::setNoResultsHint(const QString& str) {

127 }

129 }

128}

130}

129

131

132+void Scope::activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

133+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

134+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

135+{

136+ Q_UNUSED(uri);

137+ Q_UNUSED(icon_hint);

138+ Q_UNUSED(category);

139+ Q_UNUSED(result_type);

140+ Q_UNUSED(mimetype);

141+ Q_UNUSED(title);

142+ Q_UNUSED(comment);

143+ Q_UNUSED(dnd_uri);

144+ Q_UNUSED(metadata);

145+}

146+

147+void Scope::preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

148+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

149+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata)

150+{

151+ Q_UNUSED(uri);

152+ Q_UNUSED(icon_hint);

153+ Q_UNUSED(category);

154+ Q_UNUSED(result_type);

155+ Q_UNUSED(mimetype);

156+ Q_UNUSED(title);

157+ Q_UNUSED(comment);

158+ Q_UNUSED(dnd_uri);

159+ Q_UNUSED(metadata);

160+}

161+

130static const gchar * categories_model_schema[] = {

162static const gchar * categories_model_schema[] = {

131 "s", //ID

163 "s", //ID

132 "s", // DISPLAY_NAME

164 "s", // DISPLAY_NAME

@@ -168,14 +200,6 @@ static const gchar * results_model_schema[] = {

168 "a{sv}" // METADATA

200 "a{sv}" // METADATA

169};

201};

170

202

171−static const gchar * icons[] = {

172− "Applications.png",

173− "Home.png",

174− "Music.png",

175− "People.png",

176− "Videos.png",

177−};

178−

179DeeModel* create_results_model(unsigned category_count, unsigned result_count) {

203DeeModel* create_results_model(unsigned category_count, unsigned result_count) {

180 DeeModel* results_model = dee_sequence_model_new();

204 DeeModel* results_model = dee_sequence_model_new();

181 dee_model_set_schema_full(results_model, results_model_schema, G_N_ELEMENTS(results_model_schema));

205 dee_model_set_schema_full(results_model, results_model_schema, G_N_ELEMENTS(results_model_schema));

@@ -187,7 +211,7 @@ DeeModel* create_results_model(unsigned category_count, unsigned result_count) {

187

211

188 dee_model_append(results_model,

212 dee_model_append(results_model,

189 ("uri://result."+std::to_string(i)).c_str(),

213 ("uri://result."+std::to_string(i)).c_str(),

190− (shellAppDirectory() + "Dash/graphics/scopeIcons/" + (icons[i%G_N_ELEMENTS(icons)])).toLatin1().data(),

214+ (shellAppDirectory() + "graphics/applicationIcons/dash.png").toLatin1().data(),

191 category,

215 category,

192 0,

216 0,

193 "application/x-desktop",

217 "application/x-desktop",

tests/mocks/Unity/fake_scope.h+15−1

@@ -21,6 +21,8 @@

21#include <QObject>

22#include "fake_categories.h"

23

24+class Preview;

25+

24class Scope : public QObject

26class Scope : public QObject

25{

27{

26 Q_OBJECT

28 Q_OBJECT

@@ -63,6 +65,13 @@ public:

63 void setNoResultsHint(const QString& hint);

65 void setNoResultsHint(const QString& hint);

64 void setFormFactor(const QString& form_factor);

66 void setFormFactor(const QString& form_factor);

65

67

68+ Q_INVOKABLE void activate(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

69+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

70+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

71+ Q_INVOKABLE void preview(const QVariant &uri, const QVariant &icon_hint, const QVariant &category,

72+ const QVariant &result_type, const QVariant &mimetype, const QVariant &title,

73+ const QVariant &comment, const QVariant &dnd_uri, const QVariant &metadata);

74+

66Q_SIGNALS:

75Q_SIGNALS:

67 void idChanged(const QString&);

76 void idChanged(const QString&);

68 void nameChanged(const QString&);

77 void nameChanged(const QString&);

@@ -78,7 +87,12 @@ Q_SIGNALS:

78 void noResultsHintChanged();

87 void noResultsHintChanged();

79 void formFactorChanged();

88 void formFactorChanged();

80

89

81−private:

90+ // signals triggered by activate(..) or preview(..) requests.

91+ void previewReady(Preview *preview);

92+ void activateApplication(const QString &desktop);

93+

94+protected:

95+

82 QString m_id;

96 QString m_id;

83 QString m_iconHint;

97 QString m_iconHint;

84 QString m_description;

98 QString m_description;

tests/mocks/Unity/fake_scopes.cpp+4−1

@@ -19,6 +19,9 @@

19// Self

20#include "fake_scopes.h"

21

22+// Local

23+#include "fake_applications_scope.h"

24+

22// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)

25// TODO: Implement remaining pieces, like Categories (i.e. LensView now gives warnings)

23

26

24// Qt

27// Qt

@@ -53,7 +56,7 @@ void Scopes::updateScopes()

53 addScope(new Scope("MockScope1", "People", true, this));

56 addScope(new Scope("MockScope1", "People", true, this));

54 addScope(new Scope("MockScope2", "Music", false, this));

57 addScope(new Scope("MockScope2", "Music", false, this));

55 addScope(new Scope("home.scope", "Home", true, this));

58 addScope(new Scope("home.scope", "Home", true, this));

56− addScope(new Scope("applications.scope", "Applications", true, this));

59+ addScope(new ApplicationsScope(true, this));

57 addScope(new Scope("MockScope5", "Videos", true, this));

60 addScope(new Scope("MockScope5", "Videos", true, this));

58

61

59 if (!m_loaded) {

62 if (!m_loaded) {

tests/plugins/Unity/Launcher/CMakeLists.txt+40−3

@@ -1,22 +1,59 @@

1+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

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

3+

1include_directories(

4include_directories(

2 ${CMAKE_CURRENT_BINARY_DIR}

5 ${CMAKE_CURRENT_BINARY_DIR}

3 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

6 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

4 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher

7 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher

5 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend

8 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend

9+ ${GSETTINGS_QT_INCLUDE_DIRS}

6 )

10 )

7

11

8add_definitions(-DSM_BUSNAME=sessionBus)

12add_definitions(-DSM_BUSNAME=sessionBus)

9add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

13add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

14+add_definitions(-DLAUNCHER_TESTING)

10

15

16+### LauncherBackendTest

11−set(testCommand ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec

17+set(testBackendCommand ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec

12 -o ${CMAKE_BINARY_DIR}/launcherbackendtest.xml,xunitxml

18 -o ${CMAKE_BINARY_DIR}/launcherbackendtest.xml,xunitxml

13 -o -,txt)

19 -o -,txt)

14−add_test(NAME launcherbackendtest COMMAND ${testCommand})

20+add_test(NAME launcherbackendtest COMMAND ${testBackendCommand})

15−add_custom_target(launcherbackendtest ${testCommand})

21+add_custom_target(launcherbackendtest ${testBackendCommand})

16add_executable(launcherbackendtestExec

22add_executable(launcherbackendtestExec

17 launcherbackendtest.cpp

23 launcherbackendtest.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

24 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

19 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

25 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

20 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

26 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp

21 )

27 )

28+target_link_libraries(launcherbackendtestExec ${GSETTINGS_QT_LDFLAGS})

22qt5_use_modules(launcherbackendtestExec Test Core DBus)

29qt5_use_modules(launcherbackendtestExec Test Core DBus)

30+

31+### LauncherModelTest

32+set(testModelCommand ${CMAKE_CURRENT_BINARY_DIR}/launchermodeltestExec

33+ -o ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml

34+ -o -,txt)

35+add_test(NAME launchermodeltest COMMAND ${testModelCommand})

36+add_custom_target(launchermodeltest ${testModelCommand})

37+add_executable(launchermodeltestExec

38+ launchermodeltest.cpp

39+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp

40+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp

41+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp

42+ ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp

43+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp

44+ ${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/LauncherModelInterface.h

47+ ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

48+ )

49+target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS} )

50+qt5_use_modules(launchermodeltestExec Test Core DBus)

51+

52+# copy .desktop files into build directory for shadow builds

53+file(GLOB DESKTOP_FILES *.desktop)

54+

55+foreach(DESKTOP_FILE ${DESKTOP_FILES})

56+ file(COPY "${DESKTOP_FILE}"

57+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}

58+ )

59+endforeach()

tests/plugins/Unity/Launcher/launcherbackendtest.cpp+14−48

@@ -20,7 +20,6 @@

20#include "launcherbackend.h"

21

22#include <QtTest>

23−#include <QDebug>

24

23

25class LauncherBackendTest : public QObject

24class LauncherBackendTest : public QObject

26{

25{

@@ -31,62 +30,29 @@ private Q_SLOTS:

31 {

30 {

32 LauncherBackend backend(false);

31 LauncherBackend backend(false);

33

32

34− backend.setStoredApplications(QStringList() << "relative.path" << "/full/path");

33+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon" << "invalid");

35− QCOMPARE(backend.storedApplications(), QStringList() << "/usr/share/applications/relative.path" << "/full/path");

34+ QCOMPARE(backend.storedApplications(), QStringList() << "rel-icon" << "abs-icon");

36−

37− QCOMPARE(backend.desktopFile("one.desktop"), QString("/usr/share/applications/one.desktop"));

38− QCOMPARE(backend.desktopFile("two"), QString("/usr/share/applications/two"));

39− QCOMPARE(backend.desktopFile("/full"), QString("/full"));

40−

41− QCOMPARE(backend.desktopFile("/usr/share/applications/one.desktop"), QString("/usr/share/applications/one.desktop"));

42− }

43−

44− void testDesktopReading()

45− {

46− LauncherBackend backend(false);

47−

48− QCOMPARE(backend.displayName(SRCDIR "/rel-icon.desktop"), QString("Relative Icon"));

49− QCOMPARE(backend.icon(SRCDIR "/rel-icon.desktop"), QString("image://gicon/rel-icon"));

50−

51− QCOMPARE(backend.displayName(SRCDIR "/abs-icon.desktop"), QString("Absolute Icon"));

52− QCOMPARE(backend.icon(SRCDIR "/abs-icon.desktop"), QString("/path/to/icon.png"));

53−

54− QCOMPARE(backend.displayName(SRCDIR "/no-icon.desktop"), QString("No Icon"));

55− QCOMPARE(backend.icon(SRCDIR "/no-icon.desktop"), QString(""));

56−

57− QCOMPARE(backend.displayName(SRCDIR "/no-name.desktop"), QString(""));

58− QCOMPARE(backend.icon(SRCDIR "/no-name.desktop"), QString("image://gicon/no-name"));

59−

60− QCOMPARE(backend.displayName(SRCDIR "/no-exist.desktop"), QString(""));

61− QCOMPARE(backend.icon(SRCDIR "/no-exist.desktop"), QString(""));

62 }

35 }

63

36

64 void testPinning()

37 void testPinning()

65 {

38 {

66 LauncherBackend backend(false);

39 LauncherBackend backend(false);

67

40

68− // Confirm that default entries are all pinned

69− auto defaultApps = backend.storedApplications();

70− QVERIFY(defaultApps.size() > 0);

71− for (auto app: defaultApps) {

72− QCOMPARE(backend.isPinned(app), true);

73− }

74−

75− backend.setStoredApplications(QStringList() << "one" << "two");

41+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon");

76− QCOMPARE(backend.isPinned("one"), false);

42+ QCOMPARE(backend.isPinned("rel-icon"), false);

77− QCOMPARE(backend.isPinned("two"), false);

43+ QCOMPARE(backend.isPinned("abs-icon"), false);

78

44

79− backend.setPinned("two", true);

45+ backend.setPinned("rel-icon", true);

80− QCOMPARE(backend.isPinned("two"), true);

46+ QCOMPARE(backend.isPinned("rel-icon"), true);

81

47

82− backend.setStoredApplications(QStringList() << "one" << "two" << "three");

48+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon" << "no-name");

83− QCOMPARE(backend.isPinned("two"), true);

49+ QCOMPARE(backend.isPinned("rel-icon"), true);

84− QCOMPARE(backend.isPinned("three"), false);

50+ QCOMPARE(backend.isPinned("no-name"), false);

85

51

86− backend.setPinned("three", true);

52+ backend.setPinned("no-name", true);

87− backend.setStoredApplications(QStringList() << "one" << "two");

53+ backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon");

88− QCOMPARE(backend.isPinned("two"), true);

54+ QCOMPARE(backend.isPinned("rel-icon"), true);

89− QCOMPARE(backend.isPinned("three"), false); // doesn't exist anymore!

55+ QCOMPARE(backend.isPinned("no-name"), false); // doesn't exist anymore!

90 }

56 }

91};

57};

92

58

tests/plugins/Unity/Launcher/launchermodeltest.cppnew file+146

@@ -0,0 +1,146 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

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

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

20+// unity-api

21+#include <unity/shell/launcher/LauncherModelInterface.h>

22+

23+#include "launcheritem.h"

24+#include "launchermodel.h"

25+

26+#include <QtTest>

27+

28+class LauncherModelTest : public QObject

29+{

30+ Q_OBJECT

31+

32+private:

33+ LauncherModel *launcherModel;

34+

35+private Q_SLOTS:

36+

37+ void initTestCase() {

38+ launcherModel = new LauncherModel(this);

39+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);

40+ }

41+

42+ void init() {

43+ qDebug() << "init";

44+ launcherModel->applicationFocused("abs-icon");

45+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

46+

47+ launcherModel->applicationFocused("no-icon.desktop");

48+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

49+

50+ launcherModel->applicationFocused(QString());

51+ }

52+

53+ void cleanup() {

54+ while (launcherModel->rowCount(QModelIndex()) > 0) {

55+ launcherModel->requestRemove(launcherModel->get(0)->appId());

56+ }

57+ }

58+

59+ void testMove() {

60+ QCOMPARE(launcherModel->get(0)->pinned(), false);

61+ QCOMPARE(launcherModel->get(1)->pinned(), false);

62+

63+ LauncherItemInterface *item0BeforeMove = launcherModel->get(0);

64+ LauncherItemInterface *item1BeforeMove = launcherModel->get(1);

65+ launcherModel->move(1, 0);

66+

67+ QCOMPARE(item0BeforeMove, launcherModel->get(1));

68+ QCOMPARE(item1BeforeMove, launcherModel->get(0));

69+

70+ // moved item must be pinned now

71+ QCOMPARE(item0BeforeMove->pinned(), false);

72+ QCOMPARE(item1BeforeMove->pinned(), true);

73+ }

74+

75+ void testPinning() {

76+ QCOMPARE(launcherModel->get(0)->pinned(), false);

77+ QCOMPARE(launcherModel->get(1)->pinned(), false);

78+ launcherModel->pin(launcherModel->get(0)->appId());

79+ QCOMPARE(launcherModel->get(0)->pinned(), true);

80+ QCOMPARE(launcherModel->get(1)->pinned(), false);

81+ }

82+

83+ void testRemove() {

84+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

85+ launcherModel->requestRemove(launcherModel->get(0)->appId());

86+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

87+ }

88+

89+ void testQuickListPinningRemoving() {

90+ // we start with 2 unpinned items

91+ QCOMPARE(launcherModel->get(0)->pinned(), false);

92+ QCOMPARE(launcherModel->get(1)->pinned(), false);

93+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

94+

95+ // find the Pin item in the quicklist

96+ QuickListModel *model = qobject_cast<QuickListModel*>(launcherModel->get(0)->quickList());

97+ int pinActionIndex = -1;

98+ for (int i = 0; i < model->rowCount(QModelIndex()); ++i) {

99+ if (model->get(i).actionId() == "pin_item") {

100+ pinActionIndex = i;

101+ break;

102+ }

103+ }

104+ QVERIFY(pinActionIndex >= 0);

105+

106+ // trigger pin item quicklist action => Item must be pinned now.

107+ launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

108+ QCOMPARE(launcherModel->get(0)->pinned(), true);

109+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

110+

111+ // quicklist needs to transform to remove item. trigger it and check it item goes away

112+ launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

113+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

114+ }

115+

116+ void testApplicationFocused() {

117+ // all apps unfocused at beginning...

118+ QCOMPARE(launcherModel->get(0)->focused(), false);

119+ QCOMPARE(launcherModel->get(1)->focused(), false);

120+

121+ launcherModel->applicationFocused("abs-icon");

122+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

123+ QCOMPARE(launcherModel->get(0)->focused(), true);

124+ QCOMPARE(launcherModel->get(1)->focused(), false);

125+

126+ launcherModel->applicationFocused("no-icon");

127+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

128+ QCOMPARE(launcherModel->get(0)->focused(), false);

129+ QCOMPARE(launcherModel->get(1)->focused(), true);

130+

131+ launcherModel->applicationFocused("rel-icon");

132+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 3);

133+ QCOMPARE(launcherModel->get(0)->focused(), false);

134+ QCOMPARE(launcherModel->get(1)->focused(), false);

135+ QCOMPARE(launcherModel->get(2)->focused(), true);

136+

137+ launcherModel->applicationFocused(QString());

138+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 3);

139+ QCOMPARE(launcherModel->get(0)->focused(), false);

140+ QCOMPARE(launcherModel->get(1)->focused(), false);

141+ QCOMPARE(launcherModel->get(2)->focused(), false);

142+ }

143+};

144+

145+QTEST_GUILESS_MAIN(LauncherModelTest)

146+#include "launchermodeltest.moc"

tests/qmltests/Launcher/tst_Launcher.qml+8

@@ -198,6 +198,14 @@ Item {

198 compare(findChild(delegate, "progressOverlay").visible, LauncherModel.get(i).progress >= 0)

199 }

200 }

201+

202+ function test_focusedHighlight() {

203+ var launcherListView = findChild(launcher, "launcherListView");

204+ for (var i = 0; i < launcherListView.count; ++i) {

205+ var delegate = findChild(launcherListView, "launcherDelegate" + i)

206+ compare(findChild(delegate, "focusedHighlight").visible, LauncherModel.get(i).focused)

207+ }

208+ }

201 }

209 }

202

210

203 UT.UnityTestCase {

211 UT.UnityTestCase {