75f8170 · unity8 · git.iko.soy

CMakeLists.txt+5−5

compare with xenial

unifiedsplit

@@ -48,11 +48,11 @@ add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2

48 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)

49

50include(FindPkgConfig)

51−find_package(Qt5Core)

51+find_package(Qt5Core 5.2 REQUIRED)

52−find_package(Qt5Qml)

52+find_package(Qt5Qml 5.2 REQUIRED)

53−find_package(Qt5Quick)

53+find_package(Qt5Quick 5.2 REQUIRED)

54−find_package(Qt5Gui)

54+find_package(Qt5Gui 5.2 REQUIRED)

55−find_package(Qt5DBus)

55+find_package(Qt5DBus 5.2 REQUIRED)

56

57# Standard install paths

58include(GNUInstallDirs)

CODING+11−15

@@ -20,7 +20,7 @@ install dependencies

20If its your first time, install build dependencies

21

22$ cd ~/unity8/trunk

23−$ ./build --setup

23+$ ./build.sh --setup

24

25 this will:

26 - install the required dependencies to build, as well as run on the desktop

@@ -31,7 +31,7 @@ build Unity 8

31-------------

32

33$ cd ~/unity8/trunk

34−$ ./build

34+$ ./build.sh

35

36You may also rebuild with the -c for clean, which just deletes the build

37directory.

@@ -43,10 +43,10 @@ Running Unity 8 on your desktop

43run the Unity 8 shell

44---------------------

45$ cd ~/unity8/trunk

46−$ ./run

46+$ ./run.sh

47

48Options can be passed to test the lock screen

49−$ ./run -p OR -k

49+$ ./run.sh -p OR -k

50

51-p is for pin lock, for which the default prompt answer is "1234"

52-k is for keylock passphrase, for which the default prompt answer is "password"

@@ -78,19 +78,19 @@ Running Unity 8 on devices

78 on the device yourself)

79

80$ cd ~/unity/trunk

81−$ ./run_on_device --setup

81+$ ./run_on_device.sh --setup

82 this will:

83 - install your public SSH key on the device

84 - install the needed dependencies

85

86−$ ./run_on_device

86+$ ./run_on_device.sh

87 this will:

88 - rsync the code to the device

89 - build on the device

90 - replace the running shell

91

92Options can be passed to test the lock screen

93−$ ./run_on_device -p OR -k

93+$ ./run_on_device.sh -p OR -k

94

95-p is for pin lock, for which the default prompt answer is "1234"

96-k is for keylock passphrase, for which the default prompt answer is "password"

@@ -107,9 +107,9 @@ Notes

107- exporting ANDROID_SERIAL=$your_device_serial or

108 ANDROID_SERIAL=$your_device_ip:5555 will make adb not complain about

109 multiple devices

110−- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device

110+- you can export TARGET_IP=$your_device_ip TARGET_SSH_PORT=22 for run_on_device.sh

111 to not use adb forwarding - useful if you use multiple devices

112−- using Ninja (package ninja-build - run_on_device -s installs this now)

112+- using Ninja (package ninja-build - run_on_device.sh -s installs this now)

113 will improve build times (especially in the nothing-to-build case)

114

115

@@ -131,7 +131,7 @@ Running tests

131=============

132

133Tests are run from the build directory (which will be ./builddir if you used

134−the ./build script).

134+the ./build.sh script).

135

136To run the tests that do not require any graphical capability and therefore

137are pretty fast run:

@@ -167,15 +167,11 @@ NB: Manual test or interation doesn't make sense for all components or classes,

167particularly the non-graphical ones. In such cases no "tryFoo" make target is

168provided.

169

170−NB: The tests expect the locale to be the C locale, they may fail if run

171−under a different locale, if you get failures others can not reproduce

172−prepend 'LC_ALL=C' to the 'make test' command

173−

174Running autopilot tests

170Running autopilot tests

175=======================

171=======================

176

172

177Autopilot tests are run from the build directory (which will be ./builddir if you used

173Autopilot tests are run from the build directory (which will be ./builddir if you used

178−the ./build script).

174+the ./build.sh script).

179

175

180$ make autopilot

176$ make autopilot

181

177

build → build.shrenamed+2−1

@@ -43,13 +43,14 @@ install_dependencies() {

43 gsettings-desktop-schemas \

44 gsettings-ubuntu-schemas \

45 qmenumodel-qml \

46− qtdeclarative5-dee-plugin \

46+ qml-module-qtquick-xmllistmodel \

47 qtdeclarative5-gsettings1.0 \

48 qtdeclarative5-ubuntu-ui-toolkit-plugin \

49 qtdeclarative5-ubuntu-settings-components \

50 qtdeclarative5-ubuntu-thumbnailer0.1 \

51 unity-notifications-impl \

52 qtdeclarative5-xmllistmodel-plugin \

53+ ubuntu-mobile-icons \

53 unity-scope-home \

54 unity-scope-home \

54 unity-lens-applications \

55 unity-lens-applications \

55 unity-plugin-scopes \

56 unity-plugin-scopes \

cmake/modules/QmlTest.cmake+2−4

@@ -59,11 +59,11 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)

59endmacro(add_manual_qml_test)

60

61macro(add_qml_benchmark SUBPATH COMPONENT_NAME ITERATIONS)

62− add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS})

62+ add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS} ${ARGN})

63endmacro(add_qml_benchmark)

64

65macro(add_qml_test SUBPATH COMPONENT_NAME)

66− add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0)

66+ add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0 ${ARGN})

67endmacro(add_qml_test)

68

69macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)

@@ -156,8 +156,6 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)

156

157 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)

158 add_dependencies(qmluitests xvfbtest${CLASS_NAME})

159−

160− add_manual_qml_test(. ${CLASS_NAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

161endmacro(add_binary_qml_test)

159endmacro(add_binary_qml_test)

162

160

163macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)

161macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)

data/CMakeLists.txt+1−2

@@ -1,8 +1,7 @@

1# generate desktop file

2configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

3−configure_file(${SCOPE_TOOL}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_TOOL}.desktop @ONLY)

4

3

5# install desktop files

4# install desktop files

6−install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop ${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_TOOL}.desktop

5+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop

7 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

6 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

8 )

7 )

data/unity-scope-tool.desktop.indeleted−8

@@ -1,8 +0,0 @@

1−[Desktop Entry]

2−Type=Application

3−Name=Unity Scope Tool

4−Comment=Developer tool for Unity scopes.

5−Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-scope-tool

6−Terminal=false

7−Icon=unity-scope-tool

8−X-Ubuntu-Touch=true

data/unity8.conf+9−1

@@ -12,6 +12,9 @@ respawn

12expect stop

13

14pre-start script

15+ # Tell unity-mir to raise SIGSTOP after we start

16+ initctl set-env UNITY_MIR_EMITS_SIGSTOP=1

17+

15 if [ -n "$MIR_SOCKET" ]; then

18 if [ -n "$MIR_SOCKET" ]; then

16 if [ -z "$UNITY_MIR_SOCKET" ]; then

19 if [ -z "$UNITY_MIR_SOCKET" ]; then

17 # Save original value of MIR_SOCKET in case we are restarted,

20 # Save original value of MIR_SOCKET in case we are restarted,

@@ -42,7 +45,12 @@ pre-start script

42 fi

45 fi

43

46

44 initctl emit scope-ui-starting

47 initctl emit scope-ui-starting

45− initctl emit indicator-services-start

48+ initctl emit --no-wait indicator-services-start

46end script

49end script

47

50

48exec ${BINARY:-unity8} $ARGS

51exec ${BINARY:-unity8} $ARGS

52+

53+post-stop script

54+ initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET

55+ initctl unset-env --global UNITY_MIR_SOCKET

56+end script

debian/changelog+80

@@ -1,3 +1,83 @@

1+unity8 (7.86+14.10.20140507.3-0ubuntu1) utopic; urgency=low

2+

3+ [ Michał Sawicz ]

4+ * Remove HUD from the bottom edge. Again.

5+

6+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 07 May 2014 11:14:30 +0000

7+

8+unity8 (7.86+14.10.20140505-0ubuntu1) utopic; urgency=low

9+

10+ [ Ted Gould ]

11+ * Provide a dbus interface for setting the count and countVisible

