diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-10-23 12:34:34 +0300 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 10:43:12 +0000 |
| commit | d4c90ab8666f194cc692308af7a57849d5e97587 (patch) | |
| tree | ec8501e9966ef45d57a6d3ce1e29a69221bb7067 | |
| parent | 6b690e80114c0b519bd7a6470e27c2cf5756ae35 (diff) | |
Unify primary button appearance
Task-number: QTBUG-60083
Change-Id: I9958d18cf9be60699461966c86a358bbae8a00ac
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
| -rw-r--r-- | qml/DemoClosePopup.qml | 2 | ||||
| -rw-r--r-- | qml/DemoInfoPopup.qml | 1 | ||||
| -rw-r--r-- | qml/DetailView.qml | 2 | ||||
| -rw-r--r-- | qml/ViewSettings.qml | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/qml/DemoClosePopup.qml b/qml/DemoClosePopup.qml index d04f599..7dd2033 100644 --- a/qml/DemoClosePopup.qml +++ b/qml/DemoClosePopup.qml @@ -79,8 +79,6 @@ Rectangle { width: frame.width * 0.45 anchors.horizontalCenter: parent.horizontalCenter text: qsTr("CONFIRM") - borderColor: "transparent" - fillColor: viewSettings.buttonGreenColor onClicked: { root.closeApplication(); demoClosePopup.close() diff --git a/qml/DemoInfoPopup.qml b/qml/DemoInfoPopup.qml index dbeade5..fc1960e 100644 --- a/qml/DemoInfoPopup.qml +++ b/qml/DemoInfoPopup.qml @@ -28,7 +28,6 @@ ****************************************************************************/ import QtQuick 2.0 import QtQuick.Controls 2.2 -import QtDeviceUtilities.QtButtonImageProvider 1.0 Rectangle { id: demoInfoPopup diff --git a/qml/DetailView.qml b/qml/DetailView.qml index 0e02949..14e7c2d 100644 --- a/qml/DetailView.qml +++ b/qml/DetailView.qml @@ -105,8 +105,6 @@ Item { anchors.bottom: parent.bottom anchors.margins: viewSettings.pageMargin * 0.5 text: qsTr("START") - borderColor: "transparent" - fillColor: viewSettings.buttonGreenColor onClicked: root.launchApplication(startButton.loc, startButton.main, startButton.name, startButton.desc) property string loc property string main diff --git a/qml/ViewSettings.qml b/qml/ViewSettings.qml index b65e418..0142266 100644 --- a/qml/ViewSettings.qml +++ b/qml/ViewSettings.qml @@ -38,4 +38,5 @@ Item { property int stateDelay: 200; property string buttonGreenColor: "#41cd52" property string buttonGrayColor: "#9d9faa" + property string buttonActiveColor: "#216729" } |