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>
---
 .../qtcreator/welcomescreen/welcomescreen.qml |  24 +++++++++++-------
 .../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 ac74e7d1bb1..b8306b2da78 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 ede5c18daeb..45f83f32be9 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)59f*fq{XWfq_AigNcEGA>)Gc!-<OeY%G#Wb3S-Z
z4AXEk^mK6y(Kw%MVqlPPfIEVTiHT#ykMHmAui#P<oo`pWs9E>_|Nrt^TkmZ%(9+O&
c5YEWZvDSHU6$^7b0|Nttr>mdKI;Vst0RG@5`v3p{

delta 139
zcmX@Yc$HDHGr-TCmrII^fq{Y7)59f*fq_AQfq_AigNcEGVf#GGe-jn;+2pM>&w4GK
z7^V^K<muuVVsSdz$HOB*fz{yO&(G~DygL8?{Z;lo{Qv*|%pB&oraVseHUIw1RN?jE
uQDK^7Izh&3v7eNtUs6dyfr2M9!>zO02d&)PE-)}KFnGH9xvX<aXaWFhLoM_G

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)59f*fq_AQfq_AigNcEGVf#GGe+&!^jKx9jP7LeL
z$-JECAkWFp%_nUVEWlqeF+(HN!PCVt#Nu?akB3Ks0;|Ek>hFCjygL8?{Z;lo{Qv*|
z%pB&oraVseH9tSKs_^>os4z`3ogm}2*iTB+FG*!<3=@M%hW0PX$oItz3=9mOu6{1-
HoD!M<t==y+

delta 164
zcmcc2c#qMcGr-TCmrII^fq{Y7)59f*fq{XWfq_AigNcEGA>)GcLk0#0#^NA%Cx&(B
zWL`2bFt8<gySp&_2f+n<mrtIkC(p^s%VR8%mpJ$0#4rs%OHUWa5RLQ6CI$ux2e>1W
zl9D)9{P_M}{;1Z!|Ns5jqhCC}bbh`)KUaBxvd>FledlBPJzQK|KSCK8#Ppo6JzeT>
Rl!1YP!PC{xWt~$(698HyHR}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)59f*fq_AQfq_AigNcEGVf#GGe-jn;+2pM>&w4GK
z7^V^K<muuVVsSdz$HOB*fz{yO&(G~DygL8?{Z;lo{Qv*|%pB&oraVseHUIw1RN?jE
uQDK^7Izh&3v7eNtUs6dyfr2M9!>zO02d&)PE-)}KFnGH9xvX<aXaWFhLoM_G

delta 122
zcmcc0c!W{0Gr-TCmrII^fq{Y7)59f*fq{XWfq_AigNcEGA>)Gc!-<OeY%G#Wb3S-Z
z4AXEk^mK6y(Kw%MVqlPPfIEVTiHT#ykMHmAui#P<oo`pWs9E>_|Nrt^TkmZ%(9+O&
c5YEWZvDSHU6$^7b0|Nttr>mdKI;Vst0RG@5`v3p{