e538b27 · unity8 · git.iko.soy

cmake/modules/autopilot.cmake+10−1

compare with xenial

unifiedsplit

@@ -2,7 +2,7 @@ add_custom_target(autopilot)

2

3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

4 add_custom_target(autopilot-${TEST_NAME}

5− COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks autopilot run ${TEST_SUITE}

5+ COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}

6 WORKING_DIRECTORY ${WORKING_DIR}

7 DEPENDS fake_install

8 )

@@ -12,4 +12,13 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

12 )

13

14 add_dependencies(autopilot autopilot-${TEST_NAME})

15+

16+ add_custom_target(autopilot2-${TEST_NAME}

17+ COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}

18+ WORKING_DIRECTORY ${WORKING_DIR}

19+ DEPENDS fake_install

20+ )

21+

22+ add_dependencies(autopilot autopilot2-${TEST_NAME})

23+

15endfunction()

24endfunction()

data/unity8.conf+5

@@ -28,6 +28,11 @@ pre-start script

28 initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE

29 gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"

30 fi

31+

32+ # Remove the socket if still there

33+ if [ -S "$MIR_SERVER_FILE" ]; then

34+ rm "$MIR_SERVER_FILE"

35+ fi

31end script

36end script

32

37

33exec ${BINARY:-unity8} $ARGS

38exec ${BINARY:-unity8} $ARGS

debian/changelog+104

@@ -1,3 +1,107 @@

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

2+

3+ [ Michał Sawicz ]

4+ * Fix tests under Qt 5.2.

5+ * CardHeader improvements depending on background. Also drop prices,

6+ they need to be reworked into attributes.

7+ * Bring Cards closer to design

8+ * Add back the workaround for not being able scroll the image gallery

9+ Taken from AppPreview.qml (LP: #1281709)

10+ * Only allow searching when preview isn't open. (LP: #1282475)

11+ * Adds carousel dynamic switch

12+

13+ [ Leo Arias ]

14+ * Update the url dispatcher test to use the fake app fixture from the

15+ toolkit.

16+

17+ [ Albert Astals ]

18+ * Fix tests under Qt 5.2.

19+ * Workaround compiz/unity7 behaviour change/bug

20+

21+ [ Michael Zanetti ]

22+ * Fix tests under Qt 5.2.

23+ * Disable HUD from the bottom edge.

24+

25+ [ Andrea Cimitan ]

26+ * Adds carousel dynamic switch

27+

28+ [ CI bot ]

29+ * Resync trunk

30+

31+ [ Michał Karnicki ]

32+ * CardHeader improvements depending on background. Also drop prices,

33+ they need to be reworked into attributes.

34+

35+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 14 Mar 2014 15:46:10 +0000

36+

37+unity8 (7.84+14.04.20140307-0ubuntu1) trusty; urgency=low

38+

39+ * New rebuild forced

40+

41+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Mar 2014 10:54:33 +0000

42+

43+unity8 (7.84+14.04.20140306-0ubuntu1) trusty; urgency=low

44+

45+ [ Bill Filler ]

46+ * Convert gallery and camera to click

47+

48+ [ Michael Zanetti ]

49+ * Just disable HUD tests, without really disabling the HUD itself

50+

51+ [ Sergio Schvezov ]

52+ * Convert gallery and camera to click

53+

54+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 06 Mar 2014 16:45:46 +0000

55+

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

57+

58+ [ Michael Terry ]

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

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

61+ tablet mode.

62+

63+ [ Nick Dedekind ]

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

65+

66+ [ Albert Astals ]

67+ * Initialize m_distance (LP: #1285385)

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

69+

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

71+

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

73+

74+ [ Michał Sawicz ]

75+ * Fix CardHeader title font weight.

76+ * Delete stale sockets. (LP: #1285215)

77+

78+ [ Dmitrijs Ledkovs ]

79+ * Ship python3 autopilot modules.

80+

81+ [ Albert Astals ]

82+ * Cleanup DashContent Remove unused signals and properties

83+

84+ [ Michał Karnicki ]

85+ * Take it easy on the logging.

86+ * Fix CardHeader title font weight.

87+

88+ [ Nick Dedekind ]

89+ * Added ability to change indicator profile in shell (env

90+ UNITY_INDICATOR_PROFILE)

91+

92+ [ Andrea Cimitan ]

93+ * Rename PreviewRating to PreviewRatingInput

94+ * Adds PreviewRatingDisplay

95+

96+ [ Daniel d'Andrada ]

97+ * DirectionalDragArea: Reset status if disabled while dragging (LP:

98+ #1276122)

99+

100+ [ Dimitri John Ledkov ]

101+ * Ship python3 autopilot modules.

102+

103+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 28 Feb 2014 10:48:06 +0000

104+

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

105unity8 (7.84+14.04.20140221-0ubuntu1) trusty; urgency=low

2

106

3 [ Michał Sawicz ]

107 [ Michał Sawicz ]

debian/control+8−1

@@ -28,7 +28,8 @@ Build-Depends: cmake,

28 pkg-config,

29 python:any (>= 2.7),

30 python-setuptools,

31− python3:any,

31+ python3-all:any,

32+ python3-setuptools,

32 qt5-default,

33 qt5-default,

33 qtbase5-dev,

34 qtbase5-dev,

34 qtbase5-dev-tools,

35 qtbase5-dev-tools,

@@ -107,16 +108,22 @@ Depends: gir1.2-glib-2.0,

107 libautopilot-qt (>= 1.4),

108 libautopilot-qt (>= 1.4),

108 libqt5test5,

109 libqt5test5,

109 libqt5widgets5,

110 libqt5widgets5,

111+ python-autopilot,

110 python-evdev,

112 python-evdev,

111 python-fixtures,

113 python-fixtures,

112 python-gi,

114 python-gi,

113 python-mock,

115 python-mock,

116+ python3-autopilot,

117+ python3-evdev,

118+ python3-fixtures,

119+ python3-gi,

114 ubuntu-ui-toolkit-autopilot,

120 ubuntu-ui-toolkit-autopilot,

115 unity8 (>= ${source:Version}),

121 unity8 (>= ${source:Version}),

116 unity8-fake-env (>= ${source:Version}),

122 unity8-fake-env (>= ${source:Version}),

117 url-dispatcher-tools,

123 url-dispatcher-tools,

118 ${misc:Depends},

124 ${misc:Depends},

119 ${python:Depends},

125 ${python:Depends},

126+ ${python3:Depends},

120 ${shlibs:Depends},

127 ${shlibs:Depends},

121Description: Test package for Unity 8 shell

128Description: Test package for Unity 8 shell

122 Autopilot tests for the unity8 package

129 Autopilot tests for the unity8 package

debian/rules+2−2

@@ -10,7 +10,7 @@ SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/

10

11.PHONY: build

12build %:

13− dh $@ --parallel --fail-missing --with python2

13+ dh $@ --parallel --fail-missing --with python2,python3

14

15override_dh_auto_clean:

16 dh_auto_clean

@@ -28,7 +28,7 @@ override_dh_auto_build:

28override_dh_install:

29 # install autopilot tests

30 cd tests/autopilot; \

31− set -ex; for python in $(shell pyversions -r); do \

31+ set -ex; for python in $(shell pyversions -r) $(shell py3versions -r); do \

32 $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \

33 done; \

34 cd $(CURDIR)

plugins/DashViews/listviewwithpageheader.cpp+33−10

@@ -91,6 +91,7 @@

91

92#include "listviewwithpageheader.h"

93

94+#include <QCoreApplication>

94#include <QDebug>

95#include <QDebug>

95#include <qqmlinfo.h>

96#include <qqmlinfo.h>

96#include <qqmlengine.h>

97#include <qqmlengine.h>

@@ -477,6 +478,11 @@ void ListViewWithPageHeader::componentComplete()

477 polish();

478 polish();

478}

479}

479

480

481+static inline bool uFuzzyCompare(qreal r1, qreal r2)

482+{

483+ return qFuzzyCompare(r1, r2) || (qFuzzyIsNull(r1) && qFuzzyIsNull(r2));

484+}

485+

480void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

486void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

481{

487{

482 // Check we are not being taken down and don't paint anything

488 // Check we are not being taken down and don't paint anything

@@ -491,11 +497,7 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

491 const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;

497 const bool showHeaderAnimationRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationShowHeader;

492 if (m_headerItem) {

498 if (m_headerItem) {

493 const auto oldHeaderItemShownHeight = m_headerItemShownHeight;

499 const auto oldHeaderItemShownHeight = m_headerItemShownHeight;

494− if (contentY() < -m_minYExtent) {

500+ if (uFuzzyCompare(contentY(), -m_minYExtent) || contentY() > -m_minYExtent) {

495− // Stick the header item to the top when dragging down

496− m_headerItem->setY(contentY());

497− m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

498− } else {

499 m_headerItem->setHeight(m_headerItem->implicitHeight());

501 m_headerItem->setHeight(m_headerItem->implicitHeight());

500 // We are going down (but it's not because of the rebound at the end)

502 // We are going down (but it's not because of the rebound at the end)

501 // (but the header was not shown by it's own position)

503 // (but the header was not shown by it's own position)

@@ -509,21 +511,32 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

509 m_headerItemShownHeight = 0;

511 m_headerItemShownHeight = 0;

510 m_headerItem->setY(-m_minYExtent);

512 m_headerItem->setY(-m_minYExtent);

511 } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {

513 } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0) || m_inContentHeightKeepHeaderShown) {

514+ if (maximizeVisibleAreaRunning && diff > 0) {

512− if (maximizeVisibleAreaRunning && diff > 0) // If we are maximizing and the header was shown, make sure we hide it

515+ // If we are maximizing and the header was shown, make sure we hide it

513 m_headerItemShownHeight -= diff;

516 m_headerItemShownHeight -= diff;

514− else

517+ } else {

515 m_headerItemShownHeight += diff;

518 m_headerItemShownHeight += diff;

519+ }

516− if (contentY() == -m_minYExtent) {

520+ if (uFuzzyCompare(contentY(), -m_minYExtent)) {

517 m_headerItemShownHeight = 0;

521 m_headerItemShownHeight = 0;

518 } else {

522 } else {

519 m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());

523 m_headerItemShownHeight = qBound(static_cast<qreal>(0.), m_headerItemShownHeight, m_headerItem->height());

520 }

524 }

521 if (m_headerItemShownHeight > 0) {

525 if (m_headerItemShownHeight > 0) {

526+ if (uFuzzyCompare(m_headerItem->height(), m_headerItemShownHeight)) {

527+ m_headerItem->setY(contentY());

528+ m_headerItemShownHeight = m_headerItem->height();

529+ } else {

522− m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);

530+ m_headerItem->setY(contentY() - m_headerItem->height() + m_headerItemShownHeight);

531+ }

523 } else {

532 } else {

524 m_headerItem->setY(-m_minYExtent);

533 m_headerItem->setY(-m_minYExtent);

525 }

534 }

526 }

535 }

536+ } else {

537+ // Stick the header item to the top when dragging down

538+ m_headerItem->setY(contentY());

539+ m_headerItem->setHeight(m_headerItem->implicitHeight() + (-m_minYExtent - contentY()));

527 }

540 }

528 // We will be changing the clip item, need to accomadate for it

541 // We will be changing the clip item, need to accomadate for it

529 // otherwise we move the firstItem down/up twice (unless the

542 // otherwise we move the firstItem down/up twice (unless the

@@ -1128,7 +1141,12 @@ void ListViewWithPageHeader::adjustMinYExtent()

1128 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1141 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;

1129// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1142// qDebug() << m_firstVisibleIndex << visibleItemsHeight << visibleItems << nonCreatedHeight;

1130 }

1143 }

1131− m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + (m_headerItem ? m_headerItem->implicitHeight() : 0);

1144+ const qreal headerHeight = (m_headerItem ? m_headerItem->implicitHeight() : 0);

1145+ m_minYExtent = nonCreatedHeight - m_visibleItems.first()->y() - m_clipItem->y() + headerHeight;

1146+ if (m_minYExtent != 0 && qFuzzyIsNull(m_minYExtent)) {

1147+ m_minYExtent = 0;

1148+ m_visibleItems.first()->setY(nonCreatedHeight - m_clipItem->y() + headerHeight);

1149+ }

1132 }

1150 }

1133}

1151}

1134

1152

@@ -1264,6 +1282,11 @@ void ListViewWithPageHeader::updatePolish()

1264 refill();

1282 refill();

1265

1283

1266 if (m_contentHeightDirty) {

1284 if (m_contentHeightDirty) {

1285+ // We need to make sure all bindings have updated otherwise

1286+ // we may end up with bindings updating when we call setContentHeight

1287+ // and then everything gets out of sync, i.e. testHeaderPositionBug1240118

1288+ QCoreApplication::instance()->processEvents();

1289+

1267 qreal contentHeight;

1290 qreal contentHeight;

1268 if (m_visibleItems.isEmpty()) {

1291 if (m_visibleItems.isEmpty()) {

1269 contentHeight = m_headerItem ? m_headerItem->height() : 0;

1292 contentHeight = m_headerItem ? m_headerItem->height() : 0;

plugins/Ubuntu/Gestures/DirectionalDragArea.cpp+10

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

@@ -129,6 +130,8 @@ DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)

129 m_recognitionTimer->setInterval(60);

130 m_recognitionTimer->setInterval(60);

130

131

131 m_velocityCalculator = new AxisVelocityCalculator(this);

132 m_velocityCalculator = new AxisVelocityCalculator(this);

133+

134+ connect(this, &QQuickItem::enabledChanged, this, &DirectionalDragArea::onEnabledChanged);

132}

135}

133

136

134Direction::Type DirectionalDragArea::direction() const

137Direction::Type DirectionalDragArea::direction() const

@@ -528,6 +531,13 @@ void DirectionalDragArea::checkSpeed()

528 m_numSamplesOnLastSpeedCheck = m_velocityCalculator->numSamples();

531 m_numSamplesOnLastSpeedCheck = m_velocityCalculator->numSamples();

529}

532}

530

533

534+void DirectionalDragArea::onEnabledChanged()

535+{

536+ if (!isEnabled() && m_status != WaitingForTouch) {

537+ setStatus(WaitingForTouch);

538+ }

539+}

540+

531void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)

541void DirectionalDragArea::setStatus(DirectionalDragArea::Status newStatus)

