From 28bdff735036e6d1e7cf9bc9bedeb507893fc203 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Mon, 11 Jul 2011 16:20:21 +0200
Subject: [PATCH] Change welcome page tab highlighting

Change-Id: I5005f451eeed5b3d1280312f28878caa6985199b
Reviewed-on: http://codereview.qt.nokia.com/1444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
---
 share/qtcreator/welcomescreen/welcomescreen.qml    |  24 +++++++++++++--------
 share/qtcreator/welcomescreen/widgets/LinksBar.qml |   4 ++--
 src/plugins/welcome/images/tab_active.png          | Bin 213 -> 196 bytes
 src/plugins/welcome/images/tab_hover.png           | Bin 222 -> 211 bytes
 src/plugins/welcome/images/tab_inactive.png        | Bin 196 -> 213 bytes
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index ac74e7d1bb..b8306b2da7 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -50,28 +50,34 @@ Image {
         anchors.bottom: feedback.top
         anchors.margins: 10
 
-        BorderImage {
+        Item {
             id: news
-            opacity: 0.7
-            source: "qrc:welcome/images/rc_combined.png"
-            border.left: 5; border.top: 5
-            border.right: 5; border.bottom: 5
             anchors.top: parent.top
             anchors.bottom: parent.bottom
             anchors.left: parent.left
             anchors.rightMargin: 5
             width: 270
+            BorderImage {
+                anchors.fill: parent
+                opacity: 0.7
+                source: "qrc:welcome/images/rc_combined.png"
+                border.left: 5; border.top: 5
+                border.right: 5; border.bottom: 5
+            }
             FeaturedAndNewsListing {
                 anchors.fill: parent
                 anchors.margins: 8
             }
         }
 
-        BorderImage {
+        Item {
             id: tabFrame
-            source: "qrc:welcome/images/rc_combined_transparent.png"
-            border.left: 5; border.top: 5
-            border.right: 5; border.bottom: 5
+            BorderImage {
+                anchors.fill: parent
+                source: "qrc:welcome/images/rc_combined_transparent.png"
+                border.left: 5; border.top: 5
+                border.right: 5; border.bottom: 5
+            }
 
             anchors.top: parent.top
             anchors.bottom: parent.bottom
diff --git a/share/qtcreator/welcomescreen/widgets/LinksBar.qml b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
index ede5c18dae..45f83f32be 100644
--- a/share/qtcreator/welcomescreen/widgets/LinksBar.qml
+++ b/share/qtcreator/welcomescreen/widgets/LinksBar.qml
@@ -57,7 +57,7 @@ Row {
                 anchors.fill: parent
                 text: model.modelData.title
                 elide: Text.ElideRight
-                color: "white"
+                color: "black"
             }
             MouseArea {
                 id: mouseArea
@@ -69,7 +69,7 @@ Row {
                 State {
                     id: activeState; when: tabBar.current == index
                     PropertyChanges { target: tabBackground; source:"qrc:welcome/images/tab_active.png" }
-                    PropertyChanges { target: text; color: "black" }
+                    PropertyChanges { target: text; color: "white" }
                 },
                 State {
                     id: hoverState; when: mouseArea.containsMouse
diff --git a/src/plugins/welcome/images/tab_active.png b/src/plugins/welcome/images/tab_active.png
index 7bed3d9d8999b451025a0ebf8750deb59a41920d..04e804c0fc3efe676c63a556ce44204608c9523a 100644
GIT binary patch
delta 122
zcmcc0c!W{0Gr-TCmrII^fq{Y7)59eQNOJ?RBnK0a%(&qEaH66<8;hjUoDZH8!!+Cs
zJzX3_G|nfR7#JiR;ErHoV&Yiw<NN#jE4Wld=iAjTYS#V#|G)g!)_dCwv@|pxgflX9
XtaV;o#ljp9G>*a3)z4*}Q$iB}{@^A1

delta 139
zcmX@Yc$HDHGr-TCmrII^fq{Y7)59eQNDBb5BnK0a+&<6p-$X@yHhC+}vtA1)hG~R5
zdAc};Se#Dw@$g7cU^V#n^K-ijug?E}f0ca?|Ns9#Gl%)DDUXwV&A&f0Rd{`PRG222
pPLT0h>?ft^msC<vpy0{OaO<r0K`S@63qbQ3JYD@<);T3K0RU@5E%X2Y

diff --git a/src/plugins/welcome/images/tab_hover.png b/src/plugins/welcome/images/tab_hover.png
index d11cdd71fec1130a56450bd6621a23f914aa349c..618ab6e1dbbea085a04ccd2b071ba628a82ac386 100644
GIT binary patch
delta 153
zcmcb|c$rbJGr-TCmrII^fq{Y7)59eQNDBb5BnK0a+&<6pACO`!4sv&5Sa(k5<wOU0
zPIhiSX_H_9{)&ki8leuJE{-7<r;~j=JQ5UG4fa)k?^EH``Ty^)vhU&l|Nm#^FuyhB
zak8)Z`KeWf*M~=iX_Dy#8L!2DQks5ADqCZi7)&y>e@RBZF9uq};OXk;vd$@?2>`9$
BFEs!F

delta 164
zcmcc2c#qMcGr-TCmrII^fq{Y7)59eQNOJ?RBnK0a%(&qE5J)i=2e~^jtUD+363Ago
z@^*J&_z!{$_AZ}1QBR(em6yj@ATM$5#ff1WewLmtjv*T7lT8c^5)N=jBqb$rtoZT$
zz5G$FfB*mcvq!&peChmrdw#C+0A-(-!urm~^n19txPF8(Fo@|nUwgXL;V94&22WQ%
Jmvv4FO#oUXHR}KX

diff --git a/src/plugins/welcome/images/tab_inactive.png b/src/plugins/welcome/images/tab_inactive.png
index 04e804c0fc3efe676c63a556ce44204608c9523a..7bed3d9d8999b451025a0ebf8750deb59a41920d 100644
GIT binary patch
delta 139
zcmX@Yc$HDHGr-TCmrII^fq{Y7)59eQNDBb5BnK0a+&<6p-$X@yHhC+}vtA1)hG~R5
zdAc};Se#Dw@$g7cU^V#n^K-ijug?E}f0ca?|Ns9#Gl%)DDUXwV&A&f0Rd{`PRG222
pPLT0h>?ft^msC<vpy0{OaO<r0K`S@63qbQ3JYD@<);T3K0RU@5E%X2Y

delta 122
zcmcc0c!W{0Gr-TCmrII^fq{Y7)59eQNOJ?RBnK0a%(&qEaH66<8;hjUoDZH8!!+Cs
zJzX3_G|nfR7#JiR;ErHoV&Yiw<NN#jE4Wld=iAjTYS#V#|G)g!)_dCwv@|pxgflX9
XtaV;o#ljp9G>*a3)z4*}Q$iB}{@^A1

-- 
2.11.0