cee0dab · unity8 · git.iko.soy

Launcher/LauncherDelegate.qml+20−9

compare with xenial

unifiedsplit

@@ -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+3−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

Launcher/graphics/focused_app_arrow@30.pngnew file

Binary file not shown.

Shell.qml+9

@@ -96,6 +96,15 @@ FocusScope {

96 greeter.hide();

97 shell.activateApplication(desktopFile);

98 }

99+

100+ onMainStageFocusedApplicationChanged: {

101+ var app = applicationManager.mainStageFocusedApplication

102+ if (app != null) {

103+ LauncherModel.applicationFocused(app.desktopFile);

104+ } else {

105+ LauncherModel.applicationFocused("");

106+ }

107+ }

99 }

108 }

100

109

101 function activateApplication(desktopFile, argument) {

110 function activateApplication(desktopFile, argument) {

debian/changelog+13

@@ -1,3 +1,16 @@

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+

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

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

2

15

3 [ Nicolas d'Offay ]

16 [ Nicolas d'Offay ]

plugins/AccountsService/AccountsBindings.cppdeleted−104

@@ -1,104 +0,0 @@

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 "AccountsBindings.h"

20−#include "AccountsService.h"

21−

22−#include <QStringList>

23−

24−AccountsBindings::AccountsBindings(QObject* parent)

25− : QObject(parent),

26− m_service(new AccountsService(this)),

27− m_user(qgetenv("USER"))

28−{

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

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

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

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

33−}

34−

35−QString AccountsBindings::getUser()

36−{

37− return m_user;

38−}

39−

40−void AccountsBindings::setUser(const QString &user)

41−{

42− m_user = user;

43− Q_EMIT userChanged();

44−

45− updateDemoEdges();

46− updateBackgroundFile();

47−}

48−

49−bool AccountsBindings::getDemoEdges()

50−{

51− return m_demoEdges;

52−}

53−

54−void AccountsBindings::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 AccountsBindings::getBackgroundFile()

61−{

62− return m_backgroundFile;

63−}

64−

65−void AccountsBindings::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();

71− }

72−}

73−

74−void AccountsBindings::updateBackgroundFile()

75−{

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

77− if (m_backgroundFile != backgroundFile) {

78− m_backgroundFile = backgroundFile;

79− Q_EMIT backgroundFileChanged();

80− }

81−}

82−

83−void AccountsBindings::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

84−{

85− if (m_user != user) {

86− return;

87− }

88−

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

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

91− updateDemoEdges();

92− }

93− }

94−}

95−

96−void AccountsBindings::maybeChanged(const QString &user)

97−{

98− if (m_user != user) {

99− return;

100− }

101−

102− // Standard properties might have changed

103− updateBackgroundFile();

104−}

plugins/AccountsService/AccountsBindings.hdeleted−70

@@ -1,70 +0,0 @@

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_ACCOUNTSBINDINGS_H

20−#define UNITY_ACCOUNTSBINDINGS_H

21−

22−#include <QObject>

23−#include <QString>

24−

25−class AccountsService;

26−

27−class AccountsBindings: 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)

41−

42−public:

43− explicit AccountsBindings(QObject *parent = 0);

44−

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:

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

58− void maybeChanged(const QString &user);

59−

60−private:

61− void updateDemoEdges();

62− void updateBackgroundFile();

63−

64− AccountsService *m_service;

65− QString m_user;

66− bool m_demoEdges;

67− QString m_backgroundFile;

68−};

69−

70−#endif

plugins/AccountsService/AccountsService.cpp+56−78

@@ -17,110 +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 &interface, const QString &property)

35+QString AccountsService::getUser()

40{

36{

41− auto iface = getUserInterface(user);

37+ return m_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}

38}

50

39

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

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

52{

41{

53− auto iface = getUserInterface(user);

42+ m_user = user;

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

43+ Q_EMIT userChanged();

55− // The value needs to be carefully wrapped

44+

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

45+ updateDemoEdges();

57− }

46+ updateBackgroundFile();

58}

47}

59

48

60−void AccountsService::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)

49+bool AccountsService::getDemoEdges()

61{

50{

62− // Merge changed and invalidated together

51+ return m_demoEdges;

63− QStringList combined;

52+}

64− combined << invalid;

65− combined << changed.keys();

66− combined.removeDuplicates();

67

53

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

54+void AccountsService::setDemoEdges(bool demoEdges)

55+{

56+ m_demoEdges = demoEdges;

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

69}

58}

