on xenial help sign in
Merge testCyclePreviewBroken
commit145ccaec5567fcc54db0945bf8f8470cdcdade5f authorAlbert Astals <albert.astals@canonical.com> dateTue 28 Jan 2014, 13:41 (13 years ago) parent22d12eafaa5e87
5 files changed+43−38
data/unity8.conf+1 debian/control+1 po/fr.po+29−29 qml/Dash/PreviewListView.qml+1 tests/qmltests/Dash/tst_GenericScopeView.qml+11−9
data/unity8.conf+1
@@ -24,6 +24,7 @@ pre-start script
2424 # Point all future jobs in this session to our Mir socket instead of
2525 # unity-system-compositor's socket.
2626 initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
27+ gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
2728 fi
2829end script
2930
debian/control+1
@@ -72,6 +72,7 @@ Package: unity8
7272Architecture: any
7373Provides: indicator-renderer,
7474Depends: gsettings-desktop-schemas,
75+ libglib2.0-bin,
7576 qmenumodel-qml (>= 0.2.7),
7677 qtdeclarative5-dee-plugin,
7778 qtdeclarative5-gsettings1.0,
po/fr.po+29−29
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-11-29 09:21+0100\n"
11−"PO-Revision-Date: 2013-06-27 03:21+0000\n"
12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
11+"PO-Revision-Date: 2014-01-28 00:34+0000\n"
12+"Last-Translator: Pierre <Unknown>\n"
1313"Language-Team: French <fr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
1717"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2013-12-29 06:04+0000\n"
19−"X-Generator: Launchpad (build 16877)\n"
18+"X-Launchpad-Export-Date: 2014-01-28 07:06+0000\n"
19+"X-Generator: Launchpad (build 16914)\n"
2020
2121#: Components/EdgeDemoOverlay.qml:151
2222msgid "Skip intro"
23−msgstr ""
23+msgstr "Passer l'intro"
2424
2525#: Components/EdgeDemo.qml:112
2626msgid "Right edge"
27−msgstr ""
27+msgstr "Bord droit"
2828
2929#: Components/EdgeDemo.qml:113
3030msgid "Try swiping from the right edge to unlock the phone"
@@ -32,7 +32,7 @@ msgstr ""
3232
3333#: Components/EdgeDemo.qml:144
3434msgid "Top edge"
35−msgstr ""
35+msgstr "Bord supérieur"
3636
3737#: Components/EdgeDemo.qml:145
3838msgid "Try swiping from the top edge to access the indicators"
@@ -40,7 +40,7 @@ msgstr ""
4040
4141#: Components/EdgeDemo.qml:170
4242msgid "Close"
43−msgstr ""
43+msgstr "Fermer"
4444
4545#: Components/EdgeDemo.qml:171
4646msgid "Swipe up again to close the settings screen"
@@ -48,7 +48,7 @@ msgstr ""
4848
4949#: Components/EdgeDemo.qml:198
5050msgid "Left edge"
51−msgstr ""
51+msgstr "Bord gauche"
5252
5353#: Components/EdgeDemo.qml:199
5454msgid "Swipe from the left to reveal the launcher for quick access to apps"
@@ -66,70 +66,70 @@ msgstr ""
6666
6767#: Components/PageHeader.qml:364
6868msgid "Recent searches"
69−msgstr ""
69+msgstr "Recherches récentes"
7070
7171#: Dash/Apps/AppPreview.qml:135
7272msgid "Rate this"
73−msgstr ""
73+msgstr "Evaluez ceci"
7474
7575#. TRANSLATORS: Number of persons who rated this app/video/whatever
7676#: Dash/Previews/Header.qml:93
7777#, qt-format
7878msgid "(%1)"
79−msgstr ""
79+msgstr "(%1)"
8080
8181#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever
8282#: Dash/Previews/Header.qml:105
8383#, qt-format
8484msgid "%1 review"
8585msgid_plural "%1 reviews"
86−msgstr[0] ""
87−msgstr[1] ""
86+msgstr[0] "%1 avis"
87+msgstr[1] "%1 avis"
8888
8989#: Dash/Previews/Reviews.qml:74
9090msgid "Add a review"
91−msgstr ""
91+msgstr "Ajouter un avis"
9292
9393#: Dash/Previews/Reviews.qml:86
9494msgid "Review"
95−msgstr ""
95+msgstr "Avis"
9696
9797#: Dash/Previews/Reviews.qml:121
9898msgid "Send"
99−msgstr ""
99+msgstr "Envoyer"
100100
101101#: Dash/Previews/Reviews.qml:139
102102msgid "Comments:"
103−msgstr ""
103+msgstr "Commentaires :"
104104
105105#: Greeter/Lockscreen.qml:149
106106msgid "Emergency Call"
107−msgstr ""
107+msgstr "Appel d'urgence"
108108
109109#: Greeter/PassphraseLockscreen.qml:59
110110#, qt-format
111111msgid "Hello %1"
112−msgstr ""
112+msgstr "Bonjour %1"
113113
114114#: Greeter/PassphraseLockscreen.qml:59
115115msgid "Hello"
116−msgstr ""
116+msgstr "Bonjour"
117117
118118#: Hud/HudParametrizedActionsPage.qml:132
119119msgid "Confirm"
120−msgstr ""
120+msgstr "Confirmez"
121121
122122#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
123123msgid "Type or say a command"
124−msgstr ""
124+msgstr "Rédigez ou dictez une commande"
125125
126126#: Hud/Hud.qml:84
127127msgid "Loading. Please Wait..."
128−msgstr ""
128+msgstr "Chargement. Veuillez patienter…"
129129
130130#: Hud/Hud.qml:89
131131msgid "Speak Now..."
132−msgstr ""
132+msgstr "Parlez maintenant…"
133133
134134#: Hud/Hud.qml:94
135135msgid "Speaking..."
@@ -137,16 +137,16 @@ msgstr ""
137137
138138#: Notifications/NotificationMenuItemFactory.qml:89
139139msgid "Show password"
140−msgstr ""
140+msgstr "Afficher le mot de passe"
141141
142142#: Panel/SearchIndicator.qml:27
143143msgid "Search"
144−msgstr ""
144+msgstr "Rechercher"
145145
146146#: plugins/Unity/Launcher/launcheritem.cpp:43
147147#: plugins/Unity/Launcher/launcheritem.cpp:73
148148msgid "Lock to Launcher"
149−msgstr ""
149+msgstr "Conserver dans le lanceur"
150150
151151#: plugins/Unity/Launcher/launcheritem.cpp:73
152152msgid "Unlock from Launcher"
@@ -155,4 +155,4 @@ msgstr ""
155155#: Shell.qml:439
156156#, qt-format
157157msgid "Please enter %1"
158−msgstr ""
158+msgstr "Veuillez saisir %1"
qml/Dash/PreviewListView.qml+1
@@ -32,6 +32,7 @@ Item {
3232 property alias model: previewListView.model
3333 property alias currentIndex: previewListView.currentIndex
3434 property alias currentItem: previewListView.currentItem
35+ property alias count: previewListView.count
3536
3637 Image {
3738 objectName: "pointerArrow"
tests/qmltests/Dash/tst_GenericScopeView.qml+11−9
@@ -41,17 +41,10 @@ Item {
4141 signal mainStageFocusedApplicationChanged()
4242 }
4343
44− PreviewListView {
45− id: previewListView
46− anchors.fill: parent
47− openEffect: openEffect
48− categoryView: genericScopeView.categoryView
49− scope: genericScopeView.scope
50− }
51−
5244 DashContentOpenEffect {
5345 id: openEffect
5446 previewListView: previewListView
47+ sourceItem: genericScopeView
5548 }
5649
5750 PageHeaderLabel {
@@ -176,6 +169,7 @@ Item {
176169
177170 function test_previewCycle() {
178171 tryCompare(previewListView, "open", false);
172+ tryCompare(openEffect, "gap", 0);
179173
180174 openPreview();
181175
@@ -193,7 +187,7 @@ Item {
193187 checkArrowPosition(0);
194188
195189 // flick to the next previews
196−
190+ tryCompare(previewListView, "count", 15);
197191 for (var i = 1; i < previewListView.count; ++i) {
198192
199193 mouseFlick(previewListView, previewListView.width - units.gu(1),
@@ -338,4 +332,12 @@ Item {
338332 }
339333 }
340334 }
335+
336+ PreviewListView {
337+ id: previewListView
338+ anchors.fill: parent
339+ openEffect: openEffect
340+ categoryView: genericScopeView.categoryView
341+ scope: genericScopeView.scope
342+ }
341343}