git.iko.soy/unity8
on xenial help sign in
Revert lp:~unity-team/unity8/flickables-speed-workaround to avoid risk in RTM.
1309cbdMichał Sawicz
qml/Components/Carousel.qml+3−2
compare with xenial
unifiedsplit
@@ -17,7 +17,6 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import "carousel.js" as CarouselJS
19import "carousel.js" as CarouselJS
20−import "Flickables" as Flickables
21
20
22/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
21/*! The Carousel component presents the items of a model in a carousel view. It's similar to a
23 cover flow. But it stops at it's boundaries (therefore no PathView is used).
22 cover flow. But it stops at it's boundaries (therefore no PathView is used).
@@ -64,7 +63,7 @@ Item {
64 and footer item to compensate that.
63 and footer item to compensate that.
65
64
66 The scaling of the items is controlled by the variable continuousIndex, described below. */
65 The scaling of the items is controlled by the variable continuousIndex, described below. */
67− Flickables.ListView {
66+ ListView {
68 id: listView
67 id: listView
69 objectName: "listView"
68 objectName: "listView"
70
69
@@ -136,6 +135,8 @@ Item {
136
135
137 boundsBehavior: Flickable.DragOverBounds
136 boundsBehavior: Flickable.DragOverBounds
138 cacheBuffer: carousel.cacheBuffer
137 cacheBuffer: carousel.cacheBuffer
138+ flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default
139+ maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default
139 orientation: ListView.Horizontal
140 orientation: ListView.Horizontal
140
141
141 function getXFromContinuousIndex(index) {
142 function getXFromContinuousIndex(index) {
qml/Components/Flickables/Flickable.qmldeleted−23
@@ -1,23 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.3 as QtQuick
18−import Ubuntu.Components 1.1
19−
20−QtQuick.Flickable {
21− flickDeceleration: 1500 * units.gridUnit / 8
22− maximumFlickVelocity: 2500 * units.gridUnit / 8
23−}
qml/Components/Flickables/GridView.qmldeleted−25
@@ -1,25 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.3 as QtQuick
18−import Ubuntu.Components 1.1
19−
20−QtQuick.GridView {
21− // Attached components and usages like GridView.onRemove are known not to work
22− // please use GridView directly from QtQuick if needed
23− flickDeceleration: 1500 * units.gridUnit / 8
24− maximumFlickVelocity: 2500 * units.gridUnit / 8
25−}
qml/Components/Flickables/ListView.qmldeleted−25
@@ -1,25 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.3 as QtQuick
18−import Ubuntu.Components 1.1
19−
20−QtQuick.ListView {
21− // Attached components and usages like ListView.onRemove are known not to work
22− // please use ListView directly from QtQuick if needed
23− flickDeceleration: 1500 * units.gridUnit / 8
24− maximumFlickVelocity: 2500 * units.gridUnit / 8
25−}
qml/Components/Flickables/ListViewWithPageHeader.qmldeleted−23
@@ -1,23 +0,0 @@
1−/*
2− * Copyright (C) 2014 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import Dash 0.1
18−import Ubuntu.Components 1.1
19−
20−ListViewWithPageHeader {
21− flickDeceleration: 1500 * units.gridUnit / 8
22− maximumFlickVelocity: 2500 * units.gridUnit / 8
23−}
qml/Components/ResponsiveGridView.qml+1−2
@@ -16,7 +16,6 @@
16
16
17import QtQuick 2.3
17import QtQuick 2.3
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import "Flickables" as Flickables
20
19
21/*
20/*
22 Essentially a GridView where you can specify the maximum number of columns it can have.
21 Essentially a GridView where you can specify the maximum number of columns it can have.
@@ -56,7 +55,7 @@ Item {
56 return rows * height
55 return rows * height
57 }
56 }
58
57
59− Flickables.GridView {
58+ GridView {
60 id: gridView
59 id: gridView
61 objectName: "responsiveGridViewGrid"
60 objectName: "responsiveGridViewGrid"
62 anchors {
61 anchors {
qml/Components/ZoomableImage.qml+2−2
@@ -16,7 +16,7 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import "Flickables" as Flickables
19+import "../Components"
20
20
21/*! \brief Zoomable for image.
21/*! \brief Zoomable for image.
22
22
@@ -32,7 +32,7 @@ Item {
32 property alias scaleTo: lazyImage.scaleTo
32 property alias scaleTo: lazyImage.scaleTo
33 property alias asynchronous: lazyImage.asynchronous
33 property alias asynchronous: lazyImage.asynchronous
34
34
35− Flickables.Flickable {
35+ Flickable {
36 id: flickable
36 id: flickable
37 objectName: "flickable"
37 objectName: "flickable"
38 clip: true
38 clip: true
qml/Dash/CardHorizontalList.qml+1−2
@@ -17,7 +17,6 @@
17import QtQuick 2.2
17import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import "../Components"
19import "../Components"
20−import "../Components/Flickables" as Flickables
21
20
22DashRenderer {
21DashRenderer {
23 id: root
22 id: root
@@ -26,7 +25,7 @@ DashRenderer {
26 collapsedHeight: expandedHeight
25 collapsedHeight: expandedHeight
27 clip: true
26 clip: true
28
27
29− Flickables.ListView {
28+ ListView {
30 id: listView
29 id: listView
31 anchors {
30 anchors {
32 fill: parent
31 fill: parent
qml/Dash/DashContent.qml+3−2
@@ -19,7 +19,6 @@ import Ubuntu.Components 0.1
19import Unity 0.2
19import Unity 0.2
20import Utils 0.1
20import Utils 0.1
21import "../Components"
21import "../Components"
22−import "../Components/Flickables" as Flickables
23
22
24Item {
23Item {
25 id: dashContent
24 id: dashContent
@@ -99,7 +98,7 @@ Item {
99 anchors.fill: parent
98 anchors.fill: parent
100 }
99 }
101
100
102− Flickables.ListView {
101+ ListView {
103 id: dashContentList
102 id: dashContentList
104 objectName: "dashContentList"
103 objectName: "dashContentList"
105
104
@@ -108,6 +107,8 @@ Item {
108 anchors.fill: parent
107 anchors.fill: parent
109 orientation: ListView.Horizontal
108 orientation: ListView.Horizontal
110 boundsBehavior: Flickable.DragAndOvershootBounds
109 boundsBehavior: Flickable.DragAndOvershootBounds
110+ flickDeceleration: units.gu(625)
111+ maximumFlickVelocity: width * 5
111 snapMode: ListView.SnapOneItem
112 snapMode: ListView.SnapOneItem
112 highlightMoveDuration: 250
113 highlightMoveDuration: 250
113 highlightRangeMode: ListView.StrictlyEnforceRange
114 highlightRangeMode: ListView.StrictlyEnforceRange
qml/Dash/DashNavigationButton.qml+1−2
@@ -16,7 +16,6 @@
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19−import "../Components/Flickables" as Flickables
20
19
21AbstractButton {
20AbstractButton {
22 id: root
21 id: root
@@ -76,7 +75,7 @@ AbstractButton {
76 }
75 }
77
76
78 // navigationListView is outside root
77 // navigationListView is outside root
79− Flickables.ListView {
78+ ListView {
80 id: navigationListView
79 id: navigationListView
81 objectName: "navigationListView"
80 objectName: "navigationListView"
82 visible: height > 0
81 visible: height > 0
qml/Dash/DashNavigationList.qml+1−2
@@ -17,7 +17,6 @@
17import QtQuick 2.2
17import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import "../Components"
19import "../Components"
20−import "../Components/Flickables" as Flickables
21
20
22Item {
21Item {
23 id: root
22 id: root
@@ -46,7 +45,7 @@ Item {
46 }
45 }
47 }
46 }
48
47
49− Flickables.Flickable {
48+ Flickable {
50 id: flickable
49 id: flickable
51
50
52 anchors.fill: parent
51 anchors.fill: parent
qml/Dash/PageHeader.qml+1−2
@@ -21,7 +21,6 @@ import Ubuntu.Components.Popups 1.0
21import Ubuntu.Components.ListItems 1.0
21import Ubuntu.Components.ListItems 1.0
22import "../Components"
22import "../Components"
23import "../Components/SearchHistoryModel"
23import "../Components/SearchHistoryModel"
24−import "../Components/Flickables" as Flickables
25
24
26Item {
25Item {
27 id: root
26 id: root
@@ -128,7 +127,7 @@ Item {
128 }
127 }
129 }
128 }
130
129
131− Flickables.Flickable {
130+ Flickable {
132 id: headerContainer
131 id: headerContainer
133 objectName: "headerContainer"
132 objectName: "headerContainer"
134 clip: contentY < height
133 clip: contentY < height
qml/Dash/PreviewListView.qml+3−2
@@ -18,7 +18,6 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import Unity 0.2
19import Unity 0.2
20import "../Components"
20import "../Components"
21−import "../Components/Flickables" as Flickables
22import "Previews" as Previews
21import "Previews" as Previews
23
22
24Item {
23Item {
@@ -53,7 +52,7 @@ Item {
53 onBackClicked: root.backClicked()
52 onBackClicked: root.backClicked()
54 }
53 }
55
54
56− Flickables.ListView {
55+ ListView {
57 id: previewListView
56 id: previewListView
58 objectName: "listView"
57 objectName: "listView"
59 anchors {
58 anchors {
@@ -67,6 +66,8 @@ Item {
67 snapMode: ListView.SnapOneItem
66 snapMode: ListView.SnapOneItem
68 boundsBehavior: Flickable.DragAndOvershootBounds
67 boundsBehavior: Flickable.DragAndOvershootBounds
69 highlightMoveDuration: 250
68 highlightMoveDuration: 250
69+ flickDeceleration: units.gu(625)
70+ maximumFlickVelocity: width * 5
70 cacheBuffer: 0
71 cacheBuffer: 0
71
72
72 property bool open: false
73 property bool open: false
qml/Dash/Previews/Preview.qml+1−2
@@ -16,7 +16,6 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import "../../Components/Flickables" as Flickables
20
19
21/*! \brief This component constructs the Preview UI.
20/*! \brief This component constructs the Preview UI.
22 *
21 *
@@ -64,7 +63,7 @@ Item {
64 Repeater {
63 Repeater {
65 model: previewModel
64 model: previewModel
66
65
67− delegate: Flickables.ListView {
66+ delegate: ListView {
68 id: column
67 id: column
69 anchors { top: parent.top; bottom: parent.bottom }
68 anchors { top: parent.top; bottom: parent.bottom }
70 width: row.columnWidth
69 width: row.columnWidth
qml/Dash/Previews/PreviewImageGallery.qml+2−3
@@ -17,7 +17,6 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import "../../Components"
19import "../../Components"
20−import "../../Components/Flickables" as Flickables
21
20
22/*! This preview widget shows a horizontal list of images.
21/*! This preview widget shows a horizontal list of images.
23 * The URIs for the images should be an array in widgetData["sources"].
22 * The URIs for the images should be an array in widgetData["sources"].
@@ -29,7 +28,7 @@ PreviewWidget {
29
28
30 property Item rootItem: QuickUtils.rootItem(root)
29 property Item rootItem: QuickUtils.rootItem(root)
31
30
32− Flickables.ListView {
31+ ListView {
33 id: previewImageListView
32 id: previewImageListView
34 objectName: "previewImageListView"
33 objectName: "previewImageListView"
35 spacing: units.gu(1)
34 spacing: units.gu(1)
@@ -103,7 +102,7 @@ PreviewWidget {
103 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
102 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
104 }
103 }
105
104
106− Flickables.ListView {
105+ ListView {
107 id: slideShowListView
106 id: slideShowListView
108 objectName: "slideShowListView"
107 objectName: "slideShowListView"
109 anchors.fill: parent
108 anchors.fill: parent
qml/Dash/ScopeListView.qml+6−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2013 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,11 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import "../Components/Flickables" as Flickables
17+import QtQuick 2.0
18+import Dash 0.1
18
19
19−Flickables.ListViewWithPageHeader {
20+ListViewWithPageHeader {
21+ maximumFlickVelocity: height * 10
22+ flickDeceleration: height * 2
20 cacheBuffer: Number.MAX_VALUE
23 cacheBuffer: Number.MAX_VALUE
21}
24}
qml/Dash/ScopeSettingsPage.qml+1−2
@@ -18,7 +18,6 @@ import QtQuick 2.2
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import Unity 0.2
19import Unity 0.2
20import "../Components"
20import "../Components"
21−import "../Components/Flickables" as Flickables
22import "ScopeSettings"
21import "ScopeSettings"
23
22
24Item {
23Item {
@@ -40,7 +39,7 @@ Item {
40 onBackClicked: root.backClicked()
39 onBackClicked: root.backClicked()
41 }
40 }
42
41
43− Flickables.ListView {
42+ ListView {
44 id: scopeSettings
43 id: scopeSettings
45 objectName: "scopeSettings"
44 objectName: "scopeSettings"
46 anchors {
45 anchors {
qml/Dash/ScopesOverviewAll.qml+1−2
@@ -16,9 +16,8 @@
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19−import "../Components/Flickables" as Flickables
20
19
21−Flickables.Flickable {
20+Flickable {
22 id: root
21 id: root
23
22
24 property alias model: cardGrid.model
23 property alias model: cardGrid.model
qml/Dash/ScopesOverviewFavorites.qml+2−4
@@ -14,11 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.3
17+import QtQuick 2.0
18−import Ubuntu.Components 1.1
19−import "../Components/Flickables" as Flickables
20
18
21−Flickables.Flickable {
19+Flickable {
22 id: root
20 id: root
23
21
24 signal clicked(int index, var result, var itemModel)
22 signal clicked(int index, var result, var itemModel)
qml/Greeter/LoginList.qml+2−2
@@ -18,7 +18,6 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1
18import Ubuntu.Components 0.1
19import LightDM 0.1 as LightDM
19import LightDM 0.1 as LightDM
20import "../Components"
20import "../Components"
21−import "../Components/Flickables" as Flickables
22
21
23Item {
22Item {
24 id: root
23 id: root
@@ -69,7 +68,7 @@ Item {
69 antialiasing: true
68 antialiasing: true
70 }
69 }
71
70
72− Flickables.ListView {
71+ ListView {
73 id: userList
72 id: userList
74 objectName: "userList"
73 objectName: "userList"
75
74
@@ -79,6 +78,7 @@ Item {
79 preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
78 preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
80 highlightRangeMode: ListView.StrictlyEnforceRange
79 highlightRangeMode: ListView.StrictlyEnforceRange
81 highlightMoveDuration: root.moveDuration
80 highlightMoveDuration: root.moveDuration
81+ flickDeceleration: 10000
82
82
83 readonly property bool movingInternally: moveTimer.running || userList.moving
83 readonly property bool movingInternally: moveTimer.running || userList.moving
84
84
qml/Hud/Hud.qml+1−2
@@ -19,7 +19,6 @@ import Ubuntu.Components 0.1
19import HudClient 0.1
19import HudClient 0.1
20
20
21import "../Components"
21import "../Components"
22−import "../Components/Flickables" as Flickables
23
22
24Item {
23Item {
25 id: hud
24 id: hud
@@ -401,7 +400,7 @@ Item {
401 }
400 }
402 progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)
401 progress: MathUtils.clamp((y - hudShowable.y + height - units.gu(8))/elementsYSliding, 0, 1)
403
402
404− Flickables.Flickable {
403+ Flickable {
405 anchors.left: parent.left
404 anchors.left: parent.left
406 anchors.right: parent.right
405 anchors.right: parent.right
407 contentHeight: resultList.height
406 contentHeight: resultList.height
qml/Hud/HudParametrizedActionsPage.qml+1−2
@@ -18,7 +18,6 @@ import QtQuick 2.0
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
19import Ubuntu.Components.Themes.Ambiance 1.1
20import "../Components"
20import "../Components"
21−import "../Components/Flickables" as Flickables
22
21
23Item {
22Item {
24 property alias header: header.title
23 property alias header: header.title
@@ -75,7 +74,7 @@ Item {
75 return values
74 return values
76 }
75 }
77
76
78− Flickables.Flickable {
77+ Flickable {
79 anchors.top: parent.top
78 anchors.top: parent.top
80 anchors.bottom: buttons.top
79 anchors.bottom: buttons.top
81 anchors.left: parent.left
80 anchors.left: parent.left
qml/Launcher/LauncherPanel.qml+1−2
@@ -21,7 +21,6 @@ import Unity.Launcher 0.1
21import Ubuntu.Components.Popups 0.1
21import Ubuntu.Components.Popups 0.1
22import "../Components/ListItems"
22import "../Components/ListItems"
23import "../Components/"
23import "../Components/"
24−import "../Components/Flickables" as Flickables
25
24
26Rectangle {
25Rectangle {
27 id: root
26 id: root
@@ -76,7 +75,7 @@ Rectangle {
76 anchors.fill: parent
75 anchors.fill: parent
77 clip: true
76 clip: true
78
77
79− Flickables.ListView {
78+ ListView {
80 id: launcherListView
79 id: launcherListView
81 objectName: "launcherListView"
80 objectName: "launcherListView"
82 anchors {
81 anchors {
qml/Notifications/Notification.qml+1−2
@@ -20,7 +20,6 @@ import Ubuntu.Components 1.1
20import Unity.Notifications 1.0
20import Unity.Notifications 1.0
21import QMenuModel 0.1
21import QMenuModel 0.1
22import Utils 0.1
22import Utils 0.1
23−import "../Components/Flickables" as Flickables
24
23
25import Ubuntu.Components.ListItems 0.1 as ListItem
24import Ubuntu.Components.ListItems 0.1 as ListItem
26
25
@@ -520,7 +519,7 @@ Item {
520 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
519 onClicked: notification.notification.invokeAction(comboRepeater.itemAt(2).actionId)
521 expanded: false
520 expanded: false
522 expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
521 expandedHeight: (comboRepeater.count - 2) * units.gu(4) + units.gu(.5)
523− comboList: Flickables.Flickable {
522+ comboList: Flickable {
524 // this has to be wrapped inside a flickable
523 // this has to be wrapped inside a flickable
525 // to work around a feature/bug? of the
524 // to work around a feature/bug? of the
526 // ComboButton SDK-element, making a regular
525 // ComboButton SDK-element, making a regular
qml/Notifications/Notifications.qml+1−2
@@ -19,9 +19,8 @@ import Ubuntu.Components 0.1
19import Unity.Notifications 1.0 as UnityNotifications
19import Unity.Notifications 1.0 as UnityNotifications
20import Utils 0.1
20import Utils 0.1
21import "../Components"
21import "../Components"
22−import "../Components/Flickables" as Flickables
23
22
24−Flickables.ListView {
23+ListView {
25 id: notificationList
24 id: notificationList
26
25
27 objectName: "notificationList"
26 objectName: "notificationList"
qml/Panel/IndicatorPage.qml+1−2
@@ -18,7 +18,6 @@ import QtQuick 2.0
18import Ubuntu.Components 0.1 as Components
18import Ubuntu.Components 0.1 as Components
19import Unity.Indicators 0.1 as Indicators
19import Unity.Indicators 0.1 as Indicators
20import "Indicators"
20import "Indicators"
21−import "../Components/Flickables" as Flickables
22
21
23IndicatorBase {
22IndicatorBase {
24 id: main
23 id: main
@@ -63,7 +62,7 @@ IndicatorBase {
63 }
62 }
64 }
63 }
65
64
66− Flickables.ListView {
65+ ListView {
67 id: mainMenu
66 id: mainMenu
68 objectName: "mainMenu"
67 objectName: "mainMenu"
69 model: menuStack.rootMenu
68 model: menuStack.rootMenu
qml/Panel/Indicators/client/IndicatorsList.qml+1−2
@@ -22,7 +22,6 @@ import Ubuntu.Components 0.1
22import Ubuntu.Components.ListItems 0.1 as ListItem
22import Ubuntu.Components.ListItems 0.1 as ListItem
23import Unity.Indicators 0.1 as Indicators
23import Unity.Indicators 0.1 as Indicators
24import "../.."
24import "../.."
25−import "../../../Components/Flickables" as Flickables
26
25
27Page {
26Page {
28 id: page
27 id: page
@@ -36,7 +35,7 @@ Page {
36 Component.onCompleted: load(profile)
35 Component.onCompleted: load(profile)
37 }
36 }
38
37
39− Flickables.ListView {
38+ ListView {
40 id: mainMenu
39 id: mainMenu
41 objectName: "mainMenu"
40 objectName: "mainMenu"
42 anchors.fill: parent
41 anchors.fill: parent
qml/Panel/Indicators/client/IndicatorsTree.qml+1−2
@@ -21,7 +21,6 @@ import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import Unity.Indicators 0.1 as Indicators
22import Unity.Indicators 0.1 as Indicators
23import ".."
23import ".."
24−import "../../../Components/Flickables" as Flickables
25
24
26IndicatorBase {
25IndicatorBase {
27 id: root
26 id: root
@@ -31,7 +30,7 @@ IndicatorBase {
31 model: root.menuModel
30 model: root.menuModel
32 }
31 }
33
32
34− Flickables.Flickable {
33+ Flickable {
35 anchors.fill: parent
34 anchors.fill: parent
36 contentHeight: all_data.height
35 contentHeight: all_data.height
37 clip:true
36 clip:true
qml/Panel/MenuContent.qml+2−2
@@ -20,7 +20,7 @@ import Ubuntu.Components 1.1
20import Unity.Indicators 0.1 as Indicators
20import Unity.Indicators 0.1 as Indicators
21import Utils 0.1
21import Utils 0.1
22import "../Components"
22import "../Components"
23−import "../Components/Flickables" as Flickables
23+import "Indicators"
24
24
25Rectangle {
25Rectangle {
26 id: content
26 id: content
@@ -36,7 +36,7 @@ Rectangle {
36 listViewContent.currentIndex = currentMenuIndex;
36 listViewContent.currentIndex = currentMenuIndex;
37 }
37 }
38
38
39− Flickables.ListView {
39+ ListView {
40 id: listViewContent
40 id: listViewContent
41 objectName: "indicatorsContentListView"
41 objectName: "indicatorsContentListView"
42 anchors.fill: parent
42 anchors.fill: parent
qml/Stages/PhoneStage.qml+1−2
@@ -21,7 +21,6 @@ import Unity.Application 0.1
21import Unity.Session 0.1
21import Unity.Session 0.1
22import Utils 0.1
22import Utils 0.1
23import "../Components"
23import "../Components"
24−import "../Components/Flickables" as Flickables
25
24
26Rectangle {
25Rectangle {
27 id: root
26 id: root
@@ -121,7 +120,7 @@ Rectangle {
121
120
122 }
121 }
123
122
124− Flickables.Flickable {
123+ Flickable {
125 id: spreadView
124 id: spreadView
126 objectName: "spreadView"
125 objectName: "spreadView"
127 anchors.fill: parent
126 anchors.fill: parent
qml/Stages/TabletStage.qml+1−2
@@ -20,7 +20,6 @@ import Ubuntu.Gestures 0.1
20import Unity.Application 0.1
20import Unity.Application 0.1
21import Utils 0.1
21import Utils 0.1
22import "../Components"
22import "../Components"
23−import "../Components/Flickables" as Flickables
24
23
25Rectangle {
24Rectangle {
26 id: root
25 id: root
@@ -154,7 +153,7 @@ Rectangle {
154 }
153 }
155 }
154 }
156
155
157− Flickables.Flickable {
156+ Flickable {
158 id: spreadView
157 id: spreadView
159 anchors.fill: parent
158 anchors.fill: parent
160 interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)
159 interactive: (spreadDragArea.status == DirectionalDragArea.Recognized || phase > 1)