7eb4107 · unity8 · git.iko.soy

debian/changelog+33

compare with xenial

unifiedsplit

@@ -1,3 +1,36 @@

1+unity8 (7.89+14.10.20140627-0ubuntu1) utopic; urgency=low

2+

3+ [ Michael Terry ]

4+ * Fix path in launcher mock after moving our mock icons, to avoid a

5+ lot of "icon not found" warnings during qmluitests.

6+ * Fix the testMultiGreeter qmluitest. Incoming method variables are

7+ apparently read-only in Qt5.3. (LP: #1332488)

8+

9+ [ CI bot ]

10+ * Resync trunk

11+

12+ [ Michał Sawicz ]

13+ * Adapt scope mock to new api and quiet unused variable warnings.

14+ * Fix dynamic overlay height. (LP: #1334879)

15+ * Don't center items in CardVerticalJournal, kind of beats the

16+ purpose... Also don't bind unnecessarily.

17+

18+ [ Ying-Chun Liu ]

19+ * Fix LP:1330957 Fix some failed test cases. (LP: #1330957)

20+

21+ [ Albert Astals ]

22+ * Don't seem to need this waitForRendering And makes test fail in 5.3

23+

24+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 27 Jun 2014 08:47:58 +0000

25+

26+unity8 (7.89+14.10.20140624.1-0ubuntu1) utopic; urgency=low

27+

28+ [ Alberto Aguirre ]

29+ * Update Powerd plugin and Shell.qml to accommodate changes in the

30+ display power state notification.

31+

32+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 24 Jun 2014 17:11:08 +0000

33+

1unity8 (7.89+14.10.20140624-0ubuntu1) utopic; urgency=low

34unity8 (7.89+14.10.20140624-0ubuntu1) utopic; urgency=low

2

35

3 [ Ying-Chun Liu ]

36 [ Ying-Chun Liu ]

debian/control+1−1

@@ -18,7 +18,7 @@ Build-Depends: cmake,

18 libpulse-dev,

19 libqmenumodel-dev (>= 0.2.7),

20 libqt5xmlpatterns5-dev,

21− libunity-api-dev (>= 7.82),

21+ libunity-api-dev (>= 7.83),

22 libunity-mir-dev,

23 libusermetricsoutput1-dev,

24 libxcb1-dev,

plugins/Dash/CardCreator.js+7−4

@@ -113,7 +113,7 @@ var kOverlayLoaderCode = 'Loader { \n\

113 visible: showHeader && status == Loader.Ready; \n\

114 sourceComponent: ShaderEffect { \n\

115 id: overlay; \n\

116− height: fixedHeaderHeight > 0 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight; \n\

116+ height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\

117 opacity: 0.6; \n\

118 property var source: ShaderEffectSource { \n\

119 id: shaderSource; \n\

@@ -363,11 +363,11 @@ function cardString(template, components) {

363 }

364 }

365 var headerLeftAnchor;

366− var headerLeftAnchorHasMagin = false;

366+ var headerLeftAnchorHasMargin = false;

367 if (isHorizontal && hasArt) {

368 headerLeftAnchor = 'left: artShapeHolder.right; \n\

369 leftMargin: units.gu(1);\n';

370− headerLeftAnchorHasMagin = true;

370+ headerLeftAnchorHasMargin = true;

371 } else {

372 headerLeftAnchor = 'left: parent.left;\n';

373 }

@@ -392,7 +392,7 @@ function cardString(template, components) {

392 if (!hasHeaderRow) {

393 anchors += headerLeftAnchor;

394 anchors += headerVerticalAnchors;

395− if (!headerLeftAnchorHasMagin) {

395+ if (!headerLeftAnchorHasMargin) {

396 anchors += 'leftMargin: units.gu(1);\n'

397 }

398 } else {

@@ -444,6 +444,9 @@ function cardString(template, components) {

444 titleAnchors = "right: parent.right;";

445 titleAnchors += headerLeftAnchor;

446 titleAnchors += headerVerticalAnchors;

447+ if (!headerLeftAnchorHasMargin) {

448+ titleAnchors += 'leftMargin: units.gu(1);\n'

449+ }

447 }

450 }

448 subtitleAnchors = 'left: titleLabel.left; \n\

451 subtitleAnchors = 'left: titleLabel.left; \n\

449 leftMargin: titleLabel.leftMargin; \n\

452 leftMargin: titleLabel.leftMargin; \n\

plugins/Powerd/Powerd.cpp+16−16

@@ -19,35 +19,35 @@

19#include "Powerd.h"

20#include <QDBusPendingCall>

21

22−void autoBrightnessChanged(GSettings *settings, const gchar *key, QDBusInterface *powerd)

22+void autoBrightnessChanged(GSettings *settings, const gchar *key, QDBusInterface *unityScreen)

23{

24 bool value = g_settings_get_boolean(settings, key);

25− powerd->asyncCall("userAutobrightnessEnable", QVariant(value));

25+ unityScreen->asyncCall("userAutobrightnessEnable", QVariant(value));

26}

27

28Powerd::Powerd(QObject* parent)

29 : QObject(parent),

30− powerd(NULL)

30+ unityScreen(NULL)

31{

32− powerd = new QDBusInterface("com.canonical.powerd",

32+ unityScreen = new QDBusInterface("com.canonical.Unity.Screen",

33− "/com/canonical/powerd",

33+ "/com/canonical/Unity/Screen",

34− "com.canonical.powerd",

34+ "com.canonical.Unity.Screen",

35− QDBusConnection::SM_BUSNAME(), this);

35+ QDBusConnection::SM_BUSNAME(), this);

36

37− powerd->connection().connect("com.canonical.powerd",

37+ unityScreen->connection().connect("com.canonical.Unity.Screen",

38− "/com/canonical/powerd",

38+ "/com/canonical/Unity/Screen",

39− "com.canonical.powerd",

39+ "com.canonical.Unity.Screen",

40− "DisplayPowerStateChange",

40+ "DisplayPowerStateChange",

41− this,

41+ this,

42− SIGNAL(displayPowerStateChange(int, unsigned int)));

42+ SIGNAL(displayPowerStateChange(int, int)));

43

44 systemSettings = g_settings_new("com.ubuntu.touch.system");

45− g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), powerd);

45+ g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), unityScreen);

46− autoBrightnessChanged(systemSettings, "auto-brightness", powerd);

46+ autoBrightnessChanged(systemSettings, "auto-brightness", unityScreen);

47}

48

49Powerd::~Powerd()

50{

51− g_signal_handlers_disconnect_by_data(systemSettings, powerd);

51+ g_signal_handlers_disconnect_by_data(systemSettings, unityScreen);

52 g_object_unref(systemSettings);

53}

plugins/Powerd/Powerd.h+8−8

@@ -28,15 +28,15 @@ class Powerd: public QObject

28{

29 Q_OBJECT

30 Q_ENUMS(Status)

31− Q_FLAGS(DisplayFlag DisplayFlags)

31+ Q_ENUMS(DisplayStateChangeReason)

32

33public:

34− enum DisplayFlag {

34+ enum DisplayStateChangeReason {

35− UseProximity = 1, // Use proximity sensor to override screen state

35+ Unknown = 0,

36− DisableAutoBrightness = 2, // Force autobrightness to be disabled

36+ Inactivity = 1, // Display changed state due to inactivity

37− Bright = 4, // Request the screen to stay bright

37+ PowerKey = 2, // Display changed state due to user pressing power key

38+ Proximity = 3, // Display changed state due to proximity events

38 };

39 };

39− Q_DECLARE_FLAGS(DisplayFlags, DisplayFlag)

40

41 enum Status {

42 Off,

@@ -47,10 +47,10 @@ public:

47 ~Powerd();

48

49Q_SIGNALS:

50− void displayPowerStateChange(int status, unsigned int flags);

50+ void displayPowerStateChange(int status, int reason);

51

52private:

53− QDBusInterface *powerd;

53+ QDBusInterface *unityScreen;

54 GSettings *systemSettings;

55};

56

po/es.po+7−7

@@ -8,14 +8,14 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-06-13 09:55+0200\n"

11−"PO-Revision-Date: 2014-06-02 06:28+0000\n"

11+"PO-Revision-Date: 2014-06-26 03:08+0000\n"

12−"Last-Translator: benjisp94 <benjisp94@gmail.com>\n"

12+"Last-Translator: Adolfo Jayme <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−"X-Launchpad-Export-Date: 2014-06-17 06:51+0000\n"

17+"X-Launchpad-Export-Date: 2014-06-27 07:13+0000\n"

18−"X-Generator: Launchpad (build 17045)\n"

18+"X-Generator: Launchpad (build 17077)\n"

19

20#: plugins/Unity/Launcher/launcheritem.cpp:43

21#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -83,7 +83,7 @@ msgstr "Llamada de emergencia"

83

84#: qml/Components/Lockscreen.qml:231

85msgid "OK"

86−msgstr ""

86+msgstr "Aceptar"

87

88#: qml/Components/PageHeader.qml:365

89msgid "Recent searches"

@@ -100,11 +100,11 @@ msgstr "Hola"

100

101#: qml/Components/PinLockscreen.qml:198

102msgid "CANCEL"

103−msgstr ""

103+msgstr "CANCELAR"

104

105#: qml/Components/PinLockscreen.qml:216

106msgid "DONE"

107−msgstr ""

107+msgstr "HECHO"

108

109#: qml/Components/SeeMore.qml:35

110msgid "See more"

qml/Dash/CardVerticalJournal.qml−3

@@ -67,11 +67,8 @@ DashRenderer {

67 id: loader

68 sourceComponent: cardTool.cardComponent

69 width: cardTool.cardWidth

70− anchors.horizontalCenter: parent.horizontalCenter

71 onLoaded: {

70 onLoaded: {

72 item.objectName = "delegate" + index;

71 item.objectName = "delegate" + index;

73− item.width = Qt.binding(function() { return cardTool.cardWidth; });

74− item.height = Qt.binding(function() { return cardTool.cardHeight; });

75 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });

72 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });

76 item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });

