e21028b · unity8 · git.iko.soy

Dash/graphics/phone/home.pngdeleted

compare with xenial

unifiedsplit

Binary file not shown.

Dash/graphics/phone/music.pngdeleted

Binary file not shown.

Dash/graphics/phone/videos.pngdeleted

Binary file not shown.

Dash/graphics/tablet/apps.pngdeleted

Binary file not shown.

Dash/graphics/tablet/home.pngdeleted

Binary file not shown.

Dash/graphics/tablet/music.pngdeleted

Binary file not shown.

Dash/graphics/tablet/people.pngdeleted

Binary file not shown.

Dash/graphics/tablet/videos.pngdeleted

Binary file not shown.

Greeter/Greeter.qml+2

@@ -26,6 +26,8 @@ Showable {

26 enabled: shown

27 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready

28

29+ property url defaultBackground

30+

29 // 1 when fully shown and 0 when fully hidden

31 // 1 when fully shown and 0 when fully hidden

30 property real showProgress: MathLocal.clamp((width + x) / width, 0, 1)

32 property real showProgress: MathLocal.clamp((width + x) / width, 0, 1)

31

33

Greeter/GreeterContent.qml+4−3

@@ -40,11 +40,12 @@ MouseArea {

40 color: "black"

41 }

42

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

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

44 onBackgroundValueChanged: wallpaper.source = backgroundValue

45

46 CrossFadeImage {

47 id: wallpaper

48+ objectName: "wallpaper"

48 anchors.fill: parent

49 anchors.fill: parent

49 fadeInFirst: false

50 fadeInFirst: false

50 }

51 }

@@ -58,8 +59,8 @@ MouseArea {

58 sourceSize.height: 0

59 sourceSize.height: 0

59 sourceSize.width: 0

60 sourceSize.width: 0

60 onStatusChanged: {

61 onStatusChanged: {

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

62+ if (status == Image.Error && source != greeter.defaultBackground) {

62− wallpaper.source = shell.defaultBackground

63+ wallpaper.source = greeter.defaultBackground

63 }

64 }

65 }

66 }

Shell.qml+2

@@ -460,6 +460,8 @@ FocusScope {

460 hides: [launcher, panel.indicators, hud]

461 shown: true

462

463+ defaultBackground: shell.background

464+

463 y: panel.panelHeight

465 y: panel.panelHeight

464 width: parent.width

466 width: parent.width

465 height: parent.height - panel.panelHeight

467 height: parent.height - panel.panelHeight

debian/changelog+14

@@ -1,3 +1,17 @@

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

2+

3+ [ Michael Zanetti ]

4+ * allow left edge gesture to minimize apps even when launcher is

5+ already visible.

6+ * Don't hide the launcher on changes in the stages.

7+ * ssh is now installed per default, but it's set to manual in the

8+ ssh.override.

9+

10+ [ Ubuntu daily release ]

11+ * Automatic snapshot from revision 320

12+

13+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 16 Sep 2013 11:49:28 +0000

14+

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

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

2

16

3 [ Michael Zanetti ]

17 [ Michael Zanetti ]

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

@@ -132,11 +132,7 @@ QString LauncherBackend::icon(const QString &appId) const

132 }

133 }

134

135− QFileInfo info(iconName);

136− if (info.exists()) {

137− return info.absoluteFilePath();

138− }

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

135+ return iconName;

140}

136}

141

137

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

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

@@ -296,15 +292,18 @@ LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFil

296{

292{

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

293 QSettings settings(desktopFile, QSettings::IniFormat);

298

294

299−

300 LauncherBackendItem* item = new LauncherBackendItem();

295 LauncherBackendItem* item = new LauncherBackendItem();

301 item->desktopFile = desktopFile;

296 item->desktopFile = desktopFile;

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

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

303

298

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

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

299+ QString iconString = settings.value("Desktop Entry/Icon").toString();

300+ QString pathString = settings.value("Desktop Entry/Path").toString();

301+ if (QFileInfo(iconString).exists()) {

302+ item->icon = QFileInfo(iconString).absoluteFilePath();

303+ } else if (QFileInfo(pathString + '/' + iconString).exists()) {

304+ item->icon = pathString + '/' + iconString;

306 } else {

305 } else {

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

306+ item->icon = "image://theme/" + iconString;

308 }

307 }

309 item->pinned = false;

308 item->pinned = false;

310 return item;

309 return item;

tests/mocks/AccountsService/AccountsService.cpp+9−2

@@ -19,7 +19,8 @@

19#include "AccountsService.h"

20

21AccountsService::AccountsService(QObject* parent)

22− : QObject(parent)

22+ : QObject(parent),

23+ m_backgroundFile(TOP_SRCDIR "/graphics/phone_background.jpg")

23{

24{

24}

25}

25

26

@@ -45,5 +46,11 @@ void AccountsService::setDemoEdges(bool demoEdges)

45

46

46QString AccountsService::getBackgroundFile()

47QString AccountsService::getBackgroundFile()

47{

48{

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

49+ return m_backgroundFile;

50+}

51+

52+void AccountsService::setBackgroundFile(const QString &backgroundFile)

53+{

54+ m_backgroundFile = backgroundFile;

55+ backgroundFileChanged();

49}

56}

tests/mocks/AccountsService/AccountsService.h+5

@@ -37,6 +37,7 @@ class AccountsService: public QObject

37 NOTIFY demoEdgesChanged)

