@@ -15,7 +15,8 @@
1515 */
1616
1717import QtQuick 2.0
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.Themes.Ambiance 1.1
1920import Unity 0.2
2021import Utils 0.1
2122import "../Components"
@@ -177,44 +178,23 @@ Item {
177178 searchHistory: dashContent.searchHistory
178179 scope: dashContentList.currentItem && dashContentList.currentItem.theScope
179180
180− childItem: TabBar {
181+ childItem: NewHeaderStyle {
181182 id: tabBar
182183 objectName: "tabbar"
183− height: units.gu(6.5)
184184 width: parent.width
185− style: DashContentTabBarStyle {}
186−
187− SortFilterProxyModel {
188− id: tabBarModel
189−
190− model: dashContentList.model
191−
192− property int selectedIndex: -1
193− onSelectedIndexChanged: {
194− if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
195− // TODO This together with the Timer below
196− // are a workaround for the first tab sometimes not showing the text.
197− // But Tabs are going away in the future so not sure if makes
198− // sense invetigating what's the problem at this stage
199− selectionModeTimer.restart();
185+ height: units.gu(6.5)
186+ contentHeight: height
187+ separatorSource: ""
188+ textColor: "grey"
189+ property var styledItem: tabBar
190+ property var title: dashContentList.model.get(dashContentList.currentIndex).title
191+ property var config: HeaderConfiguration {
192+ actions: [
193+ Action {
194+ iconName: "search"
195+ onTriggered: dashPageHeader.triggerSearch()
200196 }
201− dashContentList.currentIndex = selectedIndex;
202− }
203− }
204−
205− model: tabBarModel.count > 0 ? tabBarModel : null
206−
207− Connections {
208− target: dashContentList
209− onCurrentIndexChanged: {
210− tabBarModel.selectedIndex = dashContentList.currentIndex
211− }
212− }
213−
214− Timer {
215− id: selectionModeTimer
216− interval: 1
217− onTriggered: tabBar.selectionMode = false
197+ ]
218198 }
219199 }
220200