fba59b4 · unity8 · git.iko.soy

Dash/Apps/FrequentlyUsedAppsModel.qml+38−8

compare with xenial

unifiedsplit

@@ -18,23 +18,43 @@ import QtQuick 2.0

18

19ListModel {

20 ListElement {

21− uri: "application:///usr/share/applications/camera-app.desktop"

21+ uri: "application:///usr/share/applications/dialer-app.desktop"

22− icon: "../../graphics/applicationIcons/camera.png"

22+ icon: "../../graphics/applicationIcons/phone-app.png"

23 category: 0

24 mimetype: "application/x-desktop"

25− title: "Camera"

25+ title: "Dialer"

26 comment: ""

27− dndUri: "file:///usr/share/applications/camera-app.desktop"

27+ dndUri: "file:///usr/share/applications/dialer-app.desktop"

28 metadata: ""

29 }

30 ListElement {

31− uri: "application:///usr/share/applications/phone-app.desktop"

31+ uri: "application:///usr/share/applications/messaging-app.desktop"

32+ icon: "../../graphics/applicationIcons/messages-app.png"

33+ category: 0

34+ mimetype: "application/x-desktop"

35+ title: "Messaging"

36+ comment: ""

37+ dndUri: "file:///usr/share/applications/messaging-app.desktop"

38+ metadata: ""

39+ }

40+ ListElement {

41+ uri: "application:///usr/share/applications/address-book-app.desktop"

32− icon: "../../graphics/applicationIcons/phone-app.png"

42+ icon: "../../graphics/applicationIcons/contacts-app.png"

43+ category: 0

44+ mimetype: "application/x-desktop"

45+ title: "Contacts"

46+ comment: ""

47+ dndUri: "file:///usr/share/applications/address-book-app.desktop"

48+ metadata: ""

49+ }

50+ ListElement {

51+ uri: "application:///usr/share/applications/camera-app.desktop"

52+ icon: "../../graphics/applicationIcons/camera.png"

33 category: 0

53 category: 0

34 mimetype: "application/x-desktop"

54 mimetype: "application/x-desktop"

35− title: "Phone"

55+ title: "Camera"

36 comment: ""

56 comment: ""

37− dndUri: "file:///usr/share/applications/phone-app.desktop"

57+ dndUri: "file:///usr/share/applications/camera-app.desktop"

38 metadata: ""

58 metadata: ""

39 }

59 }

40 ListElement {

60 ListElement {

@@ -77,4 +97,14 @@ ListModel {

77 dndUri: "file:///usr/share/applications/gmail-webapp.desktop"

97 dndUri: "file:///usr/share/applications/gmail-webapp.desktop"

78 metadata: ""

98 metadata: ""

79 }

99 }

100+ ListElement {

101+ uri: "application:///usr/share/applications/ubuntu-system-settings.desktop"

102+ icon: "../../graphics/applicationIcons/system-settings.png"

103+ category: 0

104+ mimetype: "application/x-desktop"

105+ title: "System Settings"

106+ comment: ""

107+ dndUri: "file:///usr/share/applications/ubuntu-system-settings.desktop"

108+ metadata: ""

109+ }

80}

110}

graphics/applicationIcons/contacts-app@18.pngnew file

Binary file not shown.

graphics/applicationIcons/messages-app@18.pngnew file

Binary file not shown.

graphics/applicationIcons/system-settings@18.pngnew file

Binary file not shown.

plugins/Unity/Launcher/backend/launcherbackend.cpp+9−3

@@ -28,7 +28,9 @@ LauncherBackend::LauncherBackend(QObject *parent):

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

29

30 m_storedApps <<

31− QLatin1String("phone-app.desktop") <<

31+ QLatin1String("dialer-app.desktop") <<

32+ QLatin1String("messaging-app.desktop") <<

33+ QLatin1String("address-book-app.desktop") <<

32 QLatin1String("camera-app.desktop") <<

34 QLatin1String("camera-app.desktop") <<

33 QLatin1String("gallery-app.desktop") <<

35 QLatin1String("gallery-app.desktop") <<

34 QLatin1String("facebook-webapp.desktop") <<

36 QLatin1String("facebook-webapp.desktop") <<

@@ -40,7 +42,9 @@ LauncherBackend::LauncherBackend(QObject *parent):

40 QLatin1String("calendar-app.desktop");

42 QLatin1String("calendar-app.desktop");

41

43

42 // TODO: get stuff from desktop files instead this hardcoded map

44 // TODO: get stuff from desktop files instead this hardcoded map

43− m_displayNameMap.insert("phone-app.desktop", "Phone");

45+ m_displayNameMap.insert("dialer-app.desktop", "Dialer");

46+ m_displayNameMap.insert("messaging-app.desktop", "Messaging");

47+ m_displayNameMap.insert("address-book-app.desktop", "Contacts");

44 m_displayNameMap.insert("camera-app.desktop", "Camera");

48 m_displayNameMap.insert("camera-app.desktop", "Camera");

45 m_displayNameMap.insert("gallery-app.desktop", "Gallery");

49 m_displayNameMap.insert("gallery-app.desktop", "Gallery");

46 m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");

50 m_displayNameMap.insert("facebook-webapp.desktop", "Facebook");

@@ -52,7 +56,9 @@ LauncherBackend::LauncherBackend(QObject *parent):

52 m_displayNameMap.insert("calendar-app.desktop", "Calendar");

56 m_displayNameMap.insert("calendar-app.desktop", "Calendar");

53

57

54 // TODO: get stuff from desktop files instead this hardcoded map

58 // TODO: get stuff from desktop files instead this hardcoded map

55− m_iconMap.insert("phone-app.desktop", "phone-app");

59+ m_iconMap.insert("dialer-app.desktop", "phone-app");

60+ m_iconMap.insert("messaging-app.desktop", "messages-app");

61+ m_iconMap.insert("address-book-app.desktop", "contacts-app");

56 m_iconMap.insert("camera-app.desktop", "camera");

62 m_iconMap.insert("camera-app.desktop", "camera");

57 m_iconMap.insert("gallery-app.desktop", "gallery");

63 m_iconMap.insert("gallery-app.desktop", "gallery");

58 m_iconMap.insert("facebook-webapp.desktop", "facebook");

64 m_iconMap.insert("facebook-webapp.desktop", "facebook");