Commit 8dd37bd5 authored by con's avatar con Committed by Daniel Molkentin

Welcome page adaptions.

Remove title and let the tabs span only the part that it switches.

Change-Id: I20c7f05fe11dbc71eea5487b918770236cfd748d
Reviewed-on: http://codereview.qt.nokia.com/1313Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Molkentin <daniel.molkentin@nokia.com>
parent 942d024b
......@@ -43,65 +43,76 @@ Image {
property int current: 0
onCurrentChanged: welcomeMode.activePlugin = current
Component.onCompleted: current = welcomeMode.activePlugin
Item {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: feedback.top
anchors.margins: 10
BorderImage {
id: inner_background
Image {
id: header;
source: "qrc:welcome/images/center_frame_header.png";
anchors.verticalCenter: parent.verticalCenter;
anchors.horizontalCenter: parent.horizontalCenter;
anchors.topMargin: 2
BorderImage {
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
FeaturedAndNewsListing {
anchors.fill: parent
anchors.margins: 4
}
}
anchors.top: root.top
source: "qrc:welcome/images/background_center_frame_v2.png"
width: parent.width
height: 60
border.right: 2
border.left: 2
border.top: 2
border.bottom: 10
}
LinksBar {
id: navigationAndDevLinks
property alias current: root.current
anchors.top: inner_background.bottom
anchors.left: parent.left
anchors.bottomMargin: 4
anchors.topMargin: -2
width: parent.width
model: tabs.model
tabBarWidth: width
}
BorderImage {
id: tabFrame
source: "qrc:welcome/images/rc_combined_transparent.png"
border.left: 5; border.top: 5
border.right: 5; border.bottom: 5
BorderImage {
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: navigationAndDevLinks.bottom
anchors.bottom: feedback.top
anchors.left: parent.left
anchors.margins: 5
width: 270
FeaturedAndNewsListing {
anchors.fill: parent
anchors.margins: 4
}
}
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: news.right
anchors.right: parent.right
anchors.leftMargin: 5
TabWidget {
id: tabs
property int current: root.current
model: pagesModel
anchors.top: navigationAndDevLinks.bottom
anchors.bottom: feedback.top
anchors.left: news.right
anchors.right: parent.right
anchors.leftMargin: 0
anchors.margins: 4
Rectangle {
id: tabBar
color: "#00000000"
border.color: "black"
border.width: 1
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
anchors.rightMargin: 1
height: navigationAndDevLinks.height - 1
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
tabBarWidth: width
}
}
TabWidget {
id: tabs
property int current: root.current
model: pagesModel
anchors.top: tabBar.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: 10
}
}
}
Feedback {
......
......@@ -25,5 +25,6 @@
<file>images/background_center_frame_v1.png</file>
<file>images/background_center_frame_v2.png</file>
<file>images/tab_hover.png</file>
<file>images/rc_combined_transparent.png</file>
</qresource>
</RCC>
......@@ -146,7 +146,7 @@ WelcomeMode::WelcomeMode() :
QVBoxLayout *layout = new QVBoxLayout;
layout->setMargin(0);
layout->setSpacing(0);
layout->addWidget(new Utils::StyledBar);
// layout->addWidget(new Utils::StyledBar);
layout->addWidget(m_welcomePage);
m_modeWidget->setLayout(layout);
......
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