Port welcome screen to Qt Quick 2

This ports the welcome screen to use QtQuick 2.0.
I have disabled the plugin on Qt4 builds.

Change-Id: Ia921d0747c8f7d4441c88fc9fb77b822496091f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

share/qtcreator/qml/qmlobserver/startup/Logo.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 Rectangle {
     id: myApp

share/qtcreator/welcomescreen/develop.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
+import QtQuick 2.1
 import widgets 1.0
 
 Rectangle {

share/qtcreator/welcomescreen/dummydata/examplesModel.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 ListModel {
     ListElement {

share/qtcreator/welcomescreen/dummydata/pagesModel.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 ListModel {
     ListElement {

share/qtcreator/welcomescreen/dummydata/projectList.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 ListModel {
     ListElement {

share/qtcreator/welcomescreen/dummydata/sessionList.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 ListModel {
     ListElement {

share/qtcreator/welcomescreen/dummydata/tutorialsModel.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 ListModel {
     ListElement {

share/qtcreator/welcomescreen/examples.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 import widgets 1.0
 
 Rectangle {
@@ -82,6 +82,8 @@ Rectangle {
         anchors.rightMargin: 80
         anchors.right: parent.right
         model: qtVersionModel
+        textRole: "text"
+
 
         onCurrentIndexChanged: {
             if (comboBox.model === undefined)

share/qtcreator/welcomescreen/gettingstarted.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
+import QtQuick 2.1
 import widgets 1.0
 
 Rectangle {

share/qtcreator/welcomescreen/tutorials.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 import widgets 1.0
 
 Rectangle {

share/qtcreator/welcomescreen/welcomescreen.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 import widgets 1.0
 
 Rectangle {
@@ -36,13 +36,13 @@ Rectangle {
     color: "#edf0f2"
     id: root
 
+    property var fonts: CustomFonts {}
+    property var colors: CustomColors { }
+
     Rectangle {
         id: canvas
 
         width: Math.min(1024, parent.width)
-        //this is a workaround for QTCREATORBUG-6803
-        anchors.topMargin: (root.height > 700) ? 0 : 0
-
         anchors.top: parent.top
         anchors.bottom: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter

share/qtcreator/welcomescreen/widgets/ComboBox.qml

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
-import qtcomponents 1.0
+import QtQuick 2.1
+import QtQuick.Controls 1.0
 
-ChoiceList {
+ComboBox {
 }

share/qtcreator/welcomescreen/widgets/CustomColors.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 QtObject {
     property color linkColor: "#445ba8"

share/qtcreator/welcomescreen/widgets/CustomFonts.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
+import QtQuick 2.1
 
 QtObject {
     property alias linkFont: linkText.font

share/qtcreator/welcomescreen/widgets/CustomTab.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
+import QtQuick 2.1
 
 Row {
     id: customTab

share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml

@@ -27,64 +27,36 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
-import qtcomponents 1.0
-
-GridView {
-    id: gridView
-    interactive: false
-    clip: true
-    cellHeight: 240
-    cellWidth: 216
-    property int columns:  Math.max(Math.floor(width / cellWidth), 1)
-    cacheBuffer: 1000
+import QtQuick 2.1
+import QtQuick.Controls 1.0
 
+ScrollView {
     x: Math.max((width - (cellWidth * columns)) / 2, 0);
-
-    delegate: Delegate {
-        id: delegate
-
-        property bool isHelpImage: model.imageUrl.search(/qthelp/)  != -1
-        property string sourcePrefix: isHelpImage ? "image://helpimage/" : ""
-
-        property string mockupSource: model.imageSource
-        property string helpSource: model.imageUrl !== "" ? sourcePrefix + encodeURI(model.imageUrl) : ""
-
-        imageSource: model.imageSource === undefined ? helpSource : mockupSource
-        videoSource: model.imageSource === undefined ? model.imageUrl : mockupSource
-
-        caption: model.name;
-        description: model.description
-        isVideo: model.isVideo === true
-        videoLength: model.videoLength !== undefined ? model.videoLength : ""
-        tags: model.tags
-    }
-
-    WheelArea {
-        id: wheelarea
-        anchors.fill: parent
-        verticalMinimumValue: vscrollbar.minimumValue
-        verticalMaximumValue: vscrollbar.maximumValue
-
-        onVerticalValueChanged: gridView.contentY = verticalValue
-        verticalValue: gridView.contentY
-
-    }
-
-    ScrollBar {
-        id: vscrollbar
-        orientation: Qt.Vertical
-        property int availableHeight : gridView.height
-        visible: contentHeight > availableHeight
-        maximumValue: contentHeight > availableHeight ? gridView.contentHeight - availableHeight : 0
-        minimumValue: 0
-        anchors.right: parent.right
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        anchors.topMargin: styleitem.style == "mac" ? 1 : 0
-        onValueChanged: gridView.contentY = value
-        anchors.rightMargin: styleitem.frameoffset
-        anchors.bottomMargin: hscrollbar.visible ? hscrollbar.height : styleitem.frameoffset
-        value: gridView.contentY
+    property alias model: gridView.model
+    GridView {
+        id: gridView
+        interactive: false
+        cellHeight: 240
+        cellWidth: 216
+        property int columns:  Math.max(Math.floor(width / cellWidth), 1)
+
+        delegate: Delegate {
+            id: delegate
+
+            property bool isHelpImage: model.imageUrl.search(/qthelp/)  != -1
+            property string sourcePrefix: isHelpImage ? "image://helpimage/" : ""
+
+            property string mockupSource: model.imageSource
+            property string helpSource: model.imageUrl !== "" ? sourcePrefix + encodeURI(model.imageUrl) : ""
+
+            imageSource: model.imageSource === undefined ? helpSource : mockupSource
+            videoSource: model.imageSource === undefined ? model.imageUrl : mockupSource
+
+            caption: model.name;
+            description: model.description
+            isVideo: model.isVideo === true
+            videoLength: model.videoLength !== undefined ? model.videoLength : ""
+            tags: model.tags
+        }
     }
 }

share/qtcreator/welcomescreen/widgets/Delegate.qml

@@ -27,8 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
-import qtcomponents 1.0
+import QtQuick 2.1
 
 Rectangle {
     id: delegate
@@ -64,17 +63,6 @@ Rectangle {
             searchBar.text += " " + tagStr
     }
 
-    CustomColors {
-        id: colors
-    }
-
-    CustomFonts {
-        id: fonts
-    }
-
-    QStyleItem { cursor: "pointinghandcursor"; anchors.fill: parent }
-
-
     BorderImage {
         id: image1
         x: 11
@@ -228,6 +216,7 @@ Rectangle {
         id: mousearea1
         anchors.fill: parent
         hoverEnabled: true
+        cursorShape: Qt.PointingHandCursor
         onEntered: {
             delegate.state="hover"
         }

share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml

-import QtQuick 1.1
-import qtcomponents 1.0
+import QtQuick 2.1
 
 Item {
     id: gettingStartedItem
@@ -13,16 +12,6 @@ Item {
 
     signal clicked
 
-    CustomColors {
-        id: colors
-    }
-
-    CustomFonts {
-        id: fonts
-    }
-
-    QStyleItem { cursor: "pointinghandcursor"; anchors.fill: parent }
-
     Rectangle {
         y: 170
         width: 20
@@ -106,6 +95,7 @@ Item {
     MouseArea {
         anchors.fill: parent
         hoverEnabled: true
+        cursorShape: Qt.PointingHandCursor
         onEntered: {
             gettingStartedItem.state="hover"
         }

share/qtcreator/welcomescreen/widgets/IconAndLink.qml

-import QtQuick 1.1
+import QtQuick 2.1
 import widgets 1.0
 
 Row {

share/qtcreator/welcomescreen/widgets/LinkedText.qml

@@ -27,8 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
-import qtcomponents 1.0
+import QtQuick 2.1
 
 Text {
     id: root
@@ -52,14 +51,6 @@ Text {
 
     property bool enlargeMouseArea: true
 
-    CustomFonts {
-        id: fonts
-    }
-
-    CustomColors {
-        id: colors
-    }
-
     Rectangle {
         color: "#909090"
         radius: 6
@@ -89,8 +80,7 @@ Text {
         anchors.margins: enlargeMouseArea ? -8 : 0
         hoverEnabled: true
 
-        QStyleItem { cursor: "pointinghandcursor"; anchors.fill: parent }
-
+        cursorShape: Qt.PointingHandCursor
         onEntered: {
             if (!root.active)
                 mouseArea.state = "hovered"

share/qtcreator/welcomescreen/widgets/LinksBar.qml

@@ -27,8 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
-import qtcomponents 1.0 as Components
+import QtQuick 2.1
 
 Item {
     id: tabBar

share/qtcreator/welcomescreen/widgets/Logo.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 Image {
     id: logo

share/qtcreator/welcomescreen/widgets/PageCaption.qml

@@ -27,16 +27,16 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
-import QtQuick 1.0
+import QtQuick 2.1
 
 Item {
     id: pageCaption
     width: 960
     height: 40
-    property int textOffset: captionText.x + captionText.width
 
+    property int textOffset: captionText.x + captionText.width
     property alias caption: captionText.text
+
     Text {
         id: captionText
         y: 9
@@ -55,8 +55,4 @@ Item {
         anchors.left: parent.left
         anchors.right: parent.right
     }
-
-    CustomColors {
-        id: colors
-    }
 }

share/qtcreator/welcomescreen/widgets/PageLoader.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 Item {
     id: pageLoader

share/qtcreator/welcomescreen/widgets/ProjectItem.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.1
 
 Item {
     id: projectItem
@@ -48,10 +48,6 @@ Item {
         anchors.verticalCenter: projectNameText.verticalCenter
     }
 
-    CustomFonts {
-        id: fonts
-    }
-
     LinkedText {
         id: projectNameText
         y: 2

share/qtcreator/welcomescreen/widgets/RecentProjects.qml

@@ -27,23 +27,21 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
-import qtcomponents 1.0
+import QtQuick 2.1
+import QtQuick.Controls 1.0
 
-ScrollArea {
-    property bool scrollBarVisible: projectList.verticalScrollBar.visible
+ScrollView {
     id: projectList
-    property alias model: repeater.model
 
-    Behavior on verticalScrollBar.opacity  {
-        PropertyAnimation {
+    property bool scrollBarVisible: false//projectList.verticalScrollBar.visible
+    property alias model: repeater.model
+//    Behavior on verticalScrollBar.opacity  {
+//        PropertyAnimation {
 
-        }
-    }
+//        }
+//    }
 
-    frame: false
-    horizontalScrollBar.visible: false
-    clip: true
+//    frameVisible: false
 
     Column {
         id: column

share/qtcreator/welcomescreen/widgets/SearchBar.qml

@@ -27,35 +27,42 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
-import qtcomponents 1.0
+import QtQuick 2.1
 
 Rectangle {
     id: searchBar
+
     width: 930
-    height: 31
+    height: 27
     color: "#ffffff"
     radius: 6
     border.color: "#cccccc"
-    property alias placeholderText: lineEdit.placeholderText
-    property alias text: lineEdit.text
 
-    CustomFonts {
-        id: fonts
-    }
+    property alias placeholderText: placeHolderText.text
+    property alias text: lineEdit.text
 
-    TextField {
+    TextInput {
         id: lineEdit
-        placeholderText: qsTr("Search...")
+        anchors.topMargin: 1
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.rightMargin: 12
         anchors.leftMargin: 12
-        anchors.verticalCenter: parent.verticalCenter
-        background: Item {}
+        anchors.fill: parent
+        verticalAlignment: Text.AlignVCenter
+        renderType: Text.NativeRendering
         font.pixelSize: 14
-        font.bold: false
         font.family: "Helvetica"
     }
 
+    Text {
+        id: placeHolderText
+        visible: !lineEdit.text.length
+        text: qsTr("Search...")
+        anchors.fill: lineEdit
+        font: lineEdit.font
+        verticalAlignment: Text.AlignVCenter
+        renderType: Text.NativeRendering
+        color: "gray"
+    }
 }

share/qtcreator/welcomescreen/widgets/SessionItem.qml

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.1
+import QtQuick 2.1
 
 Item {
     x: 5
@@ -36,10 +36,6 @@ Item {
     height: column.height
     property alias name: text.text
 
-    CustomFonts {
-        id: fonts
-    }
-
     Column {
         id: column
         spacing: 4
@@ -100,14 +96,13 @@ Item {
         Item {
             z: -1
             property int margin: 6
-            height: innerColumn.height + margin * 2
+            height: expanded ? innerColumn.height + margin * 2 : 0
             width: delegate.ListView.view.width - 8 - margin * 2
             opacity: delegate.expanded ? 1 : 0
 
-            Behavior on opacity {
+            Behavior on height {
                 ParallelAnimation {
-                    PauseAnimation { duration: delegate.expanded ? 100 : 0; }
-                    PropertyAnimation { duration:  100; }
+                    PropertyAnimation { duration:  160 ; easing.type: Easing.OutCubic }
                 }
             }