12+ properties. (LP: #1301400)

13+

14+ [ Michał Sawicz ]

15+ * Pass env variables to initctl start.

16+ * Suffix .sh to our scripts and clean up debian/rules.

17+ * Adapt to Debian Qt package renames and drop unneeded Dee plugin

18+ dependency.

19+

20+ [ Ying-Chun Liu ]

21+ * Add Zoomable Image for Preview widgets.

22+

23+ [ Albert Astals ]

24+ * Remove support for Qt <= 5.2.1

25+

26+ [ Mirco Müller ]

27+ * Implemented feature-request from Design for modal snap-decision

28+ notifications on the phone. See LP #1285712 (LP: #1285712)

29+

30+ [ Andrea Cimitan ]

31+ * Make progressbas in preview widget big as the button

32+

33+ [ CI bot ]

34+ * Resync trunk

35+

36+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 05 May 2014 12:09:43 +0000

37+

38+unity8 (7.86+14.10.20140502.6-0ubuntu1) utopic; urgency=low

39+

40+ [ tpeeters ]

41+ * Adapt to new TabBar

42+

43+ [ Tim Peeters ]

44+ * Adapt to new TabBar

45+

46+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 02 May 2014 16:44:52 +0000

47+

48+unity8 (7.86+14.10.20140429.2-0ubuntu1) utopic; urgency=medium

49+

50+ [ Andrea Cimitan ]

51+ * Update upstart job to reflect latest unity-mir changes

52+ * Fix locale in qml tests and fixtimeformattertest (LP: #1301038)

53+ * Fix 1309135 (LP: #1309135)

54+

55+ [ Michał Sawicz ]

56+ * Split out unity8-common package

57+ * Don't wait for indicator services to start, and drop Scope Tool's

58+ .desktop file. (LP: #1310172)

59+

60+ [ Michael Terry ]

61+ * Stop clock from hiding when the 'show dash' button is pressed in

62+ greeter. (LP: #1308139)

63+ * Make swipe teases in the greeter more helpful and obvious (LP:

64+ #1267623)

65+

66+ [ Nick Dedekind ]

67+ * Fixed datetime indicator appointment colour (LP: #1307048)

68+

69+ [ Albert Astals ]

70+ * Improve Card creation time by adding loaders that make sure only

71+ what's needed is loaded (LP: #1297197)

72+ * CategoryDelegateRange: Fix condition for detecting overshooting

73+ * Make xvfbtests work in the DashView plugins

74+ * Fix binding loop in FilterGrid height

75+

76+ [ Victor R. Ruiz ]

77+ * Move autopilot notification code to a helper method.

78+

79+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 29 Apr 2014 15:21:33 +0000

80+

1unity8 (7.85+14.04.20140416-0ubuntu1) trusty; urgency=low

81unity8 (7.85+14.04.20140416-0ubuntu1) trusty; urgency=low

2

82

3 [ Albert Astals ]

83 [ Albert Astals ]

debian/control+41−22

@@ -11,30 +11,32 @@ Build-Depends: cmake,

11 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],

12 libgl1-mesa-dri,

13 libgles2-mesa-dev[armhf],

14+ libglib2.0-dev,

14 libgsettings-qt-dev,

15 libgsettings-qt-dev,

15 libhud-client2-dev,

16 libhud-client2-dev,

16 libpulse-dev,

17 libpulse-dev,

17 libqmenumodel-dev (>= 0.2.7),

18 libqmenumodel-dev (>= 0.2.7),

19+ libqt5xmlpatterns5-dev,

18 libunity-api-dev (>= 7.80.6),

20 libunity-api-dev (>= 7.80.6),

19 libunity-mir-dev,

21 libunity-mir-dev,

20 libusermetricsoutput1-dev,

22 libusermetricsoutput1-dev,

21 libxcb1-dev,

23 libxcb1-dev,

22− libglib2.0-dev,

23 pkg-config,

24 pkg-config,

24− python:any (>= 2.7),

25 python-setuptools,

26 python3-all:any,

27 python3-setuptools,

28+ python:any (>= 2.7),

29+ qml-module-qtquick-xmllistmodel,

30+ qml-module-qtquick2,

31+ qml-module-qttest,

28 qt5-default,

32 qt5-default,

29− qtbase5-dev,

33+ qtbase5-dev (>= 5.2.1),

30 qtbase5-dev-tools,

34 qtbase5-dev-tools,

31− qtbase5-private-dev,

35+ qtbase5-private-dev (>= 5.2.1),

32− qtdeclarative5-dev,

36+ qtdeclarative5-dev (>= 5.2.1),

33 qtdeclarative5-dev-tools,

37 qtdeclarative5-dev-tools,

38+ qtdeclarative5-private-dev (>= 5.2.1),

34 qtdeclarative5-qtmultimedia-plugin,

39 qtdeclarative5-qtmultimedia-plugin,

35− qtdeclarative5-private-dev,

36− qtdeclarative5-qtquick2-plugin,

37− qtdeclarative5-test-plugin,

38 qtdeclarative5-ubuntu-settings-components,

40 qtdeclarative5-ubuntu-settings-components,

39 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.47),

41 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.47),

40 qtdeclarative5-xmllistmodel-plugin,

42 qtdeclarative5-xmllistmodel-plugin,

@@ -60,7 +62,8 @@ Description: Indicators client test application

60

62

61Package: unity-scope-tool

63Package: unity-scope-tool

62Architecture: any

64Architecture: any

65+Depends: unity8-common (= ${source:Version}),

63−Depends: unity8 (= ${binary:Version}),

66+ unity8-private (= ${binary:Version}),

64 ${misc:Depends},

67 ${misc:Depends},

65 ${shlibs:Depends},

68 ${shlibs:Depends},

66Description: Development tool for Unity scopes

69Description: Development tool for Unity scopes

@@ -71,10 +74,11 @@ Package: unity8

71Architecture: any

74Architecture: any

72Provides: indicator-renderer,

75Provides: indicator-renderer,

73Depends: gsettings-desktop-schemas,

76Depends: gsettings-desktop-schemas,

77+ libcap2-bin,

74 libglib2.0-bin,

78 libglib2.0-bin,

75− libunity-mir1,

79+ libunity-mir1 (>= 0.4),

76 qmenumodel-qml (>= 0.2.7),

80 qmenumodel-qml (>= 0.2.7),

77− qtdeclarative5-dee-plugin,

81+ qml-module-qtquick-xmllistmodel,

78 qtdeclarative5-gsettings1.0,

82 qtdeclarative5-gsettings1.0,

79 qtdeclarative5-ubuntu-settings-components,

83 qtdeclarative5-ubuntu-settings-components,

80 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

84 qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

@@ -84,14 +88,9 @@ Depends: gsettings-desktop-schemas,

84 qtdeclarative5-xmllistmodel-plugin,

88 qtdeclarative5-xmllistmodel-plugin,

85 unity-application-impl-2,

89 unity-application-impl-2,

86 unity-launcher-impl-3,

90 unity-launcher-impl-3,

87− unity-notifications-impl-2,

91+ unity8-common (= ${source:Version}),

88− unity8-fake-env | unity-application-impl,

89 unity8-private (= ${binary:Version}),

92 unity8-private (= ${binary:Version}),

90 unity8-private | unity-launcher-impl,

93 unity8-private | unity-launcher-impl,

91− unity-plugin-scopes | unity-scopes-impl,

92− unity-scopes-impl-0,

93−# for setcap:

94− libcap2-bin,

95 ${misc:Depends},

94 ${misc:Depends},

96 ${shlibs:Depends},

95 ${shlibs:Depends},

97Recommends: unity-scope-click,

96Recommends: unity-scope-click,

@@ -99,10 +98,30 @@ Recommends: unity-scope-click,

99 unity-scope-scopes,

98 unity-scope-scopes,

100Breaks: indicator-network (<< 0.5.1),

99Breaks: indicator-network (<< 0.5.1),

101 ubuntu-touch-session (<< 0.107),

100 ubuntu-touch-session (<< 0.107),

102−Replaces: ubuntu-touch-session (<< 0.82~)

101+Replaces: ubuntu-touch-session (<< 0.82~),

103Description: Unity 8 shell

102Description: Unity 8 shell

104 The Unity 8 shell is the primary user interface for Ubuntu devices.

103 The Unity 8 shell is the primary user interface for Ubuntu devices.

105

104

105+Package: unity8-common

106+Architecture: all

107+Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

108+ qtdeclarative5-ubuntu-ui-toolkit-plugin,

109+ qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,

110+ ubuntu-thumbnailer-impl-0,

111+ unity-application-impl-2,

112+ unity-notifications-impl-3,

113+ unity-plugin-scopes | unity-scopes-impl,

114+ unity-scopes-impl-0,

115+ unity8-fake-env | unity-application-impl,

116+ ${misc:Depends},

117+Breaks: unity8 (<< 7.86),

118+Replaces: unity8 (<< 7.86),

119+Description: Unity 8 shell (common files)

120+ The Unity 8 shell is the primary user interface for Ubuntu devices.

121+ .

122+ This package contains the QML, graphics and locale files shared between

123+ unity8 and unity-scope-tool.

124+

106Package: unity8-autopilot

125Package: unity8-autopilot

107Architecture: all

126Architecture: all

108Depends: gir1.2-glib-2.0,

127Depends: gir1.2-glib-2.0,

@@ -119,12 +138,12 @@ Depends: gir1.2-glib-2.0,

119 python3-fixtures,

138 python3-fixtures,

120 python3-gi,

139 python3-gi,

121 ubuntu-ui-toolkit-autopilot,

140 ubuntu-ui-toolkit-autopilot,

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

141+ unity8 (= ${source:Version}),

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

142+ unity8-fake-env (= ${source:Version}),

124 url-dispatcher-tools,

143 url-dispatcher-tools,

125 ${misc:Depends},

144 ${misc:Depends},

126− ${python:Depends},

127 ${python3:Depends},

145 ${python3:Depends},

146+ ${python:Depends},

128 ${shlibs:Depends},

147 ${shlibs:Depends},

129Description: Test package for Unity 8 shell

148Description: Test package for Unity 8 shell

130 Autopilot tests for the unity8 package

149 Autopilot tests for the unity8 package

@@ -146,9 +165,9 @@ Architecture: any

146Multi-Arch: same

165Multi-Arch: same

147Pre-Depends: ${misc:Pre-Depends},

166Pre-Depends: ${misc:Pre-Depends},

148Depends: gsettings-ubuntu-schemas,

167Depends: gsettings-ubuntu-schemas,

168+ libunity-core-6.0-9,

149 ${misc:Depends},

169 ${misc:Depends},

150 ${shlibs:Depends},

170 ${shlibs:Depends},

151− libunity-core-6.0-9,

152Provides: unity-launcher-impl,

171Provides: unity-launcher-impl,

153 unity-launcher-impl-3,

172 unity-launcher-impl-3,

154Description: Unity 8 private libs

173Description: Unity 8 private libs

debian/rules+1−2

@@ -6,8 +6,7 @@

6export DPKG_GENSYMBOLS_CHECK_LEVEL=4

7export NO_PNG_PKG_MANGLE=1

8

9−.PHONY: build

10−build %:

9+%:

11 dh $@ --parallel --fail-missing --with python2,python3

10 dh $@ --parallel --fail-missing --with python2,python3

12

11

13override_dh_auto_clean:

12override_dh_auto_clean:

debian/unity-scope-tool.install−1

@@ -1,3 +1,2 @@

1usr/bin/unity-scope-tool

2−usr/share/applications/unity-scope-tool.desktop

3usr/share/unity8/ScopeTool.qml

2usr/share/unity8/ScopeTool.qml

debian/unity8-common.installnew file+5

@@ -0,0 +1,5 @@

1+usr/share/locale

2+usr/share/unity8/Components

3+usr/share/unity8/Dash

4+usr/share/unity8/Notifications

5+usr/share/unity8/graphics

debian/unity8-fake-env.install+1−1

@@ -1,4 +1,4 @@

1−usr/lib/*/unity8/qml/nonmirplugins

2usr/lib/*/unity8/qml/mocks

1usr/lib/*/unity8/qml/mocks

2+usr/lib/*/unity8/qml/nonmirplugins

3usr/lib/*/unity8/qml/scopefakes

4usr/share/unity8/mocks

debian/unity8-private.install+1−1

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

1usr/lib/*/unity8/qml/AccountsService

2+usr/lib/*/unity8/qml/DashViews

2usr/lib/*/unity8/qml/HudClient

3usr/lib/*/unity8/qml/HudClient

3usr/lib/*/unity8/qml/LightDM

4usr/lib/*/unity8/qml/LightDM

4−usr/lib/*/unity8/qml/DashViews

5usr/lib/*/unity8/qml/Powerd

6usr/lib/*/unity8/qml/SessionBroadcast

7usr/lib/*/unity8/qml/Ubuntu

debian/unity8.install+1−7

@@ -1,15 +1,9 @@

1+data/unity8.conf usr/share/upstart/sessions/

1usr/bin/unity8

2usr/bin/unity8

2usr/share/applications/unity8.desktop

3usr/share/applications/unity8.desktop

3−usr/share/locale

4−usr/share/unity8/Bottombar

5−usr/share/unity8/Components

6−usr/share/unity8/Dash

7usr/share/unity8/Greeter

4usr/share/unity8/Greeter

8usr/share/unity8/Hud

5usr/share/unity8/Hud

9usr/share/unity8/Launcher

6usr/share/unity8/Launcher

10−usr/share/unity8/Notifications

11usr/share/unity8/Panel

7usr/share/unity8/Panel

12usr/share/unity8/Shell.qml

8usr/share/unity8/Shell.qml

13usr/share/unity8/Stages

9usr/share/unity8/Stages

14−usr/share/unity8/graphics

15−data/unity8.conf usr/share/upstart/sessions/

plugins/DashViews/abstractdashview.cpp−34

@@ -46,17 +46,10 @@ void AbstractDashView::setModel(QAbstractItemModel *model)

46 if (!m_delegateModel) {

47 createDelegateModel();

48 } else {

49−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

50− disconnect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

51− }

52− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

53− connect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

54−#else

55 disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

49 disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

56 }

50 }

57 m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

51 m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

58 connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

52 connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

59−#endif

60

53

61 cleanupExistingItems();

54 cleanupExistingItems();

62

55

@@ -181,13 +174,8 @@ void AbstractDashView::resetDelegateCreationEnd()

181

174

182void AbstractDashView::createDelegateModel()

175void AbstractDashView::createDelegateModel()

183{

176{

184−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

185− m_delegateModel = new QQuickVisualDataModel(qmlContext(this), this);

186− connect(m_delegateModel, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(itemCreated(int,QQuickItem*)));

187−#else

188 m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

177 m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

189 connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

178 connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

190−#endif

191 if (isComponentComplete())

179 if (isComponentComplete())

192 m_delegateModel->componentComplete();

180 m_delegateModel->componentComplete();

193}

181}

@@ -253,16 +241,9 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

253 return nullptr;

241 return nullptr;

254

242

255 m_asyncRequestedIndex = -1;

243 m_asyncRequestedIndex = -1;

256−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

257− QQuickItem *item = m_delegateModel->item(modelIndex, asynchronous);

258−#else

259 QObject* object = m_delegateModel->object(modelIndex, asynchronous);

244 QObject* object = m_delegateModel->object(modelIndex, asynchronous);

260 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

245 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

261−#endif

262 if (!item) {

246 if (!item) {

263−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

264− m_asyncRequestedIndex = modelIndex;

265−#else

266 if (object) {

247 if (object) {

267 m_delegateModel->release(object);

248 m_delegateModel->release(object);

268 if (!m_delegateValidated) {

249 if (!m_delegateValidated) {

@@ -273,7 +254,6 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

273 } else {

254 } else {

274 m_asyncRequestedIndex = modelIndex;

255 m_asyncRequestedIndex = modelIndex;

275 }

256 }

276−#endif

277 return nullptr;

257 return nullptr;

278 } else {

258 } else {

279 addItemToView(modelIndex, item);

259 addItemToView(modelIndex, item);

@@ -283,13 +263,8 @@ QQuickItem *AbstractDashView::createItem(int modelIndex, bool asynchronous)

283

263

284void AbstractDashView::releaseItem(QQuickItem *item)

264void AbstractDashView::releaseItem(QQuickItem *item)

285{

265{

286−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

287− QQuickVisualModel::ReleaseFlags flags = m_delegateModel->release(item);

288− if (flags & QQuickVisualModel::Destroyed) {

289−#else

290 QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

266 QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

291 if (flags & QQmlDelegateModel::Destroyed) {

267 if (flags & QQmlDelegateModel::Destroyed) {

292−#endif

293 item->setParentItem(nullptr);

268 item->setParentItem(nullptr);

294 }

269 }

295}

270}

@@ -299,10 +274,6 @@ void AbstractDashView::setImplicitHeightDirty()

299 m_implicitHeightDirty = true;

274 m_implicitHeightDirty = true;

300}

275}

301

276

302−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

303−void AbstractDashView::itemCreated(int modelIndex, QQuickItem *item)

304−{

305−#else

306void AbstractDashView::itemCreated(int modelIndex, QObject *object)

277void AbstractDashView::itemCreated(int modelIndex, QObject *object)

307{

278{

308 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

279 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

@@ -310,7 +281,6 @@ void AbstractDashView::itemCreated(int modelIndex, QObject *object)

310 qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;

281 qWarning() << "AbstractDashView::itemCreated got a non item for index" << modelIndex;

311 return;

282 return;

312 }

283 }

313−#endif

314 item->setParentItem(this);

284 item->setParentItem(this);

315

285

316 // We only need to call createItem if we are here because of an asynchronous generation

286 // We only need to call createItem if we are here because of an asynchronous generation

@@ -325,11 +295,7 @@ void AbstractDashView::itemCreated(int modelIndex, QObject *object)

325 }

295 }

326}

296}

327

297

328−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

329−void AbstractDashView::onModelUpdated(const QQuickChangeSet &changeSet, bool reset)

330−#else

331void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)

298void AbstractDashView::onModelUpdated(const QQmlChangeSet &changeSet, bool reset)

332−#endif

333{

299{

334 if (reset) {

300 if (reset) {

335 cleanupExistingItems();

301 cleanupExistingItems();

plugins/DashViews/abstractdashview.h−17

@@ -23,12 +23,8 @@ class QAbstractItemModel;

23class QQmlComponent;

24#pragma GCC diagnostic push

25#pragma GCC diagnostic ignored "-pedantic"

26−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

27−#include <private/qquickvisualdatamodel_p.h>

28−#else

29#include <private/qqmldelegatemodel_p.h>

26#include <private/qqmldelegatemodel_p.h>

30#include <qqmlinfo.h>

27#include <qqmlinfo.h>

31−#endif

32#pragma GCC diagnostic pop

28#pragma GCC diagnostic pop

33

29

34class AbstractDashView : public QQuickItem

30class AbstractDashView : public QQuickItem

@@ -94,13 +90,8 @@ protected:

94 void setImplicitHeightDirty();

90 void setImplicitHeightDirty();

95

91

96private Q_SLOTS:

92private Q_SLOTS:

97−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

98− void itemCreated(int modelIndex, QQuickItem *item);

99− void onModelUpdated(const QQuickChangeSet &changeSet, bool reset);

100−#else

101 void itemCreated(int modelIndex, QObject *object);

93 void itemCreated(int modelIndex, QObject *object);

102 void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

94 void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

103−#endif

104 void onHeightChanged();

95 void onHeightChanged();

105

96

106private:

97private:

@@ -117,17 +108,9 @@ private:

117 virtual void doRelayout() = 0;

108 virtual void doRelayout() = 0;

118 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

109 virtual void updateItemCulling(qreal visibleFromY, qreal visibleToY) = 0;

119 virtual void calculateImplicitHeight() = 0;

110 virtual void calculateImplicitHeight() = 0;

120−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

121− virtual void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) = 0;

122−#else

123 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;

111 virtual void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) = 0;

124−#endif

125

112

126−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

127− QQuickVisualDataModel *m_delegateModel;

128−#else

129 QQmlDelegateModel *m_delegateModel;

113 QQmlDelegateModel *m_delegateModel;

130−#endif

131

114

132 // Index we are waiting because we requested it asynchronously

115 // Index we are waiting because we requested it asynchronously

133 int m_asyncRequestedIndex;

116 int m_asyncRequestedIndex;

plugins/DashViews/horizontaljournal.cpp−12

@@ -28,12 +28,8 @@

28#include <qqmlengine.h>

29#pragma GCC diagnostic push

30#pragma GCC diagnostic ignored "-pedantic"

31−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

32−#include <private/qquickvisualdatamodel_p.h>

33−#else

34#include <private/qqmldelegatemodel_p.h>

31#include <private/qqmldelegatemodel_p.h>

35#include <qqmlinfo.h>

32#include <qqmlinfo.h>

36−#endif

37#include <private/qquickitem_p.h>

33#include <private/qquickitem_p.h>

38#pragma GCC diagnostic pop

34#pragma GCC diagnostic pop

39

35

@@ -188,17 +184,9 @@ void HorizontalJournal::calculateImplicitHeight()

188 }

184 }

189}

185}

190

186

191−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

192−void HorizontalJournal::processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes)

193−#else

194void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

187void HorizontalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

195−#endif

196{

188{

197−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

198− Q_FOREACH(const QQuickChangeSet::Remove &remove, removes) {

199−#else

200 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

189 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

201−#endif

202 for (int i = remove.count - 1; i >= 0; --i) {

190 for (int i = remove.count - 1; i >= 0; --i) {

203 const int indexToRemove = remove.index + i;

191 const int indexToRemove = remove.index + i;

204 // We only support removing from the end so

192 // We only support removing from the end so

plugins/DashViews/horizontaljournal.h−4

@@ -52,11 +52,7 @@ private:

52 void calculateImplicitHeight() override;

53 void doRelayout() override;

54 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

55−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

56− void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

57−#else

58 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

55 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

59−#endif

60

56

61 int m_firstVisibleIndex;

57 int m_firstVisibleIndex;

62 QList<QQuickItem*> m_visibleItems;

58 QList<QQuickItem*> m_visibleItems;

plugins/DashViews/listviewwithpageheader.cpp−50

@@ -97,11 +97,7 @@

97#include <qqmlengine.h>

98#pragma GCC diagnostic push

99#pragma GCC diagnostic ignored "-pedantic"

100−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

101−#include <private/qquickvisualdatamodel_p.h>

102−#else

103#include <private/qqmldelegatemodel_p.h>

100#include <private/qqmldelegatemodel_p.h>

104−#endif

105#include <private/qqmlglobal_p.h>

101#include <private/qqmlglobal_p.h>

106#include <private/qquickitem_p.h>

102#include <private/qquickitem_p.h>

107#include <private/qquickanimation_p.h>

103#include <private/qquickanimation_p.h>

@@ -191,17 +187,10 @@ void ListViewWithPageHeader::setModel(QAbstractItemModel *model)

191 if (!m_delegateModel) {

187 if (!m_delegateModel) {

192 createDelegateModel();

188 createDelegateModel();

193 } else {

189 } else {

194−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

195− disconnect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

196− }

197− m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

198− connect(m_delegateModel, SIGNAL(modelUpdated(QQuickChangeSet,bool)), this, SLOT(onModelUpdated(QQuickChangeSet,bool)));

199−#else

200 disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

190 disconnect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

201 }

191 }

202 m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

192 m_delegateModel->setModel(QVariant::fromValue<QAbstractItemModel *>(model));

203 connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

193 connect(m_delegateModel, SIGNAL(modelUpdated(QQmlChangeSet,bool)), this, SLOT(onModelUpdated(QQmlChangeSet,bool)));

204−#endif

205 Q_EMIT modelChanged();

194 Q_EMIT modelChanged();

206 polish();

195 polish();

207 // TODO?

196 // TODO?

@@ -570,13 +559,8 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)

570

559

571void ListViewWithPageHeader::createDelegateModel()

560void ListViewWithPageHeader::createDelegateModel()

572{

561{

573−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

574− m_delegateModel = new QQuickVisualDataModel(qmlContext(this), this);

575− connect(m_delegateModel, SIGNAL(createdItem(int,QQuickItem*)), this, SLOT(itemCreated(int,QQuickItem*)));

576−#else

577 m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

562 m_delegateModel = new QQmlDelegateModel(qmlContext(this), this);

578 connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

563 connect(m_delegateModel, SIGNAL(createdItem(int,QObject*)), this, SLOT(itemCreated(int,QObject*)));

579−#endif

580 if (isComponentComplete())

564 if (isComponentComplete())

581 m_delegateModel->componentComplete();

565 m_delegateModel->componentComplete();

582 updateWatchedRoles();

566 updateWatchedRoles();

@@ -657,13 +641,8 @@ bool ListViewWithPageHeader::addVisibleItems(qreal fillFrom, qreal fillTo, bool

657void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

641void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

658{

642{

659 QQuickItem *item = listItem->m_item;

643 QQuickItem *item = listItem->m_item;

660−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

661− QQuickVisualModel::ReleaseFlags flags = m_delegateModel->release(item);

662− if (flags & QQuickVisualModel::Destroyed) {

663−#else

664 QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

644 QQmlDelegateModel::ReleaseFlags flags = m_delegateModel->release(item);

665 if (flags & QQmlDelegateModel::Destroyed) {

645 if (flags & QQmlDelegateModel::Destroyed) {

666−#endif

667 item->setParentItem(nullptr);

646 item->setParentItem(nullptr);

668 }

647 }

669 delete listItem->m_sectionItem;

648 delete listItem->m_sectionItem;

@@ -796,16 +775,9 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

796 return nullptr;

775 return nullptr;

797

776

798 m_asyncRequestedIndex = -1;

777 m_asyncRequestedIndex = -1;

799−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

800− QQuickItem *item = m_delegateModel->item(modelIndex, asynchronous);

801−#else

802 QObject* object = m_delegateModel->object(modelIndex, asynchronous);

778 QObject* object = m_delegateModel->object(modelIndex, asynchronous);

803 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

779 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

804−#endif

805 if (!item) {

780 if (!item) {

806−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

807− m_asyncRequestedIndex = modelIndex;

808−#else

809 if (object) {

781 if (object) {

810 m_delegateModel->release(object);

782 m_delegateModel->release(object);

811 if (!m_delegateValidated) {

783 if (!m_delegateValidated) {

@@ -816,7 +788,6 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

816 } else {

788 } else {

817 m_asyncRequestedIndex = modelIndex;

789 m_asyncRequestedIndex = modelIndex;

818 }

790 }

819−#endif

820 return 0;

791 return 0;

821 } else {

792 } else {

822// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;

793// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;

@@ -872,10 +843,6 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

872 }

843 }

873}

844}

874

845

875−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

876−void ListViewWithPageHeader::itemCreated(int modelIndex, QQuickItem *item)

877−{

878−#else

879void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

846void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

880{

847{

881 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

848 QQuickItem *item = qmlobject_cast<QQuickItem*>(object);

@@ -883,7 +850,6 @@ void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

883 qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;

850 qWarning() << "ListViewWithPageHeader::itemCreated got a non item for index" << modelIndex;

884 return;

851 return;

885 }

852 }

886−#endif

887// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;

853// qDebug() << "ListViewWithPageHeader::itemCreated" << modelIndex << item;

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

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

889 // TODO Check if we still need this in 5.2

855 // TODO Check if we still need this in 5.2

@@ -924,21 +890,13 @@ void ListViewWithPageHeader::onHeightChanged()

924}

890}

925

891

926

892

927−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

928−void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bool /*reset*/)

929−#else

930void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)

893void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool /*reset*/)

931−#endif

932{

894{

933 // TODO Do something with reset

895 // TODO Do something with reset

934// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

896// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;

935 const auto oldFirstVisibleIndex = m_firstVisibleIndex;

897 const auto oldFirstVisibleIndex = m_firstVisibleIndex;

936

898

937−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

938− Q_FOREACH(const QQuickChangeSet::Remove &remove, changeSet.removes()) {

939−#else

940 Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {

899 Q_FOREACH(const QQmlChangeSet::Remove &remove, changeSet.removes()) {

941−#endif

942// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

900// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;

943 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

901 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {

944 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

902 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();

@@ -992,11 +950,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

992 }

950 }

993 }

951 }

994

952

995−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

996− Q_FOREACH(const QQuickChangeSet::Insert &insert, changeSet.inserts()) {

997−#else

998 Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {

953 Q_FOREACH(const QQmlChangeSet::Insert &insert, changeSet.inserts()) {

999−#endif

1000// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

954// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;

1001 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

955 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();

1002 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

956 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();

@@ -1054,11 +1008,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

1054 }

1008 }

1055 }

1009 }

1056

1010

1057−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1058− Q_FOREACH(const QQuickChangeSet::Change &change, changeSet.changes()) {

1059−#else

1060 Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {

1011 Q_FOREACH(const QQmlChangeSet::Change &change, changeSet.changes()) {

1061−#endif

1062// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

1012// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;

1063 for (int i = change.index; i < change.count; ++i) {

1013 for (int i = change.index; i < change.count; ++i) {

1064 ListItem *item = itemAtIndex(i);

1014 ListItem *item = itemAtIndex(i);

plugins/DashViews/listviewwithpageheader.h−20

@@ -17,21 +17,13 @@

17#ifndef LISTVIEWWITHPAGEHEADER_H

18#define LISTVIEWWITHPAGEHEADER_H

19

20−#pragma GCC diagnostic push

21−#pragma GCC diagnostic ignored "-pedantic"

22#include <private/qquickitemchangelistener_p.h>

20#include <private/qquickitemchangelistener_p.h>

23#include <private/qquickflickable_p.h>

21#include <private/qquickflickable_p.h>

24−#pragma GCC diagnostic pop

25

22

26class QAbstractItemModel;

23class QAbstractItemModel;

27class QQuickNumberAnimation;

24class QQuickNumberAnimation;

28−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

29−class QQuickChangeSet;

30−class QQuickVisualDataModel;

31−#else

32class QQmlChangeSet;

25class QQmlChangeSet;

33class QQmlDelegateModel;

26class QQmlDelegateModel;

34−#endif

35

27

36

28

37/**

29/**

@@ -117,19 +109,11 @@ protected:

117 void updatePolish();

109 void updatePolish();

118

110

119private Q_SLOTS:

111private Q_SLOTS:

120−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

121− void itemCreated(int modelIndex, QQuickItem *item);

122−#else

123 void itemCreated(int modelIndex, QObject *object);

112 void itemCreated(int modelIndex, QObject *object);

124−#endif

125 void onContentHeightChanged();

113 void onContentHeightChanged();

126 void onContentWidthChanged();

114 void onContentWidthChanged();

127 void onHeightChanged();

115 void onHeightChanged();

128−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

129− void onModelUpdated(const QQuickChangeSet &changeSet, bool reset);

130−#else

131 void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

116 void onModelUpdated(const QQmlChangeSet &changeSet, bool reset);

132−#endif

133 void onShowHeaderAnimationFinished();

117 void onShowHeaderAnimationFinished();

134

118

135private:

119private:

@@ -168,11 +152,7 @@ private:

168 QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);

152 QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);

169 QQuickItem *getSectionItem(const QString &sectionText);

153 QQuickItem *getSectionItem(const QString &sectionText);

170

154

171−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

172− QQuickVisualDataModel *m_delegateModel;

173−#else

174 QQmlDelegateModel *m_delegateModel;

155 QQmlDelegateModel *m_delegateModel;

175−#endif

176

156

177 // Index we are waiting because we requested it asynchronously

157 // Index we are waiting because we requested it asynchronously

178 int m_asyncRequestedIndex;

158 int m_asyncRequestedIndex;

plugins/DashViews/organicgrid.cpp−8

@@ -237,17 +237,9 @@ void OrganicGrid::calculateImplicitHeight()

237 }

238}

239

240−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

241−void OrganicGrid::processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes)

242−#else

243void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

240void OrganicGrid::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

244−#endif

245{

241{

246−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

247− Q_FOREACH(const QQuickChangeSet::Remove &remove, removes) {

248−#else

249 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

242 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

250−#endif

251 for (int i = remove.count - 1; i >= 0; --i) {

243 for (int i = remove.count - 1; i >= 0; --i) {

252 const int indexToRemove = remove.index + i;

244 const int indexToRemove = remove.index + i;

253 // We only support removing from the end

245 // We only support removing from the end

plugins/DashViews/organicgrid.h−4

@@ -79,11 +79,7 @@ private:

79 void doRelayout() override;

80 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

81 void calculateImplicitHeight() override;

82−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

83− void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

84−#else

85 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

82 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

86−#endif

87

83

88 QSizeF m_smallDelegateSize;

84 QSizeF m_smallDelegateSize;

89 QSizeF m_bigDelegateSize;

85 QSizeF m_bigDelegateSize;

plugins/DashViews/verticaljournal.cpp−8

@@ -239,17 +239,9 @@ void VerticalJournal::updateItemCulling(qreal visibleFromY, qreal visibleToY)

239 }

240}

241

242−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

243−void VerticalJournal::processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes)

244−#else

245void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

242void VerticalJournal::processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes)

246−#endif

247{

243{

248−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

249− Q_FOREACH(const QQuickChangeSet::Remove &remove, removes) {

250−#else

251 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

244 Q_FOREACH(const QQmlChangeSet::Remove &remove, removes) {

252−#endif

253 for (int i = remove.count - 1; i >= 0; --i) {

245 for (int i = remove.count - 1; i >= 0; --i) {

254 const int indexToRemove = remove.index + i;

246 const int indexToRemove = remove.index + i;

255 // Since we only support removing from the end, indexToRemove

247 // Since we only support removing from the end, indexToRemove

plugins/DashViews/verticaljournal.h−4

@@ -90,11 +90,7 @@ private:

90 void calculateImplicitHeight() override;

91 void doRelayout() override;

92 void updateItemCulling(qreal visibleFromY, qreal visibleToY) override;

93−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

94− void processModelRemoves(const QVector<QQuickChangeSet::Remove> &removes) override;

95−#else

96 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

93 void processModelRemoves(const QVector<QQmlChangeSet::Remove> &removes) override;

97−#endif

98

94

99 QVector<QList<ViewItem>> m_columnVisibleItems;

95 QVector<QList<ViewItem>> m_columnVisibleItems;

100 QHash<int, int> m_indexColumnMap;

96 QHash<int, int> m_indexColumnMap;

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

@@ -273,7 +273,7 @@ Item {

273 text: menuData && menuData.label || ""

274 iconSource: menuData && menuData.icon || "image://theme/calendar"

275 time: timeFormatter.timeString

276− eventColor: menu && menu.ext.hasOwnProperty("xCanonicalColor") ? menu.ext.xCanonicalColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)

276+ eventColor: getExtendedProperty(extendedData, "xCanonicalColor", Qt.rgba(0.0, 0.0, 0.0, 0.0))

277 enabled: menuData && menuData.sensitive || false

278

279 onMenuModelChanged: {

plugins/Unity/Launcher/backend/launcherbackend.cpp+266−16

@@ -34,10 +34,12 @@ public:

34 QString desktopFile;

35 QString displayName;

36 QString icon;

37+ int count;

38+ bool countVisible;

37};

39};

38

40

39LauncherBackend::LauncherBackend(QObject *parent):

41LauncherBackend::LauncherBackend(QObject *parent):

40− QObject(parent),

42+ QDBusVirtualObject(parent),

41 m_accounts(nullptr)

43 m_accounts(nullptr)

42{

44{

43#ifndef LAUNCHER_TESTING

45#ifndef LAUNCHER_TESTING

@@ -45,10 +47,25 @@ LauncherBackend::LauncherBackend(QObject *parent):

45#endif

47#endif

46 m_user = qgetenv("USER");

48 m_user = qgetenv("USER");

47 syncFromAccounts();

49 syncFromAccounts();

50+

51+ /* Set up ourselves on DBus */

52+ QDBusConnection con = QDBusConnection::sessionBus();

53+ if (!con.registerService("com.canonical.Unity.Launcher")) {

54+ qDebug() << "Unable to register launcher name";

55+ }

56+ if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {

57+ qDebug() << "Unable to register launcher object";

58+ }

48}

59}

49

60

50LauncherBackend::~LauncherBackend()

61LauncherBackend::~LauncherBackend()

51{

62{

63+ /* Remove oursevles from DBus */

64+ QDBusConnection con = QDBusConnection::sessionBus();

65+ con.unregisterService("com.canonical.Unity.Launcher");

66+ con.unregisterObject("/com/canonical/Unity/Launcher");

67+

68+ /* Clear data */

52 m_storedApps.clear();

69 m_storedApps.clear();

53

70

54 Q_FOREACH(LauncherBackendItem *item, m_itemCache) {

71 Q_FOREACH(LauncherBackendItem *item, m_itemCache) {

@@ -90,7 +107,7 @@ void LauncherBackend::setStoredApplications(const QStringList &appIds)

90

107

91QString LauncherBackend::desktopFile(const QString &appId) const

108QString LauncherBackend::desktopFile(const QString &appId) const

92{

109{

93− LauncherBackendItem *item = m_itemCache.value(appId);

110+ LauncherBackendItem *item = m_itemCache.value(appId, nullptr);

94 if (item) {

111 if (item) {

95 return item->desktopFile;

112 return item->desktopFile;

96 }

113 }

@@ -100,7 +117,7 @@ QString LauncherBackend::desktopFile(const QString &appId) const

100

117

101QString LauncherBackend::displayName(const QString &appId) const

118QString LauncherBackend::displayName(const QString &appId) const

102{

119{

103− LauncherBackendItem *item = m_itemCache.value(appId);

120+ LauncherBackendItem *item = m_itemCache.value(appId, nullptr);

104 if (item) {

121 if (item) {

105 return item->displayName;

122 return item->displayName;

106 }

123 }

@@ -118,16 +135,9 @@ QString LauncherBackend::displayName(const QString &appId) const

118QString LauncherBackend::icon(const QString &appId) const

135QString LauncherBackend::icon(const QString &appId) const

119{

136{

120 QString iconName;

137 QString iconName;

121− LauncherBackendItem *item = m_itemCache.value(appId);

138+ LauncherBackendItem *item = getItem(appId);

122 if (item) {

139 if (item) {

123 iconName = item->icon;

140 iconName = item->icon;

124− } else {

125− QString df = findDesktopFile(appId);

126− if (!df.isEmpty()) {

127− LauncherBackendItem *item = parseDesktopFile(df);

128− m_itemCache.insert(appId, item);

129− iconName = item->icon;

130− }

131 }

141 }

132

142

133 return iconName;

143 return iconName;

@@ -153,10 +163,70 @@ int LauncherBackend::progress(const QString &appId) const

153

163

154int LauncherBackend::count(const QString &appId) const

164int LauncherBackend::count(const QString &appId) const

155{

165{

156− // TODO: Return value for count emblem.

166+ int count = -1;

157− // TODO: emit countChanged() when this value changes.

167+ LauncherBackendItem *item = getItem(appId);

158− Q_UNUSED(appId)

168+

169+ if (item) {

170+ if (item->countVisible) {

171+ count = item->count;

172+ }

173+ }

174+

175+ return count;

176+}

177+

178+void LauncherBackend::setCount(const QString &appId, int count) const

179+{

180+ LauncherBackendItem *item = getItem(appId);

181+

182+ bool emitchange = false;

183+ if (item) {

184+ emitchange = (item->count != count);

185+ item->count = count;

186+ }

187+

188+ if (emitchange) {

189+ /* TODO: This needs to use the accessor to handle the visibility

190+ correctly, but when we have the two properties we can just use

191+ the local value */

192+ Q_EMIT countChanged(appId, this->count(appId));

193+ QVariant vcount(item->count);

194+ emitPropChangedDbus(appId, "count", vcount);

195+ }

196+}

197+

198+bool LauncherBackend::countVisible(const QString &appId) const

199+{

200+ bool visible = false;

201+ LauncherBackendItem *item = getItem(appId);

202+

203+ if (item) {

204+ visible = item->countVisible;

205+ }

206+

159− return 0;

207+ return visible;

208+}

209+

210+void LauncherBackend::setCountVisible(const QString &appId, bool visible) const

211+{

212+ LauncherBackendItem *item = getItem(appId);

213+

214+ bool emitchange = false;

215+ if (item) {

216+ emitchange = (item->countVisible != visible);

217+ item->countVisible = visible;

218+ } else {

219+ qDebug() << "Unable to find:" << appId;

220+ }

221+

222+ if (emitchange) {

223+ /* TODO: Because we're using visible in determining the

224+ count we need to emit a count changed as well */

225+ Q_EMIT countChanged(appId, this->count(appId));

226+ Q_EMIT countVisibleChanged(appId, item->countVisible);

227+ QVariant vCountVisible(item->countVisible);

228+ emitPropChangedDbus(appId, "countVisible", vCountVisible);

229+ }

160}

230}

161

231

162void LauncherBackend::setUser(const QString &username)

232void LauncherBackend::setUser(const QString &username)

@@ -275,6 +345,35 @@ LauncherBackendItem* LauncherBackend::parseDesktopFile(const QString &desktopFil

275 } else {

345 } else {

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

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

277 }

347 }

348+

349+ /* TODO: These should be looked up in a cache somewhere */

350+ item->count = 0;

351+ item->countVisible = false;

352+

353+ return item;

354+}

355+

356+/* Gets an item, and tries to create a new one if we need it to */

357+LauncherBackendItem* LauncherBackend::getItem(const QString &appId) const

358+{

359+ LauncherBackendItem *item = m_itemCache.value(appId, nullptr);

360+ if (!item) {

361+ QString df = findDesktopFile(appId);

362+ if (!df.isEmpty()) {

363+ item = parseDesktopFile(df);

364+ if (item) {

365+ m_itemCache[appId] = item;

366+ } else {

367+ qWarning() << "Unable to parse desktop file for" << appId << "path" << df;

368+ }

369+ } else {

370+ qDebug() << "Unable to find desktop file for:" << appId;

371+ }

372+ }

373+

374+ if (!item)

375+ qWarning() << "Unable to find item for: " << appId;

376+

278 return item;

377 return item;

279}

378}

280

379

@@ -285,7 +384,7 @@ void LauncherBackend::loadFromVariant(const QVariantMap &details)

285 }

384 }

286 QString appId = details.value("id").toString();

385 QString appId = details.value("id").toString();

287

386

288− LauncherBackendItem *item = m_itemCache.value(appId);

387+ LauncherBackendItem *item = m_itemCache.value(appId, nullptr);

289 if (item) {

388 if (item) {

290 delete item;

389 delete item;

291 }

390 }

@@ -295,6 +394,8 @@ void LauncherBackend::loadFromVariant(const QVariantMap &details)

295 item->desktopFile = details.value("desktopFile").toString();

394 item->desktopFile = details.value("desktopFile").toString();

296 item->displayName = details.value("name").toString();

395 item->displayName = details.value("name").toString();

297 item->icon = details.value("icon").toString();

396 item->icon = details.value("icon").toString();

397+ item->count = details.value("count").toInt();

398+ item->countVisible = details.value("countVisible").toBool();

298

399

299 m_itemCache.insert(appId, item);

400 m_itemCache.insert(appId, item);

300 m_storedApps.append(appId);

401 m_storedApps.append(appId);

@@ -308,6 +409,8 @@ QVariantMap LauncherBackend::itemToVariant(const QString &appId) const

308 details.insert("name", item->displayName);

409 details.insert("name", item->displayName);

309 details.insert("icon", item->icon);

410 details.insert("icon", item->icon);

310 details.insert("desktopFile", item->desktopFile);

411 details.insert("desktopFile", item->desktopFile);

412+ details.insert("count", item->count);

413+ details.insert("countVisible", item->countVisible);

311 return details;

414 return details;

312}

415}

313

416

@@ -318,3 +421,150 @@ bool LauncherBackend::isDefaultsItem(const QList<QVariantMap> &apps) const

318 // list of one item with the 'defaults' field set to true.

421 // list of one item with the 'defaults' field set to true.

319 return (apps.size() == 1 && apps[0].value("defaults").toBool());

422 return (apps.size() == 1 && apps[0].value("defaults").toBool());

320}

423}

424+

425+bool LauncherBackend::handleMessage(const QDBusMessage& message, const QDBusConnection& connection)

426+{

427+ /* Check to make sure we're getting properties on our interface */

428+ if (message.type() != QDBusMessage::MessageType::MethodCallMessage) {

429+ return false;

430+ }

431+ if (message.interface() != "org.freedesktop.DBus.Properties") {

432+ return false;

433+ }

434+ if (message.arguments()[0].toString() != "com.canonical.Unity.Launcher.Item") {

435+ return false;

436+ }

437+

438+ /* Break down the path to just the app id */

439+ QString pathtemp = message.path();

440+ if (!pathtemp.startsWith("/com/canonical/Unity/Launcher/")) {

441+ return false;

442+ }

443+ pathtemp.remove("/com/canonical/Unity/Launcher/");

444+ if (pathtemp.indexOf('/') >= 0) {

445+ return false;

446+ }

447+

448+ /* Find ourselves an appid */

449+ QString appid = decodeAppId(pathtemp);

450+ QVariantList retval;

451+

452+ if (message.member() == "Get") {

453+ if (message.arguments()[1].toString() == "count") {

454+ retval.append(QVariant::fromValue(QDBusVariant(this->count(appid))));

455+ } else if (message.arguments()[1].toString() == "countVisible") {

456+ retval.append(QVariant::fromValue(QDBusVariant(this->countVisible(appid))));

457+ }

458+ } else if (message.member() == "Set") {

459+ if (message.arguments()[1].toString() == "count") {

460+ this->setCount(appid, message.arguments()[2].value<QDBusVariant>().variant().toInt());

461+ } else if (message.arguments()[1].toString() == "countVisible") {

462+ this->setCountVisible(appid, message.arguments()[2].value<QDBusVariant>().variant().toBool());

463+ }

464+ } else if (message.member() == "GetAll") {

465+ retval.append(this->itemToVariant(appid));

466+ } else {

467+ return false;

468+ }

469+

470+ QDBusMessage reply = message.createReply(retval);

471+ return connection.send(reply);

472+}

473+

474+QString LauncherBackend::introspect(const QString &path) const

475+{

476+ /* This case we should just list the nodes */

477+ if (path == "/com/canonical/Unity/Launcher/" || path == "/com/canonical/Unity/Launcher") {

478+ QString nodes;

479+

480+ Q_FOREACH(const QString &appId, m_itemCache.keys()) {

481+ nodes.append("<node name=\"");

482+ nodes.append(encodeAppId(appId));

483+ nodes.append("\"/>\n");

484+ }

485+

486+ return nodes;

487+ }

488+

489+ /* Should not happen, but let's handle it */

490+ if (!path.startsWith("/com/canonical/Unity/Launcher")) {

491+ return "";

492+ }

493+

494+ /* Now we should be looking at a node */

495+ QString nodeiface =

496+ "<interface name=\"com.canonical.Unity.Launcher.Item\">"

497+ "<property name=\"count\" type=\"i\" access=\"readwrite\" />"

498+ "<property name=\"countVisible\" type=\"b\" access=\"readwrite\" />"

499+ "</interface>";

500+ return nodeiface;

501+}

502+

503+QString LauncherBackend::decodeAppId(const QString& path)

504+{

505+ QByteArray bytes = path.toUtf8();

506+ QByteArray decoded;

507+

508+ for (int i = 0; i < bytes.size(); ++i) {

509+ char chr = bytes.at(i);

510+

511+ if (chr == '_') {

512+ QString number;

513+ number.append(bytes.at(i+1));

514+ number.append(bytes.at(i+2));

515+

516+ bool okay;

517+ char newchar = number.toUInt(&okay, 16);

518+ if (okay)

519+ decoded.append(newchar);

520+

521+ i += 2;

522+ } else {

523+ decoded.append(chr);

524+ }

525+ }

526+

527+ return QString::fromUtf8(decoded);

528+}

529+

530+QString LauncherBackend::encodeAppId(const QString& appId)

531+{

532+ QByteArray bytes = appId.toUtf8();

533+ QString encoded;

534+

535+ for (int i = 0; i < bytes.size(); ++i) {

536+ uchar chr = bytes.at(i);

537+

538+ if ((chr >= 'a' && chr <= 'z') ||

539+ (chr >= 'A' && chr <= 'Z') ||

540+ (chr >= '0' && chr <= '9'&& i != 0)) {

541+ encoded.append(chr);

542+ } else {

543+ QString hexval = QString("_%1").arg(chr, 2, 16, QChar('0'));

544+ encoded.append(hexval.toUpper());

545+ }

546+ }

547+

548+ return encoded;

549+}

550+

551+void LauncherBackend::emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const

552+{

553+ QString path("/com/canonical/Unity/Launcher/");

554+ path.append(encodeAppId(appId));

555+

556+ QDBusMessage message = QDBusMessage::createSignal(path, "org.freedesktop.DBus.Properties", "PropertiesChanged");

557+

558+ QList<QVariant> arguments;

559+ QVariantHash changedprops;

560+ changedprops[property] = QVariant::fromValue(QDBusVariant(value));

561+ QVariantList deletedprops;

562+

563+ arguments.append(changedprops);

564+ arguments.append(deletedprops);

565+

566+ message.setArguments(arguments);

567+

568+ QDBusConnection con = QDBusConnection::sessionBus();

569+ con.send(message);

570+}

plugins/Unity/Launcher/backend/launcherbackend.h+52−4

@@ -24,6 +24,7 @@

24#include <QObject>

25#include <QSettings>

26#include <QStringList>

27+#include <QDBusVirtualObject>

27

28

28class AccountsServiceDBusAdaptor;

29class AccountsServiceDBusAdaptor;

29

30

@@ -32,11 +33,13 @@ class AccountsServiceDBusAdaptor;

32 */

33 */

33

34

34class LauncherBackendItem;

35class LauncherBackendItem;

36+class LauncherBackendTest;

35

37

36−class LauncherBackend : public QObject

38+class LauncherBackend : public QDBusVirtualObject

37{

39{

38 Q_OBJECT

40 Q_OBJECT

39

41

42+ friend LauncherBackendTest;

40

43

41public:

44public:

42 LauncherBackend(QObject *parent = 0);

45 LauncherBackend(QObject *parent = 0);

@@ -116,16 +119,53 @@ public:

116 */

119 */

117 int count(const QString &appId) const;

120 int count(const QString &appId) const;

118

121

122+ /**

123+ * @brief Set the count on an item

124+ * @param appId The ID of the application

125+ * @param count Count to show on the application

126+ */

127+ void setCount(const QString &appId, int count) const;

128+

129+ /**

130+ * @brief Get whether the count should be visible

131+ * @param appId The ID of the application.

132+ * @returns Whether to show a count on the launcher

133+ */

134+ bool countVisible(const QString &appId) const;

135+

136+ /**

137+ * @brief Set the visibility of the count item

138+ * @param appId The ID of the application

139+ * @param visible Whether the count should be visible

140+ */

141+ void setCountVisible(const QString &appId, bool visible) const;

142+

119 /**

143 /**

120 * @brief Sets the username for which to look up launcher items.

144 * @brief Sets the username for which to look up launcher items.

121 * @param username The username to use.

145 * @param username The username to use.

122 */

146 */

123 void setUser(const QString &username);

147 void setUser(const QString &username);

124

148

149+ /**

150+ * @brief Handle a message to an application node

151+ * @param message DBus message to handle

152+ * @param connection DBus connection that we're using

153+ * @returns whether the message was handled

154+ */

155+ virtual bool handleMessage(const QDBusMessage& message, const QDBusConnection& connection);

156+

157+ /**

158+ * @brief Get introspection information on the objects we're exporting

159+ * @param path the dbus path containing the appid

160+ * @returns Introspection information for that node in the tree

161+ */

162+ virtual QString introspect (const QString &path) const;

163+

125Q_SIGNALS:

164Q_SIGNALS:

126− void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList);

165+ void quickListChanged(const QString &appId, const QList<QuickListEntry> &quickList) const;

127− void progressChanged(const QString &appId, int progress);

166+ void progressChanged(const QString &appId, int progress) const;

128− void countChanged(const QString &appId, int count);

167+ void countChanged(const QString &appId, int count) const;

168+ void countVisibleChanged(const QString &appId, bool visible) const;

129

169

130private:

170private:

131 QString findDesktopFile(const QString &appId) const;

171 QString findDesktopFile(const QString &appId) const;

@@ -143,6 +183,14 @@ private:

143

183

144 AccountsServiceDBusAdaptor *m_accounts;

184 AccountsServiceDBusAdaptor *m_accounts;

145 QString m_user;

185 QString m_user;

186+

187+ void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;

188+

189+protected: /* Protected to allow testing */

190+ LauncherBackendItem* getItem(const QString& appId) const;

191+

192+ static QString decodeAppId(const QString& path);

193+ static QString encodeAppId(const QString& appId);

146};

194};

147

195

148#endif // LAUNCHERBACKEND_H

196#endif // LAUNCHERBACKEND_H

plugins/Utils/CMakeLists.txt−1

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

11)

12

13set(QMLPLUGIN_SRC

14− bottombarvisibilitycommunicatorshell.cpp

15 qlimitproxymodelqml.cpp

14 qlimitproxymodelqml.cpp

16 qsortfilterproxymodelqml.cpp

15 qsortfilterproxymodelqml.cpp

17 timeformatter.cpp

16 timeformatter.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

@@ -26,16 +26,12 @@

26#include "plugin.h"

27

28// local

29−#include "bottombarvisibilitycommunicatorshell.h"

30#include "qlimitproxymodelqml.h"

29#include "qlimitproxymodelqml.h"

31#include "qsortfilterproxymodelqml.h"

30#include "qsortfilterproxymodelqml.h"

32#include "timeformatter.h"

31#include "timeformatter.h"

33#include "unitymenumodelpaths.h"

32#include "unitymenumodelpaths.h"

34#include "easingcurve.h"

33#include "easingcurve.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,16 +41,10 @@ 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 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

44 qmlRegisterType<EasingCurve>(uri, 0, 1, "EasingCurve");

50}

45}

51

46

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

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

53{

48{

54 QQmlExtensionPlugin::initializeEngine(engine, uri);

49 QQmlExtensionPlugin::initializeEngine(engine, uri);

55−

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

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

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

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

60}

50}

po/am.po+9−13

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-18 19:28+0000\n"

12"Last-Translator: samson <Unknown>\n"

13"Language-Team: Amharic <am@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr "መላኪያ"

114msgstr "መላኪያ"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,14 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "መፈለጊያ"

163msgstr "መፈለጊያ"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "እባክዎን ያስገቡ %1"

168msgstr "እባክዎን ያስገቡ %1"

166−

167−#~ msgid "Comments:"

168−#~ msgstr "አስተያየቶች:"

169−

170−#, qt-format

171−#~ msgid "(%1)"

172−#~ msgstr "(%1)"

po/ar.po+9−27

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

13"Language-Team: Arabic <ar@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=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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

21

19

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

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

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

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

@@ -89,7 +87,7 @@ msgstr "شاهد المزيد"

89msgid "See less"

87msgid "See less"

90msgstr "شاهد أقل"

88msgstr "شاهد أقل"

91

89

92−#: qml/Dash/DashApps.qml:38

90+#: qml/Dash/DashApps.qml:37

93msgid "Recent"

91msgid "Recent"

94msgstr ""

92msgstr ""

95

93

@@ -118,6 +116,10 @@ msgstr "أضف تعليق"

118msgid "Send"

116msgid "Send"

119msgstr "أرسل"

117msgstr "أرسل"

120

118

119+#: qml/Greeter/Greeter.qml:151

120+msgid "Swipe to unlock"

121+msgstr ""

122+

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

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

122msgid "Emergency Call"

124msgid "Emergency Call"

123msgstr "مكالمة طوارئ"

125msgstr "مكالمة طوارئ"

@@ -163,27 +165,7 @@ msgstr "من فضلك أدخِل رقم التعريف الشخصي لبطاقة

163msgid "Search"

165msgid "Search"

164msgstr "ابحث"

166msgstr "ابحث"

165

167

166−#: qml/Shell.qml:417

168+#: qml/Shell.qml:348

167#, qt-format

169#, qt-format

168msgid "Please enter %1"

170msgid "Please enter %1"

169msgstr "من فضلك أدخِل %1"

171msgstr "من فضلك أدخِل %1"

170−

171−#~ msgid "Review"

172−#~ msgstr "التعليق"

173−

174−#, qt-format

175−#~ msgid "(%1)"

176−#~ msgstr "(%1)"

177−

178−#~ msgid "Comments:"

179−#~ msgstr "التعليقات:"

180−

181−#, qt-format

182−#~ msgid "%1 review"

183−#~ msgid_plural "%1 reviews"

184−#~ msgstr[0] "لا تعليقات (%1)"

185−#~ msgstr[1] "تعليق واحد (%1)"

186−#~ msgstr[2] "تعليقان (%1)"

187−#~ msgstr[3] "%1 تعليقات"

188−#~ msgstr[4] "%1 تعليقا"

189−#~ msgstr[5] "%1 تعليق"

po/ast.po+9−5

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-04-04 02:16+0000\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−"X-Launchpad-Export-Date: 2014-04-08 07:13+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

19

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

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

@@ -88,7 +88,7 @@ msgstr "Ver más"

88msgid "See less"

89msgstr "Ver menos"

90

91−#: qml/Dash/DashApps.qml:38

91+#: qml/Dash/DashApps.qml:37

92msgid "Recent"

93msgstr "Reciente"

94

@@ -117,6 +117,10 @@ msgstr "Amestar una reseña"

117msgid "Send"

118msgstr "Unviar"

119

120+#: qml/Greeter/Greeter.qml:151

121+msgid "Swipe to unlock"

122+msgstr ""

123+

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

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

121msgid "Emergency Call"

125msgid "Emergency Call"

122msgstr "Llamada d'emerxencia"

126msgstr "Llamada d'emerxencia"

@@ -162,7 +166,7 @@ msgstr "Escriba'l PIN de la SIM"

162msgid "Search"

166msgid "Search"

163msgstr "Guetar"

167msgstr "Guetar"

164

168

165−#: qml/Shell.qml:417

169+#: qml/Shell.qml:348

166#, qt-format

170#, qt-format

167msgid "Please enter %1"

171msgid "Please enter %1"

168msgstr "Introduz %1"

172msgstr "Introduz %1"

po/az.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-15 09:50+0000\n"

12"Last-Translator: Turan Mahmudov <turan.mahmudov@gmail.com>\n"

13"Language-Team: Azerbaijani <az@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -86,7 +85,7 @@ msgstr ""

86msgid "See less"

85msgid "See less"

87msgstr ""

86msgstr ""

88

87

89−#: qml/Dash/DashApps.qml:38

88+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

89msgid "Recent"

91msgstr ""

90msgstr ""

92

91

@@ -115,6 +114,10 @@ msgstr "Rəy yaz"

115msgid "Send"

114msgid "Send"

116msgstr "Göndər"

115msgstr "Göndər"

117

116

117+#: qml/Greeter/Greeter.qml:151

118+msgid "Swipe to unlock"

119+msgstr ""

120+

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

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

119msgid "Emergency Call"

122msgid "Emergency Call"

120msgstr "Zərurət zəngi"

123msgstr "Zərurət zəngi"

@@ -160,23 +163,7 @@ msgstr ""

160msgid "Search"

163msgid "Search"

161msgstr "Axtar"

164msgstr "Axtar"

162

165

163−#: qml/Shell.qml:417

166+#: qml/Shell.qml:348

164#, qt-format

167#, qt-format

165msgid "Please enter %1"

168msgid "Please enter %1"

166msgstr "Xahiş edirik daxil edin: %1"

169msgstr "Xahiş edirik daxil edin: %1"

167−

168−#~ msgid "Comments:"

169−#~ msgstr "Şərhlər:"

170−

171−#~ msgid "Review"

172−#~ msgstr "Rəy"

173−

174−#, qt-format

175−#~ msgid "%1 review"

176−#~ msgid_plural "%1 reviews"

177−#~ msgstr[0] "%1 rəy"

178−#~ msgstr[1] "%1 rəy"

179−

180−#, qt-format

181−#~ msgid "(%1)"

182−#~ msgstr "(%1)"

po/bg.po+9−5

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-04-01 14:08+0000\n"

12"Last-Translator: Atanas Kovachki <Unknown>\n"

13"Language-Team: Bulgarian <bg@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-04-03 06:06+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

19

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

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

@@ -91,7 +91,7 @@ msgstr ""

91msgid "See less"

92msgstr ""

93

94−#: qml/Dash/DashApps.qml:38

94+#: qml/Dash/DashApps.qml:37

95msgid "Recent"

96msgstr "Последни"

97

@@ -120,6 +120,10 @@ msgstr "Добави отзив"

120msgid "Send"

121msgstr "Изпрати"

122

123+#: qml/Greeter/Greeter.qml:151

124+msgid "Swipe to unlock"

125+msgstr ""

126+

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

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

124msgid "Emergency Call"

128msgid "Emergency Call"

125msgstr "Спешно повикване"

129msgstr "Спешно повикване"

@@ -165,7 +169,7 @@ msgstr ""

165msgid "Search"

169msgid "Search"

166msgstr "Търсене"

170msgstr "Търсене"

167

171

168−#: qml/Shell.qml:417

172+#: qml/Shell.qml:348

169#, qt-format

173#, qt-format

170msgid "Please enter %1"

174msgid "Please enter %1"

171msgstr "Моля, въведете %1"

175msgstr "Моля, въведете %1"

po/br.po+9−5

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-04-15 18:15+0000\n"

12"Last-Translator: Rouxel <vincent.rouxel@mailoo.org>\n"

13"Language-Team: Breton <br@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-04-16 07:12+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

19

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

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

@@ -84,7 +84,7 @@ msgstr ""

84msgid "See less"

85msgstr ""

86

87−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

88msgid "Recent"

89msgstr ""

90

@@ -113,6 +113,10 @@ msgstr ""

113msgid "Send"

114msgstr ""

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

117msgid "Emergency Call"

121msgid "Emergency Call"

118msgstr ""

122msgstr ""

@@ -158,7 +162,7 @@ msgstr ""

158msgid "Search"

162msgid "Search"

159msgstr ""

163msgstr ""

160

164

161−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

162#, qt-format

166#, qt-format

163msgid "Please enter %1"

167msgid "Please enter %1"

164msgstr ""

168msgstr ""

po/bs.po+9−7

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-16 22:33+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Bosnian <bs@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=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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

21

19

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

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

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

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

@@ -86,7 +84,7 @@ msgstr ""

86msgid "See less"

84msgid "See less"

87msgstr ""

85msgstr ""

88

86

89−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

88msgid "Recent"

91msgstr ""

89msgstr ""

92

90

@@ -115,6 +113,10 @@ msgstr ""

115msgid "Send"

113msgid "Send"

116msgstr ""

114msgstr ""

117

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

119msgid "Emergency Call"

121msgid "Emergency Call"

120msgstr ""

122msgstr ""

@@ -160,7 +162,7 @@ msgstr ""

160msgid "Search"

162msgid "Search"

161msgstr ""

163msgstr ""

162

164

163−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

164#, qt-format

166#, qt-format

165msgid "Please enter %1"

167msgid "Please enter %1"

166msgstr ""

168msgstr ""

po/ca.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-10 07:45+0000\n"

12"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

13"Language-Team: Catalan <ca@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -91,7 +90,7 @@ msgstr ""

91msgid "See less"

90msgid "See less"

92msgstr ""

91msgstr ""

93

92

94−#: qml/Dash/DashApps.qml:38

93+#: qml/Dash/DashApps.qml:37

95msgid "Recent"

94msgid "Recent"

96msgstr ""

95msgstr ""

97

96

@@ -120,6 +119,10 @@ msgstr "Afegiu una ressenya"

120msgid "Send"

119msgid "Send"

121msgstr "Envia"

120msgstr "Envia"

122

121

122+#: qml/Greeter/Greeter.qml:151

123+msgid "Swipe to unlock"

124+msgstr ""

125+

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

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

124msgid "Emergency Call"

127msgid "Emergency Call"

125msgstr "Trucada d'emergència"

128msgstr "Trucada d'emergència"

@@ -165,23 +168,7 @@ msgstr ""

165msgid "Search"

168msgid "Search"

166msgstr "Cerca"

169msgstr "Cerca"

167

170

168−#: qml/Shell.qml:417

171+#: qml/Shell.qml:348

169#, qt-format

172#, qt-format

170msgid "Please enter %1"

173msgid "Please enter %1"

171msgstr "Introduïu %1"

174msgstr "Introduïu %1"

172−

173−#, qt-format

174−#~ msgid "(%1)"

175−#~ msgstr "(%1)"

176−

177−#~ msgid "Comments:"

178−#~ msgstr "Comentaris:"

179−

180−#~ msgid "Review"

181−#~ msgstr "Ressenya"

182−

183−#, qt-format

184−#~ msgid "%1 review"

185−#~ msgid_plural "%1 reviews"

186−#~ msgstr[0] "%1 ressenya"

187−#~ msgstr[1] "%1 ressenyes"

po/ckb.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-21 11:05+0000\n"

12"Last-Translator: Aras <aras.noori@gmail.com>\n"

13"Language-Team: Kurdish (Sorani) <ckb@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "پێداچوونەوە زۆر بکە"

114msgid "Send"

113msgid "Send"

115msgstr "ناردن"

114msgstr "ناردن"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "هێڵی فریاگوزاری"

122msgstr "هێڵی فریاگوزاری"

@@ -159,23 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "گەڕان"

163msgstr "گەڕان"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "تکایە %1 بنووسە"

168msgstr "تکایە %1 بنووسە"

166−

167−#, qt-format

168−#~ msgid "(%1)"

169−#~ msgstr "(%1)"

170−

171−#~ msgid "Comments:"

172−#~ msgstr "لێدوانەکان:"

173−

174−#, qt-format

175−#~ msgid "%1 review"

176−#~ msgid_plural "%1 reviews"

177−#~ msgstr[0] "%1 پێداچوونەوە"

178−#~ msgstr[1] "%1 پێداچوونەوەکان"

179−

180−#~ msgid "Review"

181−#~ msgstr "پێداچوونەوە"

po/cs.po+9−23

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-08 10:11+0000\n"

12"Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"

13"Language-Team: Czech <cs@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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2014-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "Přidat recenzi"

114msgid "Send"

113msgid "Send"

115msgstr "Odeslat"

114msgstr "Odeslat"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "Tísňové volání"

122msgstr "Tísňové volání"

@@ -159,24 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Hledat"

163msgstr "Hledat"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "Zadejte prosím %1"

168msgstr "Zadejte prosím %1"

166−

167−#~ msgid "Comments:"

168−#~ msgstr "Komentáře:"

169−

170−#, qt-format

171−#~ msgid "(%1)"

172−#~ msgstr "(%1)"

173−

174−#~ msgid "Review"

175−#~ msgstr "Recenze"

176−

177−#, qt-format

178−#~ msgid "%1 review"

179−#~ msgid_plural "%1 reviews"

180−#~ msgstr[0] "%1 recenze"

181−#~ msgstr[1] "%1 recenze"

182−#~ msgstr[2] "%1 recenzí"

po/da.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Danish <da@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/de.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: Dennis Baudys <Unknown>\n"

13"Language-Team: German <de@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -87,7 +86,7 @@ msgstr ""

87msgid "See less"

86msgid "See less"

88msgstr ""

87msgstr ""

89

88

90−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

91msgid "Recent"

90msgid "Recent"

92msgstr ""

91msgstr ""

93

92

@@ -116,6 +115,10 @@ msgstr "Bewertung hinzufügen"

116msgid "Send"

115msgid "Send"

117msgstr "Senden"

116msgstr "Senden"

118

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

120msgid "Emergency Call"

123msgid "Emergency Call"

121msgstr "Notruf"

124msgstr "Notruf"

@@ -161,23 +164,7 @@ msgstr ""

161msgid "Search"

164msgid "Search"

162msgstr "Suchen"

165msgstr "Suchen"

163

166

164−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

165#, qt-format

168#, qt-format

166msgid "Please enter %1"

169msgid "Please enter %1"

167msgstr "Bitte geben Sie %1 ein"

170msgstr "Bitte geben Sie %1 ein"

168−

169−#~ msgid "Comments:"

170−#~ msgstr "Kommentare:"

171−

172−#, qt-format

173−#~ msgid "(%1)"

174−#~ msgstr "(%1)"

175−

176−#~ msgid "Review"

177−#~ msgstr "Bewertung"

178−

179−#, qt-format

180−#~ msgid "%1 review"

181−#~ msgid_plural "%1 reviews"

182−#~ msgstr[0] "%1 Bewertung"

183−#~ msgstr[1] "%1 Bewertungen"

po/el.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-02-26 09:58+0000\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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -89,7 +88,7 @@ msgstr "Περρισότερα"

89msgid "See less"

88msgid "See less"

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

89msgstr "Λιγότερα"

91

90

92−#: qml/Dash/DashApps.qml:38

91+#: qml/Dash/DashApps.qml:37

93msgid "Recent"

92msgid "Recent"

94msgstr ""

93msgstr ""

95

94

@@ -118,6 +117,10 @@ msgstr "Προσθέστε την αξιολόγησή σας"

118msgid "Send"

117msgid "Send"

119msgstr "Αποστολή"

118msgstr "Αποστολή"

120

119

120+#: qml/Greeter/Greeter.qml:151

121+msgid "Swipe to unlock"

122+msgstr ""

123+

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

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

122msgid "Emergency Call"

125msgid "Emergency Call"

123msgstr "Κλήση έκτακτης ανάγκης"

126msgstr "Κλήση έκτακτης ανάγκης"

@@ -163,23 +166,7 @@ msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"

163msgid "Search"

166msgid "Search"

164msgstr "Αναζήτηση"

167msgstr "Αναζήτηση"

165

168

166−#: qml/Shell.qml:417

169+#: qml/Shell.qml:348

167#, qt-format

170#, qt-format

168msgid "Please enter %1"

171msgid "Please enter %1"

169msgstr "Πληκτρολογήστε %1"

172msgstr "Πληκτρολογήστε %1"

170−

171−#, qt-format

172−#~ msgid "%1 review"

173−#~ msgid_plural "%1 reviews"

174−#~ msgstr[0] "%1 αξιολόγηση"

175−#~ msgstr[1] "%1 αξιολογήσεις"

176−

177−#, qt-format

178−#~ msgid "(%1)"

179−#~ msgstr "(%1)"

180−

181−#~ msgid "Comments:"

182−#~ msgstr "Σχόλια:"

183−

184−#~ msgid "Review"

185−#~ msgstr "Αξιολόγηση"

po/en_AU.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-09-28 07:46+0000\n"

12"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

13"Language-Team: English (Australia) <en_AU@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "Add a review"

114msgid "Send"

113msgid "Send"

115msgstr "Send"

114msgstr "Send"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "Emergency Call"

122msgstr "Emergency Call"

@@ -159,23 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Search"

163msgstr "Search"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "Please enter %1"

168msgstr "Please enter %1"

166−

167−#~ msgid "Comments:"

168−#~ msgstr "Comments:"

169−

170−#~ msgid "Review"

171−#~ msgstr "Review"

172−

173−#, qt-format

174−#~ msgid "%1 review"

175−#~ msgid_plural "%1 reviews"

176−#~ msgstr[0] "%1 review"

177−#~ msgstr[1] "%1 reviews"

178−

179−#, qt-format

180−#~ msgid "(%1)"

181−#~ msgstr "(%1)"

po/en_GB.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-03-07 13:27+0000\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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -87,7 +86,7 @@ msgstr "See more"

87msgid "See less"

86msgid "See less"

88msgstr "See less"

87msgstr "See less"

89

88

90−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

91msgid "Recent"

90msgid "Recent"

92msgstr ""

91msgstr ""

93

92

@@ -116,6 +115,10 @@ msgstr "Add a review"

116msgid "Send"

115msgid "Send"

117msgstr "Send"

116msgstr "Send"

118

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

120msgid "Emergency Call"

123msgid "Emergency Call"

121msgstr "Emergency Call"

124msgstr "Emergency Call"

@@ -161,23 +164,7 @@ msgstr "Please enter SIM PIN"

161msgid "Search"

164msgid "Search"

162msgstr "Search"

165msgstr "Search"

163

166

164−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

165#, qt-format

168#, qt-format

166msgid "Please enter %1"

169msgid "Please enter %1"

167msgstr "Please enter %1"

170msgstr "Please enter %1"

168−

169−#~ msgid "Comments:"

170−#~ msgstr "Comments:"

171−

172−#~ msgid "Review"

173−#~ msgstr "Review"

174−

175−#, qt-format

176−#~ msgid "%1 review"

177−#~ msgid_plural "%1 reviews"

178−#~ msgstr[0] "%1 review"

179−#~ msgstr[1] "%1 reviews"

180−

181−#, qt-format

182−#~ msgid "(%1)"

183−#~ msgstr "(%1)"

po/eo.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Esperanto <eo@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/es.po+9−5

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-03-28 22:37+0000\n"

12"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"

13"Language-Team: Spanish <es@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-03-29 07:34+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

19

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

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

@@ -89,7 +89,7 @@ msgstr "Ver más"

89msgid "See less"

90msgstr "Ver menos"

91

92−#: qml/Dash/DashApps.qml:38

92+#: qml/Dash/DashApps.qml:37

93msgid "Recent"

94msgstr "Recientes"

95

@@ -118,6 +118,10 @@ msgstr "Añadir una reseña"

118msgid "Send"

119msgstr "Enviar"

120

121+#: qml/Greeter/Greeter.qml:151

122+msgid "Swipe to unlock"

123+msgstr ""

124+

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

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

122msgid "Emergency Call"

126msgid "Emergency Call"

123msgstr "Llamada de emergencia"

127msgstr "Llamada de emergencia"

@@ -163,7 +167,7 @@ msgstr "Escriba el PIN de la SIM"

163msgid "Search"

167msgid "Search"

164msgstr "Buscar"

168msgstr "Buscar"

165

169

166−#: qml/Shell.qml:417

170+#: qml/Shell.qml:348

167#, qt-format

171#, qt-format

168msgid "Please enter %1"

172msgid "Please enter %1"

169msgstr "Introduzca %1"

173msgstr "Introduzca %1"

po/eu.po+9−5

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-03-30 12:44+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−"X-Launchpad-Export-Date: 2014-03-31 06:44+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

19

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

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

@@ -88,7 +88,7 @@ msgstr "Ikusi gehiago"

88msgid "See less"

89msgstr "Ikusi gutxiago"

90

91−#: qml/Dash/DashApps.qml:38

91+#: qml/Dash/DashApps.qml:37

92msgid "Recent"

93msgstr "Azkenak"

94

@@ -117,6 +117,10 @@ msgstr "Gehitu kritika"

117msgid "Send"

118msgstr "Bidali"

119

120+#: qml/Greeter/Greeter.qml:151

121+msgid "Swipe to unlock"

122+msgstr ""

123+

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

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

121msgid "Emergency Call"

125msgid "Emergency Call"

122msgstr "Larrialdi-deia"

126msgstr "Larrialdi-deia"

@@ -162,7 +166,7 @@ msgstr "Sartu SIMaren PINa"

162msgid "Search"

166msgid "Search"

163msgstr "Bilatu"

167msgstr "Bilatu"

164

168

165−#: qml/Shell.qml:417

169+#: qml/Shell.qml:348

166#, qt-format

170#, qt-format

167msgid "Please enter %1"

171msgid "Please enter %1"

168msgstr "Sartu %1"

172msgstr "Sartu %1"

po/fa.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-10-31 19:02+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Persian <fa@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/fi.po+9−5

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-04-05 09:57+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−"X-Launchpad-Export-Date: 2014-04-08 07:13+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

19

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

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

@@ -86,7 +86,7 @@ msgstr "Näytä lisää"

86msgid "See less"

87msgstr "Näytä vähemmän"

88

89−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

91msgstr "Viimeisimmät"

92

@@ -115,6 +115,10 @@ msgstr "Lisää arvostelu"

115msgid "Send"

116msgstr "Lähetä"

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

119msgid "Emergency Call"

123msgid "Emergency Call"

120msgstr "Hätäpuhelu"

124msgstr "Hätäpuhelu"

@@ -160,7 +164,7 @@ msgstr "Anna SIM-kortin PIN-koodi"

160msgid "Search"

164msgid "Search"

161msgstr "Hae"

165msgstr "Hae"

162

166

163−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

164#, qt-format

168#, qt-format

165msgid "Please enter %1"

169msgid "Please enter %1"

166msgstr "Kirjoita %1"

170msgstr "Kirjoita %1"

po/fo.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: Jógvan Olsen <jeggy@jebster.net>\n"

13"Language-Team: Faroese <fo@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Leita"

163msgstr "Leita"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/fr.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-28 00:34+0000\n"

12"Last-Translator: Pierre <Unknown>\n"

13"Language-Team: French <fr@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "Ajouter un avis"

114msgid "Send"

113msgid "Send"

115msgstr "Envoyer"

114msgstr "Envoyer"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "Appel d'urgence"

122msgstr "Appel d'urgence"

@@ -159,23 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Rechercher"

163msgstr "Rechercher"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "Veuillez saisir %1"

168msgstr "Veuillez saisir %1"

166−

167−#~ msgid "Review"

168−#~ msgstr "Avis"

169−

170−#, qt-format

171−#~ msgid "%1 review"

172−#~ msgid_plural "%1 reviews"

173−#~ msgstr[0] "%1 avis"

174−#~ msgstr[1] "%1 avis"

175−

176−#~ msgid "Comments:"

177−#~ msgstr "Commentaires :"

178−

179−#, qt-format

180−#~ msgid "(%1)"

181−#~ msgstr "(%1)"

po/gd.po+9−25

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-09-30 10:34+0000\n"

12"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"

13"Language-Team: Gaelic; Scottish <gd@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=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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

21

19

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

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

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

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

@@ -92,7 +90,7 @@ msgstr ""

92msgid "See less"

90msgid "See less"

93msgstr ""

91msgstr ""

94

92

95−#: qml/Dash/DashApps.qml:38

93+#: qml/Dash/DashApps.qml:37

96msgid "Recent"

94msgid "Recent"

97msgstr ""

95msgstr ""

98

96

@@ -121,6 +119,10 @@ msgstr "Cuir lèirmheas ris"

121msgid "Send"

119msgid "Send"

122msgstr "Cuir"

120msgstr "Cuir"

123

121

122+#: qml/Greeter/Greeter.qml:151

123+msgid "Swipe to unlock"

124+msgstr ""

125+

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

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

125msgid "Emergency Call"

127msgid "Emergency Call"

126msgstr "Gairm èiginn"

128msgstr "Gairm èiginn"

@@ -166,25 +168,7 @@ msgstr ""

166msgid "Search"

168msgid "Search"

167msgstr "Lorg"

169msgstr "Lorg"

168

170

169−#: qml/Shell.qml:417

171+#: qml/Shell.qml:348

170#, qt-format

172#, qt-format

171msgid "Please enter %1"

173msgid "Please enter %1"

172msgstr "Cuir a-steach %1"

174msgstr "Cuir a-steach %1"

173−

174−#, qt-format

175−#~ msgid "(%1)"

176−#~ msgstr "(%1)"

177−

178−#~ msgid "Comments:"

179−#~ msgstr "Beachdan"

180−

181−#~ msgid "Review"

182−#~ msgstr "Lèirmheas"

183−

184−#, qt-format

185−#~ msgid "%1 review"

186−#~ msgid_plural "%1 reviews"

187−#~ msgstr[0] "%1 lèirmheas"

188−#~ msgstr[1] "%1 lèirmheas"

189−#~ msgstr[2] "%1 lèirmheasan"

190−#~ msgstr[3] "%1 lèirmheas"

po/gl.po+10−6

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11−"PO-Revision-Date: 2014-04-08 07:04+0000\n"

11+"PO-Revision-Date: 2014-05-03 07:31+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−"X-Launchpad-Export-Date: 2014-04-09 07:31+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-06 07:34+0000\n"

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

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

19

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

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

@@ -86,7 +86,7 @@ msgstr "Ver máis"

86msgid "See less"

87msgstr "Ver menos"

88

89−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

91msgstr "Recentes"

92

@@ -115,6 +115,10 @@ msgstr "Engadir unha opinión"

115msgid "Send"

116msgstr "Enviar"

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr "Esvare para desbloquear"

121+

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

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

119msgid "Emergency Call"

123msgid "Emergency Call"

120msgstr "Chamada de emerxencia"

124msgstr "Chamada de emerxencia"

@@ -160,7 +164,7 @@ msgstr "Introduza o PIN da SIM"

160msgid "Search"

164msgid "Search"

161msgstr "Buscar"

165msgstr "Buscar"

162

166

163−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

164#, qt-format

168#, qt-format

165msgid "Please enter %1"

169msgid "Please enter %1"

166msgstr "Introduza %1"

170msgstr "Introduza %1"

po/he.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-11-20 08:30+0000\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

13"Language-Team: Hebrew <he@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "הוספת סקירה"

114msgid "Send"

113msgid "Send"

115msgstr "שליחה"

114msgstr "שליחה"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "שיחת חירום"

122msgstr "שיחת חירום"

@@ -159,23 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "חיפוש"

163msgstr "חיפוש"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "נא להזין %1"

168msgstr "נא להזין %1"

166−

167−#, qt-format

168−#~ msgid "(%1)"

169−#~ msgstr "(%1)"

170−

171−#~ msgid "Comments:"

172−#~ msgstr "הערות:"

173−

174−#~ msgid "Review"

175−#~ msgstr "סקירה"

176−

177−#, qt-format

178−#~ msgid "%1 review"

179−#~ msgid_plural "%1 reviews"

180−#~ msgstr[0] "סקירה %1"

181−#~ msgstr[1] "%1 סקירות"

po/hi.po+9−9

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-15 01:49+0000\n"

12"Last-Translator: Siddhanathan S. <Unknown>\n"

13"Language-Team: Hindi <hi@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "समीक्षा दे"

114msgid "Send"

113msgid "Send"

115msgstr "भेजें"

114msgstr "भेजें"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "आपातकालीन कॉल"

122msgstr "आपातकालीन कॉल"

@@ -159,10 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "खोजें"

163msgstr "खोजें"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

166−

167−#~ msgid "Review"

168−#~ msgstr "समीक्षा"

po/hr.po+9−7

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 04:14+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Croatian <hr@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=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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

21

19

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

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

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

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

@@ -86,7 +84,7 @@ msgstr ""

86msgid "See less"

84msgid "See less"

87msgstr ""

85msgstr ""

88

86

89−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

88msgid "Recent"

91msgstr ""

89msgstr ""

92

90

@@ -115,6 +113,10 @@ msgstr ""

115msgid "Send"

113msgid "Send"

116msgstr ""

114msgstr ""

117

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

119msgid "Emergency Call"

121msgid "Emergency Call"

120msgstr ""

122msgstr ""

@@ -160,7 +162,7 @@ msgstr ""

160msgid "Search"

162msgid "Search"

161msgstr "Pretraživanje"

163msgstr "Pretraživanje"

162

164

163−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

164#, qt-format

166#, qt-format

165msgid "Please enter %1"

167msgid "Please enter %1"

166msgstr ""

168msgstr ""

po/hu.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-14 23:02+0000\n"

12"Last-Translator: Kristóf Kiszel <Unknown>\n"

13"Language-Team: Hungarian <hu@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -87,7 +86,7 @@ msgstr ""

87msgid "See less"

86msgid "See less"

88msgstr ""

87msgstr ""

89

88

90−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

91msgid "Recent"

90msgid "Recent"

92msgstr ""

91msgstr ""

93

92

@@ -116,6 +115,10 @@ msgstr "Értékelés hozzáadása"

116msgid "Send"

115msgid "Send"

117msgstr "Küldés"

116msgstr "Küldés"

118

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

120msgid "Emergency Call"

123msgid "Emergency Call"

121msgstr "Vészhívás"

124msgstr "Vészhívás"

@@ -161,23 +164,7 @@ msgstr ""

161msgid "Search"

164msgid "Search"

162msgstr "Keresés"

165msgstr "Keresés"

163

166

164−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

165#, qt-format

168#, qt-format

166msgid "Please enter %1"

169msgid "Please enter %1"

167msgstr "Adja meg a következőt: %1"

170msgstr "Adja meg a következőt: %1"

168−

169−#, qt-format

170−#~ msgid "%1 review"

171−#~ msgid_plural "%1 reviews"

172−#~ msgstr[0] "%1 értékelés"

173−#~ msgstr[1] "%1 értékelés"

174−

175−#, qt-format

176−#~ msgid "(%1)"

177−#~ msgstr "(%1)"

178−

179−#~ msgid "Comments:"

180−#~ msgstr "Hozzászólások:"

181−

182−#~ msgid "Review"

183−#~ msgstr "Értékelés"

po/hy.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 04:43+0000\n"

12"Last-Translator: iAbaS <sosabazyan@yandex.ru>\n"

13"Language-Team: Armenian <hy@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Որոնում"

163msgstr "Որոնում"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/id.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-26 22:35+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Indonesian <id@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/is.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-09-18 16:22+0000\n"

12"Last-Translator: Andri Thorlacius <Unknown>\n"

13"Language-Team: Icelandic <is@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -86,7 +85,7 @@ msgstr ""

86msgid "See less"

85msgid "See less"

87msgstr ""

86msgstr ""

88

87

89−#: qml/Dash/DashApps.qml:38

88+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

89msgid "Recent"

91msgstr ""

90msgstr ""

92

91

@@ -115,6 +114,10 @@ msgstr "Gefa umsögn"

115msgid "Send"

114msgid "Send"

116msgstr "Senda"

115msgstr "Senda"

117

116

117+#: qml/Greeter/Greeter.qml:151

118+msgid "Swipe to unlock"

119+msgstr ""

120+

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

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

119msgid "Emergency Call"

122msgid "Emergency Call"

120msgstr "Neyðarsímtal"

123msgstr "Neyðarsímtal"

@@ -160,23 +163,7 @@ msgstr ""

160msgid "Search"

163msgid "Search"

161msgstr "Leita"

164msgstr "Leita"

162

165

163−#: qml/Shell.qml:417

166+#: qml/Shell.qml:348

164#, qt-format

167#, qt-format

165msgid "Please enter %1"

168msgid "Please enter %1"

166msgstr ""

169msgstr ""

167−

168−#, qt-format

169−#~ msgid "(%1)"

170−#~ msgstr "(%1)"

171−

172−#~ msgid "Comments:"

173−#~ msgstr "Athugasemdir:"

174−

175−#~ msgid "Review"

176−#~ msgstr "Umsögn"

177−

178−#, qt-format

179−#~ msgid "%1 review"

180−#~ msgid_plural "%1 reviews"

181−#~ msgstr[0] "%1 ummæli"

182−#~ msgstr[1] "%1 ummæli"

po/it.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-22 09:15+0000\n"

12"Last-Translator: Domenico <domenico.verde125@live.it>\n"

13"Language-Team: Italian <it@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -90,7 +89,7 @@ msgstr ""

90msgid "See less"

89msgid "See less"

91msgstr ""

90msgstr ""

92

91

93−#: qml/Dash/DashApps.qml:38

92+#: qml/Dash/DashApps.qml:37

94msgid "Recent"

93msgid "Recent"

95msgstr ""

94msgstr ""

96

95

@@ -119,6 +118,10 @@ msgstr "Aggiungi una recensione"

119msgid "Send"

118msgid "Send"

120msgstr "Invia"

119msgstr "Invia"

121

120

121+#: qml/Greeter/Greeter.qml:151

122+msgid "Swipe to unlock"

123+msgstr ""

124+

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

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

123msgid "Emergency Call"

126msgid "Emergency Call"

124msgstr "Chiamata di emergenza"

127msgstr "Chiamata di emergenza"

@@ -164,23 +167,7 @@ msgstr ""

164msgid "Search"

167msgid "Search"

165msgstr "Cerca"

168msgstr "Cerca"

166

169

167−#: qml/Shell.qml:417

170+#: qml/Shell.qml:348

168#, qt-format

171#, qt-format

169msgid "Please enter %1"

172msgid "Please enter %1"

170msgstr "Inserire %1"

173msgstr "Inserire %1"

171−

172−#, qt-format

173−#~ msgid "(%1)"

174−#~ msgstr "(%1)"

175−

176−#, qt-format

177−#~ msgid "%1 review"

178−#~ msgid_plural "%1 reviews"

179−#~ msgstr[0] "%1 recensione"

180−#~ msgstr[1] "%1 recensioni"

181−

182−#~ msgid "Comments:"

183−#~ msgstr "Commenti:"

184−

185−#~ msgid "Review"

186−#~ msgstr "Recensisci"

po/ja.po+9−13

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-18 07:01+0000\n"

12"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"

13"Language-Team: Japanese <ja@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr "送信"

114msgstr "送信"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,14 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "検索"

163msgstr "検索"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

166−

167−#~ msgid "Comments:"

168−#~ msgstr "コメント:"

169−

170−#, qt-format

171−#~ msgid "(%1)"

172−#~ msgstr "(%1)"

po/km.po+9−21

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -89,7 +88,7 @@ msgstr "មើលច្រើនទៀត"

89msgid "See less"

88msgid "See less"

90msgstr "មើលតិចជាង"

89msgstr "មើលតិចជាង"

91

90

92−#: qml/Dash/DashApps.qml:38

91+#: qml/Dash/DashApps.qml:37

93msgid "Recent"

92msgid "Recent"

94msgstr ""

93msgstr ""

95

94

@@ -118,6 +117,10 @@ msgstr "បន្ថែមការពិនិត្យ"

118msgid "Send"

117msgid "Send"

119msgstr "ផ្ញើ"

118msgstr "ផ្ញើ"

120

119

120+#: qml/Greeter/Greeter.qml:151

121+msgid "Swipe to unlock"

122+msgstr ""

123+

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

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

122msgid "Emergency Call"

125msgid "Emergency Call"

123msgstr "ការហៅពេលអាសន្ន"

126msgstr "ការហៅពេលអាសន្ន"

@@ -163,22 +166,7 @@ msgstr "បញ្ចូលកូដ PIN របស់ស៊ីមកាត"

163msgid "Search"

166msgid "Search"

164msgstr "ស្វែងរក"

167msgstr "ស្វែងរក"

165

168

166−#: qml/Shell.qml:417

169+#: qml/Shell.qml:348

167#, qt-format

170#, qt-format

168msgid "Please enter %1"

171msgid "Please enter %1"

169msgstr "សូមបញ្ចូល %1"

172msgstr "សូមបញ្ចូល %1"

170−

171−#, qt-format

172−#~ msgid "(%1)"

173−#~ msgstr "(%1)"

174−

175−#, qt-format

176−#~ msgid "%1 review"

177−#~ msgid_plural "%1 reviews"

178−#~ msgstr[0] "ពិនិត្យមើល %1"

179−

180−#~ msgid "Comments:"

181−#~ msgstr "មតិយោបល់៖"

182−

183−#~ msgid "Review"

184−#~ msgstr "ការពិនិត្យ"

po/kn.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 05:43+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kannada <kn@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "ಹುಡುಕು"

163msgstr "ಹುಡುಕು"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/ko.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-10-10 07:04+0000\n"

12"Last-Translator: Kim Boram <boramism@gmail.com>\n"

13"Language-Team: Korean <ko@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "검색"

163msgstr "검색"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/ky.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 06:17+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Kirghiz <ky@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Издөө"

163msgstr "Издөө"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/lo.po+9−13

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-10-02 10:00+0000\n"

12"Last-Translator: Anousak <anousak@gmail.com>\n"

13"Language-Team: Lao <lo@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr "ສົ່ງ"

114msgstr "ສົ່ງ"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,14 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "ຊອກຫາ"

163msgstr "ຊອກຫາ"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "ກະລູນາປ້ອນ %1"

168msgstr "ກະລູນາປ້ອນ %1"

166−

167−#, qt-format

168−#~ msgid "(%1)"

169−#~ msgstr "(%1)"

170−

171−#~ msgid "Comments:"

172−#~ msgstr "ຄໍ່ເຫັນ"

po/lt.po+9−24

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-15 12:42+0000\n"

12"Last-Translator: Gediminas Paulauskas <menesis@pov.lt>\n"

13"Language-Team: Lithuanian <lt@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=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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

21

19

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

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

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

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

@@ -89,7 +87,7 @@ msgstr ""

89msgid "See less"

87msgid "See less"

90msgstr ""

88msgstr ""

91

89

92−#: qml/Dash/DashApps.qml:38

90+#: qml/Dash/DashApps.qml:37

93msgid "Recent"

91msgid "Recent"

94msgstr ""

92msgstr ""

95

93

@@ -118,6 +116,10 @@ msgstr "Pridėkite apžvalgą"

118msgid "Send"

116msgid "Send"

119msgstr "Siųsti"

117msgstr "Siųsti"

120

118

119+#: qml/Greeter/Greeter.qml:151

120+msgid "Swipe to unlock"

121+msgstr ""

122+

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

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

122msgid "Emergency Call"

124msgid "Emergency Call"

123msgstr "Pagalbos skambutis"

125msgstr "Pagalbos skambutis"

@@ -163,24 +165,7 @@ msgstr ""

163msgid "Search"

165msgid "Search"

164msgstr "Paieška"

166msgstr "Paieška"

165

167

166−#: qml/Shell.qml:417

168+#: qml/Shell.qml:348

167#, qt-format

169#, qt-format

168msgid "Please enter %1"

170msgid "Please enter %1"

169msgstr "Prašom įvesti %1"

171msgstr "Prašom įvesti %1"

170−

171−#~ msgid "Comments:"

172−#~ msgstr "Komentarai:"

173−

174−#~ msgid "Review"

175−#~ msgstr "Apžvalga"

176−

177−#, qt-format

178−#~ msgid "%1 review"

179−#~ msgid_plural "%1 reviews"

180−#~ msgstr[0] "%1 apžvalga"

181−#~ msgstr[1] "%1 apžvalgos"

182−#~ msgstr[2] "%1 apžvalgų"

183−

184−#, qt-format

185−#~ msgid "(%1)"

186−#~ msgstr "(%1)"

po/lv.po+27−24

@@ -7,29 +7,28 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

11+"PO-Revision-Date: 2014-05-07 18:17+0000\n"

12"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@gmail.com>\n"

13"Language-Team: Latvian <lv@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=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2014-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-08 06:40+0000\n"

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

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

20

19

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

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

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

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

23msgid "Lock to Launcher"

22msgid "Lock to Launcher"

24−msgstr ""

23+msgstr "Pieslēgt palaidējam"

25

24

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

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

27msgid "Unlock from Launcher"

26msgid "Unlock from Launcher"

28−msgstr ""

27+msgstr "Atslēgt no palaidēja"

29

28

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

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

31msgid "Skip intro"

30msgid "Skip intro"

32−msgstr ""

31+msgstr "Izlaist Intro"

33

32

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

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

35msgid "Right edge"

34msgid "Right edge"

@@ -37,7 +36,7 @@ msgstr "Labā mala"

37

36

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

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

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

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

40−msgstr ""

39+msgstr "Mēģiniet iesvelt no labās malas, lai atbloķētu tālruni"

41

40

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

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

43msgid "Top edge"

42msgid "Top edge"

@@ -45,7 +44,7 @@ msgstr "Augšējā mala"

45

44

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

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

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

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

48−msgstr ""

47+msgstr "Mēģiniet iesvelt no augšējās malas, lai piekļūt pie indikatoriem"

49

48

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

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

51msgid "Close"

50msgid "Close"

@@ -79,15 +78,15 @@ msgstr "Nesen veiktās meklēšanas"

79

78

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

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

81msgid "See more"

80msgid "See more"

82−msgstr ""

81+msgstr "Redzēt vairāk"

83

82

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

83#: qml/Components/SeeMore.qml:58

85msgid "See less"

84msgid "See less"

86−msgstr ""

85+msgstr "Redzēt mazāk"

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90−msgstr ""

89+msgstr "Nesens"

91

90

92#: qml/Dash/PreviewListView.qml:52

91#: qml/Dash/PreviewListView.qml:52

93#, qt-format

92#, qt-format

@@ -96,36 +95,40 @@ msgstr ""

96

95

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

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

98msgid "More..."

97msgid "More..."

99−msgstr ""

98+msgstr "Vairāk..."

100

99

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

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

102msgid "Less..."

101msgid "Less..."

103−msgstr ""

102+msgstr "Mazāk..."

104

103

105#: qml/Dash/Previews/PreviewRatingInput.qml:81

104#: qml/Dash/Previews/PreviewRatingInput.qml:81

106msgid "Rate this"

105msgid "Rate this"

107−msgstr ""

106+msgstr "Novērtēt šo"

108

107

109#: qml/Dash/Previews/PreviewRatingInput.qml:126

108#: qml/Dash/Previews/PreviewRatingInput.qml:126

110msgid "Add a review"

109msgid "Add a review"

111−msgstr ""

110+msgstr "Komentēt"

112

111

113#: qml/Dash/Previews/PreviewRatingInput.qml:166

112#: qml/Dash/Previews/PreviewRatingInput.qml:166

114msgid "Send"

113msgid "Send"

114+msgstr "Sūtīt"

115+

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

115msgstr ""

118msgstr ""

116

119

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119−msgstr ""

122+msgstr "Neatliekamās Palīdzības zvans"

120

123

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

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

122#, qt-format

125#, qt-format

123msgid "Hello %1"

126msgid "Hello %1"

124−msgstr ""

127+msgstr "Sveiki, %1"

125

128

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

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

127msgid "Hello"

130msgid "Hello"

128−msgstr ""

131+msgstr "Sveiki"

129

132

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

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

131msgid "Confirm"

134msgid "Confirm"

@@ -149,7 +152,7 @@ msgstr "Runa..."

149

152

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

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

151msgid "Show password"

154msgid "Show password"

152−msgstr ""

155+msgstr "Rādīt paroli"

153

156

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

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

155msgid "Please enter SIM PIN"

158msgid "Please enter SIM PIN"

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Meklēt"

163msgstr "Meklēt"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165−msgstr ""

168+msgstr "Lūdzu ievadiet %1"

po/ml.po+10−23

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-11-23 11:44+0000\n"

12−"Last-Translator: STyM Alfazz <Unknown>\n"

12+"Last-Translator: Stym alfaZ <Unknown>\n"

13"Language-Team: Malayalam <ml@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -87,7 +86,7 @@ msgstr ""

87msgid "See less"

86msgid "See less"

88msgstr ""

87msgstr ""

89

88

90−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

91msgid "Recent"

90msgid "Recent"

92msgstr ""

91msgstr ""

93

92

@@ -116,6 +115,10 @@ msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"

116msgid "Send"

115msgid "Send"

117msgstr "അയയ്‌ക്കുക"

116msgstr "അയയ്‌ക്കുക"

118

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

120msgid "Emergency Call"

123msgid "Emergency Call"

121msgstr "അടിയന്തിര വിളി"

124msgstr "അടിയന്തിര വിളി"

@@ -161,23 +164,7 @@ msgstr ""

161msgid "Search"

164msgid "Search"

162msgstr "തിരയുക"

165msgstr "തിരയുക"

163

166

164−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

165#, qt-format

168#, qt-format

166msgid "Please enter %1"

169msgid "Please enter %1"

167msgstr "ദയവായി %1 നല്‍കുക"

170msgstr "ദയവായി %1 നല്‍കുക"

168−

169−#, qt-format

170−#~ msgid "(%1)"

171−#~ msgstr "(%1)"

172−

173−#~ msgid "Comments:"

174−#~ msgstr "അഭിപ്രായങ്ങള്‍:"

175−

176−#~ msgid "Review"

177−#~ msgstr "അവലോകനം"

178−

179−#, qt-format

180−#~ msgid "%1 review"

181−#~ msgid_plural "%1 reviews"

182−#~ msgstr[0] "%1 അവലോകനം"

183−#~ msgstr[1] "%1 അവലോകനങ്ങള്‍"

po/mr.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: Rohan Deshmukh <Unknown>\n"

13"Language-Team: Marathi <mr@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/ms.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-17 09:05+0000\n"

12"Last-Translator: abuyop <Unknown>\n"

13"Language-Team: Malay <ms@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "Tambah ulasan"

114msgid "Send"

113msgid "Send"

115msgstr "Hantar"

114msgstr "Hantar"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "panggilan Kecemasan"

122msgstr "panggilan Kecemasan"

@@ -159,23 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Gelintar"

163msgstr "Gelintar"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "Sila masukkan %1"

168msgstr "Sila masukkan %1"

166−

167−#~ msgid "Comments:"

168−#~ msgstr "Ulasan:"

169−

170−#~ msgid "Review"

171−#~ msgstr "Tinjauan"

172−

173−#, qt-format

174−#~ msgid "%1 review"

175−#~ msgid_plural "%1 reviews"

176−#~ msgstr[0] "%1 ulasan"

177−#~ msgstr[1] "%1 ulasan"

178−

179−#, qt-format

180−#~ msgid "(%1)"

181−#~ msgstr "(%1)"

po/my.po+9−13

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-12-12 11:12+0000\n"

12"Last-Translator: Pyae Sone <Unknown>\n"

13"Language-Team: Burmese <my@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr "ပို့မည်"

114msgstr "ပို့မည်"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "အရေးပေါ်ခေါ်မည်"

122msgstr "အရေးပေါ်ခေါ်မည်"

@@ -159,14 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "ရှာဖွေ"

163msgstr "ရှာဖွေ"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "%1ကိုရိုက်ထည့်ပါ"

168msgstr "%1ကိုရိုက်ထည့်ပါ"

166−

167−#, qt-format

168−#~ msgid "(%1)"

169−#~ msgstr "(%1)"

170−

171−#~ msgid "Comments:"

172−#~ msgstr "မှတ်ချက်များ-"

po/nb.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 07:02+0000\n"

12"Last-Translator: Joakim Langvand <jlangvand@gmail.com>\n"

13"Language-Team: Norwegian Bokmal <nb@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Søk"

163msgstr "Søk"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/nl.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: Hannie Dumoleyn <Unknown>\n"

13"Language-Team: Dutch <nl@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "Voeg recensie toe"

114msgid "Send"

113msgid "Send"

115msgstr "Versturen"

114msgstr "Versturen"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "Noodoproep"

122msgstr "Noodoproep"

@@ -159,23 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Zoeken"

163msgstr "Zoeken"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "Voer %1 in"

168msgstr "Voer %1 in"

166−

167−#, qt-format

168−#~ msgid "%1 review"

169−#~ msgid_plural "%1 reviews"

170−#~ msgstr[0] "%1 recensie"

171−#~ msgstr[1] "%1 recensies"

172−

173−#, qt-format

174−#~ msgid "(%1)"

175−#~ msgstr "(%1)"

176−

177−#~ msgid "Comments:"

178−#~ msgstr "Reacties:"

179−

180−#~ msgid "Review"

181−#~ msgstr "Recensie"

po/pl.po+9−24

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-10 11:38+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Polish <pl@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=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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

21

19

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

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

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

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

@@ -88,7 +86,7 @@ msgstr ""

88msgid "See less"

86msgid "See less"

89msgstr ""

87msgstr ""

90

88

91−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

92msgid "Recent"

90msgid "Recent"

93msgstr ""

91msgstr ""

94

92

@@ -117,6 +115,10 @@ msgstr "Dodaj recenzję"

117msgid "Send"

115msgid "Send"

118msgstr "Wyślij"

116msgstr "Wyślij"

119

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

121msgid "Emergency Call"

123msgid "Emergency Call"

122msgstr "Telefon ratunkowy"

124msgstr "Telefon ratunkowy"

@@ -162,24 +164,7 @@ msgstr ""

162msgid "Search"

164msgid "Search"

163msgstr "Szukaj"

165msgstr "Szukaj"

164

166

165−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

166#, qt-format

168#, qt-format

167msgid "Please enter %1"

169msgid "Please enter %1"

168msgstr "Wprowadź %1"

170msgstr "Wprowadź %1"

169−

170−#~ msgid "Comments:"

171−#~ msgstr "Komentarze:"

172−

173−#~ msgid "Review"

174−#~ msgstr "Recenzja"

175−

176−#, qt-format

177−#~ msgid "%1 review"

178−#~ msgid_plural "%1 reviews"

179−#~ msgstr[0] "%1 opinia"

180−#~ msgstr[1] "%1 opinie"

181−#~ msgstr[2] "%1 opinii"

182−

183−#, qt-format

184−#~ msgid "(%1)"

185−#~ msgstr "(%1)"

po/pt.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Portuguese <pt@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/pt_BR.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-18 23:24+0000\n"

12"Last-Translator: Fábio Nogueira <deb-user-ba@ubuntu.com>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -87,7 +86,7 @@ msgstr ""

87msgid "See less"

86msgid "See less"

88msgstr ""

87msgstr ""

89

88

90−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

91msgid "Recent"

90msgid "Recent"

92msgstr ""

91msgstr ""

93

92

@@ -116,6 +115,10 @@ msgstr "Adicionar uma análise"

116msgid "Send"

115msgid "Send"

117msgstr "Enviar"

116msgstr "Enviar"

118

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

120msgid "Emergency Call"

123msgid "Emergency Call"

121msgstr "Chamada de emergência"

124msgstr "Chamada de emergência"

@@ -161,23 +164,7 @@ msgstr ""

161msgid "Search"

164msgid "Search"

162msgstr "Pesquisar"

165msgstr "Pesquisar"

163

166

164−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

165#, qt-format

168#, qt-format

166msgid "Please enter %1"

169msgid "Please enter %1"

167msgstr "Por favor, digite %1"

170msgstr "Por favor, digite %1"

168−

169−#, qt-format

170−#~ msgid "(%1)"

171−#~ msgstr "(%1)"

172−

173−#, qt-format

174−#~ msgid "%1 review"

175−#~ msgid_plural "%1 reviews"

176−#~ msgstr[0] "%1 análise"

177−#~ msgstr[1] "%1 análises"

178−

179−#~ msgid "Comments:"

180−#~ msgstr "Comentários:"

181−

182−#~ msgid "Review"

183−#~ msgstr "Revisão"

po/ro.po+9−7

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 07:53+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Romanian <ro@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=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

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

19−"X-Launchpad-Export-Date: 2014-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

21

19

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

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

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

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

@@ -86,7 +84,7 @@ msgstr ""

86msgid "See less"

84msgid "See less"

87msgstr ""

85msgstr ""

88

86

89−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

88msgid "Recent"

91msgstr ""

89msgstr ""

92

90

@@ -115,6 +113,10 @@ msgstr ""

115msgid "Send"

113msgid "Send"

116msgstr ""

114msgstr ""

117

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

119msgid "Emergency Call"

121msgid "Emergency Call"

120msgstr ""

122msgstr ""

@@ -160,7 +162,7 @@ msgstr ""

160msgid "Search"

162msgid "Search"

161msgstr "Căutare"

163msgstr "Căutare"

162

164

163−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

164#, qt-format

166#, qt-format

165msgid "Please enter %1"

167msgid "Please enter %1"

166msgstr ""

168msgstr ""

po/ru.po+9−5

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: Zonov Roman <Unknown>\n"

13"Language-Team: Russian <ru@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-04-04 07:12+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

19

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

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

@@ -91,7 +91,7 @@ msgstr "Подробнее"

91msgid "See less"

92msgstr "Вкратце"

93

94−#: qml/Dash/DashApps.qml:38

94+#: qml/Dash/DashApps.qml:37

95msgid "Recent"

96msgstr "Недавние"

97

@@ -120,6 +120,10 @@ msgstr "Добавьте отзыв"

120msgid "Send"

121msgstr "Отправить"

122

123+#: qml/Greeter/Greeter.qml:151

124+msgid "Swipe to unlock"

125+msgstr ""

126+

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

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

124msgid "Emergency Call"

128msgid "Emergency Call"

125msgstr "Экстренный вызов"

129msgstr "Экстренный вызов"

@@ -165,7 +169,7 @@ msgstr "Введите PIN код"

165msgid "Search"

169msgid "Search"

166msgstr "Поиск"

170msgstr "Поиск"

167

171

168−#: qml/Shell.qml:417

172+#: qml/Shell.qml:348

169#, qt-format

173#, qt-format

170msgid "Please enter %1"

174msgid "Please enter %1"

171msgstr "Пожалуйста, введите %1"

175msgstr "Пожалуйста, введите %1"

po/shn.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-10-07 11:46+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Shan <shn@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) ? 0 : 1;\n"

18−"X-Launchpad-Export-Date: 2014-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/si.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-26 22:36+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Sinhalese <si@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/sl.po+9−25

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-02-21 16:38+0000\n"

12"Last-Translator: Damir Jerovšek <Unknown>\n"

13"Language-Team: Slovenian <sl@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=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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

21

19

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

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

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

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

@@ -90,7 +88,7 @@ msgstr "Pokaži več"

90msgid "See less"

88msgid "See less"

91msgstr "Pokaži manj"

89msgstr "Pokaži manj"

92

90

93−#: qml/Dash/DashApps.qml:38

91+#: qml/Dash/DashApps.qml:37

94msgid "Recent"

92msgid "Recent"

95msgstr ""

93msgstr ""

96

94

@@ -119,6 +117,10 @@ msgstr "Dodaj oceno"

119msgid "Send"

117msgid "Send"

120msgstr "Pošlji"

118msgstr "Pošlji"

121

119

120+#: qml/Greeter/Greeter.qml:151

121+msgid "Swipe to unlock"

122+msgstr ""

123+

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

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

123msgid "Emergency Call"

125msgid "Emergency Call"

124msgstr "Klic v sili"

126msgstr "Klic v sili"

@@ -164,25 +166,7 @@ msgstr "Vnesite PIN kartice SIM"

164msgid "Search"

166msgid "Search"

165msgstr "Iskanje"

167msgstr "Iskanje"

166

168

167−#: qml/Shell.qml:417

169+#: qml/Shell.qml:348

168#, qt-format

170#, qt-format

169msgid "Please enter %1"

171msgid "Please enter %1"

170msgstr "Vnesite %1"

172msgstr "Vnesite %1"

171−

172−#~ msgid "Review"

173−#~ msgstr "Ocena"

174−

175−#~ msgid "Comments:"

176−#~ msgstr "Opombe:"

177−

178−#, qt-format

179−#~ msgid "%1 review"

180−#~ msgid_plural "%1 reviews"

181−#~ msgstr[0] "%1 ocen"

182−#~ msgstr[1] "%1 ocena"

183−#~ msgstr[2] "%1 oceni"

184−#~ msgstr[3] "%1 ocene"

185−

186−#, qt-format

187−#~ msgid "(%1)"

188−#~ msgstr "(%1)"

po/sq.po+9−16

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-15 13:51+0000\n"

12"Last-Translator: Besmir Zanaj <besmirzanaj@gmail.com>\n"

13"Language-Team: Albanian <sq@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-03-28 06:48+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"

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

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

20

19

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

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

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

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

@@ -86,7 +85,7 @@ msgstr ""

86msgid "See less"

85msgid "See less"

87msgstr ""

86msgstr ""

88

87

89−#: qml/Dash/DashApps.qml:38

88+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

89msgid "Recent"

91msgstr ""

90msgstr ""

92

91

@@ -115,6 +114,10 @@ msgstr "Shto një rishikim"

115msgid "Send"

114msgid "Send"

116msgstr ""

115msgstr ""

117

116

117+#: qml/Greeter/Greeter.qml:151

118+msgid "Swipe to unlock"

119+msgstr ""

120+

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

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

119msgid "Emergency Call"

122msgid "Emergency Call"

120msgstr ""

123msgstr ""

@@ -160,17 +163,7 @@ msgstr ""

160msgid "Search"

163msgid "Search"

161msgstr ""

164msgstr ""

162

165

163−#: qml/Shell.qml:417

166+#: qml/Shell.qml:348

164#, qt-format

167#, qt-format

165msgid "Please enter %1"

168msgid "Please enter %1"

166msgstr ""

169msgstr ""

167−

168−#, qt-format

169−#~ msgid "%1 review"

170−#~ msgid_plural "%1 reviews"

171−#~ msgstr[0] "%1 rishikim"

172−#~ msgstr[1] "%1 rishikime"

173−

174−#, qt-format

175−#~ msgid "(%1)"

176−#~ msgstr "(%1)"

po/sr.po+9−7

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 09:19+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Serbian <sr@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=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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

21

19

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

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

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

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

@@ -86,7 +84,7 @@ msgstr ""

86msgid "See less"

84msgid "See less"

87msgstr ""

85msgstr ""

88

86

89−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

88msgid "Recent"

91msgstr ""

89msgstr ""

92

90

@@ -115,6 +113,10 @@ msgstr ""

115msgid "Send"

113msgid "Send"

116msgstr ""

114msgstr ""

117

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

119msgid "Emergency Call"

121msgid "Emergency Call"

120msgstr ""

122msgstr ""

@@ -160,7 +162,7 @@ msgstr ""

160msgid "Search"

162msgid "Search"

161msgstr "Претрага"

163msgstr "Претрага"

162

164

163−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

164#, qt-format

166#, qt-format

165msgid "Please enter %1"

167msgid "Please enter %1"

166msgstr ""

168msgstr ""

po/sv.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-26 22:36+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Swedish <sv@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/sw.po+9−9

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

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

12"Last-Translator: Damas Mlabwa <Unknown>\n"

13"Language-Team: Swahili <sw@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr "Tuma"

114msgstr "Tuma"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,10 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "Tafuta"

163msgstr "Tafuta"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

166−

167−#~ msgid "Comments:"

168−#~ msgstr "Maoni:"

po/ta.po+10−23

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-10-24 11:36+0000\n"

12−"Last-Translator: Arun Kumar -அருண் குமார் <thangam.arunx@gmail.com>\n"

12+"Last-Translator: Arun Kumar - அருண் குமார் <thangam.arunx@gmail.com>\n"

13"Language-Team: Ubuntu Tamil Team/Free Tamil Computing/Thamizha\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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20"Language: ta\n"

19"Language: ta\n"

21

20

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

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

@@ -88,7 +87,7 @@ msgstr ""

88msgid "See less"

87msgid "See less"

89msgstr ""

88msgstr ""

90

89

91−#: qml/Dash/DashApps.qml:38

90+#: qml/Dash/DashApps.qml:37

92msgid "Recent"

91msgid "Recent"

93msgstr ""

92msgstr ""

94

93

@@ -117,6 +116,10 @@ msgstr "ஒரு பரிசீலனையை சேர்"

117msgid "Send"

116msgid "Send"

118msgstr "அனுப்பு"

117msgstr "அனுப்பு"

119

118

119+#: qml/Greeter/Greeter.qml:151

120+msgid "Swipe to unlock"

121+msgstr ""

122+

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

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

121msgid "Emergency Call"

124msgid "Emergency Call"

122msgstr "அவசர அழைப்பு"

125msgstr "அவசர அழைப்பு"

@@ -162,23 +165,7 @@ msgstr ""

162msgid "Search"

165msgid "Search"

163msgstr "தெடு"

166msgstr "தெடு"

164

167

165−#: qml/Shell.qml:417

168+#: qml/Shell.qml:348

166#, qt-format

169#, qt-format

167msgid "Please enter %1"

170msgid "Please enter %1"

168msgstr "தயவுச்செய்து %1 உள்ளிடு"

171msgstr "தயவுச்செய்து %1 உள்ளிடு"

169−

170−#, qt-format

171−#~ msgid "(%1)"

172−#~ msgstr "(%1)"

173−

174−#, qt-format

175−#~ msgid "%1 review"

176−#~ msgid_plural "%1 reviews"

177−#~ msgstr[0] "%1 பரிசீலனை"

178−#~ msgstr[1] "%1 பரிசீலனைகள்"

179−

180−#~ msgid "Review"

181−#~ msgstr "மறுஆய்வு"

182−

183−#~ msgid "Comments:"

184−#~ msgstr "கருத்துகள்:"

po/te.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-06-27 09:57+0000\n"

12"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"

13"Language-Team: Telugu <te@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/tr.po+9−22

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-03-05 08:54+0000\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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -88,7 +87,7 @@ msgstr "Daha fazlası"

88msgid "See less"

87msgid "See less"

89msgstr "Daha azını gör"

88msgstr "Daha azını gör"

90

89

91−#: qml/Dash/DashApps.qml:38

90+#: qml/Dash/DashApps.qml:37

92msgid "Recent"

91msgid "Recent"

93msgstr ""

92msgstr ""

94

93

@@ -117,6 +116,10 @@ msgstr "Bir inceleme ekle"

117msgid "Send"

116msgid "Send"

118msgstr "Gönder"

117msgstr "Gönder"

119

118

119+#: qml/Greeter/Greeter.qml:151

120+msgid "Swipe to unlock"

121+msgstr ""

122+

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

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

121msgid "Emergency Call"

124msgid "Emergency Call"

122msgstr "Acil Arama"

125msgstr "Acil Arama"

@@ -162,23 +165,7 @@ msgstr "Lütfen SIM PIN'inizi girin"

162msgid "Search"

165msgid "Search"

163msgstr "Ara"

166msgstr "Ara"

164

167

165−#: qml/Shell.qml:417

168+#: qml/Shell.qml:348

166#, qt-format

169#, qt-format

167msgid "Please enter %1"

170msgid "Please enter %1"

168msgstr "Lütfen %1 girin"

171msgstr "Lütfen %1 girin"

169−

170−#~ msgid "Review"

171−#~ msgstr "İnceleme"

172−

173−#, qt-format

174−#~ msgid "%1 review"

175−#~ msgid_plural "%1 reviews"

176−#~ msgstr[0] "%1 inceleme"

177−#~ msgstr[1] "%1 inceleme"

178−

179−#, qt-format

180−#~ msgid "(%1)"

181−#~ msgstr "(%1)"

182−

183−#~ msgid "Comments:"

184−#~ msgstr "Yorumlar:"

po/ug.po+12−8

@@ -7,15 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11−"PO-Revision-Date: 2014-04-14 09:31+0000\n"

11+"PO-Revision-Date: 2014-04-22 05:46+0000\n"

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

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

13"Language-Team: Uyghur <ug@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17−"X-Launchpad-Export-Date: 2014-04-15 07:57+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

19

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

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

@@ -86,14 +86,14 @@ msgstr "جىقراق كۆرۈش"

86msgid "See less"

87msgstr "ئازراق كۆرۈش"

88

89−#: qml/Dash/DashApps.qml:38

89+#: qml/Dash/DashApps.qml:37

90msgid "Recent"

91msgstr "يېقىنقى"

92

93#: qml/Dash/PreviewListView.qml:52

94#, qt-format

95msgid "%1 Preview"

96−msgstr ""

96+msgstr "%1 ئالدىن كۆرۈپ بىقىش"

97

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

99msgid "More..."

@@ -115,6 +115,10 @@ msgstr "باھا قوشۇش"

115msgid "Send"

116msgstr "ئەۋەت"

117

118+#: qml/Greeter/Greeter.qml:151

119+msgid "Swipe to unlock"

120+msgstr ""

121+

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

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

119msgid "Emergency Call"

123msgid "Emergency Call"

120msgstr "جىددىي تېلېفون"

124msgstr "جىددىي تېلېفون"

@@ -160,7 +164,7 @@ msgstr "پارولىنى كىرگۈزۈڭPINكارتىڭىزنىڭ SIM"

160msgid "Search"

164msgid "Search"

161msgstr "ئىزدە"

165msgstr "ئىزدە"

162

166

163−#: qml/Shell.qml:417

167+#: qml/Shell.qml:348

164#, qt-format

168#, qt-format

165msgid "Please enter %1"

169msgid "Please enter %1"

166msgstr "%1 نى كىرگۈزۈڭ"

170msgstr "%1 نى كىرگۈزۈڭ"

po/uk.po+9−24

@@ -7,17 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-11-23 12:37+0000\n"

12"Last-Translator: Ignat Kizenko <Unknown>\n"

13"Language-Team: Ukrainian <uk@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=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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

21

19

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

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

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

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

@@ -89,7 +87,7 @@ msgstr ""

89msgid "See less"

87msgid "See less"

90msgstr ""

88msgstr ""

91

89

92−#: qml/Dash/DashApps.qml:38

90+#: qml/Dash/DashApps.qml:37

93msgid "Recent"

91msgid "Recent"

94msgstr ""

92msgstr ""

95

93

@@ -118,6 +116,10 @@ msgstr "Додати рецензію"

118msgid "Send"

116msgid "Send"

119msgstr "Надіслати"

117msgstr "Надіслати"

120

118

119+#: qml/Greeter/Greeter.qml:151

120+msgid "Swipe to unlock"

121+msgstr ""

122+

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

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

122msgid "Emergency Call"

124msgid "Emergency Call"

123msgstr "Терміновий виклик"

125msgstr "Терміновий виклик"

@@ -163,24 +165,7 @@ msgstr ""

163msgid "Search"

165msgid "Search"

164msgstr "Пошук"

166msgstr "Пошук"

165

167

166−#: qml/Shell.qml:417

168+#: qml/Shell.qml:348

167#, qt-format

169#, qt-format

168msgid "Please enter %1"

170msgid "Please enter %1"

169msgstr "Будь ласка, введіть %1"

171msgstr "Будь ласка, введіть %1"

170−

171−#~ msgid "Comments:"

172−#~ msgstr "Коментарі:"

173−

174−#~ msgid "Review"

175−#~ msgstr "Рецензія"

176−

177−#, qt-format

178−#~ msgid "%1 review"

179−#~ msgid_plural "%1 reviews"

180−#~ msgstr[0] "%1 рецензія"

181−#~ msgstr[1] "%1 рецензії"

182−#~ msgstr[2] "%1 рецензій"

183−

184−#, qt-format

185−#~ msgid "(%1)"

186−#~ msgstr "(%1)"

po/unity8.pot+7−3

@@ -8,7 +8,7 @@ msgid ""

8msgstr ""

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

10"Report-Msgid-Bugs-To: \n"

11−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

11+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

14"Language-Team: LANGUAGE <LL@li.org>\n"

@@ -84,7 +84,7 @@ msgstr ""

84msgid "See less"

85msgstr ""

86

87−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

88msgid "Recent"

89msgstr ""

90

@@ -113,6 +113,10 @@ msgstr ""

113msgid "Send"

114msgstr ""

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

117msgid "Emergency Call"

121msgid "Emergency Call"

118msgstr ""

122msgstr ""

@@ -158,7 +162,7 @@ msgstr ""

158msgid "Search"

162msgid "Search"

159msgstr ""

163msgstr ""

160

164

161−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

162#, qt-format

166#, qt-format

163msgid "Please enter %1"

167msgid "Please enter %1"

164msgstr ""

168msgstr ""

po/vi.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-15 01:19+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Vietnamese <vi@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/xh.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-09-28 13:20+0000\n"

12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13"Language-Team: Xhosa <xh@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr ""

163msgstr ""

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/zh_CN.po+9−6

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2013-10-09 13:51+0000\n"

12"Last-Translator: Aron Xu <Unknown>\n"

13"Language-Team: Chinese (Simplified) <zh_CN@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr ""

114msgid "Send"

113msgid "Send"

115msgstr ""

114msgstr ""

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr ""

122msgstr ""

@@ -159,7 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "搜索"

163msgstr "搜索"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

po/zh_HK.po+9−21

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-25 13:32+0000\n"

12"Last-Translator: Daniel Cheung <daniel.2345@hotmail.com>\n"

13"Language-Team: Chinese (Hong Kong) <zh_HK@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "新增評論"

114msgid "Send"

113msgid "Send"

115msgstr "傳送"

114msgstr "傳送"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "緊急電話"

122msgstr "緊急電話"

@@ -159,22 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "搜尋"

163msgstr "搜尋"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr "請輸入 %1"

168msgstr "請輸入 %1"

166−

167−#~ msgid "Comments:"

168−#~ msgstr "評論:"

169−

170−#~ msgid "Review"

171−#~ msgstr "評論"

172−

173−#, qt-format

174−#~ msgid "%1 review"

175−#~ msgid_plural "%1 reviews"

176−#~ msgstr[0] "%1 評論"

177−

178−#, qt-format

179−#~ msgid "(%1)"

180−#~ msgstr "(%1)"

po/zh_TW.po+9−21

@@ -7,16 +7,15 @@ msgid ""

7msgstr ""

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

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

10−"POT-Creation-Date: 2014-03-25 16:48+0100\n"

10+"POT-Creation-Date: 2014-04-10 11:13-0400\n"

11"PO-Revision-Date: 2014-01-16 06:04+0000\n"

12"Last-Translator: Henry Yang <henry9846@hotmail.com>\n"

13"Language-Team: Chinese (Traditional) <zh_TW@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-03-28 06:49+0000\n"

17+"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"

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

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

20

19

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

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

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

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

@@ -85,7 +84,7 @@ msgstr ""

85msgid "See less"

84msgid "See less"

86msgstr ""

85msgstr ""

87

86

88−#: qml/Dash/DashApps.qml:38

87+#: qml/Dash/DashApps.qml:37

89msgid "Recent"

88msgid "Recent"

90msgstr ""

89msgstr ""

91

90

@@ -114,6 +113,10 @@ msgstr "新增回覆"

114msgid "Send"

113msgid "Send"

115msgstr "發送"

114msgstr "發送"

116

115

116+#: qml/Greeter/Greeter.qml:151

117+msgid "Swipe to unlock"

118+msgstr ""

119+

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

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

118msgid "Emergency Call"

121msgid "Emergency Call"

119msgstr "緊急連絡"

122msgstr "緊急連絡"

@@ -159,22 +162,7 @@ msgstr ""

159msgid "Search"

162msgid "Search"

160msgstr "搜尋"

163msgstr "搜尋"

161

164

162−#: qml/Shell.qml:417

165+#: qml/Shell.qml:348

163#, qt-format

166#, qt-format

164msgid "Please enter %1"

167msgid "Please enter %1"

165msgstr ""

168msgstr ""

166−

167−#~ msgid "Comments:"

168−#~ msgstr "備註："

169−

170−#~ msgid "Review"

171−#~ msgstr "回覆"

172−

173−#, qt-format

174−#~ msgid "%1 review"

175−#~ msgid_plural "%1 reviews"

176−#~ msgstr[0] "%1 回覆"

177−

178−#, qt-format

179−#~ msgid "(%1)"

180−#~ msgstr "(%1)"

qml/Bottombar/Bottombar.qmldeleted−227

@@ -1,227 +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−import QtQuick 2.0

18−import "../Components"

19−import Utils 0.1

20−import Unity.Application 0.1

21−import Ubuntu.Gestures 0.1

22−import Ubuntu.Components 0.1

23−

24−Item {

25− id: bottombar

26−

27− // Whether there's an application on foreground (as opposed to have shell's Dash on foreground)

28− property bool applicationIsOnForeground

29−

30− property variant theHud

31− property bool enabled: false

32− property bool preventHiding: dragArea.dragging

33− readonly property real bottomEdgeButtonCenterDistance: units.gu(34)

34−

35− state: "hidden"

36−

37− function hide() {

38− dismissTimer.stop()

39− bottombar.state = "hidden"

40− }

41−

42− onApplicationIsOnForegroundChanged: {

43− if (!applicationIsOnForeground) {

44− hide()

45− }

46− }

47−

48− onStateChanged: {

49− if (state == "hidden") {

50− dismissTimer.stop()

51− bottomBarVisibilityCommunicatorShell.forceHidden = false

52− } else {

53− dismissTimer.restart()

54− }

55− }

56−

57− onPreventHidingChanged: {

58− if (!preventHiding) {

59− if (state == "hint" || state == "reveal")

60− hide()

61− }

62−

63− if (dismissTimer.running) {

64− dismissTimer.restart();

65− }

66− }

67−

68− Timer {

69− id: dismissTimer

70− interval: 1000

71− onTriggered: {

72− if (!bottombar.preventHiding) {

73− bottombar.state = "hidden"

74− } else {

75− dismissTimer.restart()

76− }

77− }

78− }

79−

80− HudButton {

81− id: hudButton

82−

83− readonly property bool centeredHud: parent.width < units.gu(68) // Nexus 7 has 67 gu width

84−

85− x: centeredHud ? parent.width / 2 - width / 2 : MathUtils.clamp(dragArea.touchStartX - (width / 2), 0, bottombar.width - width)

86− y: bottombar.height - bottomEdgeButtonCenterDistance - (height / 2) - bottomMargin

87− z: 1

88− visible: opacity != 0

89−

90− mouseOver: {

91− if (dragArea.status === DirectionalDragArea.Recognized) {

92− var touchLocal = mapFromItem(dragArea, dragArea.touchX, dragArea.touchY)

93− return touchLocal.x > 0 && touchLocal.x < width

94− && touchLocal.y > 0 && touchLocal.y < height

95− } else {

96− return false

97− }

98− }

99−

100− onClicked: theHud.show()

101−

102− Behavior on bottomMargin {

103− NumberAnimation{duration: hudButton.opacity < 0.01 ? 200 : 70; easing.type: Easing.OutQuart}

104− }

105−

106− Behavior on opacity {

107− NumberAnimation{duration: 200; easing.type: Easing.OutCubic}

108− }

109− }

110−

111− Connections {

112− target: theHud

113− onShownChanged: {

114− bottomBarVisibilityCommunicatorShell.forceHidden = theHud.shown

115− if (theHud.shown) {

116− bottombar.state = "hidden"

117− }

118− }

119− }

120−

121− EdgeDragArea {

122− id: dragArea

123− objectName: "hudDragArea"

124− width: parent.width

125− height: shell.edgeSize

126− anchors.bottom: parent.bottom

127−

128− distanceThreshold: units.gu(8)

129− enabled: !theHud.shown && bottombar.enabled && applicationIsOnForeground

130− direction: Direction.Upwards

131− maxSilenceTime: 2000

132−

133− property int previousStatus: -1

134− property real touchStartX: -1

135−

136− readonly property real distanceFromThreshold: (-distance) - distanceThreshold // distance is negative

137− readonly property real revealDistance: units.gu(2)

138− readonly property real commitDistance: units.gu(6)

139− readonly property real commitProgress: MathUtils.clamp(distanceFromThreshold / commitDistance, 0, 1)

140−

141− onStatusChanged: {

142− if (status === DirectionalDragArea.WaitingForTouch) {

143− if (previousStatus == DirectionalDragArea.Recognized) {

144− if (hudButton.mouseOver) {

145− hudButton.clicked()

146− }

147− }

148− } else if (status === DirectionalDragArea.Undecided) {

149− if (!hudButton.centeredHud) {

150− touchStartX = touchX

151− }

152− } else if (status === DirectionalDragArea.Recognized) {

153− bottombar.state = "hint"

154− }

155− previousStatus = status

156− }

157−

158− onDistanceChanged: {

159− if (status === DirectionalDragArea.Recognized) {

160− if (distanceFromThreshold > commitDistance)

161− bottombar.state = "shown"

162− else if (distanceFromThreshold > revealDistance)

163− bottombar.state = "reveal"

164− }

165− }

166− }

167−

168− Item {

169− id: dismissArea

170− anchors {

171− top: parent.top

172− left: parent.left

173− right: parent.right

174− }

175− height: parent.height - bottomBarVisibilityCommunicatorShell.position

176−

177− MouseArea {

178− anchors.fill: parent

179− enabled: bottombar.state == "shown"

180− onPressed: {

181− bottomBarVisibilityCommunicatorShell.forceHidden = true

182− bottombar.state = "hidden"

183− }

184− }

185−

186− InputFilterArea {

187− anchors.fill: parent

188− blockInput: (hudButton.opacity == 1)

189− }

190− }

191−

192− MouseArea {

193− anchors {

194− top: dismissArea.bottom

195− left: parent.left

196− right: parent.right

197− bottom: parent.bottom

198− }

199− enabled: bottombar.state == "shown" && bottomBarVisibilityCommunicatorShell.position > 0

200− onPressed: {

201− bottombar.state = "hidden"

202− }

203− }

204−

205− states: [

206− State {

207− name: "hidden"

208− PropertyChanges { target: hudButton; opacity: 0 }

209− PropertyChanges { target: hudButton; bottomMargin: units.gu(-2) }

210− },

211− State {

212− name: "hint"

213− extend: "hidden"

214− PropertyChanges { target: hudButton; opacity: 0.5 }

215− },

216− State {

217− name: "reveal"

218− extend: "hint"

219− PropertyChanges { target: hudButton; bottomMargin: units.gu(-2) + units.gu(2) * dragArea.commitProgress }

220− },

221− State {

222− name: "shown"

223− PropertyChanges { target: hudButton; opacity: 1 }

224− PropertyChanges { target: hudButton; bottomMargin: units.gu(0) }

225− }

226− ]

227−}

qml/Bottombar/HudButton.qmldeleted−64

@@ -1,64 +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−import QtQuick 2.0

18−import Ubuntu.Components 0.1

19−

20−Item {

21− id: item

22−

23− property bool mouseOver

24−

25− property int bottomMargin: units.gu(2)

26−

27− signal clicked()

28−

29− readonly property real scaleOnMouseOver: 1.2

30−

31− width: hudButton.width * scaleOnMouseOver

32− height: hudButton.height * scaleOnMouseOver

33−

34− Item {

35− id: hudButton

36−

37− anchors.centerIn: parent

38− height: units.gu(12)

39− width: height

40− opacity: item.mouseOver || abstractButton.pressed ? 1 : 0.7

41− scale: item.mouseOver || abstractButton.pressed ? scaleOnMouseOver : 1

42− Behavior on opacity {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}

43− Behavior on scale {NumberAnimation{duration: 200; easing.type: Easing.OutQuart}}

44−

45− AbstractButton {

46− id: abstractButton

47− anchors.fill: parent

48− style: Image {

49− anchors.fill: parent

50− source: "graphics/hud_invoke_button_active.png"

51− }

52−

53− onClicked: item.clicked()

54− }

55−

56− Image {

57− width: units.gu(4)

58− height: width

59− source: "graphics/hud.png"

60− anchors.centerIn: parent

61− fillMode: Image.PreserveAspectFit

62− }

63− }

64−}

qml/Bottombar/graphics/hud@20.pngdeleted

Binary file not shown.

qml/Bottombar/graphics/hud_invoke_button_active@20.pngdeleted

Binary file not shown.

qml/CMakeLists.txt−1

@@ -5,7 +5,6 @@ install(FILES ${QML_JS_FILES}

5 )

6

7set(QML_DIRS

8− Bottombar

9 Components

8 Components

10 Dash

9 Dash

11 graphics

10 graphics

qml/Components/FilterGrid.qml+37−24

@@ -28,11 +28,6 @@ import "../Components"

28Item {

29 id: root

30

31− /* If true, the number of elements displayed will be limited by collapsedRowCount.

32− If false, all elements will be displayed, effectively looking the same as a regular

33− ResponsiveGridView. */

34− property bool filter: true

35−

36 /* Whether, when collapsed, a button should be displayed enabling the user to expand

31 /* Whether, when collapsed, a button should be displayed enabling the user to expand

37 the grid to its full size. */

32 the grid to its full size. */

38 readonly property bool expandable: model.count > rowsWhenCollapsed * iconTileGrid.columns

33 readonly property bool expandable: model.count > rowsWhenCollapsed * iconTileGrid.columns

@@ -65,30 +60,48 @@ Item {

65 readonly property alias pressDelay: iconTileGrid.pressDelay

60 readonly property alias pressDelay: iconTileGrid.pressDelay

66 property alias highlightIndex: iconTileGrid.highlightIndex

61 property alias highlightIndex: iconTileGrid.highlightIndex

67 readonly property alias currentItem: iconTileGrid.currentItem

62 readonly property alias currentItem: iconTileGrid.currentItem

63+ readonly property alias filtered: d.filter

64+

65+ QtObject {

66+ id: d

67+ // We do have filter and collapsed properties because we need to decouple

68+ // the real filtering with the animation since the closing animation

69+ // i.e. setFilter(false. true) we still need to not be filtering until

70+ // the animation finishes otherwise we hide the items when the animation

71+ // is still running

72+ property bool filter: true

73+ property bool collapsed: true

74+ }

68

75

69− height: !filterAnimation.running ? childrenRect.height : height

76+ height: d.collapsed ? root.collapsedHeight : root.uncollapsedHeight

70 clip: filterAnimation.running

77 clip: filterAnimation.running

71

78

79+ Behavior on height {

80+ id: heightBehaviour

81+ enabled: false

72− NumberAnimation {

82+ NumberAnimation {

73− property bool filterEndValue

74− id: filterAnimation

83+ id: filterAnimation

75− target: root

76− property: "height"

77− to: filterEndValue ? root.collapsedHeight : root.uncollapsedHeight

78− // Duration and easing here match the ListViewWithPageHeader::m_contentYAnimation

84+ // Duration and easing here match the ListViewWithPageHeader::m_contentYAnimation

79− // otherwise since both animations can run at the same time you'll get

85+ // otherwise since both animations can run at the same time you'll get

80− // some visual weirdness.

86+ // some visual weirdness.

81− duration: 200

87+ duration: 200

82− easing.type: Easing.InOutQuad

88+ easing.type: Easing.InOutQuad

83− onStopped: {

89+ onRunningChanged: {

84− root.filter = filterEndValue;

90+ if (!running) {

91+ d.filter = d.collapsed;

92+ }

93+ heightBehaviour.enabled = false;

94+ }

85 }

95 }

86 }

96 }

87

97

88− function startFilterAnimation(filter) {

98+ function setFilter(filter, animate) {

89− filterAnimation.filterEndValue = filter

99+ heightBehaviour.enabled = animate;

90− filterAnimation.start();

100+ d.collapsed = filter;

101+ if (!animate || !filter) {

102+ d.filter = filter;

103+ }

91− }

104+ }

92

105

93 ResponsiveGridView {

106 ResponsiveGridView {

94 id: iconTileGrid

107 id: iconTileGrid

@@ -105,7 +118,7 @@ Item {

105

118

106 model: LimitProxyModel {

119 model: LimitProxyModel {

107 model: root.model

120 model: root.model

108− limit: (filter && !filterAnimation.running) ? rowsWhenCollapsed * iconTileGrid.columns : -1

121+ limit: d.filter ? rowsWhenCollapsed * iconTileGrid.columns : -1

109 }

122 }

110 }

123 }

111}

124}

qml/Components/LazyImage.qml+1

@@ -36,6 +36,7 @@ Item {

36 property alias cache: image.cache

37 property alias horizontalAlignment: image.horizontalAlignment

38 property alias verticalAlignment: image.verticalAlignment

39+ property alias sourceImage: image

39

40

40 state: "default"

41 state: "default"

41

42

qml/Components/ZoomableImage.qmlnew file+153

@@ -0,0 +1,153 @@

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 Zoomable for image.

22+

23+ This widget shows image contained in source,

24+ can be zoomable accordingly with zoomable.

25+ */

26+

27+Item {

28+ id: root

29+ property alias source: lazyImage.source

30+ property var zoomable: false

31+ property alias imageState: lazyImage.state

32+ property alias scaleTo: lazyImage.scaleTo

33+ property alias asynchronous: lazyImage.asynchronous

34+

35+ Flickable {

36+ id: flickable

37+ objectName: "flickable"

38+ clip: true

39+ contentHeight: imageContainer.height

40+ contentWidth: imageContainer.width

41+

42+ onHeightChanged: image.resetScale()

43+ onWidthChanged: image.resetScale()

44+ anchors.fill: parent

45+

46+ Item {

47+ id: imageContainer

48+ objectName: "imageContainer"

49+ width: Math.max(image.width * image.scale, flickable.width)

50+ height: Math.max(image.height * image.scale, flickable.height)

51+

52+ Item {

53+ id: image

54+ objectName: "image"

55+ property alias imageState: lazyImage.state

56+ property var prevScale

57+ anchors.centerIn: parent

58+

59+ signal imageReloaded

60+

61+ LazyImage {

62+ id: lazyImage

63+ objectName: "lazyImage"

64+ smooth: !flickable.movingVertically

65+ anchors.fill: parent

66+ fillMode: Image.PreserveAspectFit

67+ scaleTo: "fit"

68+

69+ onStateChanged: {

70+ if (state == "ready") {

71+ image.imageReloaded();

72+ }

73+ }

74+ }

75+

76+ onImageReloaded: {

77+ image.height = lazyImage.sourceImage.implicitHeight

78+ image.width = lazyImage.sourceImage.implicitWidth

79+ image.resetScale();

80+ }

81+

82+ function resetScale() {

83+ image.scale = Math.min(flickable.width / image.width, flickable.height / image.height);

84+ pinchArea.minScale = image.scale;

85+ prevScale = Math.min(image.scale, 1);

86+ }

87+

88+ onScaleChanged: {

89+ var currentWidth = width * scale

90+ var currentHeight = height * scale

91+ var scaleRatio = scale / prevScale

92+ if (currentWidth > flickable.width) {

93+ var xpos = flickable.width / 2 + flickable.contentX;

94+ var xoff = xpos * scaleRatio;

95+ flickable.contentX = xoff - flickable.width / 2;

96+ }

97+ if (currentHeight > flickable.height) {

98+ var ypos = flickable.height / 2 + flickable.contentY;

99+ var yoff = ypos * scaleRatio;

100+ flickable.contentY = yoff - flickable.height / 2;

101+ }

102+ prevScale = scale;

103+ }

104+ }

105+ }

106+

107+ PinchArea {

108+ id: pinchArea

109+ objectName: "pinchArea"

110+ property real minScale: 1.0

111+ anchors.fill: parent

112+ enabled: zoomable ? zoomable : false

113+

114+ pinch.target: image

115+ pinch.minimumScale: minScale

116+ pinch.maximumScale: 10

117+

118+ onPinchFinished: flickable.returnToBounds()

119+ }

120+

121+ MouseArea {

122+ id: mouseArea

123+ objectName: "mouseArea"

124+

125+ anchors.fill: parent

126+ enabled: zoomable ? zoomable : false

127+

128+ onWheel: {

129+ var startScale = image.scale;

130+ if (wheel.angleDelta.y > 0) {

131+ image.scale = startScale + 0.1;

132+ } else if (wheel.angleDelta.y < 0) {

133+ if (image.scale > 0.1 && image.scale > pinchArea.minScale) {

134+ image.scale = startScale - 0.1;

135+ }

136+ }

137+ wheel.accepted = true;

138+ }

139+

140+ onPressed: {

141+ mouse.accepted = false;

142+ }

143+

144+ onReleased: {

145+ mouse.accepted = false;

146+ }

147+

148+ onClicked: {

149+ mouse.accepted = false;

150+ }

151+ }

152+ }

153+}

qml/Dash/CardFilterGrid.qml+3−8

@@ -28,9 +28,10 @@ DashRenderer {

28 verticalSpacing: units.gu(1)

29 currentItem: filterGrid.currentItem

30 height: filterGrid.height

31+ filtered: filterGrid.filtered

31

32

32− function startFilterAnimation(filter) {

33+ function setFilter(filter, animate) {

33− filterGrid.startFilterAnimation(filter)

34+ filterGrid.setFilter(filter, animate)

34 }

35 }

35

36

36 FilterGrid {

37 FilterGrid {

@@ -41,7 +42,6 @@ DashRenderer {

41 delegateHeight: cardTool.cardHeight

42 delegateHeight: cardTool.cardHeight

42 verticalSpacing: genericFilterGrid.verticalSpacing

43 verticalSpacing: genericFilterGrid.verticalSpacing

43 model: genericFilterGrid.model

44 model: genericFilterGrid.model

44− filter: genericFilterGrid.filter

45 collapsedRowCount: Math.min(2, cardTool && cardTool.template && cardTool.template["collapsed-rows"] || 2)

46 delegateCreationBegin: genericFilterGrid.delegateCreationBegin

47 delegateCreationEnd: genericFilterGrid.delegateCreationEnd

@@ -66,10 +66,5 @@ DashRenderer {

66 onPressAndHold: genericFilterGrid.pressAndHold(index, card.y)

67 }

68 }

69−

70− onFilterChanged: {

71− genericFilterGrid.filter = filter

72− filter = Qt.binding(function() { return genericFilterGrid.filter })

73− }

74 }

69 }

75}

70}

qml/Dash/DashContent.qml+18−10

@@ -17,6 +17,7 @@

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19import Unity 0.2

20+import Utils 0.1

20import "../Components"

21import "../Components"

21

22

22Item {

23Item {

@@ -183,23 +184,30 @@ Item {

183 width: parent.width

184 width: parent.width

184 style: DashContentTabBarStyle {}

185 style: DashContentTabBarStyle {}

185

186

186− model: dashContentList.model

187+ SortFilterProxyModel {

188+ id: tabBarModel

187

189

190+ model: dashContentList.model

191+

192+ property int selectedIndex: -1

188− onSelectedIndexChanged: {

193+ onSelectedIndexChanged: {

189− if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {

194+ if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {

190− // TODO This together with the Timer below

195+ // TODO This together with the Timer below

191− // are a workaround for the first tab sometimes not showing the text.

196+ // are a workaround for the first tab sometimes not showing the text.

192− // But Tabs are going away in the future so not sure if makes

197+ // But Tabs are going away in the future so not sure if makes

193− // sense invetigating what's the problem at this stage

198+ // sense invetigating what's the problem at this stage

194− selectionModeTimer.restart();

199+ selectionModeTimer.restart();

200+ }

201+ dashContentList.currentIndex = selectedIndex;

195 }

202 }

196− dashContentList.currentIndex = selectedIndex;

197 }

203 }

198

204

205+ model: tabBarModel.count > 0 ? tabBarModel : null

206+

199 Connections {

207 Connections {

200 target: dashContentList

208 target: dashContentList

201 onCurrentIndexChanged: {

209 onCurrentIndexChanged: {

202− tabBar.selectedIndex = dashContentList.currentIndex

210+ tabBarModel.selectedIndex = dashContentList.currentIndex

203 }

211 }

204 }

212 }

205

213

qml/Dash/DashRenderer.qml+3−3

@@ -20,8 +20,8 @@ Item {

20 // Can the item be expanded?

21 property bool expandable: false

22

23− // In case it can be expanded, should we filter it

23+ // In case it can be expanded, is it filtered

24− property bool filter: true

24+ property bool filtered: true

25

26 property int collapsedHeight: height

27

@@ -58,6 +58,6 @@ Item {

58 /// @param itemY is y of the held delegate

59 signal pressAndHold(int index, real itemY)

60

61− function startFilterAnimation(filter) {

61+ function setFilter(filter, animate) {

62 }

63}

qml/Dash/GenericScopeView.qml+13−15

@@ -122,7 +122,7 @@ FocusScope {

122 showDivider: false

123

124 readonly property bool expandable: rendererLoader.item ? rendererLoader.item.expandable : false

125− readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filter : true

125+ readonly property bool filtered: rendererLoader.item ? rendererLoader.item.filtered : true

126 readonly property string category: categoryId

127 readonly property var item: rendererLoader.item

128

@@ -168,9 +168,7 @@ FocusScope {

168 item.objectName = Qt.binding(function() { return categoryId })

169 if (item.expandable) {

170 var shouldFilter = categoryId != categoryView.expandedCategoryId;

171− if (shouldFilter != item.filter) {

171+ item.setFilter(shouldFilter, false /*animate*/);

172− item.filter = shouldFilter;

173− }

174 }

172 }

175 updateDelegateCreationRange();

173 updateDelegateCreationRange();

176 item.cardTool = cardTool;

174 item.cardTool = cardTool;

@@ -219,11 +217,8 @@ FocusScope {

219 var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;

217 var shrinkingVisible = shouldFilter && y + item.collapsedHeight < categoryView.height;

220 var growingVisible = !shouldFilter && y + height < categoryView.height;

218 var growingVisible = !shouldFilter && y + height < categoryView.height;

221 if (!previewListView.open || !shouldFilter) {

219 if (!previewListView.open || !shouldFilter) {

222− if (shrinkingVisible || growingVisible) {

220+ var animate = shrinkingVisible || growingVisible;

223− item.startFilterAnimation(shouldFilter)

221+ item.setFilter(shouldFilter, animate)

224− } else {

225− item.filter = shouldFilter;

226− }

227 if (!shouldFilter && !previewListView.open) {

222 if (!shouldFilter && !previewListView.open) {

228 categoryView.maximizeVisibleArea(index, item.uncollapsedHeight);

223 categoryView.maximizeVisibleArea(index, item.uncollapsedHeight);

229 }

224 }

@@ -238,12 +233,15 @@ FocusScope {

238 }

233 }

239

234

240 function updateDelegateCreationRange() {

235 function updateDelegateCreationRange() {

236+ if (categoryView.moving) {

241− // Do not update the range if we are overshooting up or down, since we'll come back

237+ // Do not update the range if we are overshooting up or down, since we'll come back

242− // to the stable position and delete/create items without any reason

238+ // to the stable position and delete/create items without any reason

243− if (categoryView.contentY < categoryView.originY) {

239+ if (categoryView.contentY < categoryView.originY) {

244− return;

240+ return;

241+ } else if (categoryView.contentHeight - categoryView.originY > categoryView.height &&

245− } else if (categoryView.contentHeight > categoryView.height && categoryView.contentY + categoryView.height > categoryView.contentHeight) {

242+ categoryView.contentY + categoryView.height > categoryView.contentHeight) {

246− return;

243+ return;

244+ }

247 }

245 }

248

246

249 if (item && item.hasOwnProperty("delegateCreationBegin")) {

247 if (item && item.hasOwnProperty("delegateCreationBegin")) {

qml/Dash/Previews/PreviewProgress.qml+3−2

@@ -34,11 +34,12 @@ PreviewWidget {

34 ProgressBar {

35 id: progressBar

36 objectName: "progressBar"

37+ anchors.right: parent.right

37 value: 0

38 value: 0

38 maximumValue: 100

39 maximumValue: 100

39− implicitHeight: units.gu(5)

40+ implicitHeight: units.gu(4)

40 height: parent.height

41 height: parent.height

41− width: parent.width

42+ width: (root.width - units.gu(1)) / 2

42

43

43 property var source: widgetData["source"]

44 property var source: widgetData["source"]

44 // TODO Eventually we will need to support more sources other

45 // TODO Eventually we will need to support more sources other

qml/Dash/Previews/PreviewRatingInput.qml+2−2

@@ -155,8 +155,8 @@ PreviewWidget {

155 objectName: "submitButton"

156

157 readonly property bool readyToSubmit: {

158− if (reviewTextArea.text === "" ||

159− (widgetData["visible"] === "both" && rating.value < 0)) return false;

158+ if ((widgetData["required"] !== "review" && rating.value < 0) ||

159+ (widgetData["required"] !== "rating" && reviewTextArea.text === "")) return false;

160 else return true;

161 }

162

qml/Dash/Previews/PreviewZoomableImage.qml+4−7

@@ -28,14 +28,11 @@ PreviewWidget {

28 id: root

29 implicitHeight: units.gu(22)

30

31− LazyImage {

31+ ZoomableImage {

32+ id: image

32 objectName: "image"

33 objectName: "image"

33− anchors {

34− top: parent.top

35− bottom: parent.bottom

36− }

37− scaleTo: "height"

38 source: widgetData["source"]

34 source: widgetData["source"]

39− initialWidth: units.gu(13)

35+ zoomable: widgetData["zoomable"] ? widgetData["zoomable"] : false

36+ anchors.fill: parent

40 }

37 }

41}

38}

qml/Greeter/Clock.qml+3−6

@@ -24,14 +24,11 @@ Item {

24 implicitWidth: childrenRect.width

25 implicitHeight: childrenRect.height

26

27− // Allows to set the current Date. Will be overwritten if active

27+ // Allows to set the current Date. Will be overwritten if visible

28 property date currentDate

29

30− // If active, time will be updated through the indicators service

31− property bool active: clock.enabled && clock.visible

32−

33 Component.onCompleted: {

30 Component.onCompleted: {

34− if (active) {

31+ if (visible) {

35 currentDate = new Date()

32 currentDate = new Date()

36 }

33 }

37 }

34 }

@@ -42,7 +39,7 @@ Item {

42

39

43 busName: "com.canonical.indicator.datetime"

40 busName: "com.canonical.indicator.datetime"

44 actionsObjectPath: "/com/canonical/indicator/datetime"

41 actionsObjectPath: "/com/canonical/indicator/datetime"

45− menuObjectPath: clock.active ? "/com/canonical/indicator/datetime/phone" : ""

42+ menuObjectPath: clock.visible ? "/com/canonical/indicator/datetime/phone" : ""

46

43

47 Indicators.RootActionState {

44 Indicators.RootActionState {

48 menu: timeModel.model

45 menu: timeModel.model

qml/Greeter/Greeter.qml+115−42

@@ -28,10 +28,10 @@ Showable {

28 property url defaultBackground

29

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

31− property real showProgress: MathUtils.clamp((width + x) / width, 0, 1)

31+ property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)

32

33 showAnimation: StandardAnimation { property: "x"; to: 0 }

34− hideAnimation: StandardAnimation { property: "x"; to: -width }

34+ hideAnimation: __leftHideAnimation

35

36 property alias dragHandleWidth: dragHandle.width

37 property alias model: greeterContentLoader.model

@@ -40,19 +40,81 @@ Showable {

40 readonly property bool narrowMode: !multiUser && height > width

41 readonly property bool multiUser: LightDM.Users.count > 1

42

43− readonly property bool leftTeaserPressed: greeterContentLoader.status == Loader.Ready &&

44− greeterContentLoader.item.leftTeaserPressed

45− readonly property bool rightTeaserPressed: greeterContentLoader.status == Loader.Ready &&

46− greeterContentLoader.item.rightTeaserPressed

47−

48 readonly property int currentIndex: greeterContentLoader.currentIndex

43 readonly property int currentIndex: greeterContentLoader.currentIndex

49

44

45+ property var __leftHideAnimation: StandardAnimation { property: "x"; to: -width }

46+ property var __rightHideAnimation: StandardAnimation { property: "x"; to: width }

47+

50 signal selected(int uid)

48 signal selected(int uid)

51 signal unlocked(int uid)

49 signal unlocked(int uid)

50+ signal tease()

51+

52+ function hideRight() {

53+ if (shown) {

54+ hideAnimation = __rightHideAnimation

55+ hide()

56+ }

57+ }

58+

59+ onRequiredChanged: {

60+ // Reset hide animation to default once we're finished with it

61+ if (!required) {

62+ // Put back on left for reliable show direction and so that

63+ // if normal hide() is called, we don't animate from right.

64+ x = -width

65+ hideAnimation = __leftHideAnimation

66+ }

67+ }

68+

69+ // Bi-directional revealer

70+ DraggingArea {

71+ id: dragHandle

72+ anchors.fill: parent

73+ enabled: greeter.narrowMode || !greeter.locked

74+ orientation: Qt.Horizontal

75+ propagateComposedEvents: true

76+

77+ Component.onCompleted: {

78+ // set evaluators to baseline of dragValue == 0

79+ leftEvaluator.reset()

80+ rightEvaluator.reset()

81+ }

82+

83+ function maybeTease() {

84+ if (!greeter.locked || greeter.narrowMode)

85+ greeter.tease();

86+ }

87+

88+ onClicked: maybeTease()

89+ onDragStart: maybeTease()

90+ onPressAndHold: {} // eat event, but no need to tease, as drag will cover it

91+

92+ onDragEnd: {

93+ if (rightEvaluator.shouldAutoComplete())

94+ greeter.hideRight()

95+ else if (leftEvaluator.shouldAutoComplete())

96+ greeter.hide();

97+ else

98+ greeter.show(); // undo drag

99+ }

100+

101+ onDragValueChanged: {

102+ // dragValue is kept as a "step" value since we do this x adjusting on the fly

103+ greeter.x += dragValue

104+ }

105+

106+ EdgeDragEvaluator {

107+ id: rightEvaluator

108+ trackedPosition: dragHandle.dragValue + greeter.x

109+ maxDragDistance: parent.width

110+ direction: Direction.Rightwards

111+ }

52

112

53− onRightTeaserPressedChanged: {

113+ EdgeDragEvaluator {

54− if (rightTeaserPressed && (!locked || narrowMode) && x == 0) {

114+ id: leftEvaluator

55− teasingTimer.start();

115+ trackedPosition: dragHandle.dragValue + greeter.x

116+ maxDragDistance: parent.width

117+ direction: Direction.Leftwards

56 }

118 }

57 }

119 }

58

120

@@ -82,45 +144,56 @@ Showable {

82 }

144 }

83 }

145 }

84

146

85− Timer {

147+ onTease: showLabelAnimation.start()

86− id: teasingTimer

87− interval: 200

88− }

89

148

90− states: [

149+ Label {

91− State {

150+ id: swipeHint

92− name: "teasing"

151+ visible: greeter.shown

152+ property real baseOpacity: 0.5

153+ opacity: 0.0

154+ anchors.horizontalCenter: parent.horizontalCenter

155+ anchors.bottom: parent.bottom

156+ anchors.bottomMargin: units.gu(5)

157+ text: i18n.tr("Swipe to unlock")

158+ color: "white"

159+ font.weight: Font.Light

160+

161+ SequentialAnimation on opacity {

162+ id: showLabelAnimation

93− when: teasingTimer.running

163+ running: false

94− PropertyChanges {

164+ loops: 2

95− target: greeter

165+

96− x: -dragHandle.hintDisplacement

166+ StandardAnimation {

167+ from: 0.0

168+ to: swipeHint.baseOpacity

169+ duration: UbuntuAnimation.SleepyDuration

97 }

170 }

98− }

171+ PauseAnimation { duration: UbuntuAnimation.BriskDuration }

99− ]

172+ StandardAnimation {

100− transitions: [

173+ from: swipeHint.baseOpacity

101− Transition {

102− from: "*"

103− to: "*"

174+ to: 0.0

104− NumberAnimation {

175+ duration: UbuntuAnimation.SleepyDuration

105− target: greeter

106− property: "x"

107− duration: 300

108− easing.type: Easing.OutCubic

109 }

176 }

110 }

177 }

111− ]

178+ }

112−

113− DragHandle {

114− id: dragHandle

115

179

180+ // right side shadow

181+ Image {

182+ anchors.left: parent.right

116 anchors.top: parent.top

183 anchors.top: parent.top

117 anchors.bottom: parent.bottom

184 anchors.bottom: parent.bottom

118− anchors.right: parent.right

185+ visible: parent.required

119−

186+ fillMode: Image.Tile

120− hintDisplacement: units.gu(2)

187+ source: "../graphics/dropshadow_right.png"

121−

188+ }

122− enabled: greeter.narrowMode || !greeter.locked

123

189

124− direction: Direction.Leftwards

190+ // left side shadow

191+ Image {

192+ anchors.right: parent.left

193+ anchors.top: parent.top

194+ anchors.bottom: parent.bottom

195+ visible: parent.required

196+ fillMode: Image.Tile

197+ source: "../graphics/dropshadow_left.png"

125 }

198 }

126}

199}

qml/Greeter/GreeterContent.qml+1−10

@@ -20,15 +20,11 @@ import Ubuntu.Components 0.1

20import LightDM 0.1 as LightDM

21import "../Components"

22

23−MouseArea {

23+Item {

24 id: root

25 anchors.fill: parent

26

27 property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error

28− property bool leftTeaserPressed: teasingMouseArea.pressed &&

29− teasingMouseArea.mouseX < teasingMouseArea.width / 2

30− property bool rightTeaserPressed: teasingMouseArea.pressed &&

31− teasingMouseArea.mouseX > teasingMouseArea.width / 2

32

28

33 signal selected(int uid)

29 signal selected(int uid)

34 signal unlocked(int uid)

30 signal unlocked(int uid)

@@ -74,11 +70,6 @@ MouseArea {

74 opacity: 0.4

70 opacity: 0.4

75 }

71 }

76

72

77− MouseArea {

78− id: teasingMouseArea

79− anchors.fill: parent

80− }

81−

82 Loader {

73 Loader {

83 id: loginLoader

74 id: loginLoader

84 objectName: "loginLoader"

75 objectName: "loginLoader"

qml/Greeter/Infographics.qml+3

@@ -457,5 +457,8 @@ Item {

457 !circleGrowAnimTimer.running)

458 infographic.model.nextDataSource()

459 }

460+

461+ onClicked: mouse.accepted = false

462+ onPressed: mouse.accepted = false

460 }

463 }

461}

464}

qml/Hud/Hud.qml+1−1

@@ -491,6 +491,6 @@ Item {

491 anchors.top: hudContentClipper.top

492 anchors.bottom: hudContentClipper.bottom

493 fillMode: Image.Tile

494− source: "graphics/dropshadow_right.png"

494+ source: "../graphics/dropshadow_right.png"

495 }

496}

qml/Notifications/Notifications.qml+11

@@ -16,6 +16,8 @@

16

17import QtQuick 2.0

18import Ubuntu.Components 0.1

19+import Unity.Notifications 1.0 as UnityNotifications

20+import Utils 0.1

19import "../Components"

21import "../Components"

20

22

21ListView {

23ListView {

@@ -25,6 +27,15 @@ ListView {

25 interactive: false

27 interactive: false

26

28

27 property real margin

29 property real margin

30+ property bool useModal: snapDecisionProxyModel.count > 0

31+

32+ SortFilterProxyModel {

33+ id: snapDecisionProxyModel

34+

35+ model: notificationList.model

36+ filterRole: UnityNotifications.ModelInterface.RoleType

37+ filterRegExp: RegExp(UnityNotifications.Notification.SnapDecision)

38+ }

28 spacing: delegate.fullscreen ? 0 : units.gu(.5)

39 spacing: delegate.fullscreen ? 0 : units.gu(.5)

29

40

30 currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1

41 currentIndex: (currentIndex < 1 && count > 1) ? 1 : -1

qml/Shell.qml+79−92

@@ -28,9 +28,7 @@ import "Dash"

28import "Greeter"

29import "Launcher"

30import "Panel"

31−import "Hud"

32import "Components"

31import "Components"

33−import "Bottombar"

34import "Notifications"

32import "Notifications"

35import Unity.Notifications 1.0 as NotificationBackend

33import Unity.Notifications 1.0 as NotificationBackend

36

34

@@ -148,8 +146,8 @@ FocusScope {

148

146

149 available: !greeter.shown && !lockscreen.shown

147 available: !greeter.shown && !lockscreen.shown

150 hides: [stages, launcher, panel.indicators]

148 hides: [stages, launcher, panel.indicators]

151− shown: disappearingAnimationProgress !== 1.0

149+ shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0

152− enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled

150+ enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled

153

151

154 anchors {

152 anchors {

155 fill: parent

153 fill: parent

@@ -159,18 +157,14 @@ FocusScope {

159 contentScale: 1.0 - 0.2 * disappearingAnimationProgress

157 contentScale: 1.0 - 0.2 * disappearingAnimationProgress

160 opacity: 1.0 - disappearingAnimationProgress

158 opacity: 1.0 - disappearingAnimationProgress

161 property real disappearingAnimationProgress: {

159 property real disappearingAnimationProgress: {

162− if (greeter.shown) {

160+ if (stages.overlayMode) {

163− return greeter.showProgress;

161+ return 0;

164 } else {

162 } else {

165− if (stages.overlayMode) {

166− return 0;

167− }

168 return stages.showProgress

163 return stages.showProgress

169 }

164 }

170 }

165 }

171

166

172− // FIXME: only necessary because stages.showProgress and

167+ // FIXME: only necessary because stages.showProgress is not animated

173− // greeterRevealer.animatedProgress are not animated

174 Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}

168 Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}

175 }

169 }

176 }

170 }

@@ -312,7 +306,7 @@ FocusScope {

312

306

313 readonly property int backgroundTopMargin: -panel.panelHeight

307 readonly property int backgroundTopMargin: -panel.panelHeight

314

308

315− hides: [launcher, panel.indicators, hud]

309+ hides: [launcher, panel.indicators]

316 shown: false

310 shown: false

317 enabled: true

311 enabled: true

318 showAnimation: StandardAnimation { property: "opacity"; to: 1 }

312 showAnimation: StandardAnimation { property: "opacity"; to: 1 }

@@ -362,59 +356,73 @@ FocusScope {

362 }

356 }

363 }

357 }

364

358

365− Greeter {

359+ Rectangle {

366− id: greeter

360+ anchors.fill: parent

367− objectName: "greeter"

361+ color: "black"

368−

362+ opacity: greeterWrapper.showProgress * 0.8

369− available: true

363+ }

370− hides: [launcher, panel.indicators, hud]

371− shown: true

372−

373− defaultBackground: shell.background

374

364

365+ Item {

366+ // Just a tiny wrapper to adjust greeter's x without messing with its own dragging

367+ id: greeterWrapper

368+ x: launcher.progress

375 y: panel.panelHeight

369 y: panel.panelHeight

376 width: parent.width

370 width: parent.width

377 height: parent.height - panel.panelHeight

371 height: parent.height - panel.panelHeight

378

372

379− dragHandleWidth: shell.edgeSize

373+ Behavior on x {SmoothedAnimation{velocity: 600}}

380

374

375+ readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)

376+

377+ Greeter {

378+ id: greeter

379+ objectName: "greeter"

380+

381+ available: true

382+ hides: [launcher, panel.indicators]

383+ shown: true

384+

385+ defaultBackground: shell.background

386+

387+ width: parent.width

388+ height: parent.height

389+

390+ dragHandleWidth: shell.edgeSize

391+

381− onShownChanged: {

392+ onShownChanged: {

382− if (shown) {

393+ if (shown) {

383− lockscreen.reset();

394+ lockscreen.reset();

384− // If there is only one user, we start authenticating with that one here.

395+ // If there is only one user, we start authenticating with that one here.

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

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

386− if (LightDM.Users.count == 1) {

397+ if (LightDM.Users.count == 1) {

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

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

399+ }

400+ greeter.forceActiveFocus();

388 }

401 }

389− greeter.forceActiveFocus();

390 }

402 }

391− }

392

403

393− onUnlocked: greeter.hide()

404+ onUnlocked: greeter.hide()

394− onSelected: {

405+ onSelected: {

395− // Update launcher items for new user

406+ // Update launcher items for new user

396− var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

407+ var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

397− AccountsService.user = user;

408+ AccountsService.user = user;

398− LauncherModel.setUser(user);

409+ LauncherModel.setUser(user);

399− }

400−

401− onLeftTeaserPressedChanged: {

402− if (leftTeaserPressed) {

403− launcher.tease();

404 }

410 }

405− }

406

411

412+ onTease: launcher.tease()

413+

407− Binding {

414+ Binding {

408− target: ApplicationManager

415+ target: ApplicationManager

409− property: "suspended"

416+ property: "suspended"

410− value: greeter.shown && greeter.showProgress == 1

417+ value: greeter.shown && greeterWrapper.showProgress == 1

418+ }

411 }

419 }

412 }

420 }

413

421

414 InputFilterArea {

422 InputFilterArea {

415 anchors.fill: parent

423 anchors.fill: parent

416 blockInput: ApplicationManager.focusedApplicationId.length === 0 || greeter.shown || lockscreen.shown || launcher.shown

424 blockInput: ApplicationManager.focusedApplicationId.length === 0 || greeter.shown || lockscreen.shown || launcher.shown

417− || panel.indicators.shown || hud.shown

425+ || panel.indicators.shown

418 }

426 }

419

427

420 Connections {

428 Connections {

@@ -478,47 +486,6 @@ FocusScope {

478 }

486 }

479 }

487 }

480

488

481− Hud {

482− id: hud

483−

484− width: parent.width > units.gu(60) ? units.gu(40) : parent.width

485− height: parent.height

486−

487− available: !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled

488− shown: false

489− showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }

490− hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }

491−

492− Connections {

493− target: ApplicationManager

494− onFocusedApplicationIdChanged: hud.hide()

495− }

496− }

497−

498− Revealer {

499− id: hudRevealer

500−

501− enabled: hud.shown

502− width: hud.width

503− anchors.left: hud.left

504− height: parent.height

505− target: hud.revealerTarget

506− closedValue: height

507− openedValue: 0

508− direction: Qt.RightToLeft

509− orientation: Qt.Vertical

510− handleSize: hud.handleHeight

511− onCloseClicked: target.hide()

512− }

513−

514− Bottombar {

515− id: bottombar

516− theHud: hud

517− anchors.fill: parent

518− enabled: hud.available

519− applicationIsOnForeground: ApplicationManager.focusedApplicationId

520− }

521−

522 InputFilterArea {

489 InputFilterArea {

523 blockInput: launcher.shown

490 blockInput: launcher.shown

524 anchors {

491 anchors {

@@ -538,7 +505,7 @@ FocusScope {

538 anchors.bottom: parent.bottom

505 anchors.bottom: parent.bottom

539 width: parent.width

506 width: parent.width

540 dragAreaWidth: shell.edgeSize

507 dragAreaWidth: shell.edgeSize

541− available: (!greeter.shown || greeter.narrowMode) && edgeDemo.launcherEnabled

508+ available: edgeDemo.launcherEnabled

542

509

543 onShowDashHome: {

510 onShowDashHome: {

544 if (edgeDemo.running)

511 if (edgeDemo.running)

@@ -553,6 +520,10 @@ FocusScope {

553 launcher.hide();

520 launcher.hide();

554 }

521 }

555 }

522 }

523+ if (greeter.shown) {

524+ greeter.hideRight();

525+ launcher.hide();

526+ }

556 }

527 }

557 onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)

528 onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)

558 onLauncherApplicationSelected: {

529 onLauncherApplicationSelected: {

@@ -562,12 +533,28 @@ FocusScope {

562 onShownChanged: {

533 onShownChanged: {

563 if (shown) {

534 if (shown) {

564 panel.indicators.hide()

535 panel.indicators.hide()

565− hud.hide()

566− bottombar.hide()

567 }

536 }

568 }

537 }

569 }

538 }

570

539

540+ Rectangle {

541+ id: modalNotificationBackground

542+

543+ visible: notifications.useModal && !greeter.shown && (notifications.state == "narrow")

544+ color: "#000000"

545+ anchors.fill: parent

546+ opacity: 0.5

547+

548+ MouseArea {

549+ anchors.fill: parent

550+ }

551+

552+ InputFilterArea {

553+ anchors.fill: parent

554+ blockInput: modalNotificationBackground.visible

555+ }

556+ }

557+

571 Notifications {

558 Notifications {

572 id: notifications

559 id: notifications

573

560

qml/graphics/dropshadow_left@20.pngnew file

Binary file not shown.

qml/Hud/graphics/dropshadow_right@20.png → qml/graphics/dropshadow_right@20.pngrenamed

Binary file not shown.

run → run.shrenamed+1−1

@@ -78,6 +78,6 @@ else

78 echo "Unity8 is already running, please stop it first"

79 exit 1

80 fi

81− /sbin/initctl start unity8 BINARY="`readlink -f $QML_PHONE_SHELL_PATH` $QML_PHONE_SHELL_ARGS $@"

81+ /sbin/initctl start unity8 BINARY="`readlink -f $QML_PHONE_SHELL_PATH` $QML_PHONE_SHELL_ARGS $@" QML2_IMPORT_PATH=$QML2_IMPORT_PATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH

82 tailf -n 0 ~/.cache/upstart/unity8.log

83fi

run_on_device → run_on_device.shrenamed+2−2

@@ -88,7 +88,7 @@ sync_code() {

88}

89

90build() {

91− exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"

91+ exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build.sh"

92}

93

94run() {

@@ -105,7 +105,7 @@ run() {

105

106 exec_with_ssh "stop unity8"

107 exec_with_ssh "start maliit-server"

108− exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"

108+ exec_with_ssh "cd $CODE_DIR/ && ./run.sh $ARGS -- $RUN_OPTIONS"

109 exec_with_ssh "stop maliit-server"

110 exec_with_ssh "start unity8"

111}

tests/autopilot/unity8/shell/__init__.py+50−1

@@ -21,8 +21,9 @@

21

22from time import sleep

23from functools import wraps

24−import logging

24+from gi.repository import Notify

25

26+import logging

26

27

27logger = logging.getLogger(__name__)

28logger = logging.getLogger(__name__)

28

29

@@ -48,6 +49,7 @@ def disable_qml_mocking(fn):

48 return fn(*args, **kwargs)

49 return fn(*args, **kwargs)

49 return wrapper

50 return wrapper

50

51

52+

51class DragMixin(object):

53class DragMixin(object):

52 def _drag(self, x1, y1, x2, y2):

54 def _drag(self, x1, y1, x2, y2):

53 # XXX This ugly code is here just temporarily, waiting for drag

55 # XXX This ugly code is here just temporarily, waiting for drag

@@ -69,3 +71,50 @@ class DragMixin(object):

69 self.touch._finger_move(int(x2), int(y2))

71 self.touch._finger_move(int(x2), int(y2))

70 except AttributeError:

72 except AttributeError:

71 self.touch._device.finger_move(int(x2), int(y2))

73 self.touch._device.finger_move(int(x2), int(y2))

74+

75+

76+def create_ephemeral_notification(

77+ summary='',

78+ body='',

79+ icon=None,

80+ hints=[],

81+ urgency='NORMAL'

82+):

83+ """Create an ephemeral (non-interactive) notification

84+

85+ :param summary: Summary text for the notification

86+ :param body: Body text to display in the notification

87+ :param icon: Path string to the icon to use

88+ :param hint_strings: List of tuples containing the 'name' and value

89+ for setting the hint strings for the notification

90+ :param urgency: Urgency string for the noticiation, either: 'LOW',

91+ 'NORMAL', 'CRITICAL'

92+ """

93+ Notify.init('Unity8')

94+

95+ logger.info(

96+ "Creating ephemeral: summary(%s), body(%s), urgency(%r) "

97+ "and Icon(%s)",

98+ summary,

99+ body,

100+ urgency,

101+ icon

102+ )

103+

104+ notification = Notify.Notification.new(summary, body, icon)

105+

106+ for hint in hints:

107+ key, value = hint

108+ notification.set_hint_string(key, value)

109+ logger.info("Adding hint to notification: (%s, %s)", key, value)

110+ notification.set_urgency(_get_urgency(urgency))

111+

112+ return notification

113+

114+

115+def _get_urgency(urgency):

116+ """Translates urgency string to enum."""

117+ _urgency_enums = {'LOW': Notify.Urgency.LOW,

118+ 'NORMAL': Notify.Urgency.NORMAL,

119+ 'CRITICAL': Notify.Urgency.CRITICAL}

120+ return _urgency_enums.get(urgency.upper())

tests/autopilot/unity8/shell/tests/test_emulators.py+1−1

@@ -196,7 +196,7 @@ class DashAppsEmulatorTestCase(DashBaseTestCase):

196 category)

197 grid = category_element.select_single('CardFilterGrid')

198 filtergrid = grid.select_single('FilterGrid')

199− if (grid.filter):

199+ if (grid.filtered):

200 return filtergrid.collapsedRowCount * filtergrid.columns

201 else:

202 return filtergrid.uncollapsedRowCount * filtergrid.columns

tests/autopilot/unity8/shell/tests/test_notifications.py+97−57

@@ -21,6 +21,7 @@

21

22from __future__ import absolute_import

23

24+from unity8 import shell

24from unity8.process_helpers import unlock_unity

25from unity8.process_helpers import unlock_unity

25from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios

26from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios

26

27

@@ -64,7 +65,8 @@ class NotificationsBase(UnityTestCase):

64 if os.path.abspath(__file__).startswith('/usr/'):

65 if os.path.abspath(__file__).startswith('/usr/'):

65 return '/usr/share/unity8/graphics/' + icon_name

66 return '/usr/share/unity8/graphics/' + icon_name

66 else:

67 else:

67− return os.path.dirname(__file__) + "/../../../../../qml/graphics/" + icon_name

68+ return os.path.dirname(__file__) + (

69+ "/../../../../../qml/graphics/" + icon_name)

68

70

69 def _get_notifications_list(self):

71 def _get_notifications_list(self):

70 return self.main_window.select_single(

72 return self.main_window.select_single(

@@ -209,6 +211,89 @@ class InteractiveNotificationBase(NotificationsBase):

209 self.touch.tap_object(notification.select_single(objectName="button4"))

211 self.touch.tap_object(notification.select_single(objectName="button4"))

210 self.assert_notification_action_id_was_called("action_decline_4")

212 self.assert_notification_action_id_was_called("action_decline_4")

211

213

214+ def test_modal_sd_without_greeter (self):

215+ """A snap-decision on a phone should block input to shell beneath it when there's no greeter."""

216+ unity_proxy = self.launch_unity()

217+ unlock_unity(unity_proxy)

218+

219+ summary = "Incoming file"

220+ body = "Frank would like to send you the file: essay.pdf"

221+ icon_path = "sync-idle"

222+ hints = [

223+ ("x-canonical-snap-decisions", "true"),

224+ ("x-canonical-non-shaped-icon", "true"),

225+ ]

226+

227+ actions = [

228+ ('action_accept', 'Accept'),

229+ ('action_decline_1', 'Decline'),

230+ ]

231+

232+ self._create_interactive_notification(

233+ summary,

234+ body,

235+ icon_path,

236+ "NORMAL",

237+ actions,

238+ hints

239+ )

240+

241+ # verify that we cannot reveal the launcher (no longer interact with the shell)

242+ time.sleep(1)

243+ self.main_window.show_dash_swiping()

244+ launcher = self.main_window.get_launcher()

245+ self.assertThat(launcher.shown, Eventually(Equals(False)))

246+

247+ # verify and interact with the triggered snap-decision notification

248+ notify_list = self._get_notifications_list()

249+ get_notification = lambda: notify_list.wait_select_single(

250+ 'Notification', objectName='notification1')

251+ notification = get_notification()

252+ self._assert_notification(notification, summary, body, True, False, 1.0)

253+ self.touch.tap_object(notification.select_single(objectName="button0"))

254+ self.assert_notification_action_id_was_called("action_accept")

255+

256+ def test_modal_sd_with_greeter (self):

257+ """A snap-decision on a phone should not block input to the greeter beneath it."""

258+ unity_proxy = self.launch_unity()

259+

260+ summary = "Incoming file"

261+ body = "Frank would like to send you the file: essay.pdf"

262+ icon_path = "sync-idle"

263+ hints = [

264+ ("x-canonical-snap-decisions", "true"),

265+ ("x-canonical-non-shaped-icon", "true"),

266+ ]

267+

268+ actions = [

269+ ('action_accept', 'Accept'),

270+ ('action_decline_1', 'Decline'),

271+ ]

272+

273+ self._create_interactive_notification(

274+ summary,

275+ body,

276+ icon_path,

277+ "NORMAL",

278+ actions,

279+ hints

280+ )

281+

282+ # verify that we can swipe away the greeter (interact with the "shell")

283+ time.sleep(1)

284+ self.main_window.show_dash_swiping()

285+ greeter = self.main_window.get_greeter()

286+ self.assertThat(greeter.shown, Eventually(Equals(False)))

287+

288+ # verify and interact with the triggered snap-decision notification

289+ notify_list = self._get_notifications_list()

290+ get_notification = lambda: notify_list.wait_select_single(

291+ 'Notification', objectName='notification1')

292+ notification = get_notification()

293+ self._assert_notification(notification, summary, body, True, False, 1.0)

294+ self.touch.tap_object(notification.select_single(objectName="button0"))

295+ self.assert_notification_action_id_was_called("action_accept")

296+

212 def _create_interactive_notification(

297 def _create_interactive_notification(

213 self,

298 self,

214 summary="",

299 summary="",

@@ -354,7 +439,7 @@ class EphemeralNotificationsTests(NotificationsBase):

354 )

439 )

355 ]

440 ]

356

441

357− notification = self._create_ephemeral_notification(

442+ notification = shell.create_ephemeral_notification(

358 summary,

443 summary,

359 body,

444 body,

360 icon_path,

445 icon_path,

@@ -391,7 +476,7 @@ class EphemeralNotificationsTests(NotificationsBase):

391 )

476 )

392 ]

477 ]

393

478

394− notification = self._create_ephemeral_notification(

479+ notification = shell.create_ephemeral_notification(

395 summary,

480 summary,

396 None,

481 None,

397 None,

482 None,

@@ -433,7 +518,7 @@ class EphemeralNotificationsTests(NotificationsBase):

433 body_critical = 'Dude, this is so urgent you have no idea :)'

518 body_critical = 'Dude, this is so urgent you have no idea :)'

434 icon_path_critical = self._get_icon_path('avatars/anna_olsson.png')

519 icon_path_critical = self._get_icon_path('avatars/anna_olsson.png')

435

520

436− notification_normal = self._create_ephemeral_notification(

521+ notification_normal = shell.create_ephemeral_notification(

437 summary_normal,

522 summary_normal,

438 body_normal,

523 body_normal,

439 icon_path_normal,

524 icon_path_normal,

@@ -441,7 +526,7 @@ class EphemeralNotificationsTests(NotificationsBase):

441 )

526 )

442 notification_normal.show()

527 notification_normal.show()

443

528

444− notification_low = self._create_ephemeral_notification(

529+ notification_low = shell.create_ephemeral_notification(

445 summary_low,

530 summary_low,

446 body_low,

531 body_low,

447 icon_path_low,

532 icon_path_low,

@@ -449,7 +534,7 @@ class EphemeralNotificationsTests(NotificationsBase):

449 )

534 )

450 notification_low.show()

535 notification_low.show()

451

536

452− notification_critical = self._create_ephemeral_notification(

537+ notification_critical = shell.create_ephemeral_notification(

453 summary_critical,

538 summary_critical,

454 body_critical,

539 body_critical,

455 icon_path_critical,

540 icon_path_critical,

@@ -510,7 +595,7 @@ class EphemeralNotificationsTests(NotificationsBase):

510 summary = 'Summary-Body'

595 summary = 'Summary-Body'

511 body = 'This is a superfluous notification'

596 body = 'This is a superfluous notification'

512

597

513− notification = self._create_ephemeral_notification(summary, body)

598+ notification = shell.create_ephemeral_notification(summary, body)

514 notification.show()

599 notification.show()

515

600

516 notification = notify_list.wait_select_single(

601 notification = notify_list.wait_select_single(

@@ -534,7 +619,7 @@ class EphemeralNotificationsTests(NotificationsBase):

534

619

535 summary = 'Summary-Only'

620 summary = 'Summary-Only'

536

621

537− notification = self._create_ephemeral_notification(summary)

622+ notification = shell.create_ephemeral_notification(summary)

538 notification.show()

623 notification.show()

539

624

540 notification = notify_list.wait_select_single(

625 notification = notify_list.wait_select_single(

@@ -554,7 +639,7 @@ class EphemeralNotificationsTests(NotificationsBase):

554 body = 'This is the original content of this notification-bubble.'

639 body = 'This is the original content of this notification-bubble.'

555 icon_path = self._get_icon_path('avatars/funky.png')

640 icon_path = self._get_icon_path('avatars/funky.png')

556

641

557− notification = self._create_ephemeral_notification(

642+ notification = shell.create_ephemeral_notification(

558 summary,

643 summary,

559 body,

644 body,

560 icon_path

645 icon_path

@@ -594,7 +679,7 @@ class EphemeralNotificationsTests(NotificationsBase):

594 icon_path = self._get_icon_path('avatars/anna_olsson.png')

679 icon_path = self._get_icon_path('avatars/anna_olsson.png')

595 hint_icon = self._get_icon_path('applicationIcons/phone-app.png')

680 hint_icon = self._get_icon_path('applicationIcons/phone-app.png')

596

681

597− notification = self._create_ephemeral_notification(

682+ notification = shell.create_ephemeral_notification(

598 summary,

683 summary,

599 body,

684 body,

600 icon_path

685 icon_path

@@ -638,7 +723,7 @@ class EphemeralNotificationsTests(NotificationsBase):

638 body = 'Hey Bro Coly!'

723 body = 'Hey Bro Coly!'

639 icon_path = self._get_icon_path('avatars/amanda.png')

724 icon_path = self._get_icon_path('avatars/amanda.png')

640 body_sum = body

725 body_sum = body

641− notification = self._create_ephemeral_notification(

726+ notification = shell.create_ephemeral_notification(

642 summary,

727 summary,

643 body,

728 body,

644 icon_path,

729 icon_path,

@@ -674,7 +759,7 @@ class EphemeralNotificationsTests(NotificationsBase):

674 for new_body in bodies:

759 for new_body in bodies:

675 body = new_body

760 body = new_body

676 body_sum += '\n' + body

761 body_sum += '\n' + body

677− notification = self._create_ephemeral_notification(

762+ notification = shell.create_ephemeral_notification(

678 summary,

763 summary,

679 body,

764 body,

680 icon_path,

765 icon_path,

@@ -695,48 +780,3 @@ class EphemeralNotificationsTests(NotificationsBase):

695 False,

780 False,

696 1.0

781 1.0

697 )

782 )

698−

699− def _create_ephemeral_notification(

700− self,

701− summary="",

702− body="",

703− icon=None,

704− hints=[],

705− urgency="NORMAL"

706− ):

707− """Create an ephemeral (non-interactive) notification

708−

709− :param summary: Summary text for the notification

710− :param body: Body text to display in the notification

711− :param icon: Path string to the icon to use

712− :param hint_strings: List of tuples containing the 'name' and value

713− for setting the hint strings for the notification

714− :param urgency: Urgency string for the noticiation, either: 'LOW',

715− 'NORMAL', 'CRITICAL'

716−

717− """

718− logger.info(

719− "Creating ephemeral: summary(%s), body(%s), urgency(%r) "

720− "and Icon(%s)",

721− summary,

722− body,

723− urgency,

724− icon

725− )

726−

727− n = Notify.Notification.new(summary, body, icon)

728−

729− for hint in hints:

730− key, value = hint

731− n.set_hint_string(key, value)

732− logger.info("Adding hint to notification: (%s, %s)", key, value)

733− n.set_urgency(self._get_urgency(urgency))

734−

735− return n

736−

737− def _get_urgency(self, urgency):

738− """Translates urgency string to enum."""

739− _urgency_enums = {'LOW': Notify.Urgency.LOW,

740− 'NORMAL': Notify.Urgency.NORMAL,

741− 'CRITICAL': Notify.Urgency.CRITICAL}

742− return _urgency_enums.get(urgency.upper())

tests/autopilot/unity8/shell/tests/test_upstart.py+2−2

@@ -82,7 +82,7 @@ class UpstartIntegrationTests(UnityTestCase):

82 ))

83

84 def test_no_sigstop(self):

85− self.patch_environment("UPSTART_JOB", "foo")

85+ self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "")

86 self._launch_unity()

87 self._set_proxy()

88

@@ -91,7 +91,7 @@ class UpstartIntegrationTests(UnityTestCase):

91 logger.debug("Unity loaded and ready.")

92

93 def test_expect_sigstop(self):

94− self.patch_environment("UPSTART_JOB", "unity8")

94+ self.patch_environment("UNITY_MIR_EMITS_SIGSTOP", "1")

95 self._launch_unity()

96 self.assertThat(lambda: os.WIFSTOPPED(self._get_status()), Eventually(Equals(True)), "Unity8 should raise SIGSTOP when ready")

97

tests/plugins/DashViews/CMakeLists.txt+23−35

@@ -25,46 +25,41 @@ remove_definitions(-DQT_NO_KEYWORDS)

25add_definitions(-DDASHVIEWSTEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")

26add_definitions(-DBUILT_PLUGINS_DIR="${CMAKE_BINARY_DIR}/plugins")

27

28+macro(add_lvwph_test FILENAME TESTNAME)

29+ add_executable(${TESTNAME}TestExec

30+ ${FILENAME}test.cpp

28−add_executable(listviewwithpageheadertestExec listviewwithpageheadertest.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

31+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

29−qt5_use_modules(listviewwithpageheadertestExec Test Core Qml)

32+ qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

30−target_link_libraries(listviewwithpageheadertestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

33+ target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

31−add_custom_target(testlistviewwithpageheader ${CMAKE_CURRENT_BINARY_DIR}/listviewwithpageheadertestExec -o ${CMAKE_BINARY_DIR}/testlistviewwithpageheader.xml,xunitxml -o -,txt)

32

34

33−add_executable(listviewwithpageheadertestsectionExec listviewwithpageheadertestsection.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

35+ add_binary_qml_test(${TESTNAME} "" "DashViews-qml")

34−qt5_use_modules(listviewwithpageheadertestsectionExec Test Core Qml)

36+endmacro()

35−target_link_libraries(listviewwithpageheadertestsectionExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

36−add_custom_target(testlistviewwithpageheadersection ${CMAKE_CURRENT_BINARY_DIR}/listviewwithpageheadertestsectionExec -o ${CMAKE_BINARY_DIR}/testlistviewwithpageheadersection.xml,xunitxml -o -,txt)

37

38−add_executable(listviewwithpageheadertestsectionexternalmodelExec listviewwithpageheadertestsectionexternalmodel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/listviewwithpageheader.cpp)

38+add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)

39−qt5_use_modules(listviewwithpageheadertestsectionexternalmodelExec Test Core Qml)

39+add_lvwph_test(listviewwithpageheadersection ListViewWithPageHeaderSection)

40−target_link_libraries(listviewwithpageheadertestsectionexternalmodelExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

40+add_lvwph_test(listviewwithpageheadersectionexternalmodel ListViewWithPageHeaderSectionExternalModel)

41−add_custom_target(testlistviewwithpageheadersectionexternalmodel ${CMAKE_CURRENT_BINARY_DIR}/listviewwithpageheadertestsectionexternalmodelExec -o ${CMAKE_BINARY_DIR}/testlistviewwithpageheadersectionexternalmodel.xml,xunitxml -o -,txt)

42

41

43macro(add_dashview_try_test FILENAME TESTNAME)

42macro(add_dashview_try_test FILENAME TESTNAME)

44− add_executable(${FILENAME}testExec

43+ add_executable(${TESTNAME}TestExec

45 ${FILENAME}test.cpp

44 ${FILENAME}test.cpp

46 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

45 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

47 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

46 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

48 )

47 )

49− qt5_use_modules(${FILENAME}testExec Test Core Qml)

48+ qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

50− target_link_libraries(${FILENAME}testExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

49+ target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

51− add_custom_target(test${TESTNAME}

52− ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}testExec

53− -o ${CMAKE_BINARY_DIR}/test${TESTNAME}.xml,xunitxml

54− -o -,txt

55− DEPENDS ${FILENAME}testExec DashViews-qml

56− )

57

50

51+ add_binary_qml_test(${TESTNAME} "" "DashViews-qml")

52+

58− add_executable(${FILENAME}tryExec

53+ add_executable(${TESTNAME}tryExec

59 ${FILENAME}try.cpp

54 ${FILENAME}try.cpp

60 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

55 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/${FILENAME}.cpp

61 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

56 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/DashViews/abstractdashview.cpp

62 )

57 )

63− qt5_use_modules(${FILENAME}tryExec Test Core Qml)

58+ qt5_use_modules(${TESTNAME}tryExec Test Core Qml)

64− target_link_libraries(${FILENAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

59+ target_link_libraries(${TESTNAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

65 add_custom_target(try${TESTNAME}

60 add_custom_target(try${TESTNAME}

66− ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}tryExec

61+ ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}tryExec

67− DEPENDS ${FILENAME}tryExec DashViews-qml

62+ DEPENDS ${TESTNAME}tryExec DashViews-qml

68 )

63 )

69endmacro()

64endmacro()

70

65

@@ -72,13 +67,6 @@ add_dashview_try_test(verticaljournal VerticalJournal)

72add_dashview_try_test(horizontaljournal HorizontalJournal)

67add_dashview_try_test(horizontaljournal HorizontalJournal)

73add_dashview_try_test(organicgrid OrganicGrid)

68add_dashview_try_test(organicgrid OrganicGrid)

74

69

70+set(qmltest_DEFAULT_TARGETS qmluitests)

75set(qmltest_DEFAULT_NO_ADD_TEST TRUE)

71set(qmltest_DEFAULT_NO_ADD_TEST TRUE)

76−add_qml_test(. listviewwithpageheaderqml IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

72+add_qml_test(. ListViewWithPageHeaderQML IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

77−

78−add_dependencies(qmluitests testlistviewwithpageheader)

79−add_dependencies(qmluitests testlistviewwithpageheadersection)

80−add_dependencies(qmluitests testlistviewwithpageheadersectionexternalmodel)

81−add_dependencies(qmluitests testlistviewwithpageheaderqml)

82−add_dependencies(qmluitests testVerticalJournal)

83−add_dependencies(qmluitests testHorizontalJournal)

84−add_dependencies(qmluitests testOrganicGrid)

tests/plugins/DashViews/listviewwithpageheadertestsectionexternalmodel.cpp → tests/plugins/DashViews/listviewwithpageheadersectionexternalmodeltest.cpprenamed+1−5

@@ -24,11 +24,7 @@

24#include <QtTestGui>

25#pragma GCC diagnostic push

26#pragma GCC diagnostic ignored "-pedantic"

27−#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)

28−#include <private/qquicklistmodel_p.h>

29−#else

30#include <private/qqmllistmodel_p.h>

27#include <private/qqmllistmodel_p.h>

31−#endif

32#include <private/qquickanimation_p.h>

28#include <private/qquickanimation_p.h>

33#include <private/qquickitem_p.h>

29#include <private/qquickitem_p.h>

34#pragma GCC diagnostic pop

30#pragma GCC diagnostic pop

@@ -248,4 +244,4 @@ private:

248

244

249QTEST_MAIN(ListViewWithPageHeaderTestSection)

245QTEST_MAIN(ListViewWithPageHeaderTestSection)

250

246

251−#include "listviewwithpageheadertestsectionexternalmodel.moc"

247+#include "listviewwithpageheadersectionexternalmodeltest.moc"

tests/plugins/DashViews/listviewwithpageheadertestsection.cpp → tests/plugins/DashViews/listviewwithpageheadersectiontest.cpprenamed+1−13

@@ -23,11 +23,7 @@

23#include <QtTestGui>

24#pragma GCC diagnostic push

25#pragma GCC diagnostic ignored "-pedantic"

26−#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)

27−#include <private/qquicklistmodel_p.h>

28−#else

29#include <private/qqmllistmodel_p.h>

26#include <private/qqmllistmodel_p.h>

30−#endif

31#include <private/qquickanimation_p.h>

27#include <private/qquickanimation_p.h>

32#include <private/qquickitem_p.h>

28#include <private/qquickitem_p.h>

33#pragma GCC diagnostic pop

29#pragma GCC diagnostic pop

@@ -135,11 +131,7 @@ private Q_SLOTS:

135 view->engine()->addImportPath(BUILT_PLUGINS_DIR);

131 view->engine()->addImportPath(BUILT_PLUGINS_DIR);

136 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));

132 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));

137 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

133 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

138−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

139− model = view->rootObject()->findChild<QQuickListModel*>();

140−#else

141 model = view->rootObject()->findChild<QQmlListModel*>();

134 model = view->rootObject()->findChild<QQmlListModel*>();

142−#endif

143 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

135 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

144 QVERIFY(lvwph);

136 QVERIFY(lvwph);

145 QVERIFY(model);

137 QVERIFY(model);

@@ -2156,14 +2148,10 @@ private Q_SLOTS:

2156private:

2148private:

2157 QQuickView *view;

2149 QQuickView *view;

2158 ListViewWithPageHeader *lvwph;

2150 ListViewWithPageHeader *lvwph;

2159−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

2160− QQuickListModel *model;

2161−#else

2162 QQmlListModel *model;

2151 QQmlListModel *model;

2163−#endif

2164 QQmlComponent *otherDelegate;

2152 QQmlComponent *otherDelegate;

2165};

2153};

2166

2154

2167QTEST_MAIN(ListViewWithPageHeaderTestSection)

2155QTEST_MAIN(ListViewWithPageHeaderTestSection)

2168

2156

2169−#include "listviewwithpageheadertestsection.moc"

2157+#include "listviewwithpageheadersectiontest.moc"

tests/plugins/DashViews/listviewwithpageheadertest.cpp−15

@@ -23,11 +23,7 @@

23#include <QtTestGui>

24#pragma GCC diagnostic push

25#pragma GCC diagnostic ignored "-pedantic"

26−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

27−#include <private/qquicklistmodel_p.h>

28−#else

29#include <private/qqmllistmodel_p.h>

26#include <private/qqmllistmodel_p.h>

30−#endif

31#include <private/qquickanimation_p.h>

27#include <private/qquickanimation_p.h>

32#include <private/qquickitem_p.h>

28#include <private/qquickitem_p.h>

33#pragma GCC diagnostic pop

29#pragma GCC diagnostic pop

@@ -124,11 +120,7 @@ private Q_SLOTS:

124 view->engine()->addImportPath(BUILT_PLUGINS_DIR);

120 view->engine()->addImportPath(BUILT_PLUGINS_DIR);

125 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));

121 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));

126 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

122 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

127−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

128− model = view->rootObject()->findChild<QQuickListModel*>();

129−#else

130 model = view->rootObject()->findChild<QQmlListModel*>();

123 model = view->rootObject()->findChild<QQmlListModel*>();

131−#endif

132 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

124 otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

133 QVERIFY(lvwph);

125 QVERIFY(lvwph);

134 QVERIFY(model);

126 QVERIFY(model);

@@ -1747,9 +1739,6 @@ private Q_SLOTS:

1747

1739

1748 void testMaximizeVisibleAreaMoveUpAndShowHeader()

1740 void testMaximizeVisibleAreaMoveUpAndShowHeader()

1749 {

1741 {

1750−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1751− QSKIP("This test is extremely unstable in 5.0.x");

1752−#endif

1753 model->setProperty(0, "size", 800);

1742 model->setProperty(0, "size", 800);

1754 verifyItem(0, 50., 800., false);

1743 verifyItem(0, 50., 800., false);

1755

1744

@@ -1913,11 +1902,7 @@ private Q_SLOTS:

1913private:

1902private:

1914 QQuickView *view;

1903 QQuickView *view;

1915 ListViewWithPageHeader *lvwph;

1904 ListViewWithPageHeader *lvwph;

1916−#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1917− QQuickListModel *model;

1918−#else

1919 QQmlListModel *model;

1905 QQmlListModel *model;

1920−#endif

1921 QQmlComponent *otherDelegate;

1906 QQmlComponent *otherDelegate;

1922};

1907};

1923

1908

tests/plugins/DashViews/tst_listviewwithpageheaderqml.qml → tests/plugins/DashViews/tst_ListViewWithPageHeaderQML.qmlrenamed

The content is the same.

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+1

@@ -20,6 +20,7 @@ macro(add_gesture_ui_test CLASSNAME)

20 target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)

21

22 add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles)

23+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

23endmacro(add_gesture_ui_test)

24endmacro(add_gesture_ui_test)

24

25

25macro(add_gesture_test CLASSNAME)

26macro(add_gesture_test CLASSNAME)

tests/plugins/Unity/Launcher/CMakeLists.txt+3−3

@@ -15,9 +15,9 @@ add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

15add_definitions(-DLAUNCHER_TESTING)

16

17### LauncherBackendTest

18−set(testBackendCommand ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec

18+set(testBackendCommand dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/launcherbackendtestExec

19− -o ${CMAKE_BINARY_DIR}/launcherbackendtest.xml,xunitxml

19+ --parameter -o --parameter ${CMAKE_BINARY_DIR}/launcherbackendtest.xml,xunitxml

20− -o -,txt)

20+ --parameter -o --parameter -,txt)

21add_test(NAME launcherbackendtest COMMAND ${testBackendCommand})

22add_custom_target(launcherbackendtest ${testBackendCommand})

23add_executable(launcherbackendtestExec

tests/plugins/Unity/Launcher/launcherbackendtest.cpp+167

@@ -20,6 +20,10 @@

20#include "launcherbackend.h"

21

22#include <QtTest>

23+#include <QDBusConnection>

24+#include <QDBusMessage>

25+#include <QDBusVariant>

26+

23

27

24class LauncherBackendTest : public QObject

28class LauncherBackendTest : public QObject

25{

29{

@@ -66,6 +70,169 @@ private Q_SLOTS:

66

70

67 QCOMPARE(backend.icon(appId), expectedIcon);

71 QCOMPARE(backend.icon(appId), expectedIcon);

68 }

72 }

73+

74+ void testGetItem_data() {

75+ QTest::addColumn<QString>("appId");

76+ QTest::addColumn<bool>("exists");

77+

78+ QTest::newRow("Exists") << "rel-icon" << true;

79+ QTest::newRow("Doesn't Exist") << "does-not-exist" << false;

80+ }

81+

82+ void testGetItem() {

83+ QFETCH(QString, appId);

84+ QFETCH(bool, exists);

85+

86+ LauncherBackend backend;

87+ auto item = backend.getItem(appId);

88+

89+ if (exists) {

90+ QVERIFY(item != nullptr);

91+ } else {

92+ QVERIFY(item == nullptr);

93+ }

94+ }

95+

96+ void testCount_data() {

97+ QTest::addColumn<QString>("appId");

98+ QTest::addColumn<bool>("setCount");

99+ QTest::addColumn<int>("inCount");

100+ QTest::addColumn<bool>("countVisible");

101+ QTest::addColumn<int>("expectedCount");

102+

103+ /* Get baseline data on things working */

104+ QTest::newRow("Baseline") << "rel-icon" << false << 0 << false << -1;

105+

106+ /* Valid count, but not visible */

107+ QTest::newRow("Not visible") << "rel-icon" << true << 42 << false << -1;

108+

109+ /* Turn it on */

110+ QTest::newRow("Visible Count") << "rel-icon" << true << 42 << true << 42;

111+

112+ /* Invalide app to load */

113+ QTest::newRow("Invalid App ID") << "this-app-doesnt-exist" << true << 42 << true << -1;

114+ }

115+

116+ void testCount() {

117+ QFETCH(QString, appId);

118+ QFETCH(bool, setCount);

119+ QFETCH(int, inCount);

120+ QFETCH(bool, countVisible);

121+ QFETCH(int, expectedCount);

122+

123+ LauncherBackend backend;

124+

125+ if (setCount)

126+ backend.setCount(appId, inCount);

127+ backend.setCountVisible(appId, countVisible);

128+

129+ QCOMPARE(backend.count(appId), expectedCount);

130+ }

131+

132+ void testDbusName_data() {

133+ QTest::addColumn<QString>("decoded");

134+ QTest::addColumn<QString>("encoded");

135+

136+ /* Passthrough test */

137+ QTest::newRow("Passthrough") << "fine" << "fine";

138+

139+ /* Number as first characeter */

140+ QTest::newRow("Number first") << "31337" << "_331337";

141+

142+ /* Underscore test */

143+ QTest::newRow("Underscore test") << "this_is_c_style_namespacing" << "this_5Fis_5Fc_5Fstyle_5Fnamespacing";

144+

145+ /* Hyphen test */

146+ QTest::newRow("Hyphen test") << "typical-application" << "typical_2Dapplication";

147+

148+ /* Japanese test */

149+ QTest::newRow("日本語 test") << "日本語" << "_E6_97_A5_E6_9C_AC_E8_AA_9E";

150+ }

151+

152+ void testDbusName() {

153+ QFETCH(QString, decoded);

154+ QFETCH(QString, encoded);

155+

156+ QString encodeOut = LauncherBackend::encodeAppId(decoded);

157+ QCOMPARE(encoded, encodeOut);

158+

159+ QString decodeOut = LauncherBackend::decodeAppId(encoded);

160+ QCOMPARE(decoded, decodeOut);

161+ }

162+

163+ void testDbusIface_data() {

164+ QTest::addColumn<QString>("appId");

165+ QTest::addColumn<bool>("setCount");

166+ QTest::addColumn<int>("inCount");

167+ QTest::addColumn<bool>("countVisible");

168+ QTest::addColumn<int>("expectedCount");

169+

170+ /* Get baseline data on things working */

171+ QTest::newRow("Baseline") << "rel-icon" << false << 0 << false << -1;

172+

173+ /* Turn it on */

174+ QTest::newRow("Visible Count") << "rel-icon" << true << 42 << true << 42;

175+

176+ /* Invalide app to load */

177+ QTest::newRow("Invalid App ID") << "this-app-doesnt-exist" << true << 42 << true << -1;

178+ }

179+

180+ void testDbusIface() {

181+ QFETCH(QString, appId);

182+ QFETCH(bool, setCount);

183+ QFETCH(int, inCount);

184+ QFETCH(bool, countVisible);

185+ QFETCH(int, expectedCount);

186+

187+ QDBusConnection con = QDBusConnection::sessionBus();

188+ QDBusMessage message;

189+ QDBusMessage reply;

190+

191+ LauncherBackend backend;

192+

193+ if (setCount) {

194+ message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",

195+ "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),

196+ "org.freedesktop.DBus.Properties",

197+ "Set");

198+ QVariantList cargs;

199+ cargs.append(QString("com.canonical.Unity.Launcher.Item"));

200+ cargs.append(QString("count"));

201+ cargs.append(QVariant::fromValue(QDBusVariant(inCount)));

202+

203+ message.setArguments(cargs);

204+ reply = con.call(message);

205+ QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);

206+ }

207+

208+ /* Set countVisible */

209+ message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",

210+ "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),

211+ "org.freedesktop.DBus.Properties",

212+ "Set");

213+ QVariantList cvargs;

214+ cvargs.append(QString("com.canonical.Unity.Launcher.Item"));

215+ cvargs.append(QString("countVisible"));

216+ cvargs.append(QVariant::fromValue(QDBusVariant(countVisible)));

217+

218+ message.setArguments(cvargs);

219+ reply = con.call(message);

220+ QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);

221+

222+ /* Get value */

223+ message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",

224+ "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),

225+ "org.freedesktop.DBus.Properties",

226+ "Get");

227+ QVariantList getargs;

228+ getargs.append(QString("com.canonical.Unity.Launcher.Item"));

229+ getargs.append(QString("count"));

230+

231+ message.setArguments(getargs);

232+ reply = con.call(message);

233+ QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);

234+ QCOMPARE(reply.arguments()[0].value<QDBusVariant>().variant().toInt(), expectedCount);

235+ }

69};

236};

70

237

71QTEST_GUILESS_MAIN(LauncherBackendTest)

238QTEST_GUILESS_MAIN(LauncherBackendTest)

tests/plugins/Utils/CMakeLists.txt+2−1

@@ -11,7 +11,8 @@ macro(run_tests)

11 -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml

12 -o -,txt)

13 add_test(NAME ${_test} COMMAND ${testCommand})

14+ set_tests_properties(${_test} PROPERTIES ENVIRONMENT "LC_ALL=C")

14− add_custom_target(${_test} ${testCommand})

15+ add_custom_target(${_test} env "LC_ALL=C" ${testCommand})

15 add_executable(${_test}Exec ${_test}.cpp modeltest.cpp)

16 add_executable(${_test}Exec ${_test}.cpp modeltest.cpp)

16 qt5_use_modules(${_test}Exec Test Core Qml)

17 qt5_use_modules(${_test}Exec Test Core Qml)

17 target_link_libraries(${_test}Exec

18 target_link_libraries(${_test}Exec

tests/qmltests/CMakeLists.txt+2−1

@@ -16,7 +16,7 @@ add_qml_test(utils/Unity/Test UnityTest)

16

17set(qmltest_DEFAULT_TARGETS qmluitests)

18set(qmltest_DEFAULT_NO_ADD_TEST TRUE)

19−set(qmltest_DEFAULT_PROPERTIES "")

19+set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")

20

21add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks

22 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")

@@ -32,6 +32,7 @@ add_qml_test(Components Revealer)

32add_qml_test(Components SeeMore)

33add_qml_test(Components Showable)

34add_qml_test(Components PageHeaderLabel)

35+add_qml_test(Components ZoomableImage)

35add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})

36add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})

36add_qml_test(Dash DashContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})

37add_qml_test(Dash DashContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})

37add_qml_test(Dash Card)

38add_qml_test(Dash Card)

tests/qmltests/Components/CMakeLists.txt+1

@@ -11,6 +11,7 @@ qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)

11target_link_libraries(DragHandleTestExec UbuntuGestureQml)

12

13add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "")

14+add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

14

15

15add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

16add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

16add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")

17add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")

tests/qmltests/Components/tst_FilterGrid.qml+1−1

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

50 CheckBox {

51 id: filterCheckBox

52 checked: true

53+ onCheckedChanged: filterGrid.setFilter(checked, false /*animate*/)

53 }

54 }

55 }

56 }

@@ -99,7 +100,6 @@ Rectangle {

99 maximumNumberOfColumns: 3

100 maximumNumberOfColumns: 3

100 collapsedRowCount:

101 collapsedRowCount:

101 collapsedRowCountSelector.values[collapsedRowCountSelector.selectedIndex]

102 collapsedRowCountSelector.values[collapsedRowCountSelector.selectedIndex]

102− filter: filterCheckBox.checked

103 minimumHorizontalSpacing: units.gu(1)

104 delegateWidth: units.gu(6)

105 delegateHeight: units.gu(6)

tests/qmltests/Components/tst_ZoomableImage.qmlnew file+192

@@ -0,0 +1,192 @@

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 "../../../qml/Components"

20+import Unity.Test 0.1 as UT

21+

22+Rectangle {

23+ id: root

24+ width: units.gu(30)

25+ height: units.gu(60)

26+ color: "lightgrey"

27+

28+ property var widgetData0: {

29+ "source": "",

30+ "zoomable": false

31+ }

32+

33+ property var widgetData1: {

34+ "source": "../../../qml/graphics/phone_background.jpg",

35+ "zoomable": false

36+ }

37+

38+ property var widgetData2: {

39+ "source": "../../../qml/Dash/graphics/phone/screenshots/gallery@12.png",

40+ "zoomable": true

41+ }

42+

43+ ZoomableImage {

44+ id: zoomableImage

45+ width: parent.width

46+ anchors.fill: parent

47+ asynchronous: false

48+ }

49+

50+ SignalSpy {

51+ id: signalSpy

52+ }

53+

54+ UT.UnityTestCase {

55+ name: "ZoomableImageTest"

56+ when: windowShown

57+

58+ function test_loadImage() {

59+ var lazyImage = findChild(zoomableImage, "lazyImage");

60+

61+ zoomableImage.source = widgetData0["source"];

62+ zoomableImage.zoomable = widgetData0["zoomable"];

63+ waitForRendering(zoomableImage);

64+ tryCompare(zoomableImage, "imageState", "default");

65+

66+ signalSpy.signalName = "onStateChanged";

67+ signalSpy.target = lazyImage;

68+ signalSpy.clear();

69+

70+ zoomableImage.source = widgetData1["source"];

71+ zoomableImage.zoomable = widgetData1["zoomable"];

72+ waitForRendering(lazyImage);

73+ tryCompareFunction(function() { return get_filename(lazyImage.source.toString()) === get_filename(widgetData1["source"]); }, true);

74+ waitForRendering(zoomableImage);

75+ tryCompare(zoomableImage, "imageState", "ready");

76+ compare (signalSpy.count, 1);

77+ }

78+

79+ function get_filename(a) {

80+ var wordsA = a.split("/");

81+ var filenameA = wordsA[wordsA.length-1];

82+ return filenameA;

83+ }

84+

85+ function test_mousewheel() {

86+ var image = findChild(zoomableImage, "image");

87+ var lazyImage = findChild(zoomableImage, "lazyImage");

88+ var flickable = findChild(zoomableImage, "flickable");

89+

90+ zoomableImage.source = widgetData2["source"];

91+ zoomableImage.zoomable = true;

92+ waitForRendering(zoomableImage);

93+

94+ tryCompare(zoomableImage, "imageState", "ready");

95+ tryCompareFunction(function() { return get_filename(lazyImage.source.toString()) === get_filename(widgetData2["source"]); }, true);

96+ waitForRendering(image);

97+

98+ // move mouse to center

99+ mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);

100+

101+ // Test Zoom-in Zoom-out twice.

102+ for (var c=0; c<2; c++) {

103+ // zoom in

104+ for (var i=0; i<10; i++) {

105+ mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);

106+ tryCompare(image, "scale", 1.0 + (i + 1) * 0.1);

107+ compare(flickable.contentWidth, lazyImage.width * image.scale);

108+ compare(flickable.contentHeight, lazyImage.height * image.scale);

109+ }

110+

111+ // zoom out

112+ for (var i=0; i<10; i++) {

113+ mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);

114+ tryCompare(image, "scale", 2.0 - (i + 1) * 0.1);

115+ compare(flickable.contentWidth, lazyImage.width * image.scale);

116+ compare(flickable.contentHeight, lazyImage.height * image.scale);

117+ }

118+ }

119+ }

120+

121+ function test_pinch_data() {

122+ return [ { source:widgetData2["source"],

123+ zoomable:false,

124+ answer1: true,

125+ answer2: false,

126+ answer3: true,

127+ answer4: 1.0,

128+ answer5: 1.0 },

129+ { source:widgetData2["source"],

130+ zoomable:true,

131+ answer1: false,

132+ answer2: true,

133+ answer3: false,

134+ answer4: 1.7740461882048026,

135+ answer5: 1.0 }

136+ ]

137+ }

138+

139+ function test_pinch(data) {

140+ var image = findChild(zoomableImage, "image");

141+ var lazyImage = findChild(zoomableImage, "lazyImage");

142+ var flickable = findChild(zoomableImage, "flickable");

143+

144+ signalSpy.signalName = "onScaleChanged";

145+ signalSpy.target = image;

146+ signalSpy.clear();

147+

148+ zoomableImage.source = data.source;

149+ zoomableImage.zoomable = data.zoomable;

150+ waitForRendering(zoomableImage);

151+

152+ tryCompare(zoomableImage, "imageState", "ready");

153+ tryCompareFunction(function() { return get_filename(lazyImage.source.toString()) === get_filename(data.source); }, true);

154+ waitForRendering(image);

155+

156+ var x1Start = zoomableImage.width * 2 / 6;

157+ var y1Start = zoomableImage.height * 2 / 6;

158+ var x1End = zoomableImage.width * 1 / 6;

159+ var y1End = zoomableImage.height * 1 / 6;

160+ var x2Start = zoomableImage.width * 4 / 6;

161+ var y2Start = zoomableImage.height * 4 / 6;

162+ var x2End = zoomableImage.width * 5 / 6;

163+ var y2End = zoomableImage.height * 5 / 6;

164+

165+ var oldScale = image.scale;

166+

167+ // move mouse to center

168+ mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);

169+

170+ // Test Zoom-in Zoom-out twice.

171+ for (var c=0; c<2; c++) {

172+ wait(3000); // have to delay between two consequent pinch event.

173+ // pinch zoom-in

174+ touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);

175+

176+ tryCompare(image, "scale", data.answer4);

177+ var newScale = image.scale;

178+ compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);

179+ compare(newScale > oldScale, data.answer2, "scale factor didn't changed");

180+ compare(signalSpy.count == 0, data.answer3, "scale signal count error");

181+ compare(newScale, data.answer4, "scale factor error");

182+ compare(flickable.contentWidth, lazyImage.width * image.scale);

183+ compare(flickable.contentHeight, lazyImage.height * image.scale);

184+

185+ wait(3000); // have to delay between two consequent pinch event.

186+ // pinch zoom-out

187+ touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);

188+ tryCompare(image, "scale", data.answer5);

189+ }