532{

542{

533 if (newStatus == m_status)

543 if (newStatus == m_status)

plugins/Ubuntu/Gestures/DirectionalDragArea.h+1

@@ -218,6 +218,7 @@ protected:

218

219private Q_SLOTS:

220 void checkSpeed();

221+ void onEnabledChanged();

221

222

222private:

223private:

223 void touchEvent_absent(QTouchEvent *event);

224 void touchEvent_absent(QTouchEvent *event);

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

plugins/Utils/CMakeLists.txt−1

@@ -12,7 +12,6 @@ include_directories(

12

13set(QMLPLUGIN_SRC

14 albumartprovider.cpp

15− bottombarvisibilitycommunicatorshell.cpp

16 mediaartcache.cpp

15 mediaartcache.cpp

17 qlimitproxymodelqml.cpp

16 qlimitproxymodelqml.cpp

18 qsortfilterproxymodelqml.cpp

17 qsortfilterproxymodelqml.cpp

plugins/Utils/bottombarvisibilitycommunicatorshell.cppdeleted−49

@@ -1,49 +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−

17−#include "bottombarvisibilitycommunicatorshell.h"

18−

19−BottomBarVisibilityCommunicatorShell::BottomBarVisibilityCommunicatorShell()

20− : m_forceHidden(false),

21− m_position(0)

22−{

23−}

24−

25−bool BottomBarVisibilityCommunicatorShell::forceHidden() const

26−{

27− return m_forceHidden;

28−}

29−

30−double BottomBarVisibilityCommunicatorShell::position() const

31−{

32− return m_position;

33−}

34−

35−void BottomBarVisibilityCommunicatorShell::setForceHidden(bool forceHidden)

36−{

37− if (forceHidden != m_forceHidden) {

38− m_forceHidden = forceHidden;

39− Q_EMIT forceHiddenChanged(forceHidden);

40− }

41−}

42−

43−void BottomBarVisibilityCommunicatorShell::setPosition(double position)

44−{

45− if (position != m_position) {

46− m_position = position;

47− Q_EMIT positionChanged(position);

48− }

49−}

plugins/Utils/bottombarvisibilitycommunicatorshell.hdeleted−59

@@ -1,59 +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−

17−#ifndef BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H

18−#define BOTTOMBARVISIBILITYCOMMUNICATORSHELL_H

19−

20−#include <QObject>

21−

22−class QDBusInterface;

23−

24−/** This is an internal class used to talk with the bottom bar used by either

25− * applications or the SDK.

26− * There is a method to force the bottom bar to be hidden or otherwise behave as usual

27− */

28−

29−class BottomBarVisibilityCommunicatorShell : public QObject

30−{

31− Q_OBJECT

32− Q_PROPERTY(bool forceHidden READ forceHidden WRITE setForceHidden NOTIFY forceHiddenChanged)

33− Q_PROPERTY(double position READ position WRITE setPosition NOTIFY positionChanged)

34−

35− Q_CLASSINFO("D-Bus Interface", "com.canonical.Shell.BottomBarVisibilityCommunicator")

36−public:

37− static BottomBarVisibilityCommunicatorShell& instance() {

38− static BottomBarVisibilityCommunicatorShell instance;

39− return instance;

40− }

41−

42− bool forceHidden() const;

43− void setForceHidden(bool forceHidden);

44−

45− double position() const;

46− void setPosition(double position);

47−

48−Q_SIGNALS:

49− void forceHiddenChanged(bool forceHidden);

50− void positionChanged(double position);

51−

52−private:

53− BottomBarVisibilityCommunicatorShell();

54−

55− bool m_forceHidden;

56− double m_position;

57−};

58−

59−#endif

plugins/Utils/plugin.cpp−10

@@ -27,15 +27,11 @@

27

28// local

29#include "albumartprovider.h"

30−#include "bottombarvisibilitycommunicatorshell.h"

31#include "qlimitproxymodelqml.h"

30#include "qlimitproxymodelqml.h"

32#include "qsortfilterproxymodelqml.h"

31#include "qsortfilterproxymodelqml.h"

33#include "timeformatter.h"

32#include "timeformatter.h"

34#include "unitymenumodelpaths.h"

33#include "unitymenumodelpaths.h"

35

34

36−static const char* BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH = "/BottomBarVisibilityCommunicator";

37−static const char* DBUS_SERVICE = "com.canonical.Shell.BottomBarVisibilityCommunicator";

38−

39void UtilsPlugin::registerTypes(const char *uri)

35void UtilsPlugin::registerTypes(const char *uri)

40{

36{

41 Q_ASSERT(uri == QLatin1String("Utils"));

37 Q_ASSERT(uri == QLatin1String("Utils"));

@@ -45,7 +41,6 @@ void UtilsPlugin::registerTypes(const char *uri)

45 qmlRegisterType<UnityMenuModelPaths>(uri, 0, 1, "UnityMenuModelPaths");

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

46 qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

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

47 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");

43 qmlRegisterType<GDateTimeFormatter>(uri, 0, 1, "GDateTimeFormatter");

48− qmlRegisterUncreatableType<BottomBarVisibilityCommunicatorShell>(uri, 0, 1, "BottomBarVisibilityCommunicatorShell", "Can't create BottomBarVisibilityCommunicatorShell");

49}

44}

50

45

51void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

46void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

@@ -64,9 +59,4 @@ void UtilsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

64 {

59 {

65 qWarning() << "Failed to register image provider for albumart (unknown error)";

60 qWarning() << "Failed to register image provider for albumart (unknown error)";

66 }

61 }

67−

68− QDBusConnection::sessionBus().registerService(DBUS_SERVICE);

69− BottomBarVisibilityCommunicatorShell *bottomBarVisibilityCommunicator = &BottomBarVisibilityCommunicatorShell::instance();

70− QDBusConnection::sessionBus().registerObject(BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, bottomBarVisibilityCommunicator, QDBusConnection::ExportAllContents);

71− engine->rootContext()->setContextProperty("bottomBarVisibilityCommunicatorShell", bottomBarVisibilityCommunicator);

72}

62}

po/am.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ar.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

18"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

19−"X-Launchpad-Export-Date: 2014-02-22 07:40+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

20−"X-Generator: Launchpad (build 16926)\n"

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/ast.po+11−9

@@ -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: 2013-12-11 20:45+0000\n"

11+"PO-Revision-Date: 2014-03-01 16:51+0000\n"

12−"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"

13"Language-Team: Asturian <ast@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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

@@ -74,6 +74,8 @@ msgid ""

74"You have now mastered the edge gestures and can start using the "

75"phone Tap on the screen to start"

76msgstr ""

77+"Agora domina los xestos de los bordes y pue principiar a usar el "

78+"teléfonu Toque la pantalla pa comenzar"

77

79

78#: qml/Components/PageHeader.qml:340

80#: qml/Components/PageHeader.qml:340

79msgid "Recent searches"

81msgid "Recent searches"

@@ -81,11 +83,11 @@ msgstr "Busques recientes"

81

83

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

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

83msgid "See more"

85msgid "See more"

84−msgstr ""

86+msgstr "Ver más"

85

87

86#: qml/Components/SeeMore.qml:57

88#: qml/Components/SeeMore.qml:57

87msgid "See less"

89msgid "See less"

88−msgstr ""

90+msgstr "Ver menos"

89

91

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

92#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

91msgid "Rate this"

93msgid "Rate this"

@@ -107,11 +109,11 @@ msgstr[1] "%1 reseñes"

107

109

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

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

109msgid "More..."

111msgid "More..."

110−msgstr ""

112+msgstr "Más…"

111

113

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

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

113msgid "Less..."

115msgid "Less..."

114−msgstr ""

116+msgstr "Menos…"

115

117

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

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

117msgid "Add a review"

119msgid "Add a review"

@@ -168,7 +170,7 @@ msgstr "Amosar contraseña"

168

170

169#: qml/Notifications/NotificationMenuItemFactory.qml:103

171#: qml/Notifications/NotificationMenuItemFactory.qml:103

170msgid "Please enter SIM PIN"

172msgid "Please enter SIM PIN"

171−msgstr ""

173+msgstr "Escriba'l PIN de la SIM"

172

174

173#: qml/Panel/SearchIndicator.qml:27

175#: qml/Panel/SearchIndicator.qml:27

174msgid "Search"

176msgid "Search"

po/az.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/bg.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/bs.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/ca.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ckb.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/cs.po+2−2

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

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

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

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/da.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/de.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/el.po+10−8

@@ -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: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-01-15 16:34+0000\n"

11+"PO-Revision-Date: 2014-02-26 09:58+0000\n"

12−"Last-Translator: Filippos Kolyvas <Unknown>\n"

12+"Last-Translator: j3lc <x_nikos@yahoo.gr>\n"

13"Language-Team: Greek <el@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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

@@ -74,6 +74,8 @@ msgid ""

74"You have now mastered the edge gestures and can start using the "

75"phone Tap on the screen to start"

76msgstr ""

77+"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "

78+"χρησιμοποιείτε το τηλέφωνο Αγγίξτε την οθόνη για να ξεκινήσετε"

77

79

78#: qml/Components/PageHeader.qml:340

80#: qml/Components/PageHeader.qml:340

79msgid "Recent searches"

81msgid "Recent searches"

@@ -81,11 +83,11 @@ msgstr "Πρόσφατες αναζητήσεις"

81

83

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

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

83msgid "See more"

85msgid "See more"

84−msgstr ""

86+msgstr "Περρισότερα"

85

87

86#: qml/Components/SeeMore.qml:57

88#: qml/Components/SeeMore.qml:57

87msgid "See less"

89msgid "See less"

88−msgstr ""

90+msgstr "Λιγότερα"

89

91

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

92#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

91msgid "Rate this"

93msgid "Rate this"

@@ -152,7 +154,7 @@ msgstr "Πληκτρολογήστε ή πείτε μια εντολή"

152

154

153#: qml/Hud/Hud.qml:84

155#: qml/Hud/Hud.qml:84

154msgid "Loading. Please Wait..."

156msgid "Loading. Please Wait..."

155−msgstr "Γίνεται φόρτωση, παρακαλώ περιμένετε..."

157+msgstr "Γίνεται φόρτωση. Παρακαλώ περιμένετε..."

156

158

157#: qml/Hud/Hud.qml:89

159#: qml/Hud/Hud.qml:89

158msgid "Speak Now..."

160msgid "Speak Now..."

@@ -168,7 +170,7 @@ msgstr "Εμφάνιση κωδικού"

168

170

169#: qml/Notifications/NotificationMenuItemFactory.qml:103

171#: qml/Notifications/NotificationMenuItemFactory.qml:103

170msgid "Please enter SIM PIN"

172msgid "Please enter SIM PIN"

171−msgstr ""

173+msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"

172

174

173#: qml/Panel/SearchIndicator.qml:27

175#: qml/Panel/SearchIndicator.qml:27

174msgid "Search"

176msgid "Search"

po/en_AU.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/en_GB.po+11−9

@@ -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: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-01-14 20:46+0000\n"

11+"PO-Revision-Date: 2014-03-07 13:27+0000\n"

12−"Last-Translator: Dan Bishop <dan@danbishop.org>\n"

12+"Last-Translator: Andi Chandler <Unknown>\n"

13"Language-Team: English (United Kingdom) <en_GB@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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

@@ -72,6 +72,8 @@ msgid ""

72"You have now mastered the edge gestures and can start using the "

73"phone Tap on the screen to start"

74msgstr ""

75+"You have now mastered the edge gestures and can start using the "

76+"phone Tap on the screen to start"

75

77

76#: qml/Components/PageHeader.qml:340

78#: qml/Components/PageHeader.qml:340

77msgid "Recent searches"

79msgid "Recent searches"

@@ -79,11 +81,11 @@ msgstr "Recent searches"

79

81

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

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

81msgid "See more"

83msgid "See more"

82−msgstr ""

84+msgstr "See more"

83

85

84#: qml/Components/SeeMore.qml:57

86#: qml/Components/SeeMore.qml:57

85msgid "See less"

87msgid "See less"

86−msgstr ""

88+msgstr "See less"

87

89

88#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

89msgid "Rate this"

91msgid "Rate this"

@@ -105,11 +107,11 @@ msgstr[1] "%1 reviews"

105

107

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

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

107msgid "More..."

109msgid "More..."

108−msgstr ""

110+msgstr "More..."

109

111

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

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

111msgid "Less..."

113msgid "Less..."

112−msgstr ""

114+msgstr "Less..."

113

115

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

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

115msgid "Add a review"

117msgid "Add a review"

@@ -166,7 +168,7 @@ msgstr "Show password"

166

168

167#: qml/Notifications/NotificationMenuItemFactory.qml:103

169#: qml/Notifications/NotificationMenuItemFactory.qml:103

168msgid "Please enter SIM PIN"

170msgid "Please enter SIM PIN"

169−msgstr ""

171+msgstr "Please enter SIM PIN"

170

172

171#: qml/Panel/SearchIndicator.qml:27

173#: qml/Panel/SearchIndicator.qml:27

172msgid "Search"

174msgid "Search"

po/eo.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/es.po+2−2

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

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: 2014-02-21 06:42+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/eu.po+32−30

@@ -8,24 +8,24 @@ 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-03 22:04+0000\n"

11+"PO-Revision-Date: 2014-03-16 17:40+0000\n"

12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

13"Language-Team: Basque <eu@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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-17 05:13+0000\n"

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

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

20

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

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

23msgid "Lock to Launcher"

24−msgstr ""

24+msgstr "Lotu abiarazlera"

25

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

27msgid "Unlock from Launcher"

28−msgstr ""

28+msgstr "Askatu abiarazletik"

29

30#: qml/Components/EdgeDemoOverlay.qml:151

31msgid "Skip intro"

@@ -74,107 +74,109 @@ msgid ""

74"You have now mastered the edge gestures and can start using the "

75"phone Tap on the screen to start"

76msgstr ""

77+"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "

78+"zaitezke Ukitu pantaila hasteko"

77

79

78#: qml/Components/PageHeader.qml:340

80#: qml/Components/PageHeader.qml:340

79msgid "Recent searches"

81msgid "Recent searches"

80−msgstr ""

82+msgstr "Azken bilaketak"

81

83

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

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

83msgid "See more"

85msgid "See more"

84−msgstr ""

86+msgstr "Ikusi gehiago"

85

87

86#: qml/Components/SeeMore.qml:57

88#: qml/Components/SeeMore.qml:57

87msgid "See less"

89msgid "See less"

88−msgstr ""

90+msgstr "Ikusi gutxiago"

89

91

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

92#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

91msgid "Rate this"

93msgid "Rate this"

92−msgstr ""

94+msgstr "Puntuatu hau"

93

95

94#. TRANSLATORS: Number of persons who rated this app/video/whatever

96#. TRANSLATORS: Number of persons who rated this app/video/whatever

95#: qml/Dash/Previews/Header.qml:93

97#: qml/Dash/Previews/Header.qml:93

96#, qt-format

98#, qt-format

97msgid "(%1)"

99msgid "(%1)"

98−msgstr ""

100+msgstr "(%1)"

99

101

100#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

102#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

101#: qml/Dash/Previews/Header.qml:105

103#: qml/Dash/Previews/Header.qml:105

102#, qt-format

104#, qt-format

103msgid "%1 review"

105msgid "%1 review"

104msgid_plural "%1 reviews"

106msgid_plural "%1 reviews"

105−msgstr[0] ""

107+msgstr[0] "berrikuspen %1"

106−msgstr[1] ""

108+msgstr[1] "%1 berrikuspen"

107

109

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

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

109msgid "More..."

111msgid "More..."

110−msgstr ""

112+msgstr "Gehiago..."

111

113

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

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

113msgid "Less..."

115msgid "Less..."

114−msgstr ""

116+msgstr "Gutxiago..."

115

117

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

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

117msgid "Add a review"

119msgid "Add a review"

118−msgstr ""

120+msgstr "Gehitu berrikuspena"

119

121

120#: qml/Dash/Previews/PreviewRating.qml:153 qml/Dash/Previews/Reviews.qml:121

122#: qml/Dash/Previews/PreviewRating.qml:153 qml/Dash/Previews/Reviews.qml:121

121msgid "Send"

123msgid "Send"

122−msgstr ""

124+msgstr "Bidali"

123

125

124#: qml/Dash/Previews/Reviews.qml:86

126#: qml/Dash/Previews/Reviews.qml:86

125msgid "Review"

127msgid "Review"

126−msgstr ""

128+msgstr "Berrikusi"

127

129

128#: qml/Dash/Previews/Reviews.qml:139

130#: qml/Dash/Previews/Reviews.qml:139

129msgid "Comments:"

131msgid "Comments:"

130−msgstr ""

132+msgstr "Iruzkinak:"

131

133

132#: qml/Greeter/Lockscreen.qml:149

134#: qml/Greeter/Lockscreen.qml:149

133msgid "Emergency Call"

135msgid "Emergency Call"

134−msgstr ""

136+msgstr "Larrialdi-deia"

135

137

136#: qml/Greeter/PassphraseLockscreen.qml:59

138#: qml/Greeter/PassphraseLockscreen.qml:59

137#, qt-format

139#, qt-format

138msgid "Hello %1"

140msgid "Hello %1"

139−msgstr ""

141+msgstr "Kaixo %1"

140

142

141#: qml/Greeter/PassphraseLockscreen.qml:59

143#: qml/Greeter/PassphraseLockscreen.qml:59

142msgid "Hello"

144msgid "Hello"

143−msgstr ""

145+msgstr "Kaixo"

144

146

145#: qml/Hud/HudParametrizedActionsPage.qml:132

147#: qml/Hud/HudParametrizedActionsPage.qml:132

146msgid "Confirm"

148msgid "Confirm"

147−msgstr ""

149+msgstr "Baieztatu"

148

150

149#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372

151#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372

150msgid "Type or say a command"

152msgid "Type or say a command"

151−msgstr ""

153+msgstr "Idatzi edo esan agindu bat"

152

154

153#: qml/Hud/Hud.qml:84

155#: qml/Hud/Hud.qml:84

154msgid "Loading. Please Wait..."

156msgid "Loading. Please Wait..."

155−msgstr ""

157+msgstr "Kargatzen. Itxaron, mesedez..."

156

158

157#: qml/Hud/Hud.qml:89

159#: qml/Hud/Hud.qml:89

158msgid "Speak Now..."

160msgid "Speak Now..."

159−msgstr ""

161+msgstr "Hitz egin orain..."

160

162

161#: qml/Hud/Hud.qml:94

163#: qml/Hud/Hud.qml:94

162msgid "Speaking..."

164msgid "Speaking..."

163−msgstr ""

165+msgstr "Hitz egiten..."

164

166

165#: qml/Notifications/NotificationMenuItemFactory.qml:91

167#: qml/Notifications/NotificationMenuItemFactory.qml:91

166msgid "Show password"

168msgid "Show password"

167−msgstr ""

169+msgstr "Erakutsi pasahitza"

168

170

169#: qml/Notifications/NotificationMenuItemFactory.qml:103

171#: qml/Notifications/NotificationMenuItemFactory.qml:103

170msgid "Please enter SIM PIN"

172msgid "Please enter SIM PIN"

171−msgstr ""

173+msgstr "Sartu SIMaren PINa"

172

174

173#: qml/Panel/SearchIndicator.qml:27

175#: qml/Panel/SearchIndicator.qml:27

174msgid "Search"

176msgid "Search"

175−msgstr ""

177+msgstr "Bilatu"

176

178

177#: qml/Shell.qml:440

179#: qml/Shell.qml:440

178#, qt-format

180#, qt-format

179msgid "Please enter %1"

181msgid "Please enter %1"

180−msgstr ""

182+msgstr "Sartu %1"

po/fa.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/fi.po+8−6

@@ -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: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-02-21 19:36+0000\n"

11+"PO-Revision-Date: 2014-03-09 19:22+0000\n"

12"Last-Translator: Jiri Grönroos <Unknown>\n"

13"Language-Team: Finnish <fi@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: 2014-02-22 07:40+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

@@ -72,6 +72,8 @@ msgid ""

72"You have now mastered the edge gestures and can start using the "

73"phone Tap on the screen to start"

74msgstr ""

75+"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "

76+"käytön Napauta näyttöä aloittaaksesi"

75

77

76#: qml/Components/PageHeader.qml:340

78#: qml/Components/PageHeader.qml:340

77msgid "Recent searches"

79msgid "Recent searches"

@@ -79,11 +81,11 @@ msgstr "Viimeisimmät haut"

79

81

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

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

81msgid "See more"

83msgid "See more"

82−msgstr ""

84+msgstr "Näytä lisää"

83

85

84#: qml/Components/SeeMore.qml:57

86#: qml/Components/SeeMore.qml:57

85msgid "See less"

87msgid "See less"

86−msgstr ""

88+msgstr "Näytä vähemmän"

87

89

88#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

89msgid "Rate this"

91msgid "Rate this"

@@ -109,7 +111,7 @@ msgstr "Lisää..."

109

111

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

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

111msgid "Less..."

113msgid "Less..."

112−msgstr ""

114+msgstr "Vähemmän..."

113

115

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

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

115msgid "Add a review"

117msgid "Add a review"

po/fo.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/fr.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/gd.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

18"(n > 2 && n < 20) ? 2 : 3;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/gl.po+5−5

@@ -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: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-02-15 04:00+0000\n"

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

12"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

@@ -107,11 +107,11 @@ msgstr[1] "%1 opinións"

107

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

109msgid "More..."

110−msgstr ""

110+msgstr "Máis…"

111

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

113msgid "Less..."

114−msgstr ""

114+msgstr "Menos..."

115

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

117msgid "Add a review"

po/he.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/hi.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/hr.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/hu.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/hy.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/id.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/is.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/it.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ja.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

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-15 07:34+0000\n"

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

19+"X-Generator: Launchpad (build 16963)\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"

po/kn.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ko.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/ky.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/lo.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/lt.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"(n%100<10 || n%100>=20) ? 1 : 2;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/lv.po+2−2

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

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

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

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ml.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/mr.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ms.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/my.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/nb.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/nl.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/pl.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

18"|| n%100>=20) ? 1 : 2;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/pt.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/pt_BR.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ro.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

18"== 0) && (n != 0))) ? 2: 1));\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/ru.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/shn.po+2−2

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

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"

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

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/si.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/sl.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

18"n%100==4 ? 3 : 0);\n"

19−"X-Launchpad-Export-Date: 2014-02-22 07:40+0000\n"

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

20−"X-Generator: Launchpad (build 16926)\n"

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/sq.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/sr.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/sv.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/sw.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/ta.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20"Language: ta\n"

21

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

po/te.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/tr.po+15−13

@@ -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: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2014-01-14 19:05+0000\n"

11+"PO-Revision-Date: 2014-03-05 08:54+0000\n"

12−"Last-Translator: Osman Coşkun <Unknown>\n"

12+"Last-Translator: Muhammed Yüce <muhammedyuceee@gmail.com>\n"

13"Language-Team: Turkish <tr@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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

@@ -29,7 +29,7 @@ msgstr "Başlatıcıdan Ayır"

29

30#: qml/Components/EdgeDemoOverlay.qml:151

31msgid "Skip intro"

32−msgstr "İntro'yu geç"

32+msgstr "Tanıtımı geç"

33

34#: qml/Components/EdgeDemo.qml:113

35msgid "Right edge"

@@ -37,7 +37,7 @@ msgstr "Sağ kenar"

37

38#: qml/Components/EdgeDemo.qml:114

39msgid "Try swiping from the right edge to unlock the phone"

40−msgstr "Kilidi açmak için sağ kenara sürüklemeyi deneyin"

40+msgstr "Kilidi açmak için sağ kenardan sürüklemeyi deneyin"

41

42#: qml/Components/EdgeDemo.qml:145

43msgid "Top edge"

@@ -45,7 +45,7 @@ msgstr "Üst kenar"

45

46#: qml/Components/EdgeDemo.qml:146

47msgid "Try swiping from the top edge to access the indicators"

48−msgstr "Bildiricilere erişmek için üst kenarı sürüklemeyi deneyin"

48+msgstr "Bildiricilere erişmek için üst kenarı sürükleyin"

49

50#: qml/Components/EdgeDemo.qml:171

51msgid "Close"

@@ -73,18 +73,20 @@ msgid ""

73"You have now mastered the edge gestures and can start using the "

74"phone Tap on the screen to start"

75msgstr ""

76+"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "

77+"başlayabilirsiniz Başlamak için ekrana dokunun"

76

78

77#: qml/Components/PageHeader.qml:340

79#: qml/Components/PageHeader.qml:340

78msgid "Recent searches"

80msgid "Recent searches"

79−msgstr "Son Arananlar"

81+msgstr "Son aramalar"

80

82

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

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

82msgid "See more"

84msgid "See more"

83−msgstr ""

85+msgstr "Daha fazlası"

84

86

85#: qml/Components/SeeMore.qml:57

87#: qml/Components/SeeMore.qml:57

86msgid "See less"

88msgid "See less"

87−msgstr ""

89+msgstr "Daha azını gör"

88

90

89#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

91#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

90msgid "Rate this"

92msgid "Rate this"

@@ -106,11 +108,11 @@ msgstr[1] "%1 inceleme"

106

108

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

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

108msgid "More..."

110msgid "More..."

109−msgstr ""

111+msgstr "Daha fazlası..."

110

112

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

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

112msgid "Less..."

114msgid "Less..."

113−msgstr ""

115+msgstr "Daha az.."

114

116

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

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

116msgid "Add a review"

118msgid "Add a review"

@@ -167,7 +169,7 @@ msgstr "Parolayı göster"

167

169

168#: qml/Notifications/NotificationMenuItemFactory.qml:103

170#: qml/Notifications/NotificationMenuItemFactory.qml:103

169msgid "Please enter SIM PIN"

171msgid "Please enter SIM PIN"

170−msgstr ""

172+msgstr "Lütfen SIM PIN'inizi girin"

171

173

172#: qml/Panel/SearchIndicator.qml:27

174#: qml/Panel/SearchIndicator.qml:27

173msgid "Search"

175msgid "Search"

po/ug.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/uk.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

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

19+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

20+"X-Generator: Launchpad (build 16963)\n"

21

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

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

po/vi.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/xh.po+2−2

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

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: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-15 07:34+0000\n"

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

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

20

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

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

po/zh_CN.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/zh_HK.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

po/zh_TW.po+2−2

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

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-15 07:34+0000\n"

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

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

20

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

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

qml/Components/Stage.qml+4−6

@@ -324,13 +324,11 @@ Showable {

324

325 ScriptAction {

326 script: {

327− if (!stage.focusedApplicationWhenUsingScreenshots) {

328− // FIXME: only here to support case where application does

327+ // FIXME: only here to support case where application does

329− // not exist yet but is about to

328+ // not exist yet but is about to

330− return;

329+ if (stage.focusedApplicationWhenUsingScreenshots) {

330+ stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

331 }

332−

333− stage.__focusApplication(stage.focusedApplicationWhenUsingScreenshots);

334 }

332 }

335 }

333 }

336 }

334 }

