Merge lp:~mterry/ubuntu-system-settings/less-ubuntucolors into lp:ubuntu-system-settings

[Michael Terry]

Update some button colors to the new theme style

Remove some uses of hardcoded colors, especially ones that are wrong (mostly cases of orange -> green).

But I've also removed some odd (seemingly unnecessary) specified versions of grey when all we want is the default button color.

I haven't removed all uses of UbuntuColors, just the most noticeable ones. Several uses of the various greys exist, etc. But those are less noticeably wrong than orange.

[Ken VanDine (ken-vandine)]

Looks great, thanks!

review: Approve

=== modified file 'plugins/background/Components/AddRemove.qml'
--- plugins/background/Components/AddRemove.qml	2015-08-10 13:31:45 +0000
+++ plugins/background/Components/AddRemove.qml	2016-05-17 23:31:57 +0000
@@ -76,7 +76,6 @@
         id: add
         action: selectPeer
         objectName: "addCustomBackgroundsButton"
-        gradient: UbuntuColors.greyGradient
         text: i18n.tr("Add an image…")
         width: buttonWidth
         anchors {
@@ -87,7 +86,6 @@
     Button {
         id: queue
         objectName: "removeCustomBackgroundsButton"
-        gradient: UbuntuColors.greyGradient
         text: i18n.tr("Remove images…")
         width: buttonWidth
         anchors {

=== modified file 'plugins/background/Components/HighlightedOverlay.qml'
--- plugins/background/Components/HighlightedOverlay.qml	2015-08-10 13:31:45 +0000
+++ plugins/background/Components/HighlightedOverlay.qml	2016-05-17 23:31:57 +0000
@@ -23,7 +23,7 @@
 
 Rectangle {
     border.width: units.gu(1)
-    border.color: UbuntuColors.orange
+    border.color: theme.palette.selected.baseText
     width: parent.width + units.gu(2)
     height: parent.height + units.gu(2)
     anchors.centerIn: parent

=== modified file 'plugins/cellular/Components/LabelTextField.qml'
--- plugins/cellular/Components/LabelTextField.qml	2015-08-10 13:31:45 +0000
+++ plugins/cellular/Components/LabelTextField.qml	2016-05-17 23:31:57 +0000
@@ -37,7 +37,7 @@
             property bool error: (field.hasOwnProperty("errorHighlight") &&
                                  field.errorHighlight &&
                                  !field.acceptableInput)
-            onErrorChanged: error ? UbuntuColors.orange : color
+            onErrorChanged: error ? theme.palette.normal.negative : color
             color: Theme.palette.selected.background
             anchors.fill: parent
             visible: field.activeFocus

=== modified file 'plugins/cellular/PageChooseApn.qml'
--- plugins/cellular/PageChooseApn.qml	2016-04-01 15:13:06 +0000
+++ plugins/cellular/PageChooseApn.qml	2016-05-17 23:31:57 +0000
@@ -166,7 +166,7 @@
 
             Button {
                 text: i18n.tr("Reset")
-                color: UbuntuColors.orange
+                color: theme.palette.normal.positive
                 onClicked: {
                     Manager.reset();
                     PopupUtils.close(dialogue);

=== modified file 'plugins/phone/CallForwardItem.qml'
--- plugins/phone/CallForwardItem.qml	2015-11-06 12:22:09 +0000
+++ plugins/phone/CallForwardItem.qml	2016-05-17 23:31:57 +0000
@@ -176,17 +176,13 @@
                     property bool error: (field.hasOwnProperty("errorHighlight") &&
                                           field.errorHighlight &&
                                           !field.acceptableInput)
-                    onErrorChanged: error ? UbuntuColors.orange : color
+                    onErrorChanged: error ? theme.palette.normal.negative : color
                     color: Theme.palette.normal.background
                     anchors.fill: parent
                     visible: field.activeFocus
                 }
             }
 
-            cursorDelegate: Rectangle {
-                width: units.dp(1)
-                color: UbuntuColors.orange
-            }
             onVisibleChanged:
                 if (visible === true) forceActiveFocus()
         }
@@ -218,7 +214,7 @@
         height: contentHeight + units.gu(4)
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
-        color: UbuntuColors.red
+        color: theme.palette.normal.negative
         text: i18n.tr("Call forwarding can’t be changed right now.")
     }
 

=== modified file 'plugins/phone/CallForwarding.qml'
--- plugins/phone/CallForwarding.qml	2016-03-16 16:26:18 +0000
+++ plugins/phone/CallForwarding.qml	2016-05-17 23:31:57 +0000
@@ -157,7 +157,7 @@
                 visible: false
                 text: i18n.tr("Call forwarding status can’t be checked " +
                               "now. Try again later.")
-                color: UbuntuColors.red
+                color: theme.palette.normal.negative
                 horizontalAlignment: Text.AlignHCenter
             }
 

=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2016-02-04 15:28:51 +0000
+++ plugins/security-privacy/LockSecurity.qml	2016-05-17 23:31:57 +0000
@@ -353,7 +353,6 @@
 
                 Button {
                     Layout.fillWidth: true
-                    color: UbuntuColors.lightGrey
                     text: i18n.tr("Cancel")
                     onClicked: {
                         PopupUtils.close(changeSecurityDialog)
@@ -365,7 +364,7 @@
                 Button {
                     id: confirmButton
                     Layout.fillWidth: true
-                    color: UbuntuColors.green
+                    color: theme.palette.normal.positive
 
                     text: {
                         if (changeSecurityDialog.newMethod ===

=== modified file 'plugins/security-privacy/SimPin.qml'
--- plugins/security-privacy/SimPin.qml	2016-02-04 15:28:51 +0000
+++ plugins/security-privacy/SimPin.qml	2016-05-17 23:31:57 +0000
@@ -174,7 +174,6 @@
 
                 Button {
                     Layout.fillWidth: true
-                    color: UbuntuColors.lightGrey
                     text: i18n.tr("Cancel")
                     onClicked: PopupUtils.close(changePinDialog)
                 }
@@ -182,7 +181,7 @@
                 Button {
                     id: confirmButton
                     Layout.fillWidth: true
-                    color: UbuntuColors.green
+                    color: theme.palette.normal.positive
                     text: i18n.tr("Change")
                     enabled: false
                     onClicked: {
@@ -314,7 +313,6 @@
                 Button {
                     objectName: "cancelButton"
                     Layout.fillWidth: true
-                    color: UbuntuColors.lightGrey
                     text: i18n.tr("Cancel")
                     onClicked: {
                         if (curSim.lockedPins.length < 1)
@@ -329,7 +327,7 @@
                     id: lockButton
                     objectName: "lockButton"
                     Layout.fillWidth: true
-                    color: UbuntuColors.green
+                    color: theme.palette.normal.positive
 
                     text: curSim.lockedPins.length > 0 ? i18n.tr("Unlock") : i18n.tr("Lock")
                     enabled: false
@@ -428,7 +426,7 @@
                             objectName: "unlock"
                             enabled: sims[index].simMng.pinRequired !== 'none'
                             text: i18n.tr("Unlock…")
-                            color: UbuntuColors.green
+                            color: theme.palette.normal.positive
                             onClicked: Connectivity.unlockModem(sims[index].path)
                         }
                     }

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2016-03-02 19:16:55 +0000
+++ plugins/system-update/PageComponent.qml	2016-05-17 23:31:57 +0000
@@ -99,7 +99,7 @@
              Button {
                  text: i18n.tr("Restart & Install")
                  visible: root.batterySafeForUpdate ? true : false
-                 color: UbuntuColors.orange
+                 color: theme.palette.normal.positive
                  onClicked: {
                      installingImageUpdate.visible = true;
                      UpdateManager.applySystemUpdate();
@@ -108,7 +108,6 @@
              }
              Button {
                  text: i18n.tr("Cancel")
-                 color: UbuntuColors.warmGrey
                  onClicked: {
                      updateList.currentIndex = 0;
                      var item = updateList.currentItem;
@@ -133,7 +132,7 @@
 
              Button {
                  text: i18n.tr("OK")
-                 color: UbuntuColors.orange
+                 color: theme.palette.normal.positive
                  onClicked: {
                      PopupUtils.close(dialogueError);
                  }
@@ -305,7 +304,7 @@
                                                      i18n.tr("Install %1 update…", "Install %1 updates…", root.updatesAvailable).arg(root.updatesAvailable) :
                                                      i18n.tr("Install %1 update", "Install %1 updates", root.updatesAvailable).arg(root.updatesAvailable)
                     property string secondaryText: i18n.tr("Pause All")
-                    color: UbuntuColors.orange
+                    color: theme.palette.normal.positive
                     text: root.installAll ? secondaryText : primaryText
                     width: parent.width - units.gu(4)