ok, all on board now
commit41a28fe96470466a335f723653f0376f87b32262
authorAndrea Cimitan <andrea.cimitan@gmail.com>
dateWed 27 Jul 2016, 17:23 (10 years ago)
parentd906237
qml/Components/Carousel.qml−2
@@ -141,8 +141,6 @@ Item {
141141
142142 boundsBehavior: Flickable.DragOverBounds
143143 cacheBuffer: carousel.cacheBuffer
144− flickDeceleration: Math.max(1500 * Math.pow(realWidth / referenceWidth, 1.5), 1500) // 1500 is platform default
145− maximumFlickVelocity: Math.max(2500 * Math.pow(realWidth / referenceWidth, 1.5), 2500) // 2500 is platform default
146144 orientation: ListView.Horizontal
147145
148146 function getXFromContinuousIndex(index) {
qml/Dash/DashContent.qml−2
@@ -112,8 +112,6 @@ Item {
112112 anchors.fill: parent
113113 orientation: ListView.Horizontal
114114 boundsBehavior: Flickable.DragAndOvershootBounds
115− flickDeceleration: units.gu(625)
116− maximumFlickVelocity: width * 5
117115 snapMode: ListView.SnapOneItem
118116 highlightMoveDuration: 250
119117 highlightRangeMode: ListView.StrictlyEnforceRange
qml/Dash/DashNavigation.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Dash 0.1
20+import "../Components"
2021
2122Item {
2223 id: root
qml/Dash/FiltersPopover.qml+1
@@ -19,6 +19,7 @@ import Ubuntu.Components 1.3
1919import Ubuntu.Components.Popups 1.3
2020import Ubuntu.Components.ListItems 1.3 as ListItems
2121import "Filters" as Filters
22+import "../Components"
2223
2324Popover {
2425 id: root
qml/Dash/PageHeaderExtraPanel.qml+1
@@ -18,6 +18,7 @@ import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3 as ListItems
2020import "Filters" as Filters
21+import "../Components"
2122
2223Item {
2324 id: root
qml/Dash/ScopesList.qml+2
@@ -15,7 +15,9 @@
1515 */
1616
1717import QtQuick 2.4
18+import Ubuntu.Components 1.3
1819import Dash 0.1
20+import "../Components"
1921
2022Item {
2123 id: root
qml/Dash/ScopesListCategory.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3
1919import Dash 0.1
20+import "../Components"
2021import "../Components/ListItems" as ListItems
2122
2223Item {
qml/Greeter/LoginList.qml−1
@@ -152,7 +152,6 @@ StyledItem {
152152 preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2
153153 highlightRangeMode: ListView.StrictlyEnforceRange
154154 highlightMoveDuration: root.moveDuration
155− flickDeceleration: 10000
156155 interactive: count > 1
157156
158157 readonly property bool movingInternally: moveTimer.running || userList.moving
qml/Panel/IndicatorPage.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818import Ubuntu.Components 1.3 as Components
1919import Unity.Indicators 0.1 as Indicators
20+import "../Components"
2021import "Indicators"
2122
2223IndicatorBase {
qml/Panel/Indicators/client/IndicatorsList.qml+1
@@ -22,6 +22,7 @@ import Ubuntu.Components 1.3
2222import Ubuntu.Components.ListItems 1.3 as ListItem
2323import Unity.Indicators 0.1 as Indicators
2424import "../.."
25+import "../../../Components"
2526
2627Page {
2728 id: page
qml/Panel/Indicators/client/IndicatorsTree.qml+1
@@ -21,6 +21,7 @@ import QtQuick 2.4
2121import Ubuntu.Components 1.3
2222import Unity.Indicators 0.1 as Indicators
2323import ".."
24+import "../../../Components"
2425
2526IndicatorBase {
2627 id: root
qml/Wizard/Pages/10-welcome.qml+2−1
@@ -20,6 +20,7 @@ import Ubuntu.Components.ListItems 1.3
2020import Ubuntu.SystemSettings.LanguagePlugin 1.0
2121import Wizard 0.1
2222import ".." as LocalComponents
23+import "../../Components" as UnityComponents
2324
2425LocalComponents.Page {
2526 objectName: "languagePage"
@@ -108,7 +109,7 @@ LocalComponents.Page {
108109 onStopped: init();
109110 }
110111
111− ListView {
112+ UnityComponents.ListView {
112113 id: languagesListView
113114 clip: true
114115 snapMode: ListView.SnapToItem
qml/Wizard/Pages/30-wifi.qml+2−1
@@ -21,6 +21,7 @@ import Ubuntu.Components 1.3
2121import Wizard 0.1
2222import Ubuntu.Connectivity 1.0
2323import ".." as LocalComponents
24+import "../../Components" as UnityComponents
2425
2526LocalComponents.Page {
2627 id: wifiPage
@@ -164,7 +165,7 @@ LocalComponents.Page {
164165 : i18n.tr("No available Wi-Fi networks")
165166 }
166167
167− ListView {
168+ UnityComponents.ListView {
168169 id: listview
169170 anchors.left: parent.left
170171 anchors.right: parent.right
qml/Wizard/Pages/50-timezone.qml+2−1
@@ -21,6 +21,7 @@ import Wizard 0.1
2121import Ubuntu.SystemSettings.TimeDate 1.1
2222import Utils 0.1 as Utils
2323import ".." as LocalComponents
24+import "../../Components" as UnityComponents
2425
2526LocalComponents.Page {
2627 id: tzPage
@@ -183,7 +184,7 @@ LocalComponents.Page {
183184 onTextChanged: resetViews();
184185 }
185186
186− ListView {
187+ UnityComponents.ListView {
187188 Layout.fillHeight: true
188189 id: tzList
189190 objectName: "tzList"
qml/Wizard/Pages/70-passwd-type.qml+2−1
@@ -19,6 +19,7 @@ import Ubuntu.Components 1.3
1919import Ubuntu.Components.ListItems 1.3
2020import Ubuntu.SystemSettings.SecurityPrivacy 1.0
2121import ".." as LocalComponents
22+import "../../Components" as UnityComponents
2223
2324/**
2425 * One quirk with this page: we don't actually set the password. We avoid
@@ -67,7 +68,7 @@ LocalComponents.Page {
6768 anchors.leftMargin: wideMode ? parent.leftMargin : 0
6869 anchors.rightMargin: wideMode ? parent.rightMargin : 0
6970
70− ListView {
71+ UnityComponents.ListView {
7172 id: selector
7273 anchors.left: parent.left
7374 anchors.right: parent.right
qml/Wizard/Pages/passcode-desktop.qml+2−1
@@ -18,6 +18,7 @@ import QtQuick 2.4
1818import QtQuick.Layouts 1.1
1919import Ubuntu.Components 1.3
2020import ".." as LocalComponents
21+import "../../Components" as UnityComponents
2122
2223/**
2324 * See the main passwd-type page for an explanation of why we don't actually
@@ -33,7 +34,7 @@ LocalComponents.Page {
3334 readonly property alias password: passwordField.text
3435 readonly property alias password2: password2Field.text
3536
36− Flickable {
37+ UnityComponents.Flickable {
3738 id: column
3839 clip: true
3940 flickableDirection: Flickable.VerticalFlick
qml/Wizard/Pages/password-set.qml+2−1
@@ -18,6 +18,7 @@ import QtQuick 2.4
1818import QtQuick.Layouts 1.1
1919import Ubuntu.Components 1.3
2020import ".." as LocalComponents
21+import "../../Components" as UnityComponents
2122
2223/**
2324 * See the main passwd-type page for an explanation of why we don't actually
@@ -34,7 +35,7 @@ LocalComponents.Page {
3435 readonly property alias password2: password2Field.text
3536 readonly property bool passwordsMatching: password == password2 && password.trim().length > 7
3637
37− Flickable {
38+ UnityComponents.Flickable {
3839 id: column
3940 clip: true
4041 flickableDirection: Flickable.VerticalFlick