qml/Dash/Apps/FrequentlyUsedAppsModel.qml+6−6

@@ -48,24 +48,24 @@ ListModel {

48 metadata: "subscope:applications.scope/applications-non-click.scope"

49 }

50 ListElement {

51− uri: "application://camera-app.desktop"

51+ uri: "appid://com.ubuntu.camera/camera/current-user-version"

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

53 category: 0

54 mimetype: "application/x-desktop"

55 title: "Camera"

56 comment: ""

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

57+ dndUri: "appid://com.ubuntu.camera/camera/current-user-version"

58− metadata: "subscope:applications.scope/applications-non-click.scope"

58+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.camera"

59 }

60 ListElement {

61− uri: "application://gallery-app.desktop"

61+ uri: "appid://com.ubuntu.gallery/gallery/current-user-version"

62 icon: "../../graphics/applicationIcons/gallery.png"

63 category: 0

64 mimetype: "application/x-desktop"

65 title: "Gallery"

66 comment: ""

67− dndUri: "file:///usr/share/applications/gallery.desktop"

67+ dndUri: "appid://com.ubuntu.gallery/gallery/current-user-version"

68− metadata: "subscope:applications.scope/applications-non-click.scope"

68+ metadata: "subscope:applications.scope/applications-click.scope?app_id=com.ubuntu.gallery"

69 }

70 ListElement {

71 uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"

qml/Dash/Card.qml+9

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

44 anchors.fill: parent

45 image: backgroundImage.source ? backgroundImage : null

46

47+ property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b

48+

47 property Image backgroundImage: Image {

49 property Image backgroundImage: Image {

48 objectName: "backgroundImage"

50 objectName: "backgroundImage"

49 source: {

51 source: {

@@ -160,7 +162,12 @@ Item {

160 title: cardData && cardData["title"] || ""

162 title: cardData && cardData["title"] || ""

161 subtitle: cardData && cardData["subtitle"] || ""

163 subtitle: cardData && cardData["subtitle"] || ""

162

164

165+ titleWeight: components && components["subtitle"] ? Font.DemiBold : Font.Normal

166+

163 opacity: showHeader ? 1 : 0

167 opacity: showHeader ? 1 : 0

168+ inOverlay: template["overlay"] === true

169+ fontColor: inOverlay ? "white" : summary.color

170+ useMascotShape: !background.visible && !inOverlay

164

171

165 Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }

172 Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }

166 }

173 }

@@ -181,5 +188,7 @@ Item {

181 text: cardData && cardData["summary"] || ""

188 text: cardData && cardData["summary"] || ""

182 height: text ? implicitHeight : 0

189 height: text ? implicitHeight : 0

183 fontSize: "small"

190 fontSize: "small"

191+ // TODO karni: Change "grey" to Ubuntu.Components.Palette color once updated.

192+ color: background.visible && background.luminance < 0.7 ? "white" : "grey"

184 }

193 }

185}

194}

qml/Dash/CardHeader.qml+33−59

