[PATCH 1/2] QML UI: use Material default switches

Rick Walsh rickmwalsh at gmail.com
Sat Jul 22 20:30:41 PDT 2017


The Material theme's default switch is nicer than our own.

Signed-off-by: Rick Walsh <rickmwalsh at gmail.com>
---
 mobile-widgets/qml/CloudCredentials.qml | 21 -----------
 mobile-widgets/qml/Settings.qml         | 63 ---------------------------------
 2 files changed, 84 deletions(-)

diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml
index 72a5ccb1..c1f38434 100644
--- a/mobile-widgets/qml/CloudCredentials.qml
+++ b/mobile-widgets/qml/CloudCredentials.qml
@@ -105,27 +105,6 @@ Item {
 						password.text = "" // don't show a hidden password
 					password.echoMode = checked ? TextInput.Normal : TextInput.Password
 				}
-				indicator: Rectangle {
-					implicitWidth: Kirigami.Units.largeSpacing * 3
-					implicitHeight: Kirigami.Units.largeSpacing
-					x: showPassword.leftPadding
-					y: parent.height / 2 - height / 2
-					radius: Kirigami.Units.largeSpacing * 0.5
-					color: showPassword.checked ?
-						subsurfaceTheme.lightPrimaryColor : subsurfaceTheme.backgroundColor
-					border.color: subsurfaceTheme.darkerPrimaryColor
-
-					Rectangle {
-						x: showPassword.checked ? parent.width - width : 0
-						y: parent.height / 2 - height / 2
-						width: Kirigami.Units.largeSpacing * 1.5
-						height: Kirigami.Units.largeSpacing * 1.5
-						radius: height / 2
-						color: showPassword.down || showPassword.checked ?
-							subsurfaceTheme.primaryColor : subsurfaceTheme.lightPrimaryColor
-						border.color: subsurfaceTheme.darkerPrimaryColor
-					}
-				}
 			}
 		}
 
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml
index 8669c3bb..06554ceb 100644
--- a/mobile-widgets/qml/Settings.qml
+++ b/mobile-widgets/qml/Settings.qml
@@ -321,27 +321,6 @@ Kirigami.ScrollablePage {
 				onClicked: {
 					manager.locationServiceEnabled = checked
 				}
-				indicator: Rectangle {
-					implicitWidth: Kirigami.Units.largeSpacing * 3
-					implicitHeight: Kirigami.Units.largeSpacing
-					x: locationButton.leftPadding
-					y: parent.height / 2 - height / 2
-					radius: Kirigami.Units.largeSpacing * 0.5
-					color: locationButton.checked ?
-						subsurfaceTheme.lightPrimaryColor : subsurfaceTheme.backgroundColor
-					border.color: subsurfaceTheme.darkerPrimaryColor
-
-					Rectangle {
-						x: locationButton.checked ? parent.width - width : 0
-						y: parent.height / 2 - height / 2
-						width: Kirigami.Units.largeSpacing * 1.5
-						height: Kirigami.Units.largeSpacing * 1.5
-						radius: height / 2
-						color: locationButton.down || locationButton.checked ?
-							subsurfaceTheme.primaryColor : subsurfaceTheme.lightPrimaryColor
-						border.color: subsurfaceTheme.darkerPrimaryColor
-					}
-				}
 			}
 		}
 		Rectangle {
@@ -374,27 +353,6 @@ Kirigami.ScrollablePage {
 				onClicked: {
 					manager.libdcLog = checked
 				}
-				indicator: Rectangle {
-					implicitWidth: Kirigami.Units.largeSpacing * 3
-					implicitHeight: Kirigami.Units.largeSpacing
-					x: libdclogButton.leftPadding
-					y: parent.height / 2 - height / 2
-					radius: Kirigami.Units.largeSpacing * 0.5
-					color: libdclogButton.checked ?
-						subsurfaceTheme.lightPrimaryColor : subsurfaceTheme.backgroundColor
-					border.color: subsurfaceTheme.darkerPrimaryColor
-
-					Rectangle {
-						x: libdclogButton.checked ? parent.width - width : 0
-						y: parent.height / 2 - height / 2
-						width: Kirigami.Units.largeSpacing * 1.5
-						height: Kirigami.Units.largeSpacing * 1.5
-						radius: height / 2
-						color: libdclogButton.down || libdclogButton.checked ?
-							subsurfaceTheme.primaryColor : subsurfaceTheme.lightPrimaryColor
-						border.color: subsurfaceTheme.darkerPrimaryColor
-					}
-				}
 			}
 		}
 		Rectangle {
@@ -427,27 +385,6 @@ Kirigami.ScrollablePage {
 				onClicked: {
 					manager.developer = checked
 				}
-				indicator: Rectangle {
-					implicitWidth: Kirigami.Units.largeSpacing * 3
-					implicitHeight: Kirigami.Units.largeSpacing
-					x: developerButton.leftPadding
-					y: parent.height / 2 - height / 2
-					radius: Kirigami.Units.largeSpacing * 0.5
-					color: developerButton.checked ?
-						subsurfaceTheme.lightPrimaryColor : subsurfaceTheme.backgroundColor
-					border.color: subsurfaceTheme.darkerPrimaryColor
-
-					Rectangle {
-						x: developerButton.checked ? parent.width - width : 0
-						y: parent.height / 2 - height / 2
-						width: Kirigami.Units.largeSpacing * 1.5
-						height: Kirigami.Units.largeSpacing * 1.5
-						radius: height / 2
-						color: developerButton.down || developerButton.checked ?
-							subsurfaceTheme.primaryColor : subsurfaceTheme.lightPrimaryColor
-						border.color: subsurfaceTheme.darkerPrimaryColor
-					}
-				}
 			}
 		}
 		Item {
-- 
2.13.3



More information about the subsurface mailing list