From 8f95fb4996bef2f62d540aeda464d0ab0eced44d Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Thu, 21 Jul 2011 09:29:06 +0200
Subject: [PATCH] Remove empty tab above news section.
Change-Id: I5f7a05ebc7f7c44d55e916fec02eec7420b83f1d
Reviewed-on: http://codereview.qt.nokia.com/1921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
---
.../qtcreator/welcomescreen/welcomescreen.qml | 34 ++++++++-----------
.../widgets/FeaturedAndNewsListing.qml | 7 ----
2 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index 288f1e1c32e..68f9761ffc5 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -62,22 +62,11 @@ Rectangle {
border.bottom: 10
}
- BorderImage {
- id: deadArea
- anchors.left: parent.left
- anchors.top: inner_background.bottom
- anchors.topMargin: -2
- width: news.width
- height: navigationAndDevLinks.height
- border { top: 1; bottom: 1}
- source: "qrc:welcome/images/tab_inactive.png"
- Rectangle { anchors.right: parent.right; height: parent.height; y:0; width: 1; color: "black"}
- }
LinksBar {
id: navigationAndDevLinks
property alias current: root.current
anchors.top: inner_background.bottom
- anchors.left: deadArea.right
+ anchors.left: news.right
anchors.right: parent.right
anchors.bottomMargin: 4
anchors.topMargin: -2
@@ -88,27 +77,34 @@ Rectangle {
color: "#eee"
id: news
opacity: 0.7
- anchors.top: navigationAndDevLinks.bottom
+ anchors.top: navigationAndDevLinks.top
anchors.bottom: feedback.top
anchors.left: parent.left
width: 270
FeaturedAndNewsListing {
anchors.fill: parent
}
- Rectangle{
+ Rectangle {
+ anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
- anchors.bottom: parent.bottom
- width:1
- color: "#aaa"
+ height: 1
+ color: "black"
+ }
+ Rectangle {
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.top: parent.top
+ anchors.topMargin: 1
+ height: 1
+ color: "#ccc"
}
Rectangle{
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: parent.bottom
- anchors.rightMargin: 1
width:1
- color: "white"
+ color: "black"
}
}
diff --git a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
index 1d1d3942329..9373d6ffb65 100644
--- a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
+++ b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
@@ -34,13 +34,6 @@ import QtQuick 1.0
import components 1.0 as Components
Item {
- Rectangle {
- height: 1
- color: "#ccc"
- anchors.top: parent.top
- width: parent.width
- }
-
InsetText {
id: text
anchors.left: parent.left
--
GitLab