diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml index 4d0fd4b03350cde720817c2a82e5765fad71dcd2..f4e7defdb99f2fc4dacc2fb47fd5acf0f1f7a057 100644 --- a/share/qtcreator/welcomescreen/develop.qml +++ b/share/qtcreator/welcomescreen/develop.qml @@ -47,19 +47,19 @@ Item { id: baseitem height: Math.max(recentSessions.height, recentProjects.height) width: root.width - - Widgets.RecentProjects { - id: recentProjects - anchors.left: parent.left - width: Math.floor(root.width / 2) - } Widgets.RecentSessions { id: recentSessions - anchors.left: recentProjects.right + width: Math.floor(root.width / 2.5) + anchors.left: parent.left + } + Widgets.RecentProjects { + id: recentProjects + anchors.left: recentSessions.right anchors.right: parent.right - anchors.rightMargin: scrollArea.height >= baseitem.height ? - -scrollArea.verticalScrollBar.width : 0 + anchors.rightMargin: scrollArea.verticalScrollBar.visible ? 0 : + -scrollArea.verticalScrollBar.width } + } } Rectangle { @@ -67,6 +67,6 @@ Item { height: root.height + 2 * margin width: 1 color: "#ccc" - x: recentSessions.x - margin + x: recentProjects.x - margin } } diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml index 75ef60b9c70a4c61f3683fcf55bf590077bfd8b3..288f1e1c32eda724d5911e30c64f4fa379538476 100644 --- a/share/qtcreator/welcomescreen/welcomescreen.qml +++ b/share/qtcreator/welcomescreen/welcomescreen.qml @@ -62,16 +62,26 @@ 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: parent.left + anchors.left: deadArea.right + anchors.right: parent.right anchors.bottomMargin: 4 anchors.topMargin: -2 - width: parent.width model: tabs.model - tabBarWidth: width } Rectangle { diff --git a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml index f94c673f874accfadca88e01b89c1009fc1cfa4e..c81c6e31a164380c112b9e67820a050c14273045 100644 --- a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml +++ b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml @@ -32,6 +32,7 @@ import QtQuick 1.0 import components 1.0 as Components +import widgets 1.0 as Widgets Item { id: exampleBrowserRoot @@ -48,7 +49,7 @@ Item { anchors.leftMargin: - 8 anchors.rightMargin: scrollArea.verticalScrollBar.visible ? 0 : -8 - LineEdit { + Widgets.LineEdit { placeholderText: !checkBox.checked ? qsTr("Search in Tutorials") : qsTr("Search in Tutorials, Examples and Demos") focus: true id: lineEdit diff --git a/share/qtcreator/welcomescreen/widgets/LinksBar.qml b/share/qtcreator/welcomescreen/widgets/LinksBar.qml index b91b40fe31c93cf8177f04ecc11e86acd02fae02..dbf3ce55b36b988b394e77eab88a8f2dcdecd415 100644 --- a/share/qtcreator/welcomescreen/widgets/LinksBar.qml +++ b/share/qtcreator/welcomescreen/widgets/LinksBar.qml @@ -38,23 +38,16 @@ Row { height: 25 property alias model: tabs.model - property int tabBarWidth - + property int tabWidth: Math.floor(tabBar.width/tabs.count) Repeater { id: tabs height: tabBar.height model: parent.model - delegate: - Item { + delegate: Item { Components.QStyleItem { cursor: "pointinghandcursor"; anchors.fill: parent } - width: tabBarWidth / tabs.count height: tabBar.height - Rectangle { - width: parent.width; height: 1 - anchors { bottom: parent.bottom; bottomMargin: 1 } - color: "#acb2c2" - } + width: tabs.count-1 === index ? tabWidth : tabWidth + tabBar.width%tabs.count BorderImage { id: tabBackground anchors.fill: parent diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml index d277f5ce4063fa52f725675d30e03041e8161cd2..0c620bbd9b90a13663d8b6a93c0cd472352c11c0 100644 --- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml +++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml @@ -53,13 +53,13 @@ HeaderItemView { id: arrowImage; source: "qrc:welcome/images/list_bullet_arrow.png"; anchors.verticalCenter: parent.verticalCenter; - anchors.right: parent.right - anchors.rightMargin: 10 + anchors.left: parent.left + anchors.leftMargin: 10 } Column { spacing: 4 - anchors.left: parent.left + anchors.left: arrowImage.right anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter Text { @@ -91,7 +91,7 @@ HeaderItemView { interval: 1000 onTriggered: { if (filepath.truncated) - styleItem.showToolTip(sessionName) + styleItem.showToolTip(filePath) } } diff --git a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml index ac4a825d329541cca475bbe1fe6c19192ebb01ba..19c6fb6c3aca4a6f13a88e4b7f389135353add11 100644 --- a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml +++ b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml @@ -64,16 +64,16 @@ HeaderItemView { id: arrowImage; source: "qrc:welcome/images/list_bullet_arrow.png" anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: 10 + anchors.left: parent.left + anchors.leftMargin: 10 } Text { id: fileNameText text: parent.fullSessionName() elide: Text.ElideMiddle - anchors.left: parent.left - anchors.right: arrowImage.right + anchors.left: arrowImage.right + anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter anchors.leftMargin: 10 anchors.rightMargin: 20