Commit bf4e1c42 authored by Eike Ziller's avatar Eike Ziller Committed by Daniel Molkentin
Browse files

Get rid of rounded corners and some color adaptions.

Change-Id: Id0bbbd7455836ba7c5b311c4489aab3cf4aa1b13
Reviewed-on: http://codereview.qt.nokia.com/1459

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent 8bf08f01
......@@ -33,11 +33,9 @@
import QtQuick 1.0
import "widgets"
Image {
Rectangle {
id: root
source: "qrc:welcome/images/welcomebg.png"
smooth: true
color: "#F2F2F2"
// work around the fact that we can't use
// a property alias to welcomeMode.activePlugin
property int current: 0
......@@ -57,12 +55,11 @@ Image {
anchors.left: parent.left
anchors.rightMargin: 5
width: 270
BorderImage {
Rectangle {
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
border.color: "#36295B7F"
border.width: 1
color: "#B3FFFFFF"
}
FeaturedAndNewsListing {
anchors.fill: parent
......@@ -70,13 +67,15 @@ Image {
}
}
Item {
Image {
id: tabFrame
BorderImage {
source: "qrc:welcome/images/welcomebg.png"
smooth: true
Rectangle {
anchors.fill: parent
source: "qrc:welcome/images/rc_combined_transparent.png"
border.left: 5; border.top: 5
border.right: 5; border.bottom: 5
border.color: "#36295B7F"
border.width: 1
color: "#20FFFFFF"
}
anchors.top: parent.top
......@@ -85,33 +84,29 @@ Image {
anchors.right: parent.right
anchors.leftMargin: 5
Rectangle {
id: tabBar
color: "#00000000"
border.color: "black"
border.width: 1
LinksBar {
id: linksBar
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.rightMargin: 1
height: navigationAndDevLinks.height - 1
property alias current: root.current
model: tabs.model
}
LinksBar {
id: navigationAndDevLinks
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 1
property alias current: root.current
model: tabs.model
}
Rectangle {
anchors.fill: linksBar
anchors.bottomMargin: 1
opacity: 1
border.color: "#4D295B7F"
border.width: 1
color: "#00000000"
}
TabWidget {
id: tabs
property int current: root.current
model: pagesModel
anchors.top: tabBar.bottom
anchors.top: linksBar.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
......
......@@ -119,7 +119,7 @@ Rectangle {
onExited: parent.state = ""
}
states: [ State { name: "hover"; PropertyChanges { target: root; color: "#eeeeeeee" } } ]
states: [ State { name: "hover"; PropertyChanges { target: root; color: "#5effffff" } } ]
transitions:
Transition {
......
......@@ -40,7 +40,7 @@ BorderImage {
border.left: 2
border.right: 2
Rectangle { color: "black"; width: parent.width; height: 1; anchors.top: parent.top; anchors.left: parent.left }
Rectangle { color: "#4D295B7F"; width: parent.width; height: 1; anchors.top: parent.top; anchors.left: parent.left }
Components.QStyleItem { id: styleItem; visible: false }
......
......@@ -40,15 +40,13 @@ Row {
property int tabWidth: Math.floor(tabBar.width/tabs.count)
Repeater {
id: tabs
height: tabBar.height
model: parent.model
delegate: Item {
height: tabBar.height
width: tabs.count-1 === index ? tabWidth : tabWidth + tabBar.width%tabs.count
BorderImage {
width: index === 1 ? tabWidth : (tabWidth + tabBar.width % tabs.count + 1)
Image {
id: tabBackground
anchors.fill: parent
border { top: 1; bottom: 1}
source: "qrc:welcome/images/tab_inactive.png"
}
Text {
......
src/plugins/welcome/images/tab_active.png

196 Bytes | W: | H:

src/plugins/welcome/images/tab_active.png

2.73 KB | W: | H:

src/plugins/welcome/images/tab_active.png
src/plugins/welcome/images/tab_active.png
src/plugins/welcome/images/tab_active.png
src/plugins/welcome/images/tab_active.png
  • 2-up
  • Swipe
  • Onion skin
src/plugins/welcome/images/tab_hover.png

211 Bytes | W: | H:

src/plugins/welcome/images/tab_hover.png

2.74 KB | W: | H:

src/plugins/welcome/images/tab_hover.png
src/plugins/welcome/images/tab_hover.png
src/plugins/welcome/images/tab_hover.png
src/plugins/welcome/images/tab_hover.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment