git.iko.soy/unity8
on xenial help sign in
Merge new-scopes-clean-to-trunk
ee0293eAlbert Astals
debian/changelog+13
compare with xenial
unifiedsplit
@@ -1,3 +1,16 @@
1+unity8 (7.84+14.04.20140306-0ubuntu1) trusty; urgency=low
2+
3+ [ Bill Filler ]
4+ * Convert gallery and camera to click
5+
6+ [ Michael Zanetti ]
7+ * Just disable HUD tests, without really disabling the HUD itself
8+
9+ [ Sergio Schvezov ]
10+ * Convert gallery and camera to click
11+
12+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 06 Mar 2014 16:45:46 +0000
13+
1unity8 (7.84+14.04.20140304-0ubuntu1) trusty; urgency=low
14unity8 (7.84+14.04.20140304-0ubuntu1) trusty; urgency=low
2
15
3 [ Michael Terry ]
16 [ Michael Terry ]
po/tr.po+15−13
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-02-13 18:37+0000\n"
10"POT-Creation-Date: 2014-02-13 18:37+0000\n"
11−"PO-Revision-Date: 2014-01-14 19:05+0000\n"
11+"PO-Revision-Date: 2014-03-05 08:54+0000\n"
12−"Last-Translator: Osman Coşkun <Unknown>\n"
12+"Last-Translator: Muhammed Yüce <muhammedyuceee@gmail.com>\n"
13"Language-Team: Turkish <tr@li.org>\n"
13"Language-Team: Turkish <tr@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2014-02-19 05:44+0000\n"
18+"X-Launchpad-Export-Date: 2014-03-06 06:19+0000\n"
19−"X-Generator: Launchpad (build 16916)\n"
19+"X-Generator: Launchpad (build 16948)\n"
20
20
21#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
22#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -29,7 +29,7 @@ msgstr "Başlatıcıdan Ayır"
29
29
30#: qml/Components/EdgeDemoOverlay.qml:151
30#: qml/Components/EdgeDemoOverlay.qml:151
31msgid "Skip intro"
31msgid "Skip intro"
32−msgstr "İntro'yu geç"
32+msgstr "Tanıtımı geç"
33
33
34#: qml/Components/EdgeDemo.qml:113
34#: qml/Components/EdgeDemo.qml:113
35msgid "Right edge"
35msgid "Right edge"
@@ -37,7 +37,7 @@ msgstr "Sağ kenar"
37
37
38#: qml/Components/EdgeDemo.qml:114
38#: qml/Components/EdgeDemo.qml:114
39msgid "Try swiping from the right edge to unlock the phone"
39msgid "Try swiping from the right edge to unlock the phone"
40−msgstr "Kilidi açmak için sağ kenara sürüklemeyi deneyin"
40+msgstr "Kilidi açmak için sağ kenardan sürüklemeyi deneyin"
41
41
42#: qml/Components/EdgeDemo.qml:145
42#: qml/Components/EdgeDemo.qml:145
43msgid "Top edge"
43msgid "Top edge"
@@ -45,7 +45,7 @@ msgstr "Üst kenar"
45
45
46#: qml/Components/EdgeDemo.qml:146
46#: qml/Components/EdgeDemo.qml:146
47msgid "Try swiping from the top edge to access the indicators"
47msgid "Try swiping from the top edge to access the indicators"
48−msgstr "Bildiricilere erişmek için üst kenarı sürüklemeyi deneyin"
48+msgstr "Bildiricilere erişmek için üst kenarı sürükleyin"
49
49
50#: qml/Components/EdgeDemo.qml:171
50#: qml/Components/EdgeDemo.qml:171
51msgid "Close"
51msgid "Close"
@@ -73,18 +73,20 @@ msgid ""
73"You have now mastered the edge gestures and can start using the "
73"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
74"phone<br><br>Tap on the screen to start"
75msgstr ""
75msgstr ""
76+"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
77+"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
76
78
77#: qml/Components/PageHeader.qml:340
79#: qml/Components/PageHeader.qml:340
78msgid "Recent searches"
80msgid "Recent searches"
79−msgstr "Son Arananlar"
81+msgstr "Son aramalar"
80
82
81#: qml/Components/SeeMore.qml:35
83#: qml/Components/SeeMore.qml:35
82msgid "See more"
84msgid "See more"
83−msgstr ""
85+msgstr "Daha fazlası"
84
86
85#: qml/Components/SeeMore.qml:57
87#: qml/Components/SeeMore.qml:57
86msgid "See less"
88msgid "See less"
87−msgstr ""
89+msgstr "Daha azını gör"
88
90
89#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70
91#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70
90msgid "Rate this"
92msgid "Rate this"
@@ -106,11 +108,11 @@ msgstr[1] "%1 inceleme"
106
108
107#: qml/Dash/Previews/PreviewActionCombo.qml:34
109#: qml/Dash/Previews/PreviewActionCombo.qml:34
108msgid "More..."
110msgid "More..."
109−msgstr ""
111+msgstr "Daha fazlası..."
110
112
111#: qml/Dash/Previews/PreviewActionCombo.qml:34
113#: qml/Dash/Previews/PreviewActionCombo.qml:34
112msgid "Less..."
114msgid "Less..."
113−msgstr ""
115+msgstr "Daha az.."
114
116
115#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74
117#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74
116msgid "Add a review"
118msgid "Add a review"
@@ -167,7 +169,7 @@ msgstr "Parolayı göster"
167
169
168#: qml/Notifications/NotificationMenuItemFactory.qml:103
170#: qml/Notifications/NotificationMenuItemFactory.qml:103
169msgid "Please enter SIM PIN"
171msgid "Please enter SIM PIN"
170−msgstr ""
172+msgstr "Lütfen SIM PIN'inizi girin"
171
173
172#: qml/Panel/SearchIndicator.qml:27
174#: qml/Panel/SearchIndicator.qml:27
173msgid "Search"
175msgid "Search"
qml/Dash/GenericScopeView.qml+7−7
@@ -179,16 +179,16 @@ FocusScope {
179 Connections {
179 Connections {
180 target: rendererLoader.item
180 target: rendererLoader.item
181 onClicked: {
181 onClicked: {
182− // Prepare the preview in case activate() triggers a preview only
183− previewListView.model = target.model;
184− previewListView.currentIndex = -1
185− previewListView.currentIndex = index;
186−
187− var item = target.model.get(index);
188−
189 if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && categoryId == "local")) {
182 if (scopeView.scope.id === "scopes" || (scopeView.scope.id == "clickscope" && categoryId == "local")) {
183+ // TODO Technically it is possible that calling activate() will make the scope emit
184+ // previewRequested so that we show a preview but there's no scope that does that yet
185+ // so it's not implemented
186+ var item = target.model.get(index);
190 scopeView.scope.activate(item.result)
187 scopeView.scope.activate(item.result)
191 } else {
188 } else {
189+ previewListView.model = target.model;
190+ previewListView.currentIndex = -1
191+ previewListView.currentIndex = index;
192 previewListView.open = true
192 previewListView.open = true
193 }
193 }
194 }
194 }
tests/autopilot/unity8/shell/tests/disabled_test_hud.py+2−2
@@ -163,7 +163,7 @@ class TestHud(UnityTestCase, DragMixin):
163 self.assertThat(hud.shown, Eventually(Equals(False)))
163 self.assertThat(hud.shown, Eventually(Equals(False)))
164
164
165 def _launch_test_app_from_app_screen(self):
165 def _launch_test_app_from_app_screen(self):
166− """Launches the camera app using the Dash UI.
166+ """Launches the browser app using the Dash UI.
167
167
168 Because when testing on the desktop running
168 Because when testing on the desktop running
169 self.launch_application() will launch the application on the desktop
169 self.launch_application() will launch the application on the desktop
@@ -171,7 +171,7 @@ class TestHud(UnityTestCase, DragMixin):
171
171
172 """
172 """
173 dash = self.main_window.get_dash()
173 dash = self.main_window.get_dash()
174− icon = dash.get_application_icon('Camera')
174+ icon = dash.get_application_icon('Browser')
175 self.touch.tap_object(icon)
175 self.touch.tap_object(icon)
176
176
177 # Ensure application is open
177 # Ensure application is open
tests/mocks/data/applications/camera-app.desktop → tests/mocks/data/applications/webbrowser-app.desktoprenamed

The content is the same.