From f0b122e3d21b607d0f7590d6fee63da9c991a1a3 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 16 Mar 2012 19:30:53 +0100
Subject: [PATCH] Welcome screen: Turn the "Icon plus link" into a component

Change-Id: I65006bbd0c0b26f84eba2c38e511c53ae23753da
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
 .../welcomescreen/gettingstarted.qml          | 61 ++++---------------
 .../welcomescreen/widgets/IconAndLink.qml     | 26 ++++++++
 share/qtcreator/welcomescreen/widgets/qmldir  |  1 +
 3 files changed, 39 insertions(+), 49 deletions(-)
 create mode 100644 share/qtcreator/welcomescreen/widgets/IconAndLink.qml

diff --git a/share/qtcreator/welcomescreen/gettingstarted.qml b/share/qtcreator/welcomescreen/gettingstarted.qml
index 1249374213d..9ac2f917ceb 100644
--- a/share/qtcreator/welcomescreen/gettingstarted.qml
+++ b/share/qtcreator/welcomescreen/gettingstarted.qml
@@ -133,59 +133,22 @@ Rectangle {
 
             rows: gettingStartedRoot.height > 640 ? 3 : 1
 
-            Row {
-                id: userGuide
-                spacing: 4
-                Image {
-                    y: 10
-                    source: "widgets/images/icons/userguideIcon.png"
-                }
-
-                LinkedText {
-                    x: 19
-                    y: 5
-                    height: 38
-                    text: qsTr("User Guide")
-                    verticalAlignment: Text.AlignBottom
-                    onClicked: gettingStarted.openHelp("qthelp://com.nokia.qtcreator/doc/index.html")
-                }
+            IconAndLink {
+                iconName: "userguideIcon"
+                linkText: qsTr("User Guide")
+                onClicked: gettingStarted.openHelp("qthelp://com.nokia.qtcreator/doc/index.html")
             }
 
-            Row {
-                id: onlineCommunity
-                spacing: 4
-                Image {
-                    y: 10
-                    source: "widgets/images/icons/communityIcon.png"
-                }
-
-                LinkedText {
-                    x: 19
-                    y: 5
-                    height: 38
-                    text: qsTr("Online Community")
-                    verticalAlignment: Text.AlignBottom
-                    onClicked: gettingStarted.openUrl("http://developer.qt.nokia.com/forums")
-                }
+            IconAndLink {
+                iconName: "communityIcon"
+                linkText: qsTr("Online Community")
+                onClicked: gettingStarted.openHelp("http://developer.qt.nokia.com/forums")
             }
 
-            Row {
-                id: labs
-                spacing: 4
-                Image {
-                    y: 10
-                    source: "widgets/images/icons/labsIcon.png"
-                }
-
-                LinkedText {
-                    x: 19
-                    y: 5
-                    height: 38
-                    text: qsTr("Labs")
-                    verticalAlignment: Text.AlignBottom
-                    onClicked: gettingStarted.openUrl("http://labs.qt.nokia.com")
-                }
-
+            IconAndLink {
+                iconName: "labsIcon"
+                linkText: qsTr("Labs")
+                onClicked: gettingStarted.openHelp("http://labs.qt.nokia.com")
             }
         }
 
diff --git a/share/qtcreator/welcomescreen/widgets/IconAndLink.qml b/share/qtcreator/welcomescreen/widgets/IconAndLink.qml
new file mode 100644
index 00000000000..c9d934c276b
--- /dev/null
+++ b/share/qtcreator/welcomescreen/widgets/IconAndLink.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.1
+import widgets 1.0
+
+Row {
+    id: root
+
+    property string iconName
+    property string linkText
+    signal clicked
+
+    spacing: 4
+
+    Image {
+        y: 10
+        source: "images/icons/" + iconName +".png"
+    }
+
+    LinkedText {
+        x: 19
+        y: 5
+        height: 38
+        text: linkText
+        verticalAlignment: Text.AlignBottom
+        onClicked: root.clicked();
+    }
+}
diff --git a/share/qtcreator/welcomescreen/widgets/qmldir b/share/qtcreator/welcomescreen/widgets/qmldir
index 5a2c93ecb83..d84eb6de47e 100644
--- a/share/qtcreator/welcomescreen/widgets/qmldir
+++ b/share/qtcreator/welcomescreen/widgets/qmldir
@@ -16,4 +16,5 @@ Sessions 1.0 Sessions.qml
 Feedback 1.0 Feedback.qml
 PageLoader 1.0 PageLoader.qml
 ToolTip 1.0 ToolTip.qml
+IconAndLink 1.0 IconAndLink.qml