73 item.fixedHeaderHeight = Qt.binding(function() { return cardTool.headerHeight; });

77 item.cardData = Qt.binding(function() { return model; });

74 item.cardData = Qt.binding(function() { return model; });

qml/Greeter/LoginList.qml+4−4

@@ -257,13 +257,13 @@ Item {

257

258 onShowMessage: {

259 // inefficient, but we only rarely deal with messages

260− text = text.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">").replace(/\n/g, " ");

260+ var html = text.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">").replace(/\n/g, " ")

261 if (isError)

262− text = "" + text + ""

262+ html = "" + html + ""

263 if (infoLabel.text == "")

264− infoLabel.text = text;

264+ infoLabel.text = html

265 else

266− infoLabel.text = infoLabel.text + " " + text;

266+ infoLabel.text = infoLabel.text + " " + html

267 }

268

269 onShowPrompt: {

qml/Shell.qml+1−1

@@ -452,7 +452,7 @@ FocusScope {

452 onDisplayPowerStateChange: {

453 // We ignore any display-off signals when the proximity sensor

454 // is active. This usually indicates something like a phone call.

455− if (status == Powerd.Off && (flags & Powerd.UseProximity) == 0) {

455+ if (status == Powerd.Off && reason != Powerd.Proximity) {

456 greeter.showNow();

457 }

458

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

@@ -18,9 +18,11 @@

18

19#include "AccountsService.h"

20

21+#include <paths.h>

22+

21AccountsService::AccountsService(QObject* parent)

23AccountsService::AccountsService(QObject* parent)

22 : QObject(parent),

24 : QObject(parent),

23− m_backgroundFile(TOP_SRCDIR "/qml/graphics/phone_background.jpg"),

25+ m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),

24 m_statsWelcomeScreen(true)

26 m_statsWelcomeScreen(true)

25{

27{

26}

28}

tests/mocks/AccountsService/CMakeLists.txt−2

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

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

2−

3add_library(MockAccountsService-qml MODULE

1add_library(MockAccountsService-qml MODULE

4 AccountsService.cpp

2 AccountsService.cpp

5 plugin.cpp

3 plugin.cpp

tests/mocks/Powerd/Powerd.h+7−7

@@ -25,15 +25,15 @@ class Powerd: public QObject

25{

26 Q_OBJECT

27 Q_ENUMS(Status)

28− Q_FLAGS(DisplayFlag DisplayFlags)

28+ Q_ENUMS(DisplayStateChangeReason)

29

30public:

31− enum DisplayFlag {

31+ enum DisplayStateChangeReason {

32− UseProximity = 1, // Use proximity sensor to override screen state

32+ Unknown = 0,

33− DisableAutoBrightness = 2, // Force autobrightness to be disabled

33+ Inactivity = 1, // Display changed state due to inactivity

34− Bright = 4, // Request the screen to stay bright

34+ PowerKey = 2, // Display changed state due to user pressing power key

35+ Proximity = 3, // Display changed state due to proximity events

35 };

36 };

36− Q_DECLARE_FLAGS(DisplayFlags, DisplayFlag)

37

38 enum Status {

39 Off,

@@ -43,7 +43,7 @@ public:

43 explicit Powerd(QObject *parent = 0);

44

45Q_SIGNALS:

46− void displayPowerStateChange(int status, unsigned int flags);

46+ void displayPowerStateChange(int status, int reason);

47};

48

49#endif

tests/mocks/Unity/Launcher/CMakeLists.txt−2

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

1pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=3)

2

3−add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")

4−

5include_directories(

3include_directories(

6 ${CMAKE_CURRENT_SOURCE_DIR}

4 ${CMAKE_CURRENT_SOURCE_DIR}

7)

5)

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+3−1

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

20#include "MockLauncherItem.h"

21#include "MockQuickListModel.h"

22

23+#include <paths.h>

24+

23using namespace unity::shell::launcher;

25using namespace unity::shell::launcher;

24

26

25MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopFile, const QString& name, const QString& icon, QObject* parent):

27MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopFile, const QString& name, const QString& icon, QObject* parent):

@@ -27,7 +29,7 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF

27 m_appId(appId),

29 m_appId(appId),

28 m_desktopFile(desktopFile),

30 m_desktopFile(desktopFile),

29 m_name(name),

31 m_name(name),

30− m_icon(TOP_SRCDIR "/graphics/applicationIcons/" + icon + ".png"),

32+ m_icon(qmlDirectory() + "graphics/applicationIcons/" + icon + ".png"),

31 m_pinned(false),

33 m_pinned(false),

32 m_running(false),

34 m_running(false),

33 m_recent(false),

35 m_recent(false),

tests/mocks/Unity/fake_categories.cpp+1−1

@@ -50,7 +50,7 @@ void Categories::addSpecialCategory(QString const& categoryId, QString const& na

50 }

51}

52

53−bool Categories::overrideCategoryJson(QString const& categoryId, QString const& json)

53+bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)

54{

55 qFatal("Using un-implemented Categories::overrideCategoryJson");

56}

tests/mocks/Unity/fake_scope.cpp+5

@@ -155,6 +155,11 @@ bool Scope::hasDepartments() const

155 return true;

156}

