41a28fe · unity8 · git.iko.soy

qml/Components/Carousel.qml−2

compare with xenial

unifiedsplit

@@ -141,8 +141,6 @@ Item {

141

142 boundsBehavior: Flickable.DragOverBounds

143 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

146 orientation: ListView.Horizontal

144 orientation: ListView.Horizontal

147

145

148 function getXFromContinuousIndex(index) {

146 function getXFromContinuousIndex(index) {

qml/Dash/DashContent.qml−2

@@ -112,8 +112,6 @@ Item {

112 anchors.fill: parent

113 orientation: ListView.Horizontal

114 boundsBehavior: Flickable.DragAndOvershootBounds

115− flickDeceleration: units.gu(625)

116− maximumFlickVelocity: width * 5

117 snapMode: ListView.SnapOneItem

115 snapMode: ListView.SnapOneItem

118 highlightMoveDuration: 250

116 highlightMoveDuration: 250

119 highlightRangeMode: ListView.StrictlyEnforceRange

117 highlightRangeMode: ListView.StrictlyEnforceRange

qml/Dash/DashNavigation.qml+1

@@ -17,6 +17,7 @@

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Dash 0.1

20+import "../Components"

20

21

21Item {

22Item {

22 id: root

23 id: root

qml/Dash/FiltersPopover.qml+1

@@ -19,6 +19,7 @@ import Ubuntu.Components 1.3

19import Ubuntu.Components.Popups 1.3

20import Ubuntu.Components.ListItems 1.3 as ListItems

21import "Filters" as Filters

22+import "../Components"

22

23

23Popover {

24Popover {

24 id: root

25 id: root

qml/Dash/PageHeaderExtraPanel.qml+1

@@ -18,6 +18,7 @@ import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Ubuntu.Components.ListItems 1.3 as ListItems

20import "Filters" as Filters

21+import "../Components"

21

22

22Item {

23Item {

23 id: root

24 id: root

qml/Dash/ScopesList.qml+2

@@ -15,7 +15,9 @@

15 */

16

17import QtQuick 2.4

18+import Ubuntu.Components 1.3

18import Dash 0.1

19import Dash 0.1

20+import "../Components"

19

21

20Item {

22Item {

21 id: root

23 id: root

qml/Dash/ScopesListCategory.qml+1

@@ -17,6 +17,7 @@

17import QtQuick 2.4

18import Ubuntu.Components 1.3

19import Dash 0.1

20+import "../Components"

20import "../Components/ListItems" as ListItems

21import "../Components/ListItems" as ListItems

21

22

22Item {

23Item {

qml/Greeter/LoginList.qml−1

@@ -152,7 +152,6 @@ StyledItem {

152 preferredHighlightEnd: userList.height / 2 - root.highlightedHeight / 2

153 highlightRangeMode: ListView.StrictlyEnforceRange

154 highlightMoveDuration: root.moveDuration

155− flickDeceleration: 10000

156 interactive: count > 1

155 interactive: count > 1

157

156

158 readonly property bool movingInternally: moveTimer.running || userList.moving

157 readonly property bool movingInternally: moveTimer.running || userList.moving

qml/Panel/IndicatorPage.qml+1

@@ -17,6 +17,7 @@

17import QtQuick 2.4

18import Ubuntu.Components 1.3 as Components

19import Unity.Indicators 0.1 as Indicators

20+import "../Components"

20import "Indicators"

21import "Indicators"

21

22

22IndicatorBase {

23IndicatorBase {

qml/Panel/Indicators/client/IndicatorsList.qml+1

@@ -22,6 +22,7 @@ import Ubuntu.Components 1.3

22import Ubuntu.Components.ListItems 1.3 as ListItem

23import Unity.Indicators 0.1 as Indicators

24import "../.."

25+import "../../../Components"

25

26

26Page {

27Page {

27 id: page

28 id: page

qml/Panel/Indicators/client/IndicatorsTree.qml+1

@@ -21,6 +21,7 @@ import QtQuick 2.4

21import Ubuntu.Components 1.3

22import Unity.Indicators 0.1 as Indicators

23import ".."

24+import "../../../Components"

24

25

25IndicatorBase {

26IndicatorBase {

26 id: root

27 id: root

qml/Wizard/Pages/10-welcome.qml+2−1

@@ -20,6 +20,7 @@ import Ubuntu.Components.ListItems 1.3

20import Ubuntu.SystemSettings.LanguagePlugin 1.0

21import Wizard 0.1

22import ".." as LocalComponents

23+import "../../Components" as UnityComponents

23

24

24LocalComponents.Page {

25LocalComponents.Page {

25 objectName: "languagePage"

26 objectName: "languagePage"

@@ -108,7 +109,7 @@ LocalComponents.Page {

108 onStopped: init();

109 onStopped: init();

109 }

110 }

110

111

111− ListView {

112+ UnityComponents.ListView {

112 id: languagesListView

113 id: languagesListView

113 clip: true

114 clip: true

114 snapMode: ListView.SnapToItem

115 snapMode: ListView.SnapToItem

qml/Wizard/Pages/30-wifi.qml+2−1

@@ -21,6 +21,7 @@ import Ubuntu.Components 1.3

21import Wizard 0.1

22import Ubuntu.Connectivity 1.0

23import ".." as LocalComponents

24+import "../../Components" as UnityComponents

24

25

25LocalComponents.Page {

26LocalComponents.Page {

26 id: wifiPage

27 id: wifiPage

@@ -164,7 +165,7 @@ LocalComponents.Page {

164 : i18n.tr("No available Wi-Fi networks")

165 : i18n.tr("No available Wi-Fi networks")

165 }

166 }

166

167

167− ListView {

168+ UnityComponents.ListView {

168 id: listview

169 id: listview

169 anchors.left: parent.left

170 anchors.left: parent.left

170 anchors.right: parent.right

171 anchors.right: parent.right

qml/Wizard/Pages/50-timezone.qml+2−1

@@ -21,6 +21,7 @@ import Wizard 0.1

21import Ubuntu.SystemSettings.TimeDate 1.1

22import Utils 0.1 as Utils

23import ".." as LocalComponents

24+import "../../Components" as UnityComponents

24

25

25LocalComponents.Page {

26LocalComponents.Page {

26 id: tzPage

27 id: tzPage

@@ -183,7 +184,7 @@ LocalComponents.Page {

183 onTextChanged: resetViews();

184 onTextChanged: resetViews();

184 }

185 }

185

186

186− ListView {

187+ UnityComponents.ListView {

187 Layout.fillHeight: true

188 Layout.fillHeight: true

188 id: tzList

189 id: tzList

189 objectName: "tzList"

190 objectName: "tzList"

qml/Wizard/Pages/70-passwd-type.qml+2−1

@@ -19,6 +19,7 @@ import Ubuntu.Components 1.3

19import Ubuntu.Components.ListItems 1.3

20import Ubuntu.SystemSettings.SecurityPrivacy 1.0

21import ".." as LocalComponents

22+import "../../Components" as UnityComponents

22

23

23/**

24/**

24 * One quirk with this page: we don't actually set the password. We avoid

25 * One quirk with this page: we don't actually set the password. We avoid

@@ -67,7 +68,7 @@ LocalComponents.Page {

67 anchors.leftMargin: wideMode ? parent.leftMargin : 0

68 anchors.leftMargin: wideMode ? parent.leftMargin : 0

68 anchors.rightMargin: wideMode ? parent.rightMargin : 0

69 anchors.rightMargin: wideMode ? parent.rightMargin : 0

69

70

70− ListView {

71+ UnityComponents.ListView {

71 id: selector

72 id: selector

72 anchors.left: parent.left

73 anchors.left: parent.left

73 anchors.right: parent.right

74 anchors.right: parent.right

qml/Wizard/Pages/passcode-desktop.qml+2−1

@@ -18,6 +18,7 @@ import QtQuick 2.4

18import QtQuick.Layouts 1.1

19import Ubuntu.Components 1.3

20import ".." as LocalComponents

21+import "../../Components" as UnityComponents

21

22

22/**

23/**

23 * See the main passwd-type page for an explanation of why we don't actually

24 * See the main passwd-type page for an explanation of why we don't actually

@@ -33,7 +34,7 @@ LocalComponents.Page {

33 readonly property alias password: passwordField.text

34 readonly property alias password: passwordField.text

34 readonly property alias password2: password2Field.text

35 readonly property alias password2: password2Field.text

35

36

36− Flickable {

37+ UnityComponents.Flickable {

37 id: column

38 id: column

38 clip: true

39 clip: true

39 flickableDirection: Flickable.VerticalFlick

40 flickableDirection: Flickable.VerticalFlick

qml/Wizard/Pages/password-set.qml+2−1

@@ -18,6 +18,7 @@ import QtQuick 2.4

18import QtQuick.Layouts 1.1

19import Ubuntu.Components 1.3

20import ".." as LocalComponents

21+import "../../Components" as UnityComponents

21

22

22/**

23/**

23 * See the main passwd-type page for an explanation of why we don't actually

24 * See the main passwd-type page for an explanation of why we don't actually

@@ -34,7 +35,7 @@ LocalComponents.Page {

34 readonly property alias password2: password2Field.text

35 readonly property alias password2: password2Field.text

35 readonly property bool passwordsMatching: password == password2 && password.trim().length > 7

36 readonly property bool passwordsMatching: password == password2 && password.trim().length > 7

36

37

37− Flickable {

38+ UnityComponents.Flickable {

38 id: column

39 id: column

39 clip: true

40 clip: true

40 flickableDirection: Flickable.VerticalFlick

41 flickableDirection: Flickable.VerticalFlick