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>

diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index ac74e7d..b8306b2 100644 (file)
--- 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 ede5c18..45f83f3 100644 (file)
--- 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 7bed3d9..04e804c 100644 (file)
Binary files a/src/plugins/welcome/images/tab_active.png and b/src/plugins/welcome/images/tab_active.png differ

diff --git a/src/plugins/welcome/images/tab_hover.png b/src/plugins/welcome/images/tab_hover.png
index d11cdd7..618ab6e 100644 (file)
Binary files a/src/plugins/welcome/images/tab_hover.png and b/src/plugins/welcome/images/tab_hover.png differ

diff --git a/src/plugins/welcome/images/tab_inactive.png b/src/plugins/welcome/images/tab_inactive.png
index 04e804c..7bed3d9 100644 (file)
Binary files a/src/plugins/welcome/images/tab_inactive.png and b/src/plugins/welcome/images/tab_inactive.png differ