From 37c8060132b55f29b991e65c20d000bcb0794da2 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Tue, 3 Jan 2012 14:26:47 +0100
Subject: [PATCH] WelcomeScreen: avoding too much white

This adds a light gray background and some vertical lines.

Task-number: QTCREATORBUG-6701
Change-Id: Icc29fd73890648b493d1eb52ab8281e5afbf7f68
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
 share/qtcreator/welcomescreen/develop.qml     | 21 ++++++++++
 .../qtcreator/welcomescreen/welcomescreen.qml | 40 ++++++++++++++-----
 .../welcomescreen/widgets/LinkedText.qml      | 11 +++++
 3 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index 63ee359f2b4..8b1efd12bfb 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -79,11 +79,22 @@ Rectangle {
             model: sessionList
         }
 
+        Rectangle {
+            width: 1
+            height: line.height
+            color: "#c4c4c4"
+            anchors.left: recentSessions.right
+            anchors.leftMargin: -1
+            anchors.top: recentSessions.top
+
+        }
+
         RecentProjects {
             x: 406
             y: 144
             width: 481
             height: 416
+            id: recentProjects
 
             anchors.top: recentlyUsedProjects.bottom
             anchors.topMargin: 20
@@ -95,6 +106,16 @@ Rectangle {
             model: projectList
         }
 
+        Rectangle {
+            id: line
+            width: 1
+            height: Math.min(recentProjects.contentHeight + 120, recentProjects.height)
+            color: "#c4c4c4"
+            anchors.left: recentProjects.right
+            anchors.leftMargin: -1
+            anchors.top: recentProjects.top
+        }
+
         Text {
             id: recentlyUsedSessions
 
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index bb27b60a9d5..ce1c3058bfe 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -36,9 +36,10 @@ import "widgets"
 Rectangle {
     width: 920
     height: 600
+    color: "#edf0f2"
     id: root
 
-    Item {
+    Rectangle {
         id: canvas
 
 
@@ -53,32 +54,49 @@ Rectangle {
         }
 
         width: Math.min(1024, parent.width)
-        anchors.topMargin: (root.height > 700) ? 32 : 0
+        anchors.topMargin: 0
 
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter
 
-        CustomTab {
-            id: tab
-            x: 578
-            y: 64
-            anchors.right: parent.right
-            anchors.rightMargin: 36
-            model: pagesModel
-
-        }
         PageLoader {
             anchors.fill: parent
             anchors.topMargin: 100
             model: pagesModel
         }
 
+        CustomTab {
+            id: tab
+            x: 578
+            y: 120
+            anchors.right: parent.right
+            anchors.rightMargin: 36
+            model: pagesModel
+
+        }
+
         Logo {
             x: 25
             y: 38
         }
 
+        Rectangle {
+            width: 2
+            color: "#919191"
+            anchors.left: parent.left
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+        }
+
+        Rectangle {
+            width: 2
+            color: "#919191"
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+        }
+
     }
 
     BorderImage {
diff --git a/share/qtcreator/welcomescreen/widgets/LinkedText.qml b/share/qtcreator/welcomescreen/widgets/LinkedText.qml
index 8fb8d264cee..cc1bb00e0aa 100644
--- a/share/qtcreator/welcomescreen/widgets/LinkedText.qml
+++ b/share/qtcreator/welcomescreen/widgets/LinkedText.qml
@@ -70,6 +70,17 @@ Text {
         anchors.fill: parent
     }
 
+    Rectangle {
+        color: "#909090"
+        opacity: root.active
+        z: -1
+        anchors.rightMargin: -6
+        anchors.leftMargin: -6
+        anchors.bottomMargin: -4
+        anchors.topMargin: 10
+        anchors.fill: parent
+    }
+
     MouseArea {
         id: mouseArea
         anchors.fill: parent