diff --git a/share/qtcreator/welcomescreen/develop.qml b/share/qtcreator/welcomescreen/develop.qml
index 8b1221cc1ca47700bcdcf923d296c1a1f169b59d..4d0fd4b03350cde720817c2a82e5765fad71dcd2 100644
--- a/share/qtcreator/welcomescreen/develop.qml
+++ b/share/qtcreator/welcomescreen/develop.qml
@@ -36,26 +36,37 @@ import components 1.0 as Components
Item {
id: root
+ property int margin: 8
+
Components.ScrollArea {
id: scrollArea
- anchors.fill: parent
- anchors.margins: -8
+ anchors.fill: parent
+ anchors.margins: - margin
frame: false
- Components.SplitterRow: {
- height: Math.max(root.height,
- Math.max(recentSessions.height,
- recentProjects.height))
+ Item {
+ id: baseitem
+ height: Math.max(recentSessions.height, recentProjects.height)
width: root.width
- Widgets.RecentProjects {
- id: recentSessions
- property bool expanding: true
- }
- Widgets.RecentSessions {
- id: recentProjects
- width: 200
- }
+
+ Widgets.RecentProjects {
+ id: recentProjects
+ anchors.left: parent.left
+ width: Math.floor(root.width / 2)
+ }
+ Widgets.RecentSessions {
+ id: recentSessions
+ anchors.left: recentProjects.right
+ anchors.right: parent.right
+ anchors.rightMargin: scrollArea.height >= baseitem.height ?
+ -scrollArea.verticalScrollBar.width : 0
+ }
}
}
+ Rectangle {
+ anchors.top: scrollArea.top
+ height: root.height + 2 * margin
+ width: 1
+ color: "#ccc"
+ x: recentSessions.x - margin
+ }
}
-
-
diff --git a/share/qtcreator/welcomescreen/welcomescreen.qml b/share/qtcreator/welcomescreen/welcomescreen.qml
index 46938244d75c8432f77389998e603f445ccefe91..75ef60b9c70a4c61f3683fcf55bf590077bfd8b3 100644
--- a/share/qtcreator/welcomescreen/welcomescreen.qml
+++ b/share/qtcreator/welcomescreen/welcomescreen.qml
@@ -75,7 +75,7 @@ Rectangle {
}
Rectangle {
- color:"#eee"
+ color: "#eee"
id: news
opacity: 0.7
anchors.top: navigationAndDevLinks.bottom
diff --git a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
index f83364ad11cc76eebf3b9f7e6d1283ab5106dac1..e1ca5c737fb6f055ee95f882331a0bec3e5423de 100644
--- a/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
+++ b/share/qtcreator/welcomescreen/widgets/ExampleBrowser.qml
@@ -70,7 +70,7 @@ Item {
onCheckedChanged: examplesModel.showTutorialsOnly = !checked;
}
- Components.Button {
+ Button {
id: tagFilterButton
property string tag
Behavior on opacity { NumberAnimation{} }
diff --git a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
index 9373d6ffb65a36014da62cad6a8785f569a55528..1d1d3942329e79546721a5f1eee458c9442cd53c 100644
--- a/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
+++ b/share/qtcreator/welcomescreen/widgets/FeaturedAndNewsListing.qml
@@ -34,6 +34,13 @@ 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
diff --git a/share/qtcreator/welcomescreen/widgets/Feedback.qml b/share/qtcreator/welcomescreen/widgets/Feedback.qml
index 7140dde65c70c7d4a19cd5b6ca07e6568b09dd06..cf35cd3da65f14c89665d9b9d3535b3715eb13ee 100644
--- a/share/qtcreator/welcomescreen/widgets/Feedback.qml
+++ b/share/qtcreator/welcomescreen/widgets/Feedback.qml
@@ -78,6 +78,7 @@ Rectangle {
Components.Button {
id: openProjectButton
text: qsTr("Open Project...")
+ focus: false
iconSource: _hasDesktopTheme ? "image://desktoptheme/document-open" : ""
onClicked: welcomeMode.openProject();
anchors.right: createProjectButton.left
diff --git a/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml b/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml
index 55c5112896b5ece274588eeb4043b264a0c85060..a5a3b9c0b8745206f757370b2539a8988c68e708 100644
--- a/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml
+++ b/share/qtcreator/welcomescreen/widgets/HeaderItemView.qml
@@ -39,13 +39,19 @@ Item {
property QtObject model
property Component delegate
+ Rectangle {
+ color: "#ececec"
+ anchors.top: parent.top
+ anchors.bottom: dataSection.top
+ width: parent.width
+ }
Text {
id: titleText
text: root.header
width: parent.width
font.bold: true
font.pointSize: 16
- color: "#777"
+ color: "#444"
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
@@ -53,6 +59,18 @@ Item {
anchors.topMargin: 10
anchors.leftMargin: 10
}
+ Rectangle {
+ height: 1
+ color: "#ccc"
+ anchors.bottom: dataSection.top
+ width: parent.width
+ }
+ Rectangle {
+ height: 1
+ color: "#ccc"
+ anchors.top: parent.top
+ width: parent.width
+ }
Column {
id: dataSection
diff --git a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
index 5474b3104c8f071b62d0493716514db6e04e4ea3..d277f5ce4063fa52f725675d30e03041e8161cd2 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentProjects.qml
@@ -30,7 +30,7 @@
**
**************************************************************************/
-import QtQuick 1.0
+import QtQuick 1.1
import components 1.0 as Components
HeaderItemView {
@@ -44,7 +44,7 @@ HeaderItemView {
Rectangle {
height: 1
color: "#eee"
- anchors.top: parent.top
+ anchors.bottom: parent.bottom
width: parent.width
}
color: mousearea.containsMouse ? "#f9f9f9" : "white"
@@ -58,6 +58,9 @@ HeaderItemView {
}
Column {
+ spacing: 4
+ anchors.left: parent.left
+ anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
Text {
id: nameText
@@ -66,23 +69,31 @@ HeaderItemView {
width: parent.width
anchors.left: parent.left
anchors.leftMargin: 10
- anchors.rightMargin: 10
- anchors.right: arrowImage.left
+ anchors.rightMargin: arrowImage.width + 10
+ anchors.right: parent.right
elide: Text.ElideRight
}
Text {
+ id: filepath
text: prettyFilePath
elide: Text.ElideMiddle
color: "grey"
anchors.left: parent.left
- anchors.right: arrowImage.left
+ anchors.right: parent.right
anchors.leftMargin: 10
- anchors.rightMargin: 10
+ anchors.rightMargin: arrowImage.width + 14
}
}
- Timer { id: timer; interval: 500; onTriggered: styleItem.showToolTip(filePath) }
+ Timer {
+ id: timer
+ interval: 1000
+ onTriggered: {
+ if (filepath.truncated)
+ styleItem.showToolTip(sessionName)
+ }
+ }
MouseArea {
id: mousearea
diff --git a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
index 0d12fa167f193cc63545edd5c67e74904e589383..63d7f54fd5a1df0dd91accbc3228e41818fb4500 100644
--- a/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
+++ b/share/qtcreator/welcomescreen/widgets/RecentSessions.qml
@@ -34,7 +34,6 @@ import QtQuick 1.0
import components 1.0 as Components
HeaderItemView {
- clip: true
header: qsTr("Recently Used Sessions")
model: sessionList
@@ -45,9 +44,10 @@ HeaderItemView {
Rectangle {
height: 1
color: "#eee"
- anchors.top: parent.top
+ anchors.bottom: parent.bottom
width: parent.width
}
+
color: mousearea.containsMouse ? "#f9f9f9" : "white"
function fullSessionName()
@@ -58,35 +58,44 @@ HeaderItemView {
return newSessionName;
}
- Image{
+ Image {
id: arrowImage;
- source: "qrc:welcome/images/list_bullet_arrow.png";
- anchors.verticalCenter: parent.verticalCenter;
- anchors.left: parent.left
+ source: "qrc:welcome/images/list_bullet_arrow.png"
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.right: parent.right
+ anchors.rightMargin: 10
}
Text {
- Components.QStyleItem { id: styleItem; cursor: "pointinghandcursor"; anchors.fill: parent }
id: fileNameText
text: parent.fullSessionName()
font.italic: model.defaultSession
elide: Text.ElideMiddle
- anchors.left: arrowImage.right
- anchors.right: parent.right
+ anchors.left: parent.left
+ anchors.right: arrowImage.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 10
- elide: Text.ElideRight
+ anchors.rightMargin: 20
}
- Timer { id: timer; interval: 500; onTriggered: styleItem.showToolTip(sessionName) }
+ Timer {
+ id: timer
+ interval: 1000
+ repeat: false
+ onTriggered: {
+ if (fileNameText.truncated)
+ styleItem.showToolTip(sessionName)
+ }
+ }
MouseArea {
- id: mouseare
+ id: mousearea
anchors.fill: parent
onClicked: projectWelcomePage.requestSession(sessionName)
hoverEnabled: true
- onEntered:timer.start()
+ onEntered: timer.start()
onExited: timer.stop()
+ Components.QStyleItem { id: styleItem; cursor: "pointinghandcursor"; anchors.fill: parent }
}
}
}