70

59

71−void AccountsService::maybeChangedSlot()

60+QString AccountsService::getBackgroundFile()

72{

61{

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

62+ return m_backgroundFile;

74}

63}

75

64

76−QString AccountsService::getUserForPath(const QString &path)

65+void AccountsService::updateDemoEdges()

77{

66{

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

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

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

68+ if (m_demoEdges != demoEdges) {

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

69+ m_demoEdges = demoEdges;

81− return i.key();

70+ Q_EMIT demoEdgesChanged();

82− }

83 }

71 }

84− return QString();

85}

72}

86

73

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

74+void AccountsService::updateBackgroundFile()

88{

75{

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",

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

108− "Changed",

77+ if (m_backgroundFile != backgroundFile) {

109− this,

78+ m_backgroundFile = backgroundFile;

110− SLOT(maybeChangedSlot()));

79+ Q_EMIT backgroundFileChanged();

80+ }

81+}

111

82

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

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

113− // let's still listen there.

84+{

114− iface->connection().connect(

85+ if (m_user != user) {

115− iface->service(),

86+ return;

116− path,

87+ }

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

118− "PropertiesChanged",

119− this,

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

121

88

122− users.insert(user, iface);

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

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

91+ updateDemoEdges();

123 }

92 }

124 }

93 }

94+}

95+

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

97+{

98+ if (m_user != user) {

125− return iface;

99+ return;

100+ }

101+

102+ // Standard properties might have changed

103+ updateBackgroundFile();

126}

104}

plugins/AccountsService/AccountsService.h+31−15

@@ -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,36 +19,52 @@

19#ifndef UNITY_ACCOUNTSSERVICE_H

20#define UNITY_ACCOUNTSSERVICE_H

21

22−#include <QDBusContext>

23−#include <QDBusInterface>

24−#include <QMap>

25#include <QObject>

22#include <QObject>

26#include <QString>

23#include <QString>

27

24

25+class AccountsServiceDBusAdaptor;

26+

28−class AccountsService: public QObject, public QDBusContext

27+class AccountsService: public QObject

29{

28{

30 Q_OBJECT

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)

31

41

32public:

42public:

33 explicit AccountsService(QObject *parent = 0);

43 explicit AccountsService(QObject *parent = 0);

34

44

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

45+ QString getUser();

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

46+ void setUser(const QString &user);

47+ bool getDemoEdges();

48+ void setDemoEdges(bool demoEdges);

49+ QString getBackgroundFile();

37

50

38Q_SIGNALS:

51Q_SIGNALS:

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

52+ void userChanged();

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

53+ void demoEdgesChanged();

54+ void backgroundFileChanged();

41

55

42private Q_SLOTS:

56private Q_SLOTS:

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

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

44− void maybeChangedSlot();

58+ void maybeChanged(const QString &user);

45

59

46private:

60private:

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

61+ void updateDemoEdges();

48− QString getUserForPath(const QString &path);

62+ void updateBackgroundFile();

49

63

50− QDBusInterface *accounts_manager;

64+ AccountsServiceDBusAdaptor *m_service;

51− QMap<QString, QDBusInterface *> users;

65+ QString m_user;

66+ bool m_demoEdges;

67+ QString m_backgroundFile;

52};

68};

53

69

54#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−1

@@ -3,8 +3,8 @@ include(Plugins)

3add_definitions(-DSM_BUSNAME=systemBus)

4

5add_library(AccountsService-qml MODULE

6− AccountsBindings.cpp

7 AccountsService.cpp

6 AccountsService.cpp

7+ AccountsServiceDBusAdaptor.cpp

8 plugin.cpp

9 )

10

plugins/AccountsService/plugin.cpp+3−3

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

17 */

18

19#include "plugin.h"

20−#include "AccountsBindings.h"

20+#include "AccountsService.h"

21

22#include <QDBusMetaType>

23#include <QtQml>

@@ -26,12 +26,12 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

26{

27 Q_UNUSED(engine)

28 Q_UNUSED(scriptEngine)

29− return new AccountsBindings();

29+ return new AccountsService();

30}

31

32void AccountsServicePlugin::registerTypes(const char *uri)

33{

34 Q_ASSERT(uri == QLatin1String("AccountsService"));

35 qDBusRegisterMetaType<QList<QVariantMap>>();

36− qmlRegisterSingletonType<AccountsBindings>(uri, 0, 1, "AccountsService", service_provider);

36+ qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

37}