190+ }

191+ }

192+}

tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+21−2

@@ -36,6 +36,8 @@ Rectangle {

36 property var triggeredDataReviewOnly: { "rating": invalidInputRating, "review": validInputText, "author": null }

37

38 property var widgetDataBoth: { "visible": "both", "required": "both" }

39+ property var widgetDataBothRequireRating: { "visible": "both", "required": "rating" }

40+ property var widgetDataBothRequireReview: { "visible": "both", "required": "review" }

39 property var widgetDataRating: { "visible": "rating", "required": "rating" }

41 property var widgetDataRating: { "visible": "rating", "required": "rating" }

40 property var widgetDataRatingBroken: { "visible": "rating", "required": "review" }

42 property var widgetDataRatingBroken: { "visible": "rating", "required": "review" }

41 property var widgetDataReview: { "visible": "review", "required": "review" }

43 property var widgetDataReview: { "visible": "review", "required": "review" }

@@ -85,6 +87,14 @@ Rectangle {

85 {tag: "both, rating-only review", widgetData: widgetDataBoth, inputRating: validInputRating, inputText: invalidInputText, emitted: false},

87 {tag: "both, rating-only review", widgetData: widgetDataBoth, inputRating: validInputRating, inputText: invalidInputText, emitted: false},

86 {tag: "both, review-only review", widgetData: widgetDataBoth, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

88 {tag: "both, review-only review", widgetData: widgetDataBoth, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

87 {tag: "both, complete review", widgetData: widgetDataBoth, inputRating: validInputRating, inputText: validInputText, emitted: true},

89 {tag: "both, complete review", widgetData: widgetDataBoth, inputRating: validInputRating, inputText: validInputText, emitted: true},

90+ {tag: "both require rating, null review", widgetData: widgetDataBothRequireRating, inputRating: invalidInputRating, inputText: invalidInputText, emitted: false},

91+ {tag: "both require rating, rating-only review", widgetData: widgetDataBothRequireRating, inputRating: validInputRating, inputText: invalidInputText, emitted: true},

92+ {tag: "both require rating, review-only review", widgetData: widgetDataBothRequireRating, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

93+ {tag: "both require rating, complete review", widgetData: widgetDataBothRequireRating, inputRating: validInputRating, inputText: validInputText, emitted: true},

94+ {tag: "both require review, null review", widgetData: widgetDataBothRequireReview, inputRating: invalidInputRating, inputText: invalidInputText, emitted: false},

95+ {tag: "both require review, rating-only review", widgetData: widgetDataBothRequireReview, inputRating: validInputRating, inputText: invalidInputText, emitted: false},

96+ {tag: "both require review, review-only review", widgetData: widgetDataBothRequireReview, inputRating: invalidInputRating, inputText: validInputText, emitted: true},

97+ {tag: "both require review, complete review", widgetData: widgetDataBothRequireReview, inputRating: validInputRating, inputText: validInputText, emitted: true},

88 {tag: "rating, null review", widgetData: widgetDataRating, inputRating: invalidInputRating, inputText: invalidInputText, emitted: false},

98 {tag: "rating, null review", widgetData: widgetDataRating, inputRating: invalidInputRating, inputText: invalidInputText, emitted: false},

89 {tag: "rating, rating-only review", widgetData: widgetDataRating, inputRating: validInputRating, inputText: invalidInputText, emitted: true},

99 {tag: "rating, rating-only review", widgetData: widgetDataRating, inputRating: validInputRating, inputText: invalidInputText, emitted: true},

90 {tag: "rating, review-only review", widgetData: widgetDataRating, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

100 {tag: "rating, review-only review", widgetData: widgetDataRating, inputRating: invalidInputRating, inputText: validInputText, emitted: false},

@@ -114,7 +124,9 @@ Rectangle {

114 verify(rating.visible === true);

124 verify(rating.visible === true);

115

125

116 rating.value = data.inputRating;

126 rating.value = data.inputRating;

117− if (data.widgetData["required"] !== "rating" || data.inputRating < 0) {

127+ if (data.widgetData["required"] !== "rating" ||

128+ data.widgetData["visible"] !== "rating" ||

129+ data.inputRating < 0) {

118 compare(spy.count, 0);

130 compare(spy.count, 0);

119 } else {

131 } else {

120 compare(spy.count, 1);

132 compare(spy.count, 1);

@@ -129,7 +141,14 @@ Rectangle {

129 reviewTextArea.text = data.inputText;

141 reviewTextArea.text = data.inputText;

130 mouseClick(submitButton, submitButton.width / 2, submitButton.height / 2);

142 mouseClick(submitButton, submitButton.width / 2, submitButton.height / 2);

131 switch (data.widgetData["required"]) {

143 switch (data.widgetData["required"]) {

144+ case "rating": {

145+ if (rating.visible === false || data.inputRating < 0) {

132− case "rating": compare(spy.count, 0); break;

146+ compare(spy.count, 0);

147+ } else {

148+ compare(spy.count, 1);

149+ }

150+ break;

151+ }

133 case "both":

152 case "both":

134 default: {

153 default: {

135 if (data.inputRating < 0 || data.inputText === "") {

154 if (data.inputRating < 0 || data.inputText === "") {

tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+6−3

@@ -36,7 +36,8 @@ Rectangle {

36

37 PreviewZoomableImage {

38 id: zoomableImage

39− width: parent.width

39+ anchors.fill: parent

40+ widgetData: widgetData1

40 }

41 }

41

42

42 UT.UnityTestCase {

43 UT.UnityTestCase {

@@ -47,10 +48,12 @@ Rectangle {

47 var image = findChild(zoomableImage, "image");

48 var image = findChild(zoomableImage, "image");

48

49

49 zoomableImage.widgetData = widgetData0;

50 zoomableImage.widgetData = widgetData0;

51+ waitForRendering(zoomableImage);

50− tryCompare(image, "state", "default");

52+ tryCompare(image, "imageState", "default");

51

53

52 zoomableImage.widgetData = widgetData1;

54 zoomableImage.widgetData = widgetData1;

55+ waitForRendering(zoomableImage);

53− tryCompare(image, "state", "ready");

56+ tryCompare(image, "imageState", "ready");

54 }

57 }

55 }

58 }

56}

59}

tests/qmltests/Dash/tst_GenericScopeView.qml+3−3

@@ -140,7 +140,7 @@ Item {

140 mouseClick(header, header.width / 2, header.height / 2);

141 tryCompareFunction(function() { middleHeight = category.height; return category.height > initialHeight; }, true);

142 tryCompare(category, "filtered", false);

143− verify(category.height > middleHeight);

143+ tryCompareFunction(function() { return category.height > middleHeight; }, true);

144

145 mouseClick(header, header.width / 2, header.height / 2);

146 verify(category.expandable);

@@ -165,7 +165,7 @@ Item {

165

166 mouseClick(header2, header2.width / 2, header2.height / 2);

167 tryCompare(category2, "filtered", false);

168− tryCompare(category2FilterGrid, "filter", false);

168+ tryCompare(category2FilterGrid, "filtered", false);

169

170 categoryListView.positionAtBeginning();

171

@@ -182,7 +182,7 @@ Item {

182 mouseClick(header0, header0.width / 2, header0.height / 2);

183 tryCompare(category0, "filtered", false);

184 tryCompare(category2, "filtered", true);

185− tryCompare(category2FilterGrid, "filter", true);

185+ tryCompare(category2FilterGrid, "filtered", true);

186 mouseClick(header0, header0.width / 2, header0.height / 2);

187 tryCompare(category0, "filtered", true);

188 tryCompare(category2, "filtered", true);

tests/qmltests/Greeter/tst_Clock.qml+3−3

@@ -71,10 +71,10 @@ Rectangle {

71 var dateString = Qt.formatDate(dateObj, Qt.DefaultLocaleLongDate)

72 var timeString = Qt.formatTime(dateObj)

73

74− clock.enabled = false

74+ clock.visible = false

75 var timeModel = findInvisibleChild(clock, "timeModel")

76

77− compare(timeModel.menuObjectPath, "", "Clock shouldn't be connected to Indicators when not active.")

77+ compare(timeModel.menuObjectPath, "", "Clock shouldn't be connected to Indicators when not visible.")

78

79 clock.currentDate = dateObj

80

@@ -83,7 +83,7 @@ Rectangle {

83 var timeLabel = findChild(clock, "timeLabel")

84 compare(timeLabel.text, timeString, "Not the expected time")

85

86− clock.enabled = true

86+ clock.visible = true

87

88 verify(timeModel.menuObjectPath != "", "Should be connected to Indicators.")

89 }

tests/qmltests/Greeter/tst_Phone.qml+10−50

@@ -61,6 +61,12 @@ Item {

61 signalName: "unlocked"

62 }

63

64+ SignalSpy {

65+ id: teaseSpy

66+ target: greeter

67+ signalName: "tease"

68+ }

69+

64 UT.UnityTestCase {

70 UT.UnityTestCase {

65 name: "Greeter"

71 name: "Greeter"

66 when: windowShown

72 when: windowShown

@@ -82,56 +88,10 @@ Item {

82 }

88 }

83

89

84 function test_teasingArea(data) {

90 function test_teasingArea(data) {

85− tryCompare(greeter, "leftTeaserPressed", false)

91+ teaseSpy.clear()

86− tryCompare(greeter, "rightTeaserPressed", false)

87− mousePress(greeter, data.posX, greeter.height - units.gu(1))

88− tryCompare(greeter, "leftTeaserPressed", data.leftPressed)

89− tryCompare(greeter, "rightTeaserPressed", data.rightPressed)

90− mouseRelease(greeter, data.posX, greeter.height - units.gu(1))

91− tryCompare(greeter, "leftTeaserPressed", false)

92− tryCompare(greeter, "rightTeaserPressed", false)

93− }

94−

95− function test_teaseLockedUnlocked_data() {

96− return [

97− {tag: "unlocked", locked: false, moved: false},

98− {tag: "locked", locked: true, moved: false},

99− {tag: "moved", locked: false, moved: true}

100− ];

101− }

102−

103− function test_teaseLockedUnlocked(data) {

104− tryCompare(greeter, "rightTeaserPressed", false);

105− tryCompare(greeter, "x", 0);

106− greeter.locked = data.locked;

107−

108− // simulate greeter being in the middle of a swipe

109− if (data.moved) {

110− greeter.x = -units.gu(4);

111− tryCompare(greeter, "x", -units.gu(4));

112− }

113−

114− mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));

92+ mouseClick(greeter, data.posX, greeter.height - units.gu(1))

115− greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating

116−

117− if (!data.moved) {

118− // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area

119− // because animation duration and teaseTimer are the same duration and

120− // might cause slight offsets

121− tryCompareFunction(function() { return greeter.minX <= -units.gu(2) + 2}, true);

122− } else {

123− // waiting 100ms to make sure nothing moves

124− wait(100);

93+ teaseSpy.wait()

125− compare(greeter.minX, 0, "Greeter teasing not disabled even though it's locked or moving.");

94+ tryCompare(teaseSpy, "count", 1)

126− }

127−

128− // Restore position in case we moved it for the test

129− if (data.moved) {

130− greeter.x = 0;

131− }

132−

133− // Wait until we're back to 0

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

135 }

95 }

136

96

137 function test_statsWelcomeScreen() {

97 function test_statsWelcomeScreen() {

tests/qmltests/Greeter/tst_Tablet.qml+36−8

@@ -54,6 +54,12 @@ Item {

54 signalName: "selected"

55 }

56

57+ SignalSpy {

58+ id: teaseSpy

59+ target: greeter

60+ signalName: "tease"

61+ }

62+

57 UT.UnityTestCase {

63 UT.UnityTestCase {

58 name: "Greeter"

64 name: "Greeter"

59 when: windowShown

65 when: windowShown

@@ -325,14 +331,36 @@ Item {

325 }

331 }

326

332

327 function test_teasingArea(data) {

333 function test_teasingArea(data) {

328− tryCompare(greeter, "leftTeaserPressed", false)

334+ teaseSpy.clear()

329− tryCompare(greeter, "rightTeaserPressed", false)

330− mousePress(greeter, data.posX, greeter.height - units.gu(1))

335+ mouseClick(greeter, data.posX, greeter.height - units.gu(1))

331− tryCompare(greeter, "leftTeaserPressed", data.leftPressed)

336+ teaseSpy.wait()

332− tryCompare(greeter, "rightTeaserPressed", data.rightPressed)

337+ tryCompare(teaseSpy, "count", 1)

338+ }

339+

340+ function test_teaseLockedUnlocked_data() {

341+ return [

342+ {tag: "unlocked", locked: false, narrow: false},

343+ {tag: "locked", locked: true, narrow: false},

344+ ];

345+ }

346+

347+ function test_teaseLockedUnlocked(data) {

348+ teaseSpy.clear()

349+ greeter.locked = data.locked;

350+

333− mouseRelease(greeter, data.posX, greeter.height - units.gu(1))

351+ mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));

334− tryCompare(greeter, "leftTeaserPressed", false)

352+

335− tryCompare(greeter, "rightTeaserPressed", false)

353+ if (!data.locked || data.narrow) {

354+ teaseSpy.wait()

355+ tryCompare(teaseSpy, "count", 1);

356+ } else {

357+ // waiting 100ms to make sure nothing happens

358+ wait(100);

359+ compare(teaseSpy.count, 0, "Greeter teasing not disabled even though it's locked.");

360+ }

361+

362+ // Reset value

363+ greeter.locked = false;

336 }

364 }

337

365

338 function test_dbus_set_active_entry() {

366 function test_dbus_set_active_entry() {

tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+29−4

@@ -19,6 +19,7 @@ import QtTest 1.0

19import Unity.Test 0.1 as UT

20import QMenuModel 0.1

21import Unity.Indicators 0.1 as Indicators

22+import Utils 0.1 as Utils

22

23

23Item {

24Item {

24 id: testView

25 id: testView

@@ -42,6 +43,10 @@ Item {

42 }

43 }

44 }

44

45

46+ Utils.GDateTimeFormatter {

47+ id: timeFormatter

48+ }

49+

45 UT.UnityTestCase {

50 UT.UnityTestCase {

46 name: "MenuItemFactory"

51 name: "MenuItemFactory"

47 when: windowShown

52 when: windowShown

@@ -358,8 +363,10 @@ Item {

358

363

359 function test_create_alarmMenu_data() {

364 function test_create_alarmMenu_data() {

360 return [

365 return [

361− {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },

366+ {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),

367+ time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},

362− {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },

368+ {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),

369+ time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },

363 ];

370 ];

364 }

371 }

365

372

@@ -368,6 +375,12 @@ Item {

368 menuData.label = data.label;

375 menuData.label = data.label;

369 menuData.sensitive = data.enabled;

376 menuData.sensitive = data.enabled;

370 menuData.icon = data.icon;

377 menuData.icon = data.icon;

378+ menuData.ext = {

379+ 'xCanonicalTime': data.time,

380+ 'xCanonicalTimeFormat': data.timeFormat

381+ };

382+ timeFormatter.format = data.timeFormat;

383+ timeFormatter.time = data.time;

371

384

372 loader.data = menuData;

385 loader.data = menuData;

373 loader.sourceComponent = factory.load(menuData);

386 loader.sourceComponent = factory.load(menuData);

@@ -376,13 +389,16 @@ Item {

376

389

377 compare(loader.item.text, data.label, "Label does not match data");

390 compare(loader.item.text, data.label, "Label does not match data");

378 compare(loader.item.iconSource, data.icon, "Icon does not match data");

391 compare(loader.item.iconSource, data.icon, "Icon does not match data");

392+ compare(loader.item.time, timeFormatter.timeString, "Time does not match data");

379 compare(loader.item.enabled, data.enabled, "Enabled does not match data");

393 compare(loader.item.enabled, data.enabled, "Enabled does not match data");

380 }

394 }

381

395

382 function test_create_appointmentMenu_data() {

396 function test_create_appointmentMenu_data() {

383 return [

397 return [

384− {label: "testLabel1", enabled: true, icon: "file:///testIcon1" },

398+ {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),

399+ time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},

385− {label: "testLabel2", enabled: false, icon: "file:///testIcon2" },

400+ {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),

401+ time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },

386 ];

402 ];

387 }

403 }

388

404

@@ -391,6 +407,13 @@ Item {

391 menuData.label = data.label;

407 menuData.label = data.label;

392 menuData.sensitive = data.enabled;

408 menuData.sensitive = data.enabled;

393 menuData.icon = data.icon;

409 menuData.icon = data.icon;

410+ menuData.ext = {

411+ 'xCanonicalColor': data.colour,

412+ 'xCanonicalTime': data.time,

413+ 'xCanonicalTimeFormat': data.timeFormat

414+ };

415+ timeFormatter.format = data.timeFormat;

416+ timeFormatter.time = data.time;

394

417

395 loader.data = menuData;

418 loader.data = menuData;

396 loader.sourceComponent = factory.load(menuData);

419 loader.sourceComponent = factory.load(menuData);

@@ -399,6 +422,8 @@ Item {

399

422

400 compare(loader.item.text, data.label, "Label does not match data");

423 compare(loader.item.text, data.label, "Label does not match data");

401 compare(loader.item.iconSource, data.icon, "Icon does not match data");

424 compare(loader.item.iconSource, data.icon, "Icon does not match data");

425+ compare(loader.item.time, timeFormatter.timeString, "Time does not match data");

426+ compare(loader.item.eventColor, data.color, "Colour does not match data");

402 compare(loader.item.enabled, data.enabled, "Enabled does not match data");

427 compare(loader.item.enabled, data.enabled, "Enabled does not match data");

403 }

428 }

404

429

tests/utils/modules/Unity/Test/UnityTestCase.qml+26

@@ -260,6 +260,32 @@ TestCase {

260 }

261 }

262

263+ function touchPinch(item, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End) {

264+ // Make sure the item is rendered

265+ waitForRendering(item);

266+

267+ var event1 = touchEvent();

268+ // first finger

269+ event1.press(0, x1Start, y1Start);

270+ event1.commit();

271+ // second finger

272+ event1.stationary(0);

273+ event1.press(1, x2Start, y2Start);

274+ event1.commit();

275+

276+ // pinch

277+ for (var i = 0.0; i < 1.0; i += 0.02) {

278+ event1.move(0, x1Start + (x1End - x1Start) * i, y1Start + (y1End - y1Start) * i);

279+ event1.move(1, x2Start + (x2End - x2Start) * i, y2Start + (y2End - y2Start) * i);

280+ event1.commit();

281+ }

282+

283+ // release

284+ event1.release(0, x1End, y1End);

285+ event1.release(1, x2End, y2End);

286+ event1.commit();

287+ }

288+

263 function fetchRootItem(item) {

289 function fetchRootItem(item) {

264 if (item.parent)

290 if (item.parent)

265 return fetchRootItem(item.parent)

291 return fetchRootItem(item.parent)