Unify primary button appearance

Task-number: QTBUG-60083
Change-Id: Ic432b63d5321a11ae6dbb15e99d159a62eab2eb7
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

10 files changed, 0 insertions, 18 deletions

diff --git a/src/settingsui/display/Display.qml b/src/settingsui/display/Display.qml
index dd5f389..f889421 100644
--- a/src/settingsui/display/Display.qml
+++ b/src/settingsui/display/Display.qml
@@ -162,8 +162,6 @@ Item {
                 QtButton {
                     id: setButton
                     height: pluginMain.buttonHeight
-                    fillColor: "#41cd52"
-                    borderColor: "transparent"
                     text: qsTr("SET")
                     onClicked: {
                         DisplaySettings.physicalScreenHeightMm = parseInt(heightField.text)
diff --git a/src/settingsui/locale/Language.qml b/src/settingsui/locale/Language.qml
index 43d4d39..47a4fdf 100644
--- a/src/settingsui/locale/Language.qml
+++ b/src/settingsui/locale/Language.qml
@@ -62,7 +62,6 @@ Item {
             QtButton {
                 id: regionButton
                 height: pluginMain.buttonHeight
-                fillColor: "#41cd52"
                 text: qsTr("CHANGE")
                 onClicked: settingsLoader.source = "qrc:/locale/RegionSelect.qml"
             }
diff --git a/src/settingsui/locale/RegionSelect.qml b/src/settingsui/locale/RegionSelect.qml
index 128ff55..9ff4aad 100644
--- a/src/settingsui/locale/RegionSelect.qml
+++ b/src/settingsui/locale/RegionSelect.qml
@@ -32,7 +32,6 @@ import QtQuick.Controls 2.0
 import QtDeviceUtilities.LocaleSettings 1.0
 import "../common"
 import QtGraphicalEffects 1.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
 
 Item {
     id: root
diff --git a/src/settingsui/network/NetworkSettings.qml b/src/settingsui/network/NetworkSettings.qml
index 1f39d88..b3a6350 100644
--- a/src/settingsui/network/NetworkSettings.qml
+++ b/src/settingsui/network/NetworkSettings.qml
@@ -30,7 +30,6 @@ import QtQuick 2.6
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.2
 import QtDeviceUtilities.NetworkSettings 1.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
 
 Item {
     NetworkListView {
diff --git a/src/settingsui/network/PassphraseEnter.qml b/src/settingsui/network/PassphraseEnter.qml
index 6be0b20..d9d80d3 100644
--- a/src/settingsui/network/PassphraseEnter.qml
+++ b/src/settingsui/network/PassphraseEnter.qml
@@ -120,8 +120,6 @@ Item {
             id: setButton
             height: parent.height
             text: qsTr("SET")
-            borderColor: "transparent"
-            fillColor: "#41cd52"
             onClicked: {
                 passField.focus = false
                 NetworkSettingsManager.userAgent.setPassphrase(passField.text)
diff --git a/src/settingsui/power/Power.qml b/src/settingsui/power/Power.qml
index f4749d4..1bcc658 100644
--- a/src/settingsui/power/Power.qml
+++ b/src/settingsui/power/Power.qml
@@ -41,8 +41,6 @@ Item {
             id: shutdownButton
             width: root.width * 0.4
             height: pluginMain.fieldHeight
-            fillColor: "#41cd52"
-            borderColor: "transparent"
             text: qsTr("SHUTDOWN")
             onClicked: shutdownPopup.open(true)
         }
@@ -50,8 +48,6 @@ Item {
             id: rebootButton
             width: root.width * 0.4
             height: pluginMain.fieldHeight
-            fillColor: "#41cd52"
-            borderColor: "transparent"
             text: qsTr("REBOOT")
             onClicked: shutdownPopup.open(false)
         }
diff --git a/src/settingsui/settingsuiplugin/ShutdownPopup.qml b/src/settingsui/settingsuiplugin/ShutdownPopup.qml
index 916a2fe..b1ce3e4 100644
--- a/src/settingsui/settingsuiplugin/ShutdownPopup.qml
+++ b/src/settingsui/settingsuiplugin/ShutdownPopup.qml
@@ -91,8 +91,6 @@ Rectangle {
                 width: frame.width * 0.45
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: ""
-                borderColor: "transparent"
-                fillColor: viewSettings.buttonGreenColor
                 onClicked: shutdownPopup.accepted()
             }
             QtButton {
diff --git a/src/settingsui/settingsuiplugin/pluginMain.qml b/src/settingsui/settingsuiplugin/pluginMain.qml
index 4c35e5a..def4c80 100644
--- a/src/settingsui/settingsuiplugin/pluginMain.qml
+++ b/src/settingsui/settingsuiplugin/pluginMain.qml
@@ -34,7 +34,6 @@ import QtQuick.XmlListModel 2.0
 import QtDeviceUtilities.LocalDeviceSettings 1.0
 import QtDeviceUtilities.NetworkSettings 1.0
 import QtGraphicalEffects 1.0
-import QtDeviceUtilities.QtButtonImageProvider 1.0
 
 Rectangle {
     id: pluginMain
diff --git a/src/settingsui/timedate/ManualTime.qml b/src/settingsui/timedate/ManualTime.qml
index 0db33d9..df4a8b8 100644
--- a/src/settingsui/timedate/ManualTime.qml
+++ b/src/settingsui/timedate/ManualTime.qml
@@ -216,8 +216,6 @@ Item {
             QtButton {
                 id: dateSetButton
                 height: pluginMain.buttonHeight
-                fillColor: "#41cd52"
-                borderColor: "transparent"
                 text: qsTr("SET")
 
                 onClicked: {
diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml
index f760ec2..95e93bf 100644
--- a/src/settingsui/timedate/TimeDate.qml
+++ b/src/settingsui/timedate/TimeDate.qml
@@ -83,8 +83,6 @@ Item {
             QtButton {
                 id: automaticButton
                 height: pluginMain.buttonHeight
-                fillColor: "#41cd52"
-                borderColor: "transparent"
                 text: qsTr("AUTOMATICALLY")
                 onClicked: TimeManager.ntp = true
             }