@@ -22,16 +22,20 @@ Item {

22 property alias mascot: mascotImage.source

23 property alias title: titleLabel.text

24 property alias subtitle: subtitleLabel.text

25− property alias price: priceLabel.text

25+

26− property alias oldPrice: oldPriceLabel.text

26+ property alias titleWeight: titleLabel.font.weight

27− property alias altPrice: altPriceLabel.text

27+ property alias titleSize: titleLabel.fontSize

28

29 // FIXME: Saviq, used to scale fonts down in Carousel

30 property real fontScale: 1.0

31

32 property alias headerAlignment: titleLabel.horizontalAlignment

33

34+ property bool inOverlay: false

35+ property bool useMascotShape: true

36+ property color fontColor: Theme.palette.selected.backgroundText

37+

34− visible: mascotImage.status === Image.Ready || title || price

38+ visible: mascotImage.status === Image.Ready || title

35 height: row.height > 0 ? row.height + row.margins * 2 : 0

39 height: row.height > 0 ? row.height + row.margins * 2 : 0

36

40

37 Row {

41 Row {

@@ -40,13 +44,13 @@ Item {

40

44

41 property real margins: units.gu(1)

45 property real margins: units.gu(1)

42

46

47+ spacing: mascotShape.visible || mascotImage.visible || inOverlay ? margins : 0

43 anchors {

48 anchors {

44 top: parent.top; left: parent.left; right: parent.right

49 top: parent.top; left: parent.left; right: parent.right

45 margins: margins

50 margins: margins

46 leftMargin: spacing

51 leftMargin: spacing

47 rightMargin: spacing

52 rightMargin: spacing

48 }

53 }

49− spacing: mascotShape.visible || (template && template["overlay"]) ? margins : 0

50

54

51 UbuntuShape {

55 UbuntuShape {

52 id: mascotShape

56 id: mascotShape

@@ -55,35 +59,45 @@ Item {

55 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.

59 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.

56 width: units.gu(6)

60 width: units.gu(6)

57 height: units.gu(5.625)

61 height: units.gu(5.625)

62+ anchors.verticalCenter: parent.verticalCenter

58− visible: image.status === Image.Ready

63+ visible: useMascotShape && image && image.status === Image.Ready

59 readonly property int maxSize: Math.max(width, height)

64 readonly property int maxSize: Math.max(width, height)

60

65

61− image: Image {

62− id: mascotImage

66+ image: useMascotShape ? mascotImage : null

67+ }

63

68

69+ Image {

70+ id: mascotImage

71+ objectName: "mascotImage"

72+

73+ width: source ? mascotShape.width : 0

74+ height: mascotShape.height

75+ anchors.verticalCenter: parent.verticalCenter

76+ visible: !useMascotShape && status === Image.Ready

77+

64− sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }

78+ sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }

65− fillMode: Image.PreserveAspectCrop

79+ fillMode: Image.PreserveAspectCrop

66− horizontalAlignment: Image.AlignHCenter

80+ horizontalAlignment: Image.AlignHCenter

67− verticalAlignment: Image.AlignVCenter

81+ verticalAlignment: Image.AlignVCenter

68− }

69 }

82 }

70

83

71 Column {

84 Column {

72 objectName: "column"

85 objectName: "column"

73 width: parent.width - x

86 width: parent.width - x

74− spacing: units.gu(0.5)

87+ spacing: units.gu(0.25)

88+ anchors.verticalCenter: parent.verticalCenter

75

89

76 Label {

90 Label {

77 id: titleLabel

91 id: titleLabel

78 objectName: "titleLabel"

92 objectName: "titleLabel"

79 anchors { left: parent.left; right: parent.right }

93 anchors { left: parent.left; right: parent.right }

80 elide: Text.ElideRight

94 elide: Text.ElideRight

81− font.weight: Font.DemiBold

95+ font.weight: Font.Normal

96+ fontSize: "small"

82 wrapMode: Text.Wrap

97 wrapMode: Text.Wrap

83 maximumLineCount: 2

98 maximumLineCount: 2

84− fontSize: "small"

85 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

99 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

86− color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText

100+ color: fontColor

87 }

101 }

88

102

89 Label {

103 Label {

@@ -91,51 +105,11 @@ Item {

91 objectName: "subtitleLabel"

105 objectName: "subtitleLabel"

92 anchors { left: parent.left; right: parent.right }

106 anchors { left: parent.left; right: parent.right }

93 elide: Text.ElideRight

107 elide: Text.ElideRight

108+ fontSize: "small"

94 font.weight: Font.Light

109 font.weight: Font.Light

95 visible: titleLabel.text && text

110 visible: titleLabel.text && text

96− fontSize: "x-small"

97 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

111 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale)

98− color: template["overlay"] === true ? "white" : Theme.palette.selected.backgroundText

112+ color: fontColor

99− }

100−

101− Row {

102− id: prices

103− objectName: "prices"

104− anchors { left: parent.left; right: parent.right }

105−

106− property int labels: {

107− var labels = 1; // price always visible

108− if (oldPriceLabel.text !== "") labels += 1;

109− if (altPriceLabel.text !== "") labels += 1;

110− return labels;

111− }

112− property real labelWidth: width / labels

113−

114− Label {

115− id: priceLabel

116− width: parent.labelWidth

117− elide: Text.ElideRight

118− font.weight: Font.DemiBold

119− color: Theme.palette.selected.foreground

120− visible: text

121− }

122−

123− Label {

124− id: oldPriceLabel

125− objectName: "oldPriceLabel"

126− width: parent.labelWidth

127− elide: Text.ElideRight

128− horizontalAlignment: parent.labels === 3 ? Text.AlignHCenter : Text.AlignRight

129− visible: text

130− }

131−

132− Label {

133− id: altPriceLabel

134− width: parent.labelWidth

135− elide: Text.ElideRight

136− horizontalAlignment: Text.AlignRight

137− visible: text

138− }

139 }

113 }

140 }

114 }

141 }

115 }

qml/Dash/CardTool.qml+46−8

@@ -28,6 +28,22 @@ import QtQuick 2.0

28

29Item {

30 id: cardTool

31+

32+ /*!

33+ \brief Number of cards.

34+ */

35+ property int count

36+

37+ /*!

38+ \brief Width of the category view.

39+ */

40+ property real viewWidth

41+

42+ /*!

43+ \brief Scaling factor of selected Carousel item.

44+ */

45+ readonly property real carouselSelectedItemScaleFactor: 1.38 // XXX assuming 1.38 carousel scaling factor for cards

46+

31 /*!

47 /*!

32 \brief Template supplied for the category.

48 \brief Template supplied for the category.

33 */

49 */

@@ -39,9 +55,15 @@ Item {

39 property var components

55 property var components

40

56

41 /*!

57 /*!

42− \brief Width of the view, based on which carousel width is calculated.

58+ \brief The category layout for this card tool.

43 */

59 */

44− property var viewWidth

60+ property string categoryLayout: {

61+ var layout = template["category-layout"];

62+

63+ // carousel fallback mode to grid

64+ if (layout === "carousel" && count <= Math.ceil(carouselTool.realPathItemCount)) layout = "grid";

65+ return layout;

66+ }

45

67

46 // FIXME: Saviq

68 // FIXME: Saviq

47 // Only way for the card below to actually be laid out completely.

69 // Only way for the card below to actually be laid out completely.

@@ -56,7 +78,7 @@ Item {

56 If undefined, should use implicit width of the actual card.

78 If undefined, should use implicit width of the actual card.

57 */

79 */

58 readonly property var cardWidth: {

80 readonly property var cardWidth: {

59− switch (template !== undefined && template["category-layout"]) {

81+ switch (categoryLayout) {

60 case "grid":

82 case "grid":

61 case "vertical-journal":

83 case "vertical-journal":

62 if (template["card-layout"] === "horizontal") return units.gu(38);

84 if (template["card-layout"] === "horizontal") return units.gu(38);

@@ -66,10 +88,7 @@ Item {

66 }

88 }

67 return units.gu(18.5);

89 return units.gu(18.5);

68 case "carousel":

90 case "carousel":

69− if (viewWidth === undefined) return undefined

91+ return carouselTool.minimumTileWidth;

70− if (viewWidth <= units.gu(40)) return units.gu(18)

71− if (viewWidth >= units.gu(128)) return units.gu(26)

72− return units.gu(18 + Math.round((viewWidth - units.gu(40))/ units.gu(11)))

73 case undefined:

92 case undefined:

74 case "organic-grid":

93 case "organic-grid":

75 case "journal":

94 case "journal":

@@ -84,7 +103,7 @@ Item {

84 If undefined, should use implicit height of the actual card.

103 If undefined, should use implicit height of the actual card.

85 */

104 */

86 readonly property var cardHeight: {

105 readonly property var cardHeight: {

87− switch (template !== undefined && template["category-layout"]) {

106+ switch (categoryLayout) {

88 case "journal":

107 case "journal":

89 if (template["card-size"] >= 12 && template["card-size"] <= 38) return units.gu(template["card-size"]);

108 if (template["card-size"] >= 12 && template["card-size"] <= 38) return units.gu(template["card-size"]);

90 return units.gu(18.5);

109 return units.gu(18.5);

@@ -123,6 +142,25 @@ Item {

123 return (template["card-layout"] === "horizontal") ? Text.AlignLeft : Text.AlignHCenter;

142 return (template["card-layout"] === "horizontal") ? Text.AlignLeft : Text.AlignHCenter;

124 }

143 }

125

144

145+ QtObject {

146+ id: carouselTool

147+

148+ property real minimumTileWidth: {

149+ if (cardTool.viewWidth === undefined) return undefined;

150+ if (cardTool.viewWidth <= units.gu(40)) return units.gu(18);

151+ if (cardTool.viewWidth >= units.gu(128)) return units.gu(26);

152+ return units.gu(18 + Math.round((cardTool.viewWidth - units.gu(40)) / units.gu(11)));

153+ }

154+

155+ readonly property real pathItemCount: 4.8457 /// (848 / 175) reference values

156+

157+ property real realPathItemCount: {

158+ var scaledMinimumTileWidth = minimumTileWidth / cardTool.carouselSelectedItemScaleFactor;

159+ var tileWidth = Math.max(cardTool.viewWidth / pathItemCount, scaledMinimumTileWidth);

160+ return Math.min(cardTool.viewWidth / tileWidth, pathItemCount);

161+ }

162+ }

163+

126 Card {

164 Card {

127 id: card

165 id: card

128 objectName: "card"

166 objectName: "card"

qml/Dash/Dash.qml+1−1

@@ -27,8 +27,8 @@ Showable {

27 visible: shown

28

29 property ListModel searchHistory: SearchHistoryModel {}

30+ property bool searchable: !dashContent.previewOpen

30

31

31− property alias contentProgress: dashContent.contentProgress

32 property string showScopeOnLoaded: "home.scope"

33 property real contentScale: 1.0

34

qml/Dash/DashContent.qml+1−8

@@ -24,16 +24,14 @@ Item {

24

25 property var model: null

26 property var scopes: null

27− property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))

28 property alias currentIndex: dashContentList.currentIndex

27 property alias currentIndex: dashContentList.currentIndex

28+ property alias previewOpen: previewListView.open

29

30 property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}

31 property ListModel searchHistory

32

33 signal movementStarted()

34 signal movementEnded()

35− signal contentFlickStarted()

36− signal contentEndReached()

37 signal scopeLoaded(string scopeId)

35 signal scopeLoaded(string scopeId)

38 signal positionedAtBeginning()

36 signal positionedAtBeginning()

39

37

@@ -144,11 +142,6 @@ Item {

144 dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)

142 dashContent.positionedAtBeginning.connect(item.positionedAtBeginning)

145 dashContent.scopeLoaded(item.scope.id)

143 dashContent.scopeLoaded(item.scope.id)

146 }

144 }

147− Connections {

148− target: item

149− ignoreUnknownSignals: true

150− onEndReached: contentEndReached()

151− }

152

145

153 Component.onDestruction: active = false

146 Component.onDestruction: active = false

154 }

147 }

qml/Dash/GenericScopeView.qml+1−5

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

33 property OpenEffect openEffect: null

34 property Item previewListView: null

35

36− signal endReached

37 signal movementStarted

36 signal movementStarted

38 signal positionedAtBeginning

37 signal positionedAtBeginning

39

38

@@ -118,9 +117,6 @@ FocusScope {

118 model: scopeView.categories

117 model: scopeView.categories

119 forceNoClip: previewListView.onScreen

118 forceNoClip: previewListView.onScreen

120

119

121− onAtYEndChanged: if (atYEnd) endReached()

122− onMovingChanged: if (moving && atYEnd) endReached()

123−

124 property string expandedCategoryId: ""

120 property string expandedCategoryId: ""

125 signal correctExpandedCategory();

121 signal correctExpandedCategory();

126

122

@@ -287,7 +283,7 @@ FocusScope {

287

283

288 sectionProperty: "name"

284 sectionProperty: "name"

289 sectionDelegate: ListItems.Header {

285 sectionDelegate: ListItems.Header {

290− objectName: "dashSectionHeader" + delegate.category

286+ objectName: "dashSectionHeader" + (delegate ? delegate.category : "")

291 property var delegate: categoryView.item(delegateIndex)

287 property var delegate: categoryView.item(delegateIndex)

292 width: categoryView.width

288 width: categoryView.width

293 text: section

289 text: section

qml/Dash/Previews/PreviewActions.qml+1−1

@@ -24,7 +24,7 @@ import QtQuick 2.1

24PreviewWidget {

25 id: root

26

27− height: row.height

27+ height: row.height + units.gu(1)

28

29 Row {

30 id: row

qml/Dash/Previews/PreviewHeader.qml+3−1

@@ -34,5 +34,7 @@ PreviewWidget {

34 title: root.widgetData["title"] || ""

35 subtitle: root.widgetData["subtitle"] || ""

36 width: parent.width

37+

38+ titleSize: "large"

37 }

39 }

38−}

40+}

qml/Dash/Previews/PreviewImageGallery.qml+9

@@ -33,6 +33,15 @@ PreviewWidget {

33 cacheBuffer: width * 3

34 model: root.widgetData["sources"]

35

36+ // FIXME: Because of ListViews inside ListViews inside Flickables inside ListViews (and some more)

37+ // we finally reached the point where this ListView doesn't correctly get swipe input any more but

38+ // instead the parent ListView is the one that is swiped. This MouseArea sort of creates a blocking

39+ // layer to make sure this ListView can be swiped, regardless of what's behind it.

40+ MouseArea {

41+ anchors.fill: parent

42+ enabled: parent.contentWidth > parent.width

43+ }

44+

36 LazyImage {

45 LazyImage {

37 objectName: "placeholderScreenshot"

46 objectName: "placeholderScreenshot"

38 anchors {

47 anchors {

qml/Dash/Previews/PreviewRatingDisplay.qmlnew file+101

@@ -0,0 +1,101 @@

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+import QtQuick 2.0

18+import Ubuntu.Components 0.1

19+import "../../Components"

20+

21+/*! \brief Preview widget for rating display.

22+

23+ The widget can show a rating widget and a field showing a comment.

24+ The icons used in the rating widget can be customised with

25+ widgetData["rating-icon-empty"], widgetData["rating-icon-full"]

26+ and widgetData["rating-icon-half"].

27+

28+ This widget shows reviews contained in widgetData["reviews"], each of which should be of the form:

29+

30+ \code{.json}

31+ {

32+ "rating": null,

33+ "review": null,

34+ "author": null

35+ }

36+ \endcode

37+ */

38+

39+PreviewWidget {

40+ id: root

41+ height: childrenRect.height

42+

43+ Column {

44+ anchors { left: parent.left; right: parent.right; }

45+ visible: reviewsRepeater.count > 0

46+

47+ Repeater {

48+ id: reviewsRepeater

49+ objectName: "reviewsRepeater"

50+ model: root.widgetData["reviews"]

51+

52+ delegate: Column {

53+ id: reviewItem

54+ objectName: "reviewItem" + index

55+ anchors { left: parent.left; right: parent.right;}

56+ spacing: units.gu(1)

57+

58+ Rating {

59+ id: rating

60+ objectName: "rating"

61+ size: 5

62+ value: modelData["rating"] || -1

63+ visible: value >= 0

64+

65+ property var urlIconEmpty: widgetData["rating-icon-empty"]

66+ property var urlIconFull: widgetData["rating-icon-full"]

67+ property var urlIconHalf: widgetData["rating-icon-half"]

68+ }

69+

70+ Label {

71+ id: authorLabel

72+ objectName: "authorLabel"

73+ anchors { left: parent.left; right: parent.right }

74+ color: Theme.palette.selected.backgroundText

75+ opacity: .8

76+ text: modelData["author"] || ""

77+ visible: text !== ""

78+ wrapMode: Text.Wrap

79+ }

80+

81+ Label {

82+ id: reviewLabel

83+ objectName: "reviewLabel"

84+ anchors { left: parent.left; right: parent.right }

85+ color: Theme.palette.selected.backgroundText

86+ opacity: .8

87+ text: modelData["review"] || ""

88+ visible: text !== ""

89+ wrapMode: Text.Wrap

90+ }

91+

92+ Item {

93+ id: spacing

94+ anchors { left: parent.left; right: parent.right }

95+ height: units.gu(2)

96+ visible: rating.visible || authorLabel.visible || reviewLabel.visible

97+ }

98+ }

99+ }

100+ }

101+}

qml/Dash/Previews/PreviewRating.qml → qml/Dash/Previews/PreviewRatingInput.qmlrenamed

The content is the same.

qml/Dash/Previews/PreviewTextSummary.qml+2−1

@@ -58,7 +58,8 @@ PreviewWidget {

58 }

59 height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)

60 clip: true

61− fontSize: "medium"

61+ fontSize: "small"

62+ lineHeight: 1.2

62 color: Theme.palette.selected.backgroundText

63 color: Theme.palette.selected.backgroundText

63 opacity: .8

64 opacity: .8

64 text: widgetData["text"]

65 text: widgetData["text"]

qml/Dash/Previews/PreviewWidgetFactory.qml+2−1

@@ -48,7 +48,8 @@ Loader {

48 case "header": return "PreviewHeader.qml";

49 case "image": return "PreviewZoomableImage.qml"

50 case "progress": return "PreviewProgress.qml";

51− case "rating-input": return "PreviewRating.qml";

51+ case "rating-input": return "PreviewRatingInput.qml";

52+ case "reviews": return "PreviewRatingDisplay.qml";

52 case "text": return "PreviewTextSummary.qml";

53 case "text": return "PreviewTextSummary.qml";

53 case "video": return "PreviewVideoPlayback.qml";

54 case "video": return "PreviewVideoPlayback.qml";

54 default: return "";

55 default: return "";

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/Panel/IndicatorItem.qml+13−21

@@ -19,37 +19,29 @@ import Ubuntu.Components 0.1

19import Unity.Indicators 0.1 as Indicators

20import "../Components"

21

22−Item {

22+Loader {

23− id: indicatorItem

23+ id: root

24

25− property alias widgetSource: loader.source

25+ property alias widgetSource: root.source

26 property bool dimmed: false

27 property var indicatorProperties: undefined

28− property bool indicatorVisible: loader.item ? loader.item.enabled : false

28+ property bool indicatorVisible: item ? item.enabled : false

29 property string identifier

30

31 opacity: dimmed ? 0.4 : 1

32 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration } }

33

34− width: loader.item ? loader.item.width : 0

35−

36− Loader {

37− id: loader

38−

39− onLoaded: {

34+ onLoaded: {

40− item.height = Qt.binding(function() { return indicatorItem.height; });

41−

42− for(var pName in indicatorProperties) {

35+ for(var pName in indicatorProperties) {

43− if (item.hasOwnProperty(pName)) {

36+ if (item.hasOwnProperty(pName)) {

44− item[pName] = indicatorProperties[pName];

37+ item[pName] = indicatorProperties[pName];

45− }

46 }

38 }

47 }

39 }

40+ }

48

41

49− Binding {

42+ Binding {

50− target: loader.item

43+ target: item

51− property: "objectName"

44+ property: "objectName"

52− value: identifier + "-widget"

45+ value: identifier + "-widget"

53− }

54 }

46 }

55}

47}

qml/Panel/Indicators.qml+1−1

@@ -32,7 +32,7 @@ Showable {

32 property alias overFlowWidth: indicatorRow.overFlowWidth

33 property alias showAll: indicatorRow.showAll

34 // TODO: This should be sourced by device type (eg "desktop", "tablet", "phone"...)

35− property string profile: "phone"

35+ property string profile: indicatorProfile

36

37 readonly property real hintValue: panelHeight + menuContent.headerHeight

38 readonly property int lockThreshold: openedHeight / 2

qml/Shell.qml+4−52

@@ -28,9 +28,7 @@ import "Dash"

28import "Greeter"

29import "Launcher"

30import "Panel"

31−import "Hud"

32import "Components"

31import "Components"

33−import "Bottombar"

34import "SideStage"

32import "SideStage"

35import "Notifications"

33import "Notifications"

36import Unity.Notifications 1.0 as NotificationBackend

34import Unity.Notifications 1.0 as NotificationBackend

@@ -405,7 +403,7 @@ FocusScope {

405

403

406 readonly property int backgroundTopMargin: -panel.panelHeight

404 readonly property int backgroundTopMargin: -panel.panelHeight

407

405

408− hides: [launcher, panel.indicators, hud]

406+ hides: [launcher, panel.indicators]

409 shown: false

407 shown: false

410 enabled: true

408 enabled: true

411 showAnimation: StandardAnimation { property: "opacity"; to: 1 }

409 showAnimation: StandardAnimation { property: "opacity"; to: 1 }

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

423 Component.onCompleted: {

421 Component.onCompleted: {

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

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

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

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

426− greeter.selected(0)

427 }

424 }

428 }

425 }

429 }

426 }

@@ -461,7 +458,7 @@ FocusScope {

461 objectName: "greeter"

458 objectName: "greeter"

462

459

463 available: true

460 available: true

464− hides: [launcher, panel.indicators, hud]

461+ hides: [launcher, panel.indicators]

465 shown: true

462 shown: true

466

463

467 defaultBackground: shell.background

464 defaultBackground: shell.background

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

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

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

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

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

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

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

502− greeter.selected(0);

503 }

499 }

504 greeter.forceActiveFocus();

500 greeter.forceActiveFocus();

505 removeApplicationFocus();

501 removeApplicationFocus();

@@ -550,7 +546,7 @@ FocusScope {

550 InputFilterArea {

546 InputFilterArea {

551 anchors.fill: parent

547 anchors.fill: parent

552 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown

548 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown

553− || panel.indicators.shown || hud.shown

549+ || panel.indicators.shown

554 }

550 }

555

551

556 Connections {

552 Connections {

@@ -599,7 +595,7 @@ FocusScope {

599 contentEnabled: edgeDemo.panelContentEnabled

595 contentEnabled: edgeDemo.panelContentEnabled

600 }

596 }

601 fullscreenMode: shell.fullscreenMode

597 fullscreenMode: shell.fullscreenMode

602− searchVisible: !greeter.shown && !lockscreen.shown && dash.shown

598+ searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable

603

599

604 InputFilterArea {

600 InputFilterArea {

605 anchors {

601 anchors {

@@ -612,48 +608,6 @@ FocusScope {

612 }

608 }

613 }

609 }

614

610

615− Hud {

616− id: hud

617−

618− width: parent.width > units.gu(60) ? units.gu(40) : parent.width

619− height: parent.height

620−

621− available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled

622− shown: false

623− showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }

624− hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }

625−

626− Connections {

627− target: shell.applicationManager

628− onMainStageFocusedApplicationChanged: hud.hide()

629− onSideStageFocusedApplicationChanged: hud.hide()

630− }

631− }

632−

633− Revealer {

634− id: hudRevealer

635−

636− enabled: hud.shown

637− width: hud.width

638− anchors.left: hud.left

639− height: parent.height

640− target: hud.revealerTarget

641− closedValue: height

642− openedValue: 0

643− direction: Qt.RightToLeft

644− orientation: Qt.Vertical

645− handleSize: hud.handleHeight

646− onCloseClicked: target.hide()

647− }

648−

649− Bottombar {

650− id: bottombar

651− theHud: hud

652− anchors.fill: parent

653− enabled: hud.available

654− applicationIsOnForeground: applicationFocused

655− }

656−

657 InputFilterArea {

611 InputFilterArea {

658 blockInput: launcher.shown

612 blockInput: launcher.shown

659 anchors {

613 anchors {

@@ -695,8 +649,6 @@ FocusScope {

695 onShownChanged: {

649 onShownChanged: {

696 if (shown) {

650 if (shown) {

697 panel.indicators.hide()

651 panel.indicators.hide()

698− hud.hide()

699− bottombar.hide()

700 }

652 }

701 }

653 }

702 }

654 }

src/main.cpp+6

@@ -59,6 +59,11 @@ int startShell(int argc, const char** argv, void* server)

59 application = new QGuiApplication(argc, (char**)argv);

60 }

61

62+ QString indicatorProfile = qgetenv("UNITY_INDICATOR_PROFILE");

63+ if (indicatorProfile.isEmpty()) {

64+ indicatorProfile = "phone";

65+ }

66+

62 resolveIconTheme();

67 resolveIconTheme();

63

68

64 QStringList args = application->arguments();

69 QStringList args = application->arguments();

@@ -88,6 +93,7 @@ int startShell(int argc, const char** argv, void* server)

88 view->setTitle("Qml Phone Shell");

93 view->setTitle("Qml Phone Shell");

89 view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

94 view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

90 view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);

95 view->rootContext()->setContextProperty("applicationArguments", &qmlArgs);

96+ view->rootContext()->setContextProperty("indicatorProfile", indicatorProfile);

91 if (args.contains(QLatin1String("-frameless"))) {

97 if (args.contains(QLatin1String("-frameless"))) {

92 view->setFlags(Qt::FramelessWindowHint);

98 view->setFlags(Qt::FramelessWindowHint);

93 }

99 }

tests/autopilot/unity8/__init__.py+5−2

@@ -82,7 +82,10 @@ def get_binary_path(binary="unity8"):

82 )

83 if not os.path.exists(binary_path):

84 try:

85− binary_path = subprocess.check_output(['which', binary]).strip()

85+ binary_path = subprocess.check_output(

86+ ['which', binary],

87+ universal_newlines=True,

88+ ).strip()

86 except subprocess.CalledProcessError as e:

89 except subprocess.CalledProcessError as e:

87 raise RuntimeError("Unable to locate %s binary: %r" % (binary, e))

90 raise RuntimeError("Unable to locate %s binary: %r" % (binary, e))

88 return binary_path

91 return binary_path

@@ -128,7 +131,7 @@ def _get_xdg_upstart_env():

128 "get-env",

131 "get-env",

129 "--global",

132 "--global",

130 "XDG_DATA_DIRS"

133 "XDG_DATA_DIRS"

131− ]).rstrip()

134+ ], universal_newlines=True).rstrip()

132 except subprocess.CalledProcessError:

135 except subprocess.CalledProcessError:

133 return None

136 return None

134

137

tests/autopilot/unity8/application_lifecycle/tests/test_url_dispatcher.py+5−40

@@ -20,12 +20,11 @@

20"""Test the integration with the URL dispatcher service."""

21

22import os

23−import tempfile

24

23

25from autopilot import platform

24from autopilot import platform

26from autopilot.matchers import Eventually

25from autopilot.matchers import Eventually

27from testtools.matchers import Equals

26from testtools.matchers import Equals

28−from ubuntuuitoolkit import base as toolkit_base

27+from ubuntuuitoolkit import fixture_setup

29

28

30from unity8 import process_helpers

29from unity8 import process_helpers

31from unity8.shell import tests

30from unity8.shell import tests

@@ -47,13 +46,6 @@ MainView {

47 text: 'Test application.'

46 text: 'Test application.'

48 }

47 }

49}

48}

50−""")

51−

52− desktop_file_contents = ("""[Desktop Entry]

53−Type=Application

54−Name=test

55−Exec={qmlscene} {qml_file_path}

56−Icon=Not important

57""")

49""")

58

50

59 def setUp(self):

51 def setUp(self):

@@ -66,37 +58,10 @@ Icon=Not important

66 process_helpers.unlock_unity(unity_proxy)

58 process_helpers.unlock_unity(unity_proxy)

67

59

68 def create_test_application(self):

60 def create_test_application(self):

69− # FIXME most of this code is duplicated in the toolkit. We should

61+ fake_application = fixture_setup.FakeApplication(self.test_qml)

70− # create a fixture on the toolkit for other projects to use.

62+ self.useFixture(fake_application)

71− # http://pad.lv/1277334 --elopio - 2014-02-06

72− qml_file_path = self._write_test_qml_file()

73− self.addCleanup(os.remove, qml_file_path)

74− desktop_file_path = self._write_test_desktop_file(qml_file_path)

75− self.addCleanup(os.remove, desktop_file_path)

76− return qml_file_path, desktop_file_path

77−

78− def _write_test_qml_file(self):

79− qml_file = tempfile.NamedTemporaryFile(suffix='.qml', delete=False)

80− qml_file.write(self.test_qml.encode('utf-8'))

81− qml_file.close()

82− return qml_file.name

83−

84− def _write_test_desktop_file(self, qml_file_path):

85− desktop_file_dir = self._get_local_desktop_file_directory()

86− if not os.path.exists(desktop_file_dir):

87− os.makedirs(desktop_file_dir)

88− desktop_file = tempfile.NamedTemporaryFile(

89− suffix='.desktop', dir=desktop_file_dir, delete=False)

90− contents = self.desktop_file_contents.format(

91− qmlscene=toolkit_base.get_qmlscene_launch_command(),

92− qml_file_path=qml_file_path)

93− desktop_file.write(contents.encode('utf-8'))

94− desktop_file.close()

95− return desktop_file.name

96−

97− def _get_local_desktop_file_directory(self):

98− return os.path.join(

63+ return (

99− os.environ.get('HOME'), '.local', 'share', 'applications')

64+ fake_application.qml_file_path, fake_application.desktop_file_path)

100

65

101 def test_swipe_out_application_started_by_url_dispatcher(self):

66 def test_swipe_out_application_started_by_url_dispatcher(self):

102 _, desktop_file_path = self.create_test_application()

67 _, desktop_file_path = self.create_test_application()

tests/autopilot/unity8/process_helpers.py+1−1

@@ -156,7 +156,7 @@ def _get_unity_status():

156 '/sbin/initctl',

157 'status',

158 'unity8'

159− ])

159+ ], universal_newlines=True)