157

158+QVariantMap Scope::customizations() const

159+{

160+ return QVariantMap();

161+}

162+

158unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& id)

163unity::shell::scopes::DepartmentInterface* Scope::getDepartment(const QString& id)

159{

164{

160 if (id.isEmpty())

165 if (id.isEmpty())

tests/mocks/Unity/fake_scope.h+2

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

64 Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;

65 Q_INVOKABLE void loadDepartment(const QString& id) override;

66

67+ QVariantMap customizations() const override;

68+

67protected:

69protected:

68

70

69 QString m_id;

71 QString m_id;

tests/plugins/Dash/cardcreator/1.res+1

@@ -68,6 +68,7 @@ Label {

68 anchors { right: parent.right;left: parent.left;

69top: artShapeHolder.bottom;

70 topMargin: units.gu(1);

71+leftMargin: units.gu(1);

71 }

72 }

72 elide: Text.ElideRight;

73 elide: Text.ElideRight;

73 fontSize: "small";

74 fontSize: "small";

tests/plugins/Dash/cardcreator/3.res+1

@@ -68,6 +68,7 @@ Label {

68 anchors { right: parent.right;left: parent.left;

69top: artShapeHolder.bottom;

70 topMargin: units.gu(1);

71+leftMargin: units.gu(1);

71}

72}

72 elide: Text.ElideRight;

73 elide: Text.ElideRight;

73 fontSize: "small";

74 fontSize: "small";

tests/plugins/Dash/cardcreator/5.res+1−1

@@ -73,7 +73,7 @@ Loader {

73 visible: showHeader && status == Loader.Ready;

74 sourceComponent: ShaderEffect {

75 id: overlay;

76− height: fixedHeaderHeight > 0 ? fixedHeaderHeight + units.gu(1) * 2 : headerHeight;

76+ height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);

77 opacity: 0.6;

78 property var source: ShaderEffectSource {

79 id: shaderSource;

tests/qmltests/Components/tst_LazyImage.qml−1

@@ -152,7 +152,6 @@ Rectangle {

152

153 function test_lazyimage(data) {

154 data.func();

155− waitForRendering(baseRect);

156

155

157 if (data.transition) {

156 if (data.transition) {

158 // wait for the transition to complete

157 // wait for the transition to complete

tests/qmltests/tst_Shell.qml+1−1

@@ -195,7 +195,7 @@ Item {

195 tryCompare(mainApp, "state", ApplicationInfo.Running);

196

197 // Try to suspend while proximity is engaged...

198− Powerd.displayPowerStateChange(Powerd.Off, Powerd.UseProximity);

198+ Powerd.displayPowerStateChange(Powerd.Off, Powerd.Proximity);

199 tryCompare(greeter, "showProgress", 0);

200

201 // Now really suspend