e908bd4 · unity8 · git.iko.soy

debian/changelog+16

compare with xenial

unifiedsplit

@@ -1,3 +1,19 @@

1+unity8 (7.84+14.04.20140304-0ubuntu1) trusty; urgency=low

2+

3+ [ Michael Terry ]

4+ * Ensure that the selected() signal is emitted by the greeter on

5+ startup, fixing the background on startup for the first user in

6+ tablet mode.

7+

8+ [ Nick Dedekind ]

9+ * Remocked IndicatorModel to fix qt5.2.1 changes.

10+

11+ [ Albert Astals ]

12+ * Initialize m_distance (LP: #1285385)

13+ * import Ubuntu.Components so we can use UbuntuAnimation

14+

15+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 04 Mar 2014 11:43:04 +0000

16+

1unity8 (7.84+14.04.20140228-0ubuntu1) trusty; urgency=low

17unity8 (7.84+14.04.20140228-0ubuntu1) trusty; urgency=low

2

18

3 [ Michał Sawicz ]

19 [ Michał Sawicz ]

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+1

@@ -109,6 +109,7 @@ private:

109DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)

110 : QQuickItem(parent)

111 , m_status(WaitingForTouch)

112+ , m_sceneDistance(0)

112 , m_touchId(-1)

113 , m_touchId(-1)

113 , m_direction(Direction::Rightwards)

114 , m_direction(Direction::Rightwards)

114 , m_wideningAngle(0)

115 , m_wideningAngle(0)

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

@@ -22,6 +22,7 @@ import Ubuntu.Settings.Menus 0.1 as Menus

22import QMenuModel 0.1 as QMenuModel

23import Utils 0.1 as Utils

24import Ubuntu.Components.ListItems 0.1 as ListItems

25+import Ubuntu.Components 0.1

25

26

26Item {

27Item {

27 id: menuFactory

28 id: menuFactory

po/km.po+5−5

@@ -8,15 +8,15 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-02-13 18:37+0000\n"

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

11+"PO-Revision-Date: 2014-03-04 02:32+0000\n"

12"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"

13"Language-Team: Khmer <km@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=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-04 08:33+0000\n"

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

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

20

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

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

@@ -108,11 +108,11 @@ msgstr[0] "ពិនិត្យមើល %1"

108

109#: qml/Dash/Previews/PreviewActionCombo.qml:34

110msgid "More..."

111−msgstr ""

111+msgstr "ច្រើនជាង..."

112

113#: qml/Dash/Previews/PreviewActionCombo.qml:34

114msgid "Less..."

115−msgstr ""

115+msgstr "តិចជាង..."

116

117#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

118msgid "Add a review"

qml/Greeter/Greeter.qml+4

@@ -67,6 +67,10 @@ Showable {

67

68 source: required ? "GreeterContent.qml" : ""

69

70+ onLoaded: {

71+ selected(currentIndex);

72+ }

73+

70 Connections {

74 Connections {

71 target: greeterContentLoader.item

75 target: greeterContentLoader.item

72

76

qml/Greeter/GreeterContent.qml−1

@@ -96,7 +96,6 @@ MouseArea {

96

97 onLoaded: {

98 item.currentIndex = greeterContentLoader.currentIndex;

99− selected(item.currentIndex);

100 item.resetAuthentication();

99 item.resetAuthentication();

101 }

100 }

102

101

qml/Shell.qml−2

@@ -421,7 +421,6 @@ FocusScope {

421 Component.onCompleted: {

422 if (LightDM.Users.count == 1) {

423 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))

424− greeter.selected(0)

425 }

424 }

426 }

425 }

427 }

426 }

@@ -497,7 +496,6 @@ FocusScope {

497 // If there are more users, the Greeter will handle that

496 // If there are more users, the Greeter will handle that

498 if (LightDM.Users.count == 1) {

497 if (LightDM.Users.count == 1) {

499 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

498 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

500− greeter.selected(0);

501 }

499 }

502 greeter.forceActiveFocus();

500 greeter.forceActiveFocus();

503 removeApplicationFocus();

501 removeApplicationFocus();

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

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

20

21AccountsService::AccountsService(QObject* parent)

22 : QObject(parent),

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

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

24 m_statsWelcomeScreen(true)

25{

26}

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cpp−6

@@ -20,12 +20,6 @@

20#include "fakeindicatorsmodel.h"

21#include "indicators.h"

22

23−#include <paths.h>

24−

25−#include <QQmlContext>

26−#include <QQmlEngine>

27−#include <QDebug>

28−

29FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)

23FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)

30 : QAbstractListModel(parent)

24 : QAbstractListModel(parent)

31{

25{

tests/mocks/Unity/Indicators/fakeindicatorsmodel.h−2

@@ -22,8 +22,6 @@

22

23#include <QAbstractListModel>

24

25−class IndicatorsManager;

26−

27class FakeIndicatorsModel : public QAbstractListModel

25class FakeIndicatorsModel : public QAbstractListModel

28{

26{

29 Q_OBJECT

27 Q_OBJECT

tests/mocks/Unity/Indicators/fakeplugin.cpp+3

@@ -33,12 +33,15 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)

33{

34 Q_INIT_RESOURCE(indicators_fake);

35

36+ // internal

36 qmlRegisterType<FakeIndicatorsModel>(uri, 0, 1, "FakeIndicatorsModel");

37 qmlRegisterType<FakeIndicatorsModel>(uri, 0, 1, "FakeIndicatorsModel");

37

38

39+ // external

38 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

40 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");

39 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

41 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");

40 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

42 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

41

43

44+ // external uncreatables

42 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

45 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");

43 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

46 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

44 qmlRegisterUncreatableType<NetworkActionState>(uri, 0, 1, "NetworkActionState", "Can't create NetworkActionState class");

47 qmlRegisterUncreatableType<NetworkActionState>(uri, 0, 1, "NetworkActionState", "Can't create NetworkActionState class");

tests/qmltests/Greeter/tst_Phone.qml+19

@@ -44,6 +44,17 @@ Item {

44 }

45 }

46

47+ Component {

48+ id: greeterComponent

49+ Greeter {

50+ SignalSpy {

51+ objectName: "selectedSpy"

52+ target: parent

53+ signalName: "selected"

54+ }

55+ }

56+ }

57+

47 SignalSpy {

58 SignalSpy {

48 id: unlockSpy

59 id: unlockSpy

49 target: greeter

60 target: greeter

@@ -148,5 +159,13 @@ Item {

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

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

149 tryCompare(background, "status", Image.Ready)

160 tryCompare(background, "status", Image.Ready)

150 }

161 }

162+

163+ function test_initial_selected_signal() {

164+ var greeterObj = greeterComponent.createObject(this)

165+ var spy = findChild(greeterObj, "selectedSpy")

166+ spy.wait()

167+ tryCompare(spy, "count", 1)

168+ greeterObj.destroy()

169+ }

151 }

170 }

152}

171}

tests/qmltests/Greeter/tst_Tablet.qml+19

@@ -31,6 +31,17 @@ Item {

31 anchors.fill: parent

32 }

33

34+ Component {

35+ id: greeterComponent

36+ Greeter {

37+ SignalSpy {

38+ objectName: "selectedSpy"

39+ target: parent

40+ signalName: "selected"

41+ }

42+ }

43+ }

44+

34 SignalSpy {

45 SignalSpy {

35 id: unlockSpy

46 id: unlockSpy

36 target: greeter

47 target: greeter

@@ -335,5 +346,13 @@ Item {

335 var userlist = findChild(greeter, "userList")

346 var userlist = findChild(greeter, "userList")

336 compare(greeter.model.data(userlist.currentIndex, LightDM.UserRoles.NameRole), "has-password")

347 compare(greeter.model.data(userlist.currentIndex, LightDM.UserRoles.NameRole), "has-password")

337 }

348 }

349+

350+ function test_initial_selected_signal() {

351+ var greeterObj = greeterComponent.createObject(this)

352+ var spy = findChild(greeterObj, "selectedSpy")

353+ spy.wait()

354+ tryCompare(spy, "count", 1)

355+ greeterObj.destroy()

356+ }

338 }

357 }

339}

358}