160 except subprocess.CalledProcessError as e:

161 raise CannotAccessUnity("Unable to get unity's status: %s" % str(e))

162

tests/autopilot/unity8/shell/emulators/create_interactive_notification.py+2−1

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

1#!/usr/bin/env python

2+from __future__ import print_function

2

3

3# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

4# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

4#

5#

@@ -25,7 +26,7 @@ import signal

25

26

27

27def action_callback(notification, action_id, data):

28def action_callback(notification, action_id, data):

28− print action_id

29+ print(action_id)

29

30

31

31def quit_callback(notification):

32def quit_callback(notification):

tests/autopilot/unity8/shell/tests/__init__.py+12−13

@@ -85,12 +85,12 @@ class UnityTestCase(AutopilotTestCase):

85 @classmethod

86 def setUpClass(cls):

87 try:

88− output = subprocess.check_output([

88+ output = subprocess.check_output(

89− "/sbin/initctl",

89+ ["/sbin/initctl", "status", "unity8"],

90− "status",

91− "unity8"

92− ], stderr=subprocess.STDOUT)

90+ stderr=subprocess.STDOUT,

91+ universal_newlines=True,

92+ )

93− except subprocess.CalledProcessError, e:

93+ except subprocess.CalledProcessError as e:

94 sys.stderr.write(

95 "Error: `initctl status unity8` failed, most probably the "

96 "unity8 session could not be found:\n\n"

@@ -218,12 +218,11 @@ class UnityTestCase(AutopilotTestCase):

218 def _patch_environment(self, key, value):

219 """Wrapper for patching env for upstart environment."""

220 try:

221− current_value = subprocess.check_output([

221+ current_value = subprocess.check_output(

222− "/sbin/initctl",

222+ ["/sbin/initctl", "get-env", "--global", key],

223− "get-env",

224− "--global",

225− key

226− ], stderr=subprocess.STDOUT).rstrip()

223+ stderr=subprocess.STDOUT,

224+ universal_newlines=True,

225+ ).rstrip()

227 except subprocess.CalledProcessError:

226 except subprocess.CalledProcessError:

228 current_value = None

227 current_value = None

229

228

@@ -305,7 +304,7 @@ class UnityTestCase(AutopilotTestCase):

305

304

306 binary_arg = "BINARY=%s" % binary_path

305 binary_arg = "BINARY=%s" % binary_path

307 extra_args = "ARGS=%s" % " ".join(args)

306 extra_args = "ARGS=%s" % " ".join(args)

308− env_args = ["%s=%s" % (k, v) for k, v in self._environment.iteritems()]

307+ env_args = ["%s=%s" % (k, v) for k, v in self._environment.items()]

309 all_args = [binary_arg, extra_args] + env_args

308 all_args = [binary_arg, extra_args] + env_args

310

309

311 self.addCleanup(self._cleanup_launching_upstart_unity)

310 self.addCleanup(self._cleanup_launching_upstart_unity)

tests/autopilot/unity8/shell/tests/test_hud.py → tests/autopilot/unity8/shell/tests/disabled_test_hud.pyrenamed+2−2

@@ -163,7 +163,7 @@ class TestHud(UnityTestCase, DragMixin):

163 self.assertThat(hud.shown, Eventually(Equals(False)))

164

165 def _launch_test_app_from_app_screen(self):

166− """Launches the camera app using the Dash UI.

166+ """Launches the browser app using the Dash UI.

167

168 Because when testing on the desktop running

169 self.launch_application() will launch the application on the desktop

@@ -171,7 +171,7 @@ class TestHud(UnityTestCase, DragMixin):

171

172 """

173 dash = self.main_window.get_dash()

174− icon = dash.get_application_icon('Camera')

174+ icon = dash.get_application_icon('Browser')

175 self.touch.tap_object(icon)

176

177 # Ensure application is open

tests/autopilot/unity8/shell/tests/test_emulators.py+4−1

@@ -27,7 +27,10 @@ don't break them for those external projects.

27

28"""

29

30+try:

31+ from unittest import mock

32+except ImportError:

30−import mock

33+ import mock

31

34

32from testtools.matchers import Contains, HasLength

35from testtools.matchers import Contains, HasLength

33

36

tests/autopilot/unity8/shell/tests/test_lock_screen.py+18−3

@@ -26,12 +26,18 @@ from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios

26

27from autopilot.matchers import Eventually

28from autopilot.platform import model

29+import sys

29from testtools import skipUnless

30from testtools import skipUnless

30from testtools.matchers import Equals

31from testtools.matchers import Equals

31import logging

32import logging

32

33

33logger = logging.getLogger(__name__)

34logger = logging.getLogger(__name__)

34

35

36+# py2 compatible alias for py3

37+if sys.version >= '3':

38+ basestring = str

39+

40+

35class TestLockscreen(UnityTestCase):

41class TestLockscreen(UnityTestCase):

36

42

37 """Tests for the lock screen."""

43 """Tests for the lock screen."""

@@ -125,7 +131,10 @@ class TestLockscreen(UnityTestCase):

125 """

131 """

126

132

127 if not isinstance(code, basestring):

133 if not isinstance(code, basestring):

134+ raise TypeError(

128− raise TypeError("'code' parameter must be a string.")

135+ "'code' parameter must be a string, not %r."

136+ % type(passphrase)

137+ )

129 for num in code:

138 for num in code:

130 if not num.isdigit():

139 if not num.isdigit():

131 raise ValueError(

140 raise ValueError(

@@ -142,7 +151,10 @@ class TestLockscreen(UnityTestCase):

142

151

143 """

152 """

144 if not isinstance(passphrase, basestring):

153 if not isinstance(passphrase, basestring):

154+ raise TypeError(

145− raise TypeError("'passphrase' parameter must be a string.")

155+ "'passphrase' parameter must be a string, not %r."

156+ % type(passphrase)

157+ )

146

158

147 pinentryField = self.main_window.get_pinentryField()

159 pinentryField = self.main_window.get_pinentryField()

148 self.touch.tap_object(pinentryField)

160 self.touch.tap_object(pinentryField)

@@ -161,7 +173,10 @@ class TestLockscreen(UnityTestCase):

161

173

162 """

174 """

163 if not isinstance(passphrase, basestring):

175 if not isinstance(passphrase, basestring):

176+ raise TypeError(

164− raise TypeError("'passphrase' parameter must be a string.")

177+ "'passphrase' parameter must be a string, not %r."

178+ % type(passphrase)

179+ )

165

180

166 prompt = self.main_window.get_greeter().get_prompt()

181 prompt = self.main_window.get_greeter().get_prompt()

167 self.touch.tap_object(prompt)

182 self.touch.tap_object(prompt)

tests/autopilot/unity8/shell/tests/test_notifications.py+8−1

@@ -33,9 +33,15 @@ import os

33import logging

34import signal

35import subprocess

36+import sys

36

37

37logger = logging.getLogger(__name__)

38logger = logging.getLogger(__name__)

38

39

40+# from __future__ import range

41+# (python3's range, is same as python2's xrange)

42+if sys.version_info < (3,):

43+ range = xrange

44+

39

45

40class NotificationsBase(UnityTestCase):

46class NotificationsBase(UnityTestCase):

41 """Base class for all notification tests that provides helper methods."""

47 """Base class for all notification tests that provides helper methods."""

@@ -261,6 +267,7 @@ class InteractiveNotificationBase(NotificationsBase):

261 stdout=subprocess.PIPE,

267 stdout=subprocess.PIPE,

262 stderr=subprocess.PIPE,

268 stderr=subprocess.PIPE,

263 close_fds=True,

269 close_fds=True,

270+ universal_newlines=True,

264 )

271 )

265

272

266 self.addCleanup(self._tidy_up_script_process)

273 self.addCleanup(self._tidy_up_script_process)

@@ -298,7 +305,7 @@ class InteractiveNotificationBase(NotificationsBase):

298 if self._notify_proc is None:

305 if self._notify_proc is None:

299 raise AssertionError("No interactive notification was created.")

306 raise AssertionError("No interactive notification was created.")

300

307

301− for i in xrange(timeout):

308+ for i in range(timeout):

302 self._notify_proc.poll()

309 self._notify_proc.poll()

303 if self._notify_proc.returncode is not None:

310 if self._notify_proc.returncode is not None:

304 output = self._notify_proc.communicate()

311 output = self._notify_proc.communicate()

tests/autopilot/unity8/shell/tests/test_upstart.py+6−1

@@ -36,6 +36,11 @@ import logging

36

37logger = logging.getLogger(__name__)

38

39+# from __future__ import range

40+# (python3's range, is same as python2's xrange)

41+import sys

42+if sys.version_info < (3,):

43+ range = xrange

39

44

40class UpstartIntegrationTests(UnityTestCase):

45class UpstartIntegrationTests(UnityTestCase):

41

46

@@ -52,7 +57,7 @@ class UpstartIntegrationTests(UnityTestCase):

52 self.process = subprocess.Popen([get_binary_path()] + self.unity_geometry_args)

57 self.process = subprocess.Popen([get_binary_path()] + self.unity_geometry_args)

53 def ensure_stopped():

58 def ensure_stopped():

54 self.process.terminate()

59 self.process.terminate()

55− for i in xrange(10):

60+ for i in range(10):

56 try:

61 try:

57 self._get_status()

62 self._get_status()

58 except OSError:

63 except OSError:

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

@@ -16,6 +16,7 @@ set(IndicatorsFakeQml_SOURCES

16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp

17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

19+ fakeindicatorsmodel.cpp

19)

20)