38 Q_PROPERTY (QString backgroundFile

39 READ getBackgroundFile

40+ WRITE setBackgroundFile // only available in mock

40 NOTIFY backgroundFileChanged)

41 NOTIFY backgroundFileChanged)

41

42

42public:

43public:

@@ -47,11 +48,15 @@ public:

47 bool getDemoEdges();

48 bool getDemoEdges();

48 void setDemoEdges(bool demoEdges);

49 void setDemoEdges(bool demoEdges);

49 QString getBackgroundFile();

50 QString getBackgroundFile();

51+ void setBackgroundFile(const QString &backgroundFile);

50

52

51Q_SIGNALS:

53Q_SIGNALS:

52 void userChanged();

54 void userChanged();

53 void demoEdgesChanged();

55 void demoEdgesChanged();

54 void backgroundFileChanged();

56 void backgroundFileChanged();

57+

58+private:

59+ QString m_backgroundFile;

55};

60};

56

61

57#endif

62#endif

tests/plugins/Unity/Launcher/click-icon.svgnew file

No changes to the content.

tests/plugins/Unity/Launcher/launcherbackendtest.cpp+10−2

@@ -26,6 +26,15 @@ class LauncherBackendTest : public QObject

26 Q_OBJECT

27

28private Q_SLOTS:

29+

30+ void initTestCase()

31+ {

32+ // As we want to test absolute file paths in the .desktop file, we need to modify the

33+ // sample file and replace the path in there with the current build dir.

34+ QSettings settings(QDir::currentPath() + "/click-icon.desktop", QSettings::IniFormat);

35+ settings.setValue("Desktop Entry/Path", QDir::currentPath());

36+ }

37+

29 void testFileNames()

38 void testFileNames()

30 {

39 {

31 LauncherBackend backend(false);

40 LauncherBackend backend(false);

@@ -66,8 +75,7 @@ private Q_SLOTS:

66 QTest::newRow("fallback on theme") << "abs-icon" << "image://theme//path/to/icon.png";

75 QTest::newRow("fallback on theme") << "abs-icon" << "image://theme//path/to/icon.png";

67

76

68 // Click packages have a relative icon path but an absolute path as a separate entry

77 // Click packages have a relative icon path but an absolute path as a separate entry

69− // As we don't want to rely on a click app being installed for the test, accept it with the image://theme fallback

70− QTest::newRow("click package icon") << "click-icon" << "image://theme//path/to/some/click/app/click-icon.svg";

78+ QTest::newRow("click package icon") << "click-icon" << QDir::currentPath() + "/click-icon.svg";

71 }

79 }

72

80

73 void testIcon() {

81 void testIcon() {

tests/qmltests/Greeter/tst_Phone.qml+19−1

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

18import QtTest 1.0

19import ".."

20import "../../../Greeter"

21+import AccountsService 0.1

21import Ubuntu.Components 0.1

22import Ubuntu.Components 0.1

22−import LightDM 0.1 as LightDM

23import Unity.Test 0.1 as UT

24

25Item {

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

32 height: parent.height

33 x: 0; y: 0

34

35+ defaultBackground: "../../../graphics/phone_background.jpg"

36+

35 property int minX: 0

37 property int minX: 0

36

38

37 onXChanged: {

39 onXChanged: {

@@ -102,5 +104,21 @@ Item {

102 // Wait until we're back to 0

104 // Wait until we're back to 0

103 tryCompareFunction(function() { return greeter.x;}, 0);

105 tryCompareFunction(function() { return greeter.x;}, 0);

104 }

106 }

107+

108+ function test_wallpaper_data() {

109+ return [

110+ {tag: "set", accounts: "../tests/data/unity/backgrounds/blue.png", expected: "blue.png"},

111+ {tag: "unset", accounts: "", expected: "background.jpg"},

112+ {tag: "invalid", accounts: "invalid", expected: "background.jpg"},

113+ ]

114+ }

115+

116+ function test_wallpaper(data) {

117+ var loader = findChild(greeter, "greeterContentLoader")

118+ var wallpaper = findChild(loader.item, "wallpaper")

119+ AccountsService.backgroundFile = data.accounts

120+ tryCompareFunction(function() { return wallpaper.source.toString().indexOf(data.expected) !== -1; }, true)

121+ tryCompare(wallpaper, "status", Image.Ready)

122+ }

105 }

123 }

106}

124}