plugins/Unity/Launcher/CMakeLists.txt+1−1

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

17 quicklistmodel.cpp

18 common/quicklistentry.cpp

19 backend/launcherbackend.cpp

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

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

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

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

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

plugins/Unity/Launcher/backend/launcherbackend.cpp+34−6

@@ -18,13 +18,14 @@

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>

25#include <QDBusArgument>

26#include <QFileInfo>

27#include <QGSettings>

28+#include <QDebug>

28

29

29class LauncherBackendItem

30class LauncherBackendItem

30{

31{

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

42 m_accounts(nullptr)

43 m_accounts(nullptr)

43{

44{

44 if (useStorage) {

45 if (useStorage) {

45− m_accounts = new AccountsService(this);

46+ m_accounts = new AccountsServiceDBusAdaptor(this);

46 }

47 }

47 m_user = qgetenv("USER");

48 m_user = qgetenv("USER");

48 syncFromAccounts();

49 syncFromAccounts();

@@ -73,6 +74,19 @@ void LauncherBackend::setStoredApplications(const QStringList &appIds)

73 }

74 }

75 }

75 m_storedApps = appIds;

76 m_storedApps = appIds;

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

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+ }

89+ }

76 syncToAccounts();

90 syncToAccounts();

77}

91}

78

92

@@ -199,7 +213,7 @@ void LauncherBackend::syncFromAccounts()

199

213

200 m_storedApps.clear();

214 m_storedApps.clear();

201

215

202− if (m_accounts && m_user.isEmpty()) {

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

203 QVariant 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");

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

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

205 defaults = isDefaultsItem(apps);

219 defaults = isDefaultsItem(apps);

@@ -210,7 +224,11 @@ void LauncherBackend::syncFromAccounts()

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

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

211 if (entry.startsWith("application://")) {

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

212 QString appId = entry;

226 QString appId = entry;

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

213 appId.remove("application://");

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

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

230+ appId.chop(8);

231+ }

214 QString df = findDesktopFile(appId);

232 QString df = findDesktopFile(appId);

215

233

216 if (!df.isEmpty()) {

234 if (!df.isEmpty()) {

@@ -248,14 +266,24 @@ QString LauncherBackend::findDesktopFile(const QString &appId) const

248 int dashPos = -1;

266 int dashPos = -1;

249 QString helper = appId;

267 QString helper = appId;

250

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+

251 do {

277 do {

252 if (dashPos != -1) {

278 if (dashPos != -1) {

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

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

254 }

280 }

255

281

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

256− QFileInfo fileInfo(QDir("/usr/share/applications"), helper);

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

257− if (fileInfo.exists()) {

284+ if (fileInfo.exists()) {

258− return fileInfo.absoluteFilePath();

285+ return fileInfo.absoluteFilePath();

286+ }

259 }

287 }

260

288

261 dashPos = helper.indexOf("-");

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

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+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();

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/AccountsService/AccountsBindings.cpp → tests/mocks/AccountsService/AccountsService.cpprenamed+7−7

@@ -16,34 +16,34 @@

16 * Author: Michael Terry <michael.terry@canonical.com>

17 */

18

19−#include "AccountsBindings.h"

19+#include "AccountsService.h"

20

21−AccountsBindings::AccountsBindings(QObject* parent)

21+AccountsService::AccountsService(QObject* parent)

22 : QObject(parent)

23{

24}

25

26−QString AccountsBindings::getUser()

26+QString AccountsService::getUser()

27{

28 return "testuser";

29}

30

31−void AccountsBindings::setUser(const QString &user)

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

32{

33 Q_UNUSED(user)

34}

35

36−bool AccountsBindings::getDemoEdges()

36+bool AccountsService::getDemoEdges()

37{

38 return false;

39}

40

41−void AccountsBindings::setDemoEdges(bool demoEdges)

41+void AccountsService::setDemoEdges(bool demoEdges)

42{

43 Q_UNUSED(demoEdges)

44}

45

46−QString AccountsBindings::getBackgroundFile()

46+QString AccountsService::getBackgroundFile()

47{

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

49}

tests/mocks/AccountsService/AccountsBindings.h → tests/mocks/AccountsService/AccountsService.hrenamed+5−5

@@ -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

@@ -17,14 +17,14 @@

17 * Michael Terry <michael.terry@canonical.com>

18 */

19

20−#ifndef UNITY_MOCK_ACCOUNTSBINDINGS_H

20+#ifndef UNITY_MOCK_ACCOUNTSSERVICE_H

21−#define UNITY_MOCK_ACCOUNTSBINDINGS_H

21+#define UNITY_MOCK_ACCOUNTSSERVICE_H

22

23#include <QObject>

24#include <QString>

25#include <QVariant>

26

27−class AccountsBindings: public QObject

27+class AccountsService: public QObject

28{

29 Q_OBJECT

30 Q_PROPERTY (QString user

@@ -40,7 +40,7 @@ class AccountsBindings: public QObject

40 NOTIFY backgroundFileChanged)

41

42public:

43− explicit AccountsBindings(QObject *parent = 0);

43+ explicit AccountsService(QObject *parent = 0);

44

45 QString getUser();

46 void setUser(const QString &user);

tests/mocks/AccountsService/CMakeLists.txt+1−1

@@ -1,7 +1,7 @@

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

2

3add_library(MockAccountsService-qml MODULE

4− AccountsBindings.cpp

4+ AccountsService.cpp

5 plugin.cpp

6 )

7

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

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

18 */

19

20#include "plugin.h"

21−#include "AccountsBindings.h"

21+#include "AccountsService.h"

22

23#include <QtQml>

24

@@ -26,11 +26,11 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

26{

27 Q_UNUSED(engine)

28 Q_UNUSED(scriptEngine)

29− return new AccountsBindings();

29+ return new AccountsService();

30}

31

32void AccountsServicePlugin::registerTypes(const char *uri)

33{

34 Q_ASSERT(uri == QLatin1String("AccountsService"));

35− qmlRegisterSingletonType<AccountsBindings>(uri, 0, 1, "AccountsService", service_provider);

35+ qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

36}

tests/mocks/LightDM/demo/GreeterPrivate.cpp+4−2

@@ -55,11 +55,13 @@ void GreeterPrivate::handleRespond(const QString &response)

55 QSettings settings(QDir::homePath() + "/.unity8-greeter-demo", QSettings::NativeFormat);

56 QVariant password = settings.value("password", "none");

57

58+ QString passwordValue;

58 if (password == "pin") {

59 if (password == "pin") {

59− authenticated = (response == "1234");

60+ passwordValue = settings.value("passwordValue", "1234").toString();

60 } else {

61 } else {

61− authenticated = (response == "password");

62+ passwordValue = settings.value("passwordValue", "password").toString();

62 }

63 }

64+ authenticated = (response == passwordValue);

63 Q_EMIT q->authenticationComplete();

65 Q_EMIT q->authenticationComplete();

64}

66}

65

67

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−9

@@ -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";

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

73 }

82 }

74}