20

21

21set(IndicatorsFakeQml_RESOURCES

22set(IndicatorsFakeQml_RESOURCES

tests/mocks/Unity/Indicators/IndicatorsModel.qml+3−5

@@ -17,12 +17,10 @@

17import QtQuick 2.0

18import Unity.Indicators 0.1 as Indicators

19

20−ListModel {

20+Indicators.FakeIndicatorsModel {

21

22− property var indicatorData : undefined

23−

24− function load() {

22+ function load(profile) {

25− clear();

23+ unload();

26

24

27 append({ "identifier": "indicator-fake1",

25 append({ "identifier": "indicator-fake1",

28 "position": 0,

26 "position": 0,

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cppnew file+116

@@ -0,0 +1,116 @@

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+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#include "fakeindicatorsmodel.h"

21+#include "indicators.h"

22+

23+FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)

24+ : QAbstractListModel(parent)

25+{

26+ QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

27+ QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

28+ QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));

29+}

30+

31+/*! \internal */

32+FakeIndicatorsModel::~FakeIndicatorsModel()

33+{

34+ unload();

35+}

36+

37+int FakeIndicatorsModel::count() const

38+{

39+ return rowCount();

40+}

41+

42+void FakeIndicatorsModel::load(const QString&)

43+{

44+}

45+

46+void FakeIndicatorsModel::unload()

47+{

48+ beginResetModel();

49+

50+ qDeleteAll(m_indicators);

51+ m_indicators.clear();

52+

53+ endResetModel();

54+}

55+

56+

57+void FakeIndicatorsModel::append(const QVariantMap& row)

58+{

59+ Indicator* new_row = new QHash<int, QVariant>();

60+ for (auto iter = row.begin(); iter != row.end(); ++iter )

61+ {

62+ int key = roleNames().key(iter.key().toUtf8(), -1);

63+ if (key != -1) {

64+ new_row->insert(key, iter.value());

65+ }

66+ }

67+

68+ beginInsertRows(QModelIndex(), m_indicators.count(), m_indicators.count());

69+

70+ m_indicators.append(new_row);

71+

72+ endInsertRows();

73+}

74+

75+QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const

76+{

77+ static QHash<int, QByteArray> roles;

78+ if (roles.isEmpty())

79+ {

80+ roles[IndicatorsModelRole::Identifier] = "identifier";

81+ roles[IndicatorsModelRole::Position] = "position";

82+ roles[IndicatorsModelRole::WidgetSource] = "widgetSource";

83+ roles[IndicatorsModelRole::PageSource] = "pageSource";

84+ roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

85+ }

86+ return roles;

87+}

88+

89+int FakeIndicatorsModel::columnCount(const QModelIndex &) const

90+{

91+ return 1;

92+}

93+

94+Q_INVOKABLE QVariant FakeIndicatorsModel::data(int row, int role) const

95+{

96+ return data(index(row, 0), role);

97+}

98+

99+QVariant FakeIndicatorsModel::data(const QModelIndex &index, int role) const

100+{

101+ if (!index.isValid() || index.row() >= m_indicators.size())

102+ return QVariant();

103+

104+ Indicator* indicator = m_indicators[index.row()];

105+ return indicator->value(role, QVariant());

106+}

107+

108+QModelIndex FakeIndicatorsModel::parent(const QModelIndex&) const

109+{

110+ return QModelIndex();

111+}

112+

113+int FakeIndicatorsModel::rowCount(const QModelIndex&) const

114+{

115+ return m_indicators.count();

116+}

tests/mocks/Unity/Indicators/fakeindicatorsmodel.hnew file+59

@@ -0,0 +1,59 @@

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+ * Nick Dedekind <nick.dedekind@canonical.com>

18+ */

19+

20+#ifndef FAKE_INDICATORSMODEL_H

21+#define FAKE_INDICATORSMODEL_H

22+

23+#include <QAbstractListModel>

24+

25+class FakeIndicatorsModel : public QAbstractListModel

26+{

27+ Q_OBJECT

28+ Q_ENUMS(Roles)

29+ Q_PROPERTY(int count READ count NOTIFY countChanged)

30+public:

31+

32+ FakeIndicatorsModel(QObject *parent=0);

33+ ~FakeIndicatorsModel();

34+

35+ Q_INVOKABLE void load(const QString& profile);

36+ Q_INVOKABLE void unload();

37+

38+ Q_INVOKABLE void append(const QVariantMap& row);

39+

40+ Q_INVOKABLE QVariant data(int row, int role) const;

41+

42+ /* QAbstractItemModel */

43+ QHash<int, QByteArray> roleNames() const;

44+ int columnCount(const QModelIndex &parent = QModelIndex()) const;

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

46+ QModelIndex parent (const QModelIndex &index) const;

47+ int rowCount(const QModelIndex &parent = QModelIndex()) const;

48+

49+Q_SIGNALS:

50+ void countChanged();

51+

52+private:

53+ int count() const;

54+

55+ typedef QHash<int, QVariant> Indicator;

56+ QList<Indicator*> m_indicators;

57+};

58+

59+#endif // FAKE_INDICATORSMODEL_H

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

@@ -23,6 +23,7 @@

23#include "fakeplugin.h"

24

25// local

26+#include "fakeindicatorsmodel.h"

26#include "indicators.h"

27#include "indicators.h"

27#include "menucontentactivator.h"

28#include "menucontentactivator.h"

28#include "unitymenumodelstack.h"

29#include "unitymenumodelstack.h"

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

32{

33{

33 Q_INIT_RESOURCE(indicators_fake);

34 Q_INIT_RESOURCE(indicators_fake);

34

35

36+ // internal

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

38+

39+ // external

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

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

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

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

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

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

38

43

44+ // external uncreatables

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

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

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

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

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

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

tests/mocks/data/applications/camera-app.desktop → tests/mocks/data/applications/webbrowser-app.desktoprenamed

The content is the same.

tests/plugins/DashViews/listviewwithpageheadertest.cpp−6

@@ -1281,9 +1281,6 @@ private Q_SLOTS:

1281

1282 void testShowHeaderHalfShown()

1283 {

1284−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1285− QSKIP("This test is extremely unstable in 5.0.x");

1286−#endif

1287 changeContentY(20);

1284 changeContentY(20);

1288

1285

1289 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

1286 QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

@@ -1860,9 +1857,6 @@ private Q_SLOTS:

1860 model->setProperty(4, "size", 10);

1857 model->setProperty(4, "size", 10);

1861 model->setProperty(5, "size", 10);

1858 model->setProperty(5, "size", 10);

1862 model->setProperty(6, "size", 10);

1859 model->setProperty(6, "size", 10);

1863−#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 3))

1864− QTRY_COMPARE(lvwph->m_minYExtent, 210.);

1865−#endif

1866 QTRY_COMPARE(lvwph->m_headerItem->y(), -lvwph->m_minYExtent);

1860 QTRY_COMPARE(lvwph->m_headerItem->y(), -lvwph->m_minYExtent);

1867 }

1861 }

1868

1862

tests/plugins/DashViews/listviewwithpageheadertestsection.cpp−3

@@ -1486,9 +1486,6 @@ private Q_SLOTS:

1486

1487 void testShowHeaderHalfShown()

1488 {

1489−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1490− QSKIP("This test is extremely unstable in 5.0.x");

1491−#endif

1492 changeContentY(20);

1489 changeContentY(20);

1493

1490

1494 QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

1491 QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

tests/plugins/DashViews/organicgridtest.cpp+2−1

@@ -134,11 +134,12 @@ private Q_SLOTS:

134 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/organicgridtest.qml"));

135

136 view->show();

137− view->resize(470, 400);

138 QTest::qWaitForWindowExposed(view);

137 QTest::qWaitForWindowExposed(view);

138+ view->resize(470, 400);

139

140 grid = dynamic_cast<OrganicGrid*>(view->rootObject()->findChild<QObject*>("grid"));

141 grid->setModel(model);

142+ QTRY_COMPARE(grid->width(), 470.);

142

143

143 checkInitialPositions();

144 checkInitialPositions();

144 }

145 }

tests/plugins/DashViews/verticaljournaltest.cpp+2−1

@@ -135,11 +135,12 @@ private Q_SLOTS:

135 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/verticaljournaltest.qml"));

136

137 view->show();

138− view->resize(470, 400);

139 QTest::qWaitForWindowExposed(view);

138 QTest::qWaitForWindowExposed(view);

139+ view->resize(470, 400);

140

141 vj = dynamic_cast<VerticalJournal*>(view->rootObject()->findChild<QObject*>("vj"));

142 vj->setModel(model);

143+ QTRY_COMPARE(vj->width(), 470.);

143

144

144 checkInitialPositions();

145 checkInitialPositions();

145 }

146 }

tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp+54

@@ -86,6 +86,7 @@ private Q_SLOTS:

86 void rotated();

87 void sceneDistance();

88 void sceneDistance_data();

89+ void disabledWhileDragging();

89

90

90private:

91private:

91 void passTime(qint64 timeSpan);

92 void passTime(qint64 timeSpan);

@@ -102,6 +103,14 @@ void tst_DirectionalDragArea::init()

102{

103{

103 GestureTest::init();

104 GestureTest::init();

104

105

106+ // We shouldn't need the three lines below, but a compiz/unity7

107+ // regression means we don't pass the test without them because

108+ // the window doesn't have the proper size. Can be removed in the

109+ // future if the regression is fixed and tests pass again

110+ m_view->resize(m_view->rootObject()->width(), m_view->rootObject()->height());

111+ QTRY_COMPARE(m_view->width(), (int)m_view->rootObject()->width());

112+ QTRY_COMPARE(m_view->height(), (int)m_view->rootObject()->height());

113+

105 fakeTimeSource.reset(new FakeTimeSource);

114 fakeTimeSource.reset(new FakeTimeSource);

106 fakeTimer = new FakeTimer(fakeTimeSource);

115 fakeTimer = new FakeTimer(fakeTimeSource);

107}

116}

@@ -795,6 +804,51 @@ void tst_DirectionalDragArea::sceneDistance_data()

795 QTest::newRow("rotated by 90 degrees") << 90. << QPointF(0., 1.);

804 QTest::newRow("rotated by 90 degrees") << 90. << QPointF(0., 1.);

796}

805}

797

806

807+/*

808+ Regression test for https://bugs.launchpad.net/unity8/+bug/1276122

809+

810+ The bug:

811+ If setting "enabled: false" while the DirectionalDragArea's (DDA) dragging

812+ property is true, the DDA stays in that state and doesn't recover any more.

813+*/

814+void tst_DirectionalDragArea::disabledWhileDragging()

815+{

816+ DirectionalDragArea *edgeDragArea =

817+ m_view->rootObject()->findChild<DirectionalDragArea*>("hpDragArea");

818+ Q_ASSERT(edgeDragArea != 0);

819+ edgeDragArea->setRecognitionTimer(fakeTimer);

820+ edgeDragArea->setTimeSource(fakeTimeSource);

821+

822+ QPointF touchPoint = calculateInitialTouchPos(edgeDragArea);

823+

824+ qreal desiredDragDistance = edgeDragArea->distanceThreshold()*2.0f;

825+ QPointF dragDirectionVector(1., 0.); // horizontal positive

826+

827+ qreal movementStepDistance = edgeDragArea->distanceThreshold() * 0.1f;

828+ QPointF touchMovement = dragDirectionVector * movementStepDistance;

829+ int totalMovementSteps = qCeil(desiredDragDistance / movementStepDistance);

830+ int movementTimeStepMs = (edgeDragArea->compositionTime() * 1.5f) / totalMovementSteps;

831+

832+ QTest::touchEvent(m_view, m_device).press(0, touchPoint.toPoint());

833+

834+ for (int i = 0; i < totalMovementSteps; ++i) {

835+ touchPoint += touchMovement;

836+ passTime(movementTimeStepMs);

837+ QTest::touchEvent(m_view, m_device).move(0, touchPoint.toPoint());

838+ }

839+

840+ QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::Recognized);

841+ QCOMPARE(edgeDragArea->dragging(), true);

842+

843+ // disable the dragArea while it's being dragged.

844+ edgeDragArea->setEnabled(false);

845+

846+ QCOMPARE((int)edgeDragArea->status(), (int)DirectionalDragArea::WaitingForTouch);

847+ QCOMPARE(edgeDragArea->dragging(), false);

848+

849+ QTest::touchEvent(m_view, m_device).release(0, touchPoint.toPoint());

850+}

851+

798QTEST_MAIN(tst_DirectionalDragArea)

852QTEST_MAIN(tst_DirectionalDragArea)

799

853

800#include "tst_DirectionalDragArea.moc"

854#include "tst_DirectionalDragArea.moc"

tests/qmltests/CMakeLists.txt+2−1

@@ -62,7 +62,8 @@ add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_I

62add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

63add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

64add_qml_test(Dash/Previews PreviewProgress IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

65+add_qml_test(Dash/Previews PreviewRatingDisplay IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

65−add_qml_test(Dash/Previews PreviewRating IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

66+add_qml_test(Dash/Previews PreviewRatingInput IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

66add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

67add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

67add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

68add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

68add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

69add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

tests/qmltests/Components/tst_DragHandle.cpp−1

@@ -126,7 +126,6 @@ QQuickView *tst_DragHandle::createView()

126{

127 QQuickView *window = new QQuickView(0);

128 window->setResizeMode(QQuickView::SizeRootObjectToView);

129− window->resize(600, 600);

130 window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

129 window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

131 window->engine()->addImportPath(QLatin1String(TEST_DIR));

130 window->engine()->addImportPath(QLatin1String(TEST_DIR));

132

131

tests/qmltests/Components/tst_LazyImage.qml+1−1

@@ -155,7 +155,7 @@ Rectangle {

155

156 if (data.transition) {

157 // wait for the transition to complete

158− var transition = findInvisibleChild(data.image, data.transition);

158+ var transition = findChildIn(data.image, "transitions", data.transition);

159 tryCompare(transition, "running", true);

160 tryCompare(transition, "running", false);

161 }

tests/qmltests/Dash/Previews/tst_PreviewRatingDisplay.qmlnew file+112

@@ -0,0 +1,112 @@

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+import QtQuick 2.0

18+import QtTest 1.0

19+import Ubuntu.Components 0.1

20+import "../../../../qml/Dash/Previews"

21+import Unity.Test 0.1 as UT

22+

23+Rectangle {

24+ id: root

25+ width: units.gu(40)

26+ height: units.gu(80)

27+ color: Theme.palette.selected.background

28+

29+ property var reviewsModel0: {

30+ "reviews": [ ]

31+ }

32+

33+ property var reviewsModel1: {

34+ "reviews": [ { author: "Some dude", rating: 4.5, review: "Very cool app" },

35+ { author: "Yet Another dude", rating: 5, review: "Very cool app" }, ]

36+ }

37+

38+ property var reviewsModel2: {

39+ "reviews": [ { author: "Some dude", rating: 4.5, review: "Very cool app" },

40+ { author: "Another dude", rating: 3, review: "Average app. Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh." },

41+ { author: "Yet Another dude", rating: 5, review: "Very cool app" }, ]

42+ }

43+

44+ property var reviewsModelMixed: {

45+ "reviews": [ { author: "Some dude", review: "Very cool app" },

46+ { author: "" },

47+ { rating: 3, review: "Average app. Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh." },

48+ { author: "Yet Another dude", rating: 5 }, ]

49+ }

50+

51+ PreviewRatingDisplay {

52+ id: previewRatingDisplay

53+ anchors.left: parent.left

54+ anchors.right: parent.right

55+ widgetData: reviewsModelMixed

56+ }

57+

58+ UT.UnityTestCase {

59+ name: "PreviewRatingDisplayTest"

60+ when: windowShown

61+

62+ function test_reviews_data() {

63+ return [

64+ {tag: "0 reviews", reviewsModel: reviewsModel0},

65+ {tag: "1 review", reviewsModel: reviewsModel1},

66+ {tag: "3 reviews", reviewsModel: reviewsModel2},

67+ {tag: "3 mixed reviews", reviewsModel: reviewsModelMixed}

68+ ];

69+ }

70+

71+ function test_reviews(data) {

72+ previewRatingDisplay.widgetData = data.reviewsModel;

73+

74+ var reviewsRepeater = findChild(previewRatingDisplay, "reviewsRepeater");

75+ compare(reviewsRepeater.count, data.reviewsModel["reviews"].length);

76+

77+ for (var i = 0; i < data.reviewsModel["reviews"].length; ++i) {

78+ var reviewItem = findChild(previewRatingDisplay, "reviewItem" + i);

79+

80+ var rating = findChild(reviewItem, "rating");

81+ if (data.reviewsModel["reviews"][i]["rating"] >= 0) {

82+ compare(rating.visible, true);

83+ compare(rating.value, data.reviewsModel["reviews"][i]["rating"]);

84+ } else {

85+ compare(rating.visible, false);

86+ }

87+

88+ var authorLabel = findChild(reviewItem, "authorLabel");

89+ if (data.reviewsModel["reviews"][i]["author"] &&

90+ data.reviewsModel["reviews"][i]["author"] !== "") {

91+ compare(authorLabel.visible, true);

92+ compare(authorLabel.text, data.reviewsModel["reviews"][i]["author"]);

93+ } else {

94+ compare(authorLabel.visible, false);

95+ }

96+

97+ var reviewLabel = findChild(reviewItem, "reviewLabel");

98+ if (data.reviewsModel["reviews"][i]["review"] &&

99+ data.reviewsModel["reviews"][i]["review"] !== "") {

100+ compare(reviewLabel.visible, true);

101+ compare(reviewLabel.text, data.reviewsModel["reviews"][i]["review"]);

102+ } else {

103+ compare(reviewLabel.visible, false);

104+ }

105+

106+ if (!rating.visible && !authorLabel.visible && !reviewLabel.visible) {

107+ verify(reviewItem.height === 0);

108+ }

109+ }

110+ }

111+ }

112+}

tests/qmltests/Dash/Previews/tst_PreviewRating.qml → tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qmlrenamed+15−15

@@ -43,12 +43,12 @@ Rectangle {

43

44 property var widgetDataNewLabels: { "visible": "both", "required": "both", "rating-label": "TestRatingLabel", "review-label": "TestReviewLabel", "submit-label": "TestSubmitLabel" }

45

46− PreviewRating {

46+ PreviewRatingInput {

47− id: previewRating

47+ id: previewRatingInput

48 anchors.left: parent.left

49 anchors.right: parent.right

50 widgetData: widgetDataBoth

51− widgetId: "previewRating"

51+ widgetId: "previewRatingInput"

52 }

53

54 SignalSpy {

@@ -57,12 +57,12 @@ Rectangle {

57 }

58

59 UT.UnityTestCase {

60− name: "PreviewRatingTest"

60+ name: "PreviewRatingInputTest"

61 when: windowShown

62

63− property var rating: findChild(previewRating, "rating")

63+ property var rating: findChild(previewRatingInput, "rating")

64− property var reviewTextArea: findChild(previewRating, "reviewTextArea")

64+ property var reviewTextArea: findChild(previewRatingInput, "reviewTextArea")

65− property var submitButton: findChild(previewRating, "submitButton")

65+ property var submitButton: findChild(previewRatingInput, "submitButton")

66

67 function init() {

68 rating.value = -1;

@@ -70,10 +70,10 @@ Rectangle {

70 }

71

72 function test_labels() {

73− var ratingLabel = findChild(previewRating, "ratingLabel");

73+ var ratingLabel = findChild(previewRatingInput, "ratingLabel");

74− var reviewLabel = findChild(previewRating, "reviewLabel");

74+ var reviewLabel = findChild(previewRatingInput, "reviewLabel");

75

76− previewRating.widgetData = widgetDataNewLabels;

76+ previewRatingInput.widgetData = widgetDataNewLabels;

77 compare(ratingLabel.text, widgetDataNewLabels["rating-label"]);

78 compare(reviewLabel.text, widgetDataNewLabels["review-label"]);

79 compare(submitButton.text, widgetDataNewLabels["submit-label"]);

@@ -106,9 +106,9 @@ Rectangle {

106

107 function test_submit_and_visibility(data) {

108 spy.clear();

109− spy.target = previewRating;

109+ spy.target = previewRatingInput;

110

111− previewRating.widgetData = data.widgetData;

111+ previewRatingInput.widgetData = data.widgetData;

112

113 if (data.widgetData["visible"] !== "review") {

114 verify(rating.visible === true);

@@ -161,9 +161,9 @@ Rectangle {

161

162 function test_triggered(data) {

163 spy.clear();

164− spy.target = previewRating;

164+ spy.target = previewRatingInput;

165

166− previewRating.widgetData = data.widgetData;

166+ previewRatingInput.widgetData = data.widgetData;

167

168 if (data.inputRating > 0) rating.value = data.inputRating;

169 if (data.inputText !== "") {

@@ -173,7 +173,7 @@ Rectangle {

173

174 compare(spy.count, 1);

175 var args = spy.signalArguments[0];

176− compare(args[0], previewRating.widgetId);

176+ compare(args[0], previewRatingInput.widgetId);

177 compare(args[1], data.widgetData["required"]);

178 compare(args[2]["rating"], data.triggeredData["rating"]);

179 compare(args[2]["review"], data.triggeredData["review"]);

tests/qmltests/Dash/Previews/tst_PreviewVideoPlayback.qml−6

@@ -53,12 +53,6 @@ Rectangle {

53 function test_loadScreenshot() {

54 var screenshot = findChild(videoPlayback, "screenshot");

55

56− videoPlayback.widgetData = widgetData0;

57− tryCompare(screenshot.visible, false);

58−

59− videoPlayback.widgetData = widgetData1;

60− tryCompare(screenshot.visible, true);

61−

62 videoPlayback.widgetData = widgetData2;

56 videoPlayback.widgetData = widgetData2;

63 var screenshotSource = screenshot.source

57 var screenshotSource = screenshot.source

64 verify(screenshotSource.toString().indexOf("image://thumbnailer/") === 0)

58 verify(screenshotSource.toString().indexOf("image://thumbnailer/") === 0)

tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+2−1

@@ -81,7 +81,8 @@ Rectangle {

81 { tag: "Header", type: "header", source: "PreviewHeader.qml" },

82 { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },

83 { tag: "Progress", type: "progress", source: "PreviewProgress.qml" },

84− { tag: "Rating Input", type: "rating-input", source: "PreviewRating.qml" },

84+ { tag: "Rating Input", type: "rating-input", source: "PreviewRatingInput.qml" },

85+ { tag: "Rating Display", type: "reviews", source: "PreviewRatingDisplay.qml" },

85 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },

86 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },

86 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },

87 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },

87 ];

88 ];

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+3−4

@@ -30,14 +30,13 @@ Rectangle {

30 }

31

32 property var widgetData1: {

33− "source": "../../graphics/phone_background.jpg",

33+ "source": Qt.resolvedUrl("../artwork/checkers.png"),

34 "zoomable": false

35 }

36

37 PreviewZoomableImage {

38 id: zoomableImage

39 width: parent.width

40− widgetData: widgetData1

41 }

40 }

42

41

43 UT.UnityTestCase {

42 UT.UnityTestCase {

@@ -48,10 +47,10 @@ Rectangle {

48 var image = findChild(zoomableImage, "image");

47 var image = findChild(zoomableImage, "image");

49

48

50 zoomableImage.widgetData = widgetData0;

49 zoomableImage.widgetData = widgetData0;

51− tryCompare(image.state, "default");

50+ tryCompare(image, "state", "default");

52

51

53 zoomableImage.widgetData = widgetData1;

52 zoomableImage.widgetData = widgetData1;

54− tryCompare(image.state, "ready");

53+ tryCompare(image, "state", "ready");

55 }

54 }

56 }

55 }

57}

56}

tests/qmltests/Dash/qml/FakeScopeView.qml−5

@@ -25,11 +25,6 @@ GenericScopeView {

25 property alias backColor : back.color

26 property var categoryView: null

27

28− onEndReached: {

29− if (scope != undefined && shell != undefined && shell.scopeStatus != undefined) {

30− shell.scopeStatus[scope.id].endReached++;

31− }

32− }

33 onMovementStarted: {

28 onMovementStarted: {

34 if (shell != undefined && shell.scopeStatus != undefined) {

29 if (shell != undefined && shell.scopeStatus != undefined) {

35 shell.scopeStatus[scope.id].movementStarted++;

30 shell.scopeStatus[scope.id].movementStarted++;

tests/qmltests/Dash/tst_Card.qml+63

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

182 when: windowShown

183

184 property Item header: findChild(card, "cardHeader")

185+ property Item title: findChild(header, "titleLabel")

185 property Item art: findChild(card, "artShape")

186 property Item art: findChild(card, "artShape")

186 property Item artImage: findChild(card, "artImage")

187 property Item artImage: findChild(card, "artImage")

187 property Item summary: findChild(card, "summaryLabel")

188 property Item summary: findChild(card, "summaryLabel")

@@ -413,5 +414,67 @@ Rectangle {

413 tryCompare(backgroundImage, "source", data.image);

414 tryCompare(backgroundImage, "source", data.image);

414 }

415 }

416 }

417+

418+ function test_font_weights_data() {

419+ return [

420+ { tag: "Title only", index: 8, weight: Font.Normal },

421+ { tag: "Title, subtitle", index: 0, weight: Font.DemiBold },

422+ ]

423+ }

424+

425+ function test_font_weights(data) {

426+ selector.selectedIndex = data.index;

427+

428+ tryCompare(testCase.title.font, "weight", data.weight);

429+ }

430+

431+ function test_fontColor_data() {

432+ return [

433+ { tag: "#ffffff", dark: true },

434+ { tag: "#fdfdfd", dark: true },

435+ { tag: "#f9f9f9", dark: true },

436+ { tag: "#000000", dark: false },

437+ { tag: "#ef814c", dark: false },

438+ { tag: "#312f2c", dark: false },

439+ { tag: "#be332d", dark: false },

440+ { tag: "#52ace4", dark: false },

441+ { tag: "#3a5897", dark: false },

442+ { tag: "#1caeeb", dark: false },

443+ { tag: "#87c341", dark: false },

444+ { tag: "#50893b", dark: false },

445+ ];

446+ }

447+

448+ function test_fontColor(data) {

449+ selector.selectedIndex = 10;

450+

451+ background.color = data.tag;

452+

453+ var fontColor = data.dark ? "grey" : "white";

454+

455+ tryCompareFunction(function() { return Qt.colorEqual(summary.color, fontColor); }, true);

456+ tryCompareFunction(function() { return Qt.colorEqual(header.fontColor, fontColor); }, true);

457+ }

458+

459+ function test_mascotShape_data() {

460+ return [

461+ { tag: "Art and summary", shape: false, index: 0 },

462+ { tag: "No Summary", shape: true, index: 6 },

463+ { tag: "With background", shape: false, index: 10 },

464+ ];

465+ }

466+

467+ function test_mascotShape(data) {

468+ selector.selectedIndex = data.index;

469+

470+ var shape = findChild(card, "mascotShape");

471+ var image = findChild(card, "mascotImage");

472+

473+ verify(shape, "Could not find shape.");

474+ verify(image, "Could not find image.");

475+

476+ tryCompare(shape, "visible", data.shape);

477+ tryCompare(image, "visible", !data.shape);

478+ }

416 }

479 }

417}

480}

tests/qmltests/Dash/tst_CardHeader.qml+1−28

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

46 property Item mascot: findChild(cardHeader, "mascotShape")

47 property Item titleLabel: findChild(cardHeader, "titleLabel")

48 property Item subtitleLabel: findChild(cardHeader, "subtitleLabel")

49− property Item prices: findChild(cardHeader, "prices")

50 property Item oldPriceLabel: findChild(cardHeader, "oldPriceLabel")

49 property Item oldPriceLabel: findChild(cardHeader, "oldPriceLabel")

51 property Item outerRow: findChild(cardHeader, "outerRow")

50 property Item outerRow: findChild(cardHeader, "outerRow")

52 property Item column: findChild(cardHeader, "column")

51 property Item column: findChild(cardHeader, "column")

@@ -55,7 +54,6 @@ Rectangle {

55 verify(typeof testCase.mascot === "object", "Couldn't find mascot object.");

54 verify(typeof testCase.mascot === "object", "Couldn't find mascot object.");

56 verify(typeof testCase.titleLabel === "object", "Couldn't find titleLabel object.");

55 verify(typeof testCase.titleLabel === "object", "Couldn't find titleLabel object.");

57 verify(typeof testCase.subtitleLabel === "object", "Couldn't find subtitleLabel object.");

56 verify(typeof testCase.subtitleLabel === "object", "Couldn't find subtitleLabel object.");

58− verify(typeof testCase.prices === "object", "Couldn't find prices object.");

59 verify(typeof testCase.oldPriceLabel === "object", "Couldn't find oldPriceLabel object.");

57 verify(typeof testCase.oldPriceLabel === "object", "Couldn't find oldPriceLabel object.");

60 }

58 }

61

59

@@ -63,9 +61,6 @@ Rectangle {

63 cardHeader.mascot = "";

61 cardHeader.mascot = "";

64 cardHeader.title = "";

62 cardHeader.title = "";

65 cardHeader.subtitle = "";

63 cardHeader.subtitle = "";

66− cardHeader.price = "";

67− cardHeader.oldPrice = "";

68− cardHeader.altPrice = "";

69 }

64 }

70

65

71 function test_mascot_data() {

66 function test_mascot_data() {

@@ -96,33 +91,11 @@ Rectangle {

96 tryCompare(cardHeader, "visible", data.visible);

91 tryCompare(cardHeader, "visible", data.visible);

97 }

92 }

98

93

99− function test_prices_data() {

100− return [

101− { tag: "Main", main: "$1.25", visible: true },

102− { tag: "Alt", alt: "€1.00", visible: false },

103− { tag: "Old", old: "€2.00", visible: false },

104− { tag: "Main and Alt", main: "$1.25", alt: "€1.00", visible: true },

105− { tag: "Main and Old", main: "$1.25", old: "$2.00", visible: true, oldAlign: Text.AlignRight },

106− { tag: "Alt and Old", alt: "€1.00", old: "$2.00", visible: false },

107− { tag: "All", main: "$1.25", alt: "€1.00", old: "$2.00", visible: true, oldAlign: Text.AlignHCenter },

108− ]

109− }

110−

111− function test_prices(data) {

112− cardHeader.price = data.main !== undefined ? data.main : "";

113− cardHeader.oldPrice = data.old !== undefined ? data.old : "";

114− cardHeader.altPrice = data.alt !== undefined ? data.alt : "";

115− tryCompare(cardHeader, "visible", data.visible);

116− if (data.hasOwnProperty("oldAlign")) {

117− compare(testCase.oldPriceLabel.horizontalAlignment, data.oldAlign, "Old price label is aligned wrong.")

118− }

119− }

120−

121 function test_dimensions_data() {

94 function test_dimensions_data() {

122 return [

95 return [

123 { tag: "Column width", object: column, width: cardHeader.width },

96 { tag: "Column width", object: column, width: cardHeader.width },

124 { tag: "Column width with mascot", object: column, width: cardHeader.width - mascot.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },

97 { tag: "Column width with mascot", object: column, width: cardHeader.width - mascot.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },

125− { tag: "Header height", object: cardHeader, height: function() { return subtitleLabel.y + subtitleLabel.height + outerRow.margins * 2 } },

98+ { tag: "Header height", object: cardHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },

126 ]

99 ]

127 }

100 }

128

101

tests/qmltests/Dash/tst_CardTool.qml+20

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

93 CardTool {

94 id: cardTool

95

96+ count: 8

96 template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];

97 template: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['template'];

97 components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];

98 components: Helpers.update(JSON.parse(Helpers.defaultLayout), Helpers.tryParse(layoutArea.text, layoutError))['components'];

98 viewWidth: units.gu(Math.round(widthSlider.value))

99 viewWidth: units.gu(Math.round(widthSlider.value))

@@ -343,5 +344,24 @@ Rectangle {

343 tryCompare(cardTool, data.property, data.value);

344 tryCompare(cardTool, data.property, data.value);

344 }

345 }

346 }

347+

348+ function test_categoryLayout_data() {

349+ return [

350+ { tag: "Default Grid", layout_index: 0, count: 2, viewWidth: units.gu(40), layout: "grid" },

351+ { tag: "Long carousel", layout_index: 4, count: 6, viewWidth: units.gu(140), layout: "carousel" },

352+ { tag: "Long carousel fallback", layout_index: 4, count: 5, viewWidth: units.gu(140), layout: "grid" },

353+ { tag: "Short carousel", layout_index: 4, count: 4, viewWidth: units.gu(30), layout: "carousel" },

354+ { tag: "Short carousel fallback", layout_index: 4, count: 3, viewWidth: units.gu(30), layout: "grid" },

355+ { tag: "Journal", layout_index: 2, count: 8, viewWidth: units.gu(30), layout: "journal" }

356+ ]

357+ }

358+

359+ function test_categoryLayout(data) {

360+ selector.selectedIndex = 0;

361+ layoutSelector.selectedIndex = data.layout_index;

362+ cardTool.viewWidth = data.viewWidth;

363+ cardTool.count = data.count;

364+ compare(cardTool.categoryLayout, data.layout);

365+ }

346 }

366 }

347}

367}

tests/qmltests/Dash/tst_DashContent.qml+15−36

@@ -105,25 +105,19 @@ Item {

105 signalName: "movementStarted"

106 }

107

108− SignalSpy {

109− id: contentEndReachedSpy

110− target: dashContent

111− signalName: "contentEndReached"

112− }

113−

114 UT.UnityTestCase {

108 UT.UnityTestCase {

115 name: "DashContent"

109 name: "DashContent"

116 when: scopesModel.loaded

110 when: scopesModel.loaded

117

111

118 function init() {

112 function init() {

119 scopesModel.clear();

113 scopesModel.clear();

114+ scopeLoadedSpy.clear();

120 scopesModel.load();

115 scopesModel.load();

116+ tryCompare(scopeLoadedSpy, "count", 5);

121 }

117 }

122

118

123 function cleanup() {

119 function cleanup() {

124− scopeLoadedSpy.clear();

125 movementStartedSpy.clear();

120 movementStartedSpy.clear();

126− contentEndReachedSpy.clear();

127 clear_scope_status();

121 clear_scope_status();

128 dashContent.visible = true;

122 dashContent.visible = true;

129

123

@@ -132,17 +126,18 @@ Item {

132 scopesModel.clear();

126 scopesModel.clear();

133 // wait for dash to empty scopes.

127 // wait for dash to empty scopes.

134 tryCompare(dashContentList, "count", 0);

128 tryCompare(dashContentList, "count", 0);

135− // this is the default state for empty model

136− dashContentList.currentIndex = -1;

137 }

129 }

138

130

139 function test_current_index() {

131 function test_current_index() {

140 var dashContentList = findChild(dashContent, "dashContentList");

132 var dashContentList = findChild(dashContent, "dashContentList");

141 verify(dashContentList != undefined)

133 verify(dashContentList != undefined)

142

134

135+ scopesModel.clear();

143 compare(dashContentList.count, 0, "DashContent should have 0 items when it starts");

136 compare(dashContentList.count, 0, "DashContent should have 0 items when it starts");

144− compare(dashContentList.currentIndex, -1, "DashContent's currentIndex should be -1 while there have been no items in the model");

137+ tryCompare(dashContentList, "currentIndex", -1);

145

138

139+ scopeLoadedSpy.clear();

140+ scopesModel.load();

146 tryCompare(scopeLoadedSpy, "count", 5);

141 tryCompare(scopeLoadedSpy, "count", 5);

147

142

148 verify(dashContentList.currentIndex >= 0);

143 verify(dashContentList.currentIndex >= 0);

@@ -152,10 +147,13 @@ Item {

152 var dashContentList = findChild(dashContent, "dashContentList");

147 var dashContentList = findChild(dashContent, "dashContentList");

153 verify(dashContentList != undefined)

148 verify(dashContentList != undefined)

154

149

150+ scopesModel.clear();

155− compare(dashContentList.count, 0, "DashContent should have 0 items when it starts");

151+ compare(dashContentList.count, 0, "DashContent should have 0 items after clearing");

156 // pretend we're running after a model reset

152 // pretend we're running after a model reset

157 dashContentList.currentIndex = 27;

153 dashContentList.currentIndex = 27;

158

154

155+ scopeLoadedSpy.clear();

156+ scopesModel.load();

159 tryCompare(scopeLoadedSpy, "count", 5);

157 tryCompare(scopeLoadedSpy, "count", 5);

160

158

161 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);

159 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);

@@ -167,8 +165,6 @@ Item {

167 var dashContentList = findChild(dashContent, "dashContentList");

165 var dashContentList = findChild(dashContent, "dashContentList");

168 verify(dashContentList != undefined)

166 verify(dashContentList != undefined)

169

167

170− tryCompare(scopeLoadedSpy, "count", 5);

171−

172 dashContentList.movementStarted();

168 dashContentList.movementStarted();

173

169

174 compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");

170 compare(movementStartedSpy.count, 1, "DashContent should have emitted movementStarted signal when content list did.");

@@ -182,8 +178,6 @@ Item {

182 function test_positioned_at_beginning_signal() {

178 function test_positioned_at_beginning_signal() {

183 dashContent.setCurrentScopeAtIndex(3, true, false);

179 dashContent.setCurrentScopeAtIndex(3, true, false);

184

180

185− tryCompare(scopeLoadedSpy, "count", 5);

186−

187 dashContent.positionedAtBeginning();

181 dashContent.positionedAtBeginning();

188 compare(scopeStatus["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");

182 compare(scopeStatus["MockScope1"].positionedAtBeginning, 1, "MockScope1 should have emitted positionedAtBeginning signal when DashContent did.");

189 compare(scopeStatus["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");

183 compare(scopeStatus["MockScope2"].positionedAtBeginning, 1, "MockScope2 should have emitted positionedAtBeginning signal when DashContent did.");

@@ -192,30 +186,17 @@ Item {

192 compare(scopeStatus["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");

186 compare(scopeStatus["MockScope5"].positionedAtBeginning, 1, "MockScope5 should have emitted positionedAtBeginning signal when DashContent did.");

193 }

187 }

194

188

195− function test_scope_loaded() {

196− tryCompare(scopeLoadedSpy, "count", 5);

197− }

198−

199− function test_content_end_reached() {

200− var dashContentList = findChild(dashContent, "dashContentList");

201− verify(dashContentList != undefined);

202−

203− tryCompare(scopeLoadedSpy, "count", 5);

204− dashContent.setCurrentScopeAtIndex(0, true, false);

205− dashContentList.currentItem.item.endReached();

206−

207− compare(contentEndReachedSpy.count, 1);

208− }

209−

210 // This tests that setting the current scope index will end up at the correct index even if

189 // This tests that setting the current scope index will end up at the correct index even if

211 // the scopes are loaded asynchrounsly.

190 // the scopes are loaded asynchrounsly.

212 function test_set_current_scope_index_async() {

191 function test_set_current_scope_index_async() {

192+ scopesModel.clear();

213 verify(scopesModel.loaded == false);

193 verify(scopesModel.loaded == false);

214

194

215− // next index is 1 if current is -1, otherwise it's current + 1

195+ tryCompare(dashContent, "currentIndex", -1);

216− var next_index = ((dashContent.currentIndex == -1 ? 0 : dashContent.currentIndex) + 1) % 5

196+ var next_index = 1

217

197

218 dashContent.setCurrentScopeAtIndex(next_index, true, false);

198 dashContent.setCurrentScopeAtIndex(next_index, true, false);

199+ scopesModel.load();

219 tryCompare(dashContent, "currentIndex", next_index);

200 tryCompare(dashContent, "currentIndex", next_index);

220 verify(scopesModel.loaded == true);

201 verify(scopesModel.loaded == true);

221

202

@@ -265,8 +246,6 @@ Item {

265 function test_is_active(data) {

246 function test_is_active(data) {

266 var dashContentList = findChild(dashContent, "dashContentList");

247 var dashContentList = findChild(dashContent, "dashContentList");

267

248

268− tryCompare(scopeLoadedSpy, "count", 5);

269−

270 dashContent.setCurrentScopeAtIndex(data.select, true, false);

249 dashContent.setCurrentScopeAtIndex(data.select, true, false);

271 dashContent.visible = data.visible;

250 dashContent.visible = data.visible;

272

251

@@ -305,7 +284,7 @@ Item {

305 tryCompare(scopesModel, "loaded", true);

284 tryCompare(scopesModel, "loaded", true);

306 var tabbar = findChild(dashContent, "tabbar");

285 var tabbar = findChild(dashContent, "tabbar");

307

286

308− compare(dashContent.currentIndex, 0);

287+ tryCompare(dashContent, "currentIndex", 0);

309 tryCompare(tabbar, "selectedIndex", 0);

288 tryCompare(tabbar, "selectedIndex", 0);

310 tryCompare(tabbar, "selectionMode", false);

289 tryCompare(tabbar, "selectionMode", false);

311

290

tests/qmltests/Dash/tst_GenericPreview.qml+2−2

@@ -22,7 +22,7 @@ import Unity.Test 0.1 as UT

22Item {

23 id: root

24 width: units.gu(60)

25− height: units.gu(80)

25+ height: units.gu(90)

26

27 property var calls: []

28 property int counter: 0

@@ -81,7 +81,7 @@ Item {

81

82 var actions = get_actions_data();

83 for(var i = 0; i < actions.length; i++) {

84− compare(root.calls[i], actions[i].id);

84+ tryCompare(root.calls, i, actions[i].id);

85 }

86 }

87

tests/qmltests/Dash/tst_GenericScopeView.qml+3−3

@@ -67,7 +67,7 @@ Item {

67 function init() {

68 shell.width = units.gu(120)

69 genericScopeView.categoryView.positionAtBeginning();

70− tryCompare(genericScopeView.categoryView.contentY, 0)

70+ tryCompare(genericScopeView.categoryView, "contentY", 0)

71 }

72

73 function test_isCurrent() {

@@ -184,13 +184,13 @@ Item {

184 categoryListView.positionAtBeginning();

185 waitForRendering(categoryListView);

186 categoryListView.flick(0, -units.gu(60));

187− tryCompare(categoryListView.flicking, false);

187+ tryCompare(categoryListView, "flicking", false);

188

189 var tile = findChild(findChild(genericScopeView, "0"), "delegate0");

190 mouseClick(tile, tile.width / 2, tile.height - 1);

191 tryCompare(openEffect, "gap", 1);

192

193− verify(openEffect.positionPx >= pageHeader.height + categoryListView.stickyHeaderHeight);

193+ verify(openEffect.positionPx >= Math.round(pageHeader.height + categoryListView.stickyHeaderHeight));

194 }

195

196 function test_previewCycle() {

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}

tests/qmltests/Launcher/tst_Launcher.qml+6−4

@@ -121,8 +121,7 @@ Item {

121 revealer.dragLauncherIntoView()

122

123 var listView = findChild(launcher, "launcherListView");

124− listView.flick(0, units.gu(500));

124+ listView.positionViewAtEnd();

125− tryCompare(listView, "flicking", false);

126

125

127 var appIcon = findChild(launcher, "launcherDelegate0")

126 var appIcon = findChild(launcher, "launcherDelegate0")

128

127

@@ -397,8 +396,11 @@ Item {

397

396

398 // Position launcher to where we need it

397 // Position launcher to where we need it

399 var listView = findChild(launcher, "launcherListView");

398 var listView = findChild(launcher, "launcherListView");

400− listView.flick(0, units.gu(200) * (data.flickTo === "top" ? 1 : -1));

399+ if (data.flickTo == "top") {

401− tryCompare(listView, "flicking", false);

400+ listView.positionViewAtEnd();

401+ } else {

402+ listView.positionViewAtBeginning();

403+ }

402

404

403 // Doing longpress

405 // Doing longpress

404 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

406 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

tests/qmltests/Panel/tst_IndicatorRow.qml+3−3

@@ -70,13 +70,13 @@ Item {

70 function test_set_current_item() {

71 init_test();

72 indicatorRow.setCurrentItemIndex(0);

73− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake1", "Incorrect item at position 0");

73+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake1", "Incorrect item at position 0");

74

75 indicatorRow.setCurrentItemIndex(1);

76− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake2", "Incorrect item at position 1");

76+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake2", "Incorrect item at position 1");

77

78 indicatorRow.setCurrentItemIndex(2);

79− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake3", "Incorrect item at position 2");

79+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake3", "Incorrect item at position 2");

80 }

81

82 function test_highlight_data() {

tests/qmltests/Panel/tst_MenuContent.qml+1−1

@@ -133,7 +133,7 @@ Item {

133 var menuIndex = i%menuCount;

134

135 activate_content(menuIndex);

136− testTabObjectName = indicatorsModel.get(menuIndex).identifier;

136+ testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);

137 compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");

138 tryCompareFunction(selected_tab_equals_test_tab, true);

139 }

tests/qmltests/tst_Shell.qml+18−2

@@ -110,6 +110,9 @@ Item {

110 swipeUntilScopeViewIsReached(dashHome);

111

112 hideIndicators();

113+

114+ var dashContent = findChild(shell, "dashContent");

115+ dashContent.previewOpen = false;

113 }

116 }

114

117

115 function killApps(apps) {

118 function killApps(apps) {

@@ -235,8 +238,8 @@ Item {

235

238

236 var dash = findChild(shell, "dash");

239 var dash = findChild(shell, "dash");

237 // check that dash has normal scale and opacity

240 // check that dash has normal scale and opacity

238− tryCompare(dash.contentScale, 1.0);

241+ tryCompare(dash, "contentScale", 1.0);

239− tryCompare(dash.opacity, 1.0);

242+ tryCompare(dash, "opacity", 1.0);

240

243

241 touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,

244 touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,

242 true /* beginTouch */, false /* endTouch */);

245 true /* beginTouch */, false /* endTouch */);

@@ -550,6 +553,19 @@ Item {

550 tryCompare(searchIndicator, "opacity", 0)

553 tryCompare(searchIndicator, "opacity", 0)

551 }

554 }

552

555

556+ function test_searchIndicatorHideOnPreviewShown() {

557+ var searchIndicator = findChild(shell, "container");

558+ var dashContent = findChild(shell, "dashContent");

559+

560+ verify(dashContent != null);

561+

562+ tryCompare(searchIndicator, "opacity", 1);

563+

564+ dashContent.previewOpen = true;

565+

566+ tryCompare(searchIndicator, "opacity", 0);

567+ }

568+

553 function test_focusRequestedHidesGreeter() {

569 function test_focusRequestedHidesGreeter() {

554 var greeter = findChild(shell, "greeter")

570 var greeter = findChild(shell, "greeter")

555

571

tests/utils/modules/Unity/Test/UnityTestCase.qml+10−16

@@ -71,19 +71,8 @@ TestCase {

71

72

73 // Find an object with the given name in the children tree of "obj"

74− function findChild(obj,objectName) {

74+ function findChild(obj, objectName) {

75− var childs = new Array(0);

75+ return findChildIn(obj, "children", objectName);

76− childs.push(obj)

77− while (childs.length > 0) {

78− if (childs[0].objectName == objectName) {

79− return childs[0]

80− }

81− for (var i in childs[0].children) {

82− childs.push(childs[0].children[i])

83− }

84− childs.splice(0, 1);

85− }

86− return null;

87 }

76 }

88

77

89 // Find an object with the given name in the children tree of "obj"

78 // Find an object with the given name in the children tree of "obj"

@@ -91,15 +80,20 @@ TestCase {

91 // Note: you should use findChild if you're not sure you need this

80 // Note: you should use findChild if you're not sure you need this

92 // as this tree is much bigger and might contain stuff that goes

81 // as this tree is much bigger and might contain stuff that goes

93 // away randomly.

82 // away randomly.

94− function findInvisibleChild(obj,objectName) {

83+ function findInvisibleChild(obj, objectName) {

84+ return findChildIn(obj, "data", objectName);

85+ }

86+

87+ // Find a child in the named property

88+ function findChildIn(obj, prop, objectName) {

95 var childs = new Array(0);

89 var childs = new Array(0);

96 childs.push(obj)

90 childs.push(obj)

97 while (childs.length > 0) {

91 while (childs.length > 0) {

98 if (childs[0].objectName == objectName) {

92 if (childs[0].objectName == objectName) {

99 return childs[0]

93 return childs[0]

100 }

94 }

101− for (var i in childs[0].data) {

95+ for (var i in childs[0][prop]) {

102− childs.push(childs[0].data[i])

96+ childs.push(childs[0][prop][i])

103 }

97 }

104 childs.splice(0, 1);

98 childs.splice(0, 1);

105 }

99 }