git.iko.soy/unity8
on xenial help sign in
Revert to previous version as it's linked to latest sdk change which is making gallery-app AP tests failing on the CI dashboard
c1c3279Didier Roche
debian/changelog+7
compare with xenial
unifiedsplit
@@ -1,3 +1,10 @@
1+unity8 (7.85+14.04.20140404.is.7.85+14.04.20140403.1-0ubuntu1) trusty; urgency=medium
2+
3+ * Revert to previous version as it's linked to latest sdk change which
4+ is making gallery-app AP tests failing on the CI dashboard
5+
6+ -- Didier Roche <didrocks@ubuntu.com> Tue, 08 Apr 2014 13:53:47 +0200
7+
1unity8 (7.85+14.04.20140404-0ubuntu1) trusty; urgency=low
8unity8 (7.85+14.04.20140404-0ubuntu1) trusty; urgency=low
2
9
3 [ Albert Astals ]
10 [ Albert Astals ]
qml/Dash/DashContent.qml+10−18
@@ -17,7 +17,6 @@
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
21import "../Components"
20import "../Components"
22
21
23Item {
22Item {
@@ -189,30 +188,23 @@ Item {
189 width: parent.width
188 width: parent.width
190 style: DashContentTabBarStyle {}
189 style: DashContentTabBarStyle {}
191
190
192− SortFilterProxyModel {
191+ model: dashContentList.model
193− id: tabBarModel
194
192
195− model: dashContentList.model
196−
197− property int selectedIndex: -1
198− onSelectedIndexChanged: {
193+ onSelectedIndexChanged: {
199− if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
194+ if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
200− // TODO This together with the Timer below
195+ // TODO This together with the Timer below
201− // 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.
202− // 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
203− // sense invetigating what's the problem at this stage
198+ // sense invetigating what's the problem at this stage
204− selectionModeTimer.restart();
199+ selectionModeTimer.restart();
205− }
206− dashContentList.currentIndex = selectedIndex;
207 }
200 }
201+ dashContentList.currentIndex = selectedIndex;
208 }
202 }
209
203
210− model: tabBarModel.count > 0 ? tabBarModel : null
211−
212 Connections {
204 Connections {
213 target: dashContentList
205 target: dashContentList
214 onCurrentIndexChanged: {
206 onCurrentIndexChanged: {
215− tabBarModel.selectedIndex = dashContentList.currentIndex
207+ tabBar.selectedIndex = dashContentList.currentIndex
216 }
208 }
217 }
209 }
218
210