83}

75

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+

76void

104void

77Categories::onEmitCountChanged()

105Categories::onEmitCountChanged()

78{

106{

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

92 return m_roles;

120 return m_roles;

93}

121}

94

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+

95void Categories::setResultModel(DeeModel* model)

158void Categories::setResultModel(DeeModel* model)

96{

159{

97 // FIXME: should ref it

160 // FIXME: should ref it

@@ -153,24 +216,36 @@ Categories::data(const QModelIndex& index, int role) const

153 }

216 }

154

217

155 switch (role) {

218 switch (role) {

156− case RoleId:

219+ case RoleCategoryId:

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

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

158 case RoleName:

221 case RoleName:

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

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

160 case RoleIcon:

223 case RoleIcon:

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

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

162 case RoleRenderer:

225 case RoleRenderer:

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

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

164 case RoleContentType:

227 case RoleContentType:

165 {

228 {

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

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

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

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

168 }

231 }

169 case RoleHints:

232 case RoleHints:

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

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

171 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+ }

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

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

173 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+ }

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

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

175 default:

250 default:

176 return QVariant();

251 return QVariant();

tests/mocks/Unity/fake_categories.h+6−1

@@ -34,7 +34,7 @@ class Categories : public DeeListModel

34public:

35 Categories(QObject* parent = 0);

36 enum Roles {

37− RoleId,

37+ RoleCategoryId,

38 RoleName,

39 RoleIcon,

40 RoleRenderer,

@@ -44,6 +44,8 @@ public:

44 RoleCount

45 };

46

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

48+

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

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

48

50

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

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

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

53

55

54private Q_SLOTS:

56private Q_SLOTS:

55 void onCountChanged();

57 void onCountChanged();

