git.iko.soy/unity8
on xenial help sign in
Merge
commita2e2fbc2206fa4d4c6905f467de0e39975521cad authorAlbert Astals <albert.astals@canonical.com> dateTue 25 Jun 2013, 10:46 (13 years ago) parentb5e4e15e97365d
12 files changed+109−82
compare with xenial
unifiedsplit
Components/IconUtil.js+5−5 Dash/Apps/ApplicationsFilterGrid.qml+3−2 Greeter/Lockscreen.qml+7−1 Shell.qml+1−1 debian/changelog+14 po/ar.po+7−7 po/de.po+8−8 po/en_GB.po+7−7 po/ru.po+11−11 po/tr.po+31−31 po/zh_CN.po+8−8 tests/qmltests/Greeter/tst_Lockscreen.qml+7−1
Components/IconUtil.js+5−5
@@ -26,17 +26,17 @@ function from_gicon(name) {
2626 var base_icon_re = /'base-icon':.+?'(.+?)'/;
2727 var base_icon = name.toString().match(base_icon_re);
2828 icon_name = base_icon[1];
29− }
30− else {
29+ } else {
3130 var themed_re = /^. GThemedIcon\s*([^\s]+)\s*/;
3231 var themed = name.match(themed_re);
3332 if (themed) {
3433 return "image://gicon/" + themed[1];
3534 }
3635 }
37− var remote_re = /^http/;
38− if (remote_re.test(icon_name)) {
36+ var name_re = /^[a-z0-9\._-]+$/;
37+ if (name_re.test(icon_name)) {
38+ return "image://gicon/" + icon_name;
39+ } else {
3940 return icon_name;
4041 }
41− return "image://gicon/" + icon_name;
4242}
Dash/Apps/ApplicationsFilterGrid.qml+3−2
@@ -17,11 +17,12 @@
1717import QtQuick 2.0
1818import "../../Components"
1919import "../../Applications"
20+import "../../Components/IconUtil.js" as IconUtil
2021
2122FilterGrid {
2223 id: filterGrid
2324
24− filter: true
25+ filter: false
2526 expandable: false
2627 minimumHorizontalSpacing: units.gu(0.5)
2728 maximumNumberOfColumns: 6
@@ -50,7 +51,7 @@ FilterGrid {
5051 text: model.column_5 ? model.column_5 : application.name // FIXME: this is temporary
5152 imageWidth: units.gu(8)
5253 imageHeight: units.gu(7.5)
53− source: icon.indexOf("/") == -1 ? "image://gicon/" + icon : icon
54+ source: IconUtil.from_gicon(icon)
5455 onClicked: filterGrid.clicked(index, application.desktopFile);
5556 }
5657}
Greeter/Lockscreen.qml+7−1
@@ -41,7 +41,14 @@ Showable {
4141 signal cancel()
4242 signal emergencyCall()
4343
44+ onRequiredChanged: {
45+ if (required && pinPadLoader.item) {
46+ pinPadLoader.item.clear(false);
47+ }
48+ }
49+
4450 function reset() {
51+ // This causes the loader below to destry and recreate the source
4552 pinPadLoader.resetting = true;
4653 pinPadLoader.resetting = false;
4754 }
@@ -140,7 +147,6 @@ Showable {
140147 }
141148 if (LightDM.Greeter.authenticated) {
142149 root.unlocked();
143− pinPadLoader.item.clear(false);
144150 } else {
145151 pinPadLoader.item.clear(true);
146152 }
Shell.qml+1−1
@@ -380,7 +380,7 @@ FocusScope {
380380 } else {
381381 lockscreen.alphaNumeric = true
382382 }
383− lockscreen.placeholderText = i18n.tr("Please enter %1:").arg(text);
383+ lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);
384384 lockscreen.show();
385385 }
386386 }
debian/changelog+14
@@ -1,3 +1,17 @@
1+unity8 (7.81.1) saucy; urgency=low
2+
3+ * Translation updates.
4+
5+ [ Michał Sawicz ]
6+ * Don't limit installed apps.
7+ * Pre-optimize PNGs to speed-up builds.
8+ * Clean up build scripts.
9+
10+ [ Daniel d'Andrada ]
11+ * Use DirectionalDragArea in BottomBar.
12+
13+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 21 Jun 2013 17:37:02 +0200
14+
115unity8 (7.81.0) saucy; urgency=low
216
317 * Translation updates.
po/ar.po+7−7
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-14 21:09+0000\n"
11+"PO-Revision-Date: 2013-06-22 16:15+0000\n"
1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
1313"Language-Team: Arabic <ar@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-23 05:56+0000\n"
18+"X-Generator: Launchpad (build 16677)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -195,16 +195,16 @@ msgstr "المؤلف:"
195195
196196#: Greeter/Lockscreen.qml:126
197197msgid "Emergency call"
198−msgstr ""
198+msgstr "مكالمة طوارئ"
199199
200200#: Greeter/PassphraseLockscreen.qml:59
201201#, qt-format
202202msgid "Hello %1"
203−msgstr ""
203+msgstr "مرحبا %1"
204204
205205#: Greeter/PassphraseLockscreen.qml:59
206206msgid "Hello"
207−msgstr ""
207+msgstr "مرحبًا"
208208
209209#: Hud/HudParametrizedActionsPage.qml:132
210210msgid "Confirm"
@@ -249,4 +249,4 @@ msgstr "الشاشة الرئيسية"
249249#: Shell.qml:380
250250#, qt-format
251251msgid "Please enter %1:"
252−msgstr ""
252+msgstr "رجاءً أدخِل %1:"
po/de.po+8−8
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-15 20:04+0000\n"
12−"Last-Translator: Eduard Gotwig <eduardgotwig@gmail.com>\n"
11+"PO-Revision-Date: 2013-06-23 18:17+0000\n"
12+"Last-Translator: Phillip Sz <Unknown>\n"
1313"Language-Team: German <de@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-24 05:27+0000\n"
18+"X-Generator: Launchpad (build 16677)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -195,16 +195,16 @@ msgstr "Autor:"
195195
196196#: Greeter/Lockscreen.qml:126
197197msgid "Emergency call"
198−msgstr ""
198+msgstr "Notruf"
199199
200200#: Greeter/PassphraseLockscreen.qml:59
201201#, qt-format
202202msgid "Hello %1"
203−msgstr ""
203+msgstr "Hallo %1"
204204
205205#: Greeter/PassphraseLockscreen.qml:59
206206msgid "Hello"
207−msgstr ""
207+msgstr "Hallo"
208208
209209#: Hud/HudParametrizedActionsPage.qml:132
210210msgid "Confirm"
@@ -249,4 +249,4 @@ msgstr "Startseite"
249249#: Shell.qml:380
250250#, qt-format
251251msgid "Please enter %1:"
252−msgstr ""
252+msgstr "Bitte geben Sie %1 ein:"
po/en_GB.po+7−7
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-14 12:43+0000\n"
11+"PO-Revision-Date: 2013-06-23 22:34+0000\n"
1212"Last-Translator: Andi Chandler <Unknown>\n"
1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-24 05:27+0000\n"
18+"X-Generator: Launchpad (build 16677)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -195,16 +195,16 @@ msgstr "Author:"
195195
196196#: Greeter/Lockscreen.qml:126
197197msgid "Emergency call"
198−msgstr ""
198+msgstr "Emergency call"
199199
200200#: Greeter/PassphraseLockscreen.qml:59
201201#, qt-format
202202msgid "Hello %1"
203−msgstr ""
203+msgstr "Hello %1"
204204
205205#: Greeter/PassphraseLockscreen.qml:59
206206msgid "Hello"
207−msgstr ""
207+msgstr "Hello"
208208
209209#: Hud/HudParametrizedActionsPage.qml:132
210210msgid "Confirm"
@@ -249,4 +249,4 @@ msgstr "Home screen"
249249#: Shell.qml:380
250250#, qt-format
251251msgid "Please enter %1:"
252−msgstr ""
252+msgstr "Please enter %1:"
po/ru.po+11−11
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
11+"PO-Revision-Date: 2013-06-21 10:08+0000\n"
12+"Last-Translator: Andrey Dedikov <iamawesome.ndr@gmail.com>\n"
1313"Language-Team: Russian <ru@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:36+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-22 06:26+0000\n"
18+"X-Generator: Launchpad (build 16677)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -63,7 +63,7 @@ msgstr ""
6363
6464#: Applications/applications.js:86
6565msgid "Evernote"
66−msgstr ""
66+msgstr "Evernote"
6767
6868#: Applications/applications.js:91
6969msgid "Map"
@@ -71,11 +71,11 @@ msgstr ""
7171
7272#: Applications/applications.js:96
7373msgid "Pinterest"
74−msgstr ""
74+msgstr "Pinterest"
7575
7676#: Applications/applications.js:101
7777msgid "SoundCloud"
78−msgstr ""
78+msgstr "SoundCloud"
7979
8080#: Applications/applications.js:106
8181msgid "Wikipedia"
@@ -143,7 +143,7 @@ msgstr ""
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
146−msgstr ""
146+msgstr "Новые релизы"
147147
148148#: Dash/DashMusic.qml:30
149149msgid "Top Charting"
@@ -163,7 +163,7 @@ msgstr ""
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "Новые контакты"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
@@ -183,11 +183,11 @@ msgstr "Видео"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "Режиссёр"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
190−msgstr ""
190+msgstr "В главных ролях"
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
po/tr.po+31−31
@@ -8,58 +8,58 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-05 22:20+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
11+"PO-Revision-Date: 2013-06-24 17:24+0000\n"
12+"Last-Translator: Adar Cem EREN <adarcemeren34@gmail.com>\n"
1313"Language-Team: Turkish <tr@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-25 06:00+0000\n"
18+"X-Generator: Launchpad (build 16677)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
22−msgstr ""
22+msgstr "Telefon"
2323
2424#: Applications/applications.js:29
2525msgid "Camera"
26−msgstr ""
26+msgstr "Kamera"
2727
2828#: Applications/applications.js:35
2929msgid "Gallery"
30−msgstr ""
30+msgstr "Galeri"
3131
3232#: Applications/applications.js:40
3333msgid "Facebook"
34−msgstr ""
34+msgstr "Facebook"
3535
3636#: Applications/applications.js:46
3737msgid "Browser"
38−msgstr ""
38+msgstr "Tarayıcı"
3939
4040#: Applications/applications.js:51
4141msgid "Twitter"
42−msgstr ""
42+msgstr "Twitter"
4343
4444#: Applications/applications.js:57
4545msgid "GMail"
46−msgstr ""
46+msgstr "GMail"
4747
4848#: Applications/applications.js:62
4949msgid "Weather"
50−msgstr ""
50+msgstr "Hava Durumu"
5151
5252#: Applications/applications.js:68
5353msgid "Notepad"
54−msgstr ""
54+msgstr "Not Defteri"
5555
5656#: Applications/applications.js:74
5757msgid "Calendar"
58−msgstr ""
58+msgstr "Takvim"
5959
6060#: Applications/applications.js:80
6161msgid "Media Player"
62−msgstr ""
62+msgstr "Ortam Oynatıcı"
6363
6464#: Applications/applications.js:86
6565msgid "Evernote"
@@ -67,7 +67,7 @@ msgstr ""
6767
6868#: Applications/applications.js:91
6969msgid "Map"
70−msgstr ""
70+msgstr "Harita"
7171
7272#: Applications/applications.js:96
7373msgid "Pinterest"
@@ -79,15 +79,15 @@ msgstr ""
7979
8080#: Applications/applications.js:106
8181msgid "Wikipedia"
82−msgstr ""
82+msgstr "Vikipedi"
8383
8484#: Applications/applications.js:111
8585msgid "YouTube"
86−msgstr ""
86+msgstr "YouTube"
8787
8888#: Components/PageHeader.qml:300
8989msgid "Recent searches"
90−msgstr "Son aramalar"
90+msgstr "Son Arananlar"
9191
9292#: Dash/DashApps.qml:65
9393msgid "Running apps"
@@ -131,15 +131,15 @@ msgstr "Çevrimiçi Yaygın Videolar"
131131
132132#: Dash/DashHome.qml:197 plugins/Unity/lenses.cpp:38
133133msgid "Home"
134−msgstr "Ev"
134+msgstr "Ana Sayfa"
135135
136136#: Dash/DashMusic.qml:27 Dash/DashVideos.qml:28
137137msgid "Featured"
138−msgstr ""
138+msgstr "Öne Çıkanlar"
139139
140140#: Dash/DashMusic.qml:28 Dash/DashVideos.qml:29
141141msgid "Recent"
142−msgstr ""
142+msgstr "En Son"
143143
144144#: Dash/DashMusic.qml:29 Dash/DashVideos.qml:30
145145msgid "New Releases"
@@ -155,7 +155,7 @@ msgstr "Müzik"
155155
156156#: Dash/DashPeople.qml:31
157157msgid "Favourites"
158−msgstr ""
158+msgstr "Favoriler"
159159
160160#: Dash/DashPeople.qml:32
161161msgid "Recently in touch"
@@ -163,11 +163,11 @@ msgstr ""
163163
164164#: Dash/DashPeople.qml:33
165165msgid "New Contacts"
166−msgstr ""
166+msgstr "Yeni Kişiler"
167167
168168#: Dash/DashPeople.qml:34
169169msgid "A-Z"
170−msgstr ""
170+msgstr "A-Z"
171171
172172#: Dash/DashPeople.qml:123
173173msgid "People"
@@ -175,7 +175,7 @@ msgstr "Kişiler"
175175
176176#: Dash/DashVideos.qml:31
177177msgid "Popular Online"
178−msgstr ""
178+msgstr "Genellikle Çevrimiçi"
179179
180180#: Dash/DashVideos.qml:155
181181msgid "Videos"
@@ -183,7 +183,7 @@ msgstr "Videolar"
183183
184184#: Dash/Video/VideoPreview.qml:98
185185msgid "Directed by:"
186−msgstr ""
186+msgstr "Yönetmen"
187187
188188#: Dash/Video/VideoPreview.qml:121
189189msgid "Starring:"
@@ -191,11 +191,11 @@ msgstr ""
191191
192192#: Dash/Video/VideoPreview.qml:144
193193msgid "Author:"
194−msgstr ""
194+msgstr "Yazar:"
195195
196196#: Greeter/Lockscreen.qml:126
197197msgid "Emergency call"
198−msgstr ""
198+msgstr "Acil Arama"
199199
200200#: Greeter/PassphraseLockscreen.qml:59
201201#, qt-format
@@ -204,7 +204,7 @@ msgstr ""
204204
205205#: Greeter/PassphraseLockscreen.qml:59
206206msgid "Hello"
207−msgstr ""
207+msgstr "Merhaba"
208208
209209#: Hud/HudParametrizedActionsPage.qml:132
210210msgid "Confirm"
@@ -232,7 +232,7 @@ msgstr "Aygıt"
232232
233233#: Panel/Menus/Overview/FlightModeWidget.qml:42
234234msgid "Flight mode"
235−msgstr "Uçak kipi"
235+msgstr "Uçak Modu"
236236
237237#: Panel/SearchIndicator.qml:26 plugins/Unity/lenses.cpp:40
238238msgid "Search"
po/zh_CN.po+8−8
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2013-06-19 17:06+0200\n"
11−"PO-Revision-Date: 2013-06-13 11:35+0000\n"
12−"Last-Translator: Wylmer Wang <Unknown>\n"
11+"PO-Revision-Date: 2013-06-22 21:20+0000\n"
12+"Last-Translator: Anthony Wong <anthony.wong@canonical.com>\n"
1313"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2013-06-20 06:37+0000\n"
18−"X-Generator: Launchpad (build 16673)\n"
17+"X-Launchpad-Export-Date: 2013-06-23 05:56+0000\n"
18+"X-Generator: Launchpad (build 16677)\n"
1919
2020#: Applications/applications.js:23
2121msgid "Phone"
@@ -195,16 +195,16 @@ msgstr "作者："
195195
196196#: Greeter/Lockscreen.qml:126
197197msgid "Emergency call"
198−msgstr ""
198+msgstr "紧急呼救"
199199
200200#: Greeter/PassphraseLockscreen.qml:59
201201#, qt-format
202202msgid "Hello %1"
203−msgstr ""
203+msgstr "你好，%1"
204204
205205#: Greeter/PassphraseLockscreen.qml:59
206206msgid "Hello"
207−msgstr ""
207+msgstr "你好"
208208
209209#: Hud/HudParametrizedActionsPage.qml:132
210210msgid "Confirm"
@@ -249,4 +249,4 @@ msgstr "主页"
249249#: Shell.qml:380
250250#, qt-format
251251msgid "Please enter %1:"
252−msgstr ""
252+msgstr "请输入 %1:"
tests/qmltests/Greeter/tst_Lockscreen.qml+7−1
@@ -187,8 +187,8 @@ Rectangle {
187187 unlockedCheckBox.checked = false
188188 LightDM.Greeter.authenticate(data.username)
189189
190+ var inputField = findChild(lockscreen, "pinentryField")
190191 if (data.alphanumeric) {
191− var inputField = findChild(lockscreen, "pinentryField")
192192 mouseClick(inputField, units.gu(1), units.gu(1))
193193 typeString(data.password)
194194 keyClick(Qt.Key_Enter)
@@ -200,6 +200,12 @@ Rectangle {
200200 }
201201 }
202202 tryCompare(unlockedCheckBox, "checked", data.unlockedSignal)
203+ if (!data.unlockedSignal) {
204+ // make sure the input is cleared on wrong input
205+ tryCompareFunction(function() {return inputField.text.length == 0}, true)
206+ } else {
207+ tryCompareFunction(function() {return inputField.text.length > 0}, true)
208+ }
203209 }
204210 }
205211}