git.iko.soy/unity8
on xenial help sign in
Merge from trunk
0ec5075Michael Terry
debian/changelog+10
compare with xenial
unifiedsplit
@@ -1,3 +1,13 @@
1+unity8 (7.86+14.10.20140502.6-0ubuntu1) utopic; urgency=low
2+
3+ [ tpeeters ]
4+ * Adapt to new TabBar
5+
6+ [ Tim Peeters ]
7+ * Adapt to new TabBar
8+
9+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 02 May 2014 16:44:52 +0000
10+
1unity8 (7.86+14.10.20140429.2-0ubuntu1) utopic; urgency=medium
11unity8 (7.86+14.10.20140429.2-0ubuntu1) utopic; urgency=medium
2
12
3 [ Andrea Cimitan ]
13 [ Andrea Cimitan ]
po/gl.po+3−3
@@ -8,13 +8,13 @@ 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-04-10 11:13-0400\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"
12"Last-Translator: Marcos Lans <Unknown>\n"
13"Language-Team: Galician <gl@li.org>\n"
13"Language-Team: Galician <gl@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−"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-05-04 06:33+0000\n"
18"X-Generator: Launchpad (build 16985)\n"
18"X-Generator: Launchpad (build 16985)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -117,7 +117,7 @@ msgstr "Enviar"
117
117
118#: qml/Greeter/Greeter.qml:151
118#: qml/Greeter/Greeter.qml:151
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120−msgstr ""
120+msgstr "Esvare para desbloquear"
121
121
122#: qml/Greeter/Lockscreen.qml:149
122#: qml/Greeter/Lockscreen.qml:149
123msgid "Emergency Call"
123msgid "Emergency Call"
qml/Dash/DashContent.qml+18−10
@@ -17,6 +17,7 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Unity 0.2
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