58+ void onRowCountChanged();

56 void onEmitCountChanged();

59 void onEmitCountChanged();

60+ void onOverrideModelDestroyed();

57

61

58private:

62private:

59 DeeModel* getResultsForCategory(unsigned index) const;

63 DeeModel* getResultsForCategory(unsigned index) const;

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

63 QTimer m_timer;

67 QTimer m_timer;

64 QSet<DeeListModel*> m_timerFilters;

68 QSet<DeeListModel*> m_timerFilters;

65 QHash<int, QByteArray> m_roles;

69 QHash<int, QByteArray> m_roles;

70+ QMap<QString, QAbstractItemModel*> m_overriddenCategories;

66 mutable QMap<int, DeeListModel*> m_filters;

71 mutable QMap<int, DeeListModel*> m_filters;

67};

72};

68

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/AccountsService/CMakeLists.txt+1−1

@@ -25,7 +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/AccountsBindings.cpp

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

29 client.cpp

30 )

31qt5_use_modules(test-accountsservice Core DBus Test)

tests/plugins/AccountsService/client.cpp+11−11

@@ -17,8 +17,8 @@

17 * Authored by: Michael Terry <michael.terry@canonical.com>

18 */

19

20−#include "AccountsBindings.h"

21#include "AccountsService.h"

20#include "AccountsService.h"

21+#include "AccountsServiceDBusAdaptor.h"

22#include <QSignalSpy>

23#include <QTest>

24

@@ -31,28 +31,28 @@ private Q_SLOTS:

31 void testInvalids()

32 {

33 // Test various invalid calls

34− AccountsService session;

34+ AccountsServiceDBusAdaptor session;

35 QCOMPARE(session.getUserProperty("NOPE", "com.canonical.unity.AccountsService", "demo-edges"), QVariant());

36 QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "NOPE"), QVariant());

37 }

38

39− void testGetSetService()

39+ void testGetSetServiceDBusAdaptor()

40 {

41− AccountsService session;

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));

46 }

47

48− void testGetSetBindings()

48+ void testGetSetService()

49 {

50− AccountsBindings bindings;

50+ AccountsService session;

51− bindings.setUser("testuser");

51+ session.setUser("testuser");

52− bindings.setDemoEdges(true);

52+ session.setDemoEdges(true);

53− QCOMPARE(bindings.getDemoEdges(), true);

53+ QCOMPARE(session.getDemoEdges(), true);

54− bindings.setDemoEdges(false);

54+ session.setDemoEdges(false);

55− QCOMPARE(bindings.getDemoEdges(), false);

55+ QCOMPARE(session.getDemoEdges(), false);

56 }

57};

58

tests/plugins/Unity/Launcher/CMakeLists.txt+37−4

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

1pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

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

2

3

3include_directories(

4include_directories(

4 ${CMAKE_CURRENT_BINARY_DIR}

5 ${CMAKE_CURRENT_BINARY_DIR}

@@ -10,17 +11,49 @@ include_directories(

10

11

11add_definitions(-DSM_BUSNAME=sessionBus)

12add_definitions(-DSM_BUSNAME=sessionBus)

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

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

14+add_definitions(-DLAUNCHER_TESTING)

13

15

16+### LauncherBackendTest

14−set(testCommand ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec

17+set(testBackendCommand ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec

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

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

16 -o -,txt)

19 -o -,txt)

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

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

18−add_custom_target(launcherbackendtest ${testCommand})

21+add_custom_target(launcherbackendtest ${testBackendCommand})

19add_executable(launcherbackendtestExec

22add_executable(launcherbackendtestExec

20 launcherbackendtest.cpp

23 launcherbackendtest.cpp

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

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

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

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

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

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

24 )

27 )

25target_link_libraries(launcherbackendtestExec ${GSETTINGS_QT_LDFLAGS})

28target_link_libraries(launcherbackendtestExec ${GSETTINGS_QT_LDFLAGS})

26qt5_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/AccountsServiceDBusAdaptor.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−15

@@ -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,29 +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() << "relative.path" << "/full/path");

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

36 }

35 }

37

36

38 void testPinning()

37 void testPinning()

39 {

38 {

40 LauncherBackend backend(false);

39 LauncherBackend backend(false);

41

40

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

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

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

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

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

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

45

44

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

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

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

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

48

47

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

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

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

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

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

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

52

51

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

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

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

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

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

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

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

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

57 }

56 }

58};

57};

59

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 {