From 7fded5040f56b8def7a93fcce03f93f06bcc6bc4 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Mon, 11 Mar 2013 11:42:00 +0100
Subject: [PATCH] Cosmetic changes in DefaultFileDialog and dialog shared controls

Implementation of the button for QML-based dialogs matches
the one for QML examples.  The button and the text field
use system palette colors, as does the file dialog.

Change-Id: Ibf45d57bdab8799ae6aa69ba543c0e05c55b01d3
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
 src/imports/dialogs/DefaultFileDialog.qml |   19 +++-----
 src/imports/dialogs/dialogs.pro           |    2 -
 src/imports/dialogs/images/titlebar.png   |  Bin 1436 -> 0 bytes
 src/imports/dialogs/images/titlebar.sci   |    5 --
 src/imports/dialogs/qml/Button.qml        |   64 ++++++++++++++---------------
 src/imports/dialogs/qml/TextField.qml     |   11 +----
 6 files changed, 40 insertions(+), 61 deletions(-)
 delete mode 100644 src/imports/dialogs/images/titlebar.png
 delete mode 100644 src/imports/dialogs/images/titlebar.sci

diff --git a/src/imports/dialogs/DefaultFileDialog.qml b/src/imports/dialogs/DefaultFileDialog.qml
index 9e05ace..5542e59 100644
--- a/src/imports/dialogs/DefaultFileDialog.qml
+++ b/src/imports/dialogs/DefaultFileDialog.qml
@@ -213,7 +213,7 @@ AbstractFileDialog {
             delegate: folderDelegate
             highlight: Rectangle {
                 color: "transparent"
-                border.color: palette.midlight
+                border.color: Qt.darker(palette.window, 1.3)
             }
             highlightMoveDuration: 0
             highlightMoveVelocity: -1
@@ -257,11 +257,10 @@ AbstractFileDialog {
             id: titleBar
             width: parent.width
             height: currentPathField.height * 1.5
-            BorderImage {
-                source: "images/titlebar.sci"
+            Rectangle {
                 anchors.fill: parent
-                anchors.topMargin: -7
-                anchors.bottomMargin: -7
+                color: Qt.darker(palette.window, 1.1)
+                border.color: Qt.darker(palette.window, 1.3)
             }
             Rectangle {
                 id: upButton
@@ -291,7 +290,7 @@ AbstractFileDialog {
                 anchors.left: parent.left; anchors.right: parent.right; anchors.verticalCenter: parent.verticalCenter
                 anchors.leftMargin: textX; anchors.rightMargin: 4
                 text: root.urlToPath(view.model.folder)
-                color: "white"
+                color: palette.text
                 elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
                 MouseArea {
                     anchors.fill: parent
@@ -320,12 +319,8 @@ AbstractFileDialog {
             width: parent.width
             height: buttonRow.height + buttonRow.spacing * 2
             anchors.bottom: parent.bottom
-            gradient: Gradient {
-                GradientStop { position: 0.0; color: palette.dark }
-                GradientStop { position: 0.3; color: palette.mid }
-                GradientStop { position: 0.85; color: palette.mid }
-                GradientStop { position: 1.0; color: palette.light }
-            }
+            color: Qt.darker(palette.window, 1.1)
+            border.color: Qt.darker(palette.window, 1.3)
 
             Row {
                 id: buttonRow
diff --git a/src/imports/dialogs/dialogs.pro b/src/imports/dialogs/dialogs.pro
index 784517f..ec425c1 100644
--- a/src/imports/dialogs/dialogs.pro
+++ b/src/imports/dialogs/dialogs.pro
@@ -23,8 +23,6 @@ QML_FILES += \
     qml/TextField.qml \
     qml/qmldir \
     images/folder.png \
-    images/titlebar.png \
-    images/titlebar.sci \
     images/up.png
 
 QT += quick-private gui-private core-private
diff --git a/src/imports/dialogs/images/titlebar.png b/src/imports/dialogs/images/titlebar.png
deleted file mode 100644
index 51c90082d052a94af34488ca9a13842122f7d7a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1436
zcmV;N1!MY&P)<h;3K|Lk000e1NJLTq001!n001lq1^@s6%+yd>00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXW1
z0xv7!9LBW(000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000E{Nkl<Z
zXx`PDzit~x5XOJAx1{I@R?^xq6ay}j0504Ha9+XBk|J%IJY8xxR^!45+!zo9Ie|^y
z?arjw-MhWxk&>Liq!w7*fp`1oo9~;MC5Hkm0Ga8f)%S;LHn|^l4>W+QI@MK<0LU%?
zTCN^g=1tdNq`Dpph<f7&#N2xjKFg}9x;p|{O<B-t^AQL@@W6u%WSN2NlGq_Z=*0Q~
z=ztdJJa7uEfRo&p6_BO^a3~N3NDZLPeGRM&h;MR#kbx|6cL(&1sV`^+V3PrS0=x&#
zR;!a&=jY%5`s~>=PESv9&Y_yal)K%ETFKXCtR`vY67D3wB9@+&cbGgIArTN6+wSAX
zkGy^RmUr*o{T4#Fkk#tskC!ih`Tfb0Cxj5Vy1F8SK-YDE!#OZB%*L~eNSa)23&d?U
zSw1i0>gRr9IT1mtHP62Lmb0@nE-o&3^XAQ;^5Vq{d;a`6A3l8G`uZB@98Hs4A;w4}
zZZ8P$T;_Us-Wa3LiY3JoBbsA{322^IDj+WNr!^z_J?9)<*YWV-LmoYP#Ov3u@#p8~
zTwPspd3nidwF01RTNaB2BC@r4CKHDcwm?9#oSA`>USgwAW7e}#gkM0Yvk41^nr1^7
z&N;5HuQ@q6;px+-_|@_O@8ADLBaYYwR2A=iy0?Jz0cyTE=eGiSB!O3eXvr9oHkkl)
zJria&VhTXjdXO$lOS6-T2wfXkEEZf|Uh??yV|<K}&8EZqMAKriKvmhapII)KJ>9$6
z$kf}E2}3pUBO*h1vm}>TF;RnPvP?}ajZsZ(s`c^F`G#o9X1&4r25)A>7;$dUeu#sd
zH0nr`HO-^wWQOLC8t2no3_(Fez${xkBmh<z%pgTD17`~?R&tDKoS7j`2$`~`StJ6w
zZi88*Z6ne+HeH)HrHI&IfyxhR37Cb^xkN<hB<?(`7!b0hi!q9Q3ae)8!B7^fu}P05
zsAz}~I(!I$7-L>=yunfEn^?XuQ?3Ij+Zzn(@H!pav#Pqq_?!|nMq-S~Ct{2l-QZ~b
zHR{$P`zF6tD!u{4zWIxhQbJa`7!wn!ntVca%bFsRXx#Sb;tV@Ca^rcTGS~=!F~4Rd
zD^=}7d=H{l@KpDMcDE-M<BOS?g72+-!x2qHP%)xL+R!CAmBFTiWmJ=l%5~1#QaR{d
zTAj(~Kon!{@<ZnwS|X{&!Lg?qwBGz2?fn8X?A*n%=RnlM=X^s|QywDAscl=ju1n|`
zGf{HKF1?FLAHVMcq8vqb9c9GWV!w`t<pdB-S+^~I-ELU78=P~q*8Y;{^EFzLdiQya
zE6C>beynXOK|hy7X0?B$O;vFv(d|Qf^dRaKe_z@t5t}6@ZhHA%GI8viucfZ4DLUOJ
z%g-f2H+QV4licii=|7xc|4$k9K5-Z1_4nO<nfz-z`Hdi&rs<Eo{g<Z<$T@cu((<=K
zDk3yZ(`WW_wklsv4(;4Gf`~Ep091AK(@F82L(9oG;%J&Z)@*8Nxuc9!{)eA_<i0ln
zey)DjUojM0>T1!U>l1aAsH<udpMg&v_&Yz?FcerykwrLc-OeUp`VtqDBFjG+#F}y4
z?$9jkW1}$A0UMtw3EBG7Dk=wLVai7NLA?Mem7~sQ2D*v$kEQ%OCo7$@;xmBAaTem|
qKomxLW_+gPnEw(nC#%ulBK`%3l#FT?MBUf`0000<MNUMnLSTaHVxb-Y

diff --git a/src/imports/dialogs/images/titlebar.sci b/src/imports/dialogs/images/titlebar.sci
deleted file mode 100644
index 0418d94..0000000
--- a/src/imports/dialogs/images/titlebar.sci
+++ /dev/null
@@ -1,5 +0,0 @@
-border.left: 10
-border.top: 12
-border.bottom: 12
-border.right: 10
-source: titlebar.png
diff --git a/src/imports/dialogs/qml/Button.qml b/src/imports/dialogs/qml/Button.qml
index 936c72c..491dc2e 100644
--- a/src/imports/dialogs/qml/Button.qml
+++ b/src/imports/dialogs/qml/Button.qml
@@ -41,49 +41,47 @@
 import QtQuick 2.1
 
 Item {
-    height: label.implicitHeight * 2
-    width: Math.max(label.implicitWidth * 1.2, height * 2.5);
-    anchors.verticalCenter: parent.verticalCenter
-    property alias text: label.text
-    property string tooltip
+    id: container
+
+    property alias text: buttonLabel.text
+    property alias label: buttonLabel
     signal clicked
+    property alias containsMouse: mouseArea.containsMouse
+    property alias pressed: mouseArea.pressed
+    implicitHeight: buttonLabel.implicitHeight
+    implicitWidth: buttonLabel.implicitWidth
+    height: buttonLabel.implicitHeight + 12
+    width: Math.max(80, implicitWidth + 8)
+
     SystemPalette { id: palette }
+
     Rectangle {
-        antialiasing: true
-        border.color: mouseArea.pressed ? palette.highlight : palette.light
-        color: "transparent"
-        anchors.fill: parent
-        anchors.rightMargin: 1
-        anchors.bottomMargin: 1
-        radius: 3
-    }
-    Rectangle {
-        border.color: palette.dark
+        id: frame
         anchors.fill: parent
-        anchors.leftMargin: 1
-        anchors.topMargin: 1
-        radius: 3
-    }
-    Rectangle {
+        color: palette.button
         gradient: Gradient {
-            GradientStop { position: 0.0; color: mouseArea.pressed ? palette.dark : palette.light }
-            GradientStop { position: 0.2; color: palette.button }
-            GradientStop { position: 0.8; color: palette.button }
-            GradientStop { position: 1.0; color: mouseArea.pressed ? palette.light : palette.dark }
+            GradientStop { position: 0.0; color: mouseArea.pressed ? Qt.darker(palette.button, 1.3) : palette.button }
+            GradientStop { position: 1.0; color: Qt.darker(palette.button, 1.3) }
         }
-        anchors.fill: parent
-        anchors.margins: 1
-        radius: 3
-    }
-    Text {
-        id: label
-        anchors.centerIn: parent
-        color: palette.buttonText
+        antialiasing: true
+        radius: 5
+        border.color: Qt.darker(palette.button, 1.5)
+        border.width: 1
     }
 
     MouseArea {
         id: mouseArea
         anchors.fill: parent
-        onClicked: parent.clicked()
+        onClicked: container.clicked()
+        hoverEnabled: true
+    }
+
+    Text {
+        id: buttonLabel
+        width: parent.width
+        horizontalAlignment: Text.Center
+        text: container.text
+        color: palette.buttonText
+        anchors.verticalCenter: parent.verticalCenter
     }
 }
diff --git a/src/imports/dialogs/qml/TextField.qml b/src/imports/dialogs/qml/TextField.qml
index da93239..89487e8 100644
--- a/src/imports/dialogs/qml/TextField.qml
+++ b/src/imports/dialogs/qml/TextField.qml
@@ -53,16 +53,9 @@ Item {
     Rectangle {
         id: rect
         anchors.fill: parent
-        anchors.leftMargin: -radius
-        border.color: palette.light
         radius: height / 4
-        antialiasing: true
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: palette.dark }
-            GradientStop { position: 0.2; color: palette.button }
-            GradientStop { position: 0.8; color: palette.button }
-            GradientStop { position: 1.0; color: palette.light }
-        }
+        color: palette.button
+        border.color: Qt.darker(palette.button, 1.5)
     }
 
     TextInput {
-- 
1.7.2.5