diff --git a/share/qtcreator/welcomescreen/examples_fallback.xml b/share/qtcreator/welcomescreen/examples_fallback.xml
index fa26da162ff1d20fb5afe4e1f29cc8c8d469640f..8c23b56892c9ffeeae394b5b366a729814b15fc9 100644
--- a/share/qtcreator/welcomescreen/examples_fallback.xml
+++ b/share/qtcreator/welcomescreen/examples_fallback.xml
@@ -843,7 +843,7 @@
</example>
</examples>
<tutorials>
- <tutorial imageUrl="qthelp://com.trolltech.qt/qdoc/images/addressbook-tutorial-part1-screenshot.png" difficulty="?" docUrl="qthelp://com.trolltech.qt/qdoc/tutorials-addressbook-part1.html" projectPath="tutorials/addressbook/part1/part1.pro" name="Address Book Tutorial">
+ <tutorial imageUrl="images/icons/adressbook.png" difficulty="?" docUrl="qthelp://com.trolltech.qt/qdoc/tutorials-addressbook-part1.html" projectPath="tutorials/addressbook/part1/part1.pro" name="Address Book Tutorial">
<steps>
<step imageUrl="qthelp://com.trolltech.qt/qdoc/images/addressbook-tutorial-part1-screenshot.png" docUrl="qthelp://com.trolltech.qt/qdoc/tutorials-addressbook-part1.html" projectPath="tutorials/addressbook/part1/part1.pro"/>
<step imageUrl="qthelp://com.trolltech.qt/qdoc/images/addressbook-tutorial-part2-add-contact.png" docUrl="qthelp://com.trolltech.qt/qdoc/tutorials-addressbook-part2.html" projectPath="tutorials/addressbook/part2/part2.pro"/>
diff --git a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml
index 307cabe959984072e4b1d50f8fe42e9333f26b1f..559bdeeff2b9b0b04e6d46b20ab67bef4fc0d943 100644
--- a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml
+++ b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<instructionals module="Qt">
<tutorials>
- <tutorial imageUrl="qthelp://com.nokia.qtcreator/doc/images/qtcreator-gs-build-example-select-qs.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-build-example-application.html" projectPath="" name="Building and Running an Example Application">
+ <tutorial imageUrl="images/icons/buildrun.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-build-example-application.html" projectPath="" name="Building and Running an Example Application">
<description><![CDATA[You can test that your installation is successful by opening an existing example application project.]]></description>
<tags>qt creator,build,compile</tags>
</tutorial>
- <tutorial imageUrl="qthelp://com.nokia.qtcreator/doc/images/qtcreator-textfinder-screenshot.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-writing-program.html" projectPath="" name="Creating a Qt Widget Based Application">
+ <tutorial imageUrl="images/icons/qwidget.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-writing-program.html" projectPath="" name="Creating a Qt Widget Based Application">
<description><![CDATA[This tutorial describes how to use Qt Creator to create a small Qt application, Text Finder.]]></description>
<tags>qt,c++,text,qt designer,qt creator</tags>
</tutorial>
- <tutorial imageUrl="qthelp://com.nokia.qtcreator/doc/images/qmldesigner-tutorial.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-qml-application.html" projectPath="" name="Creating a Qt Quick Application">
+ <tutorial imageUrl="images/icons/qtquick.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-qml-application.html" projectPath="" name="Creating a Qt Quick Application">
<description><![CDATA[This tutorial uses basic elements and illustrates basic concepts of Qt Quick.]]></description>
<tags>qt quick,qml,states,transitions,visual designer,qt creator</tags>
</tutorial>
- <tutorial imageUrl="qthelp://com.nokia.qtcreator/doc/images/qtcreator-symbian-components-example.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-qml-components-example.html" projectPath="" name="Creating a Qt Quick Application Using Qt Quick Components">
+ <tutorial imageUrl="images/icons/components.png" difficulty="" docUrl="qthelp://com.nokia.qtcreator/doc/creator-qml-components-example.html" projectPath="" name="Qt Quick Components">
<description><![CDATA[This tutorial describes how to use Qt Creator to create a small Qt application, Battery Status, that uses the System Information Mobility API to fetch battery information from the device. ]]></description>
<tags>qt quick,qml,components,symbian,visual designer,qt creator</tags>
</tutorial>
@@ -37,19 +37,19 @@
<description><![CDATA[In this video Nigel Hietala describes how to use the States and Transitions of Qt Quick. Nigel creates a simple application using a state to control the visibility of an image when a button is clicked.]]></description>
<tags>qt quick,qml,qt sdk,qt creator</tags>
</tutorial>
- <tutorial imageUrl="images/icons/ddays11.png" difficulty="" projectPath="" name="Qt Creator Bootcamp" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/qt_creator_bootcamp" videoLength="58:29">
+ <tutorial imageUrl="images/icons/ddays09.png" difficulty="" projectPath="" name="Qt Creator Bootcamp" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/qt_creator_bootcamp" videoLength="58:29">
<description><![CDATA[All you need to start with Qt Creator - a cross-platform IDE Are you developing cross-platform applications with Qt, but are missing a cross-platform development environment?]]></description>
<tags>qt sdk,qt creator</tags>
</tutorial>
- <tutorial imageUrl="images/icons/ddays11.png" difficulty="" projectPath="" name="Qt Quick - Rapid User Interface Prototyping" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/qt_quick_rapid_user_interface_prototyping" videoLength="1:09:53">
+ <tutorial imageUrl="images/icons/ddays10.png" difficulty="" projectPath="" name="Qt Quick - Rapid User Interface Prototyping" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/qt_quick_rapid_user_interface_prototyping" videoLength="1:09:53">
<description><![CDATA[Skip Flash & PhotoShop. Go straight to Qt Quick! Creating an application with a great user experience is a challenge. Traditionally a lot of effort goes into upfront design where tools such as Flash or PhotoShop are used to prototype ideas.]]></description>
<tags>qt quick,qml,qt sdk,qt creator</tags>
</tutorial>
- <tutorial imageUrl="images/icons/ddays11.png" difficulty="" projectPath="" name="Qt Creator! Getting the Most out" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/getting_the_most_out_of_qt_creator" videoLength="1:16:27">
+ <tutorial imageUrl="images/icons/ddays10.png" difficulty="" projectPath="" name="Qt Creator! Getting the Most out" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/getting_the_most_out_of_qt_creator" videoLength="1:16:27">
<description><![CDATA[A quick intro plus hidden wonders! In this session, we will provide a very quick introduction to Qt Creator, then dive into the hidden wonders of this powerful and easy-to-use cross-platform Qt IDE.]]></description>
<tags>qt sdk,qt creator</tags>
</tutorial>
- <tutorial imageUrl="images/icons/ddays11.png" difficulty="" projectPath="" name="Meet Qt Quick" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/meet_qt_quick" videoLength="1:08:24">
+ <tutorial imageUrl="images/icons/ddays10.png" difficulty="" projectPath="" name="Meet Qt Quick" isVideo="true" videoUrl="http://developer.qt.nokia.com/videos/watch/meet_qt_quick" videoLength="1:08:24">
<description><![CDATA[The fundamental elements behind Qt Quick and how to quickly create fluid, animated user interfaces! Qt Quick is a set of technologies that makes it easier for developers and designers to create modern and attractive UIs.]]></description>
<tags>qt quick, qml</tags>
</tutorial>
diff --git a/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml b/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml
index b71dd2e19350a5b5b75134f8ab97942d0c48dbdf..ad3f8ee9dffbb2719a1a29b6c2058163fc4cd79e 100644
--- a/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml
+++ b/share/qtcreator/welcomescreen/widgets/CustomizedGridView.qml
@@ -45,10 +45,13 @@ GridView {
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 realSource: model.imageUrl !== "" ? "image://helpimage/" + encodeURI(model.imageUrl) : ""
+ property string helpSource: model.imageUrl !== "" ? sourcePrefix + encodeURI(model.imageUrl) : ""
- imageSource: model.imageSource === undefined ? realSource : mockupSource
+ imageSource: model.imageSource === undefined ? helpSource : mockupSource
videoSource: model.imageSource === undefined ? model.imageUrl : mockupSource
caption: model.name;
@@ -58,5 +61,4 @@ GridView {
tags: model.tags
}
-
}
diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/adressbook.png b/share/qtcreator/welcomescreen/widgets/images/icons/adressbook.png
new file mode 100644
index 0000000000000000000000000000000000000000..6800819207b6a0e65ae26c58458416c7e05c53e6
Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/icons/adressbook.png differ
diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/buildrun.png b/share/qtcreator/welcomescreen/widgets/images/icons/buildrun.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f620bf8b6862e0b0b0104d0b169b8bc738e173
Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/icons/buildrun.png differ
diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/components.png b/share/qtcreator/welcomescreen/widgets/images/icons/components.png
new file mode 100644
index 0000000000000000000000000000000000000000..efed0b66ee62bb6d10a23ff7f3346d635f55cb7b
Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/icons/components.png differ
diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/ddays09.png b/share/qtcreator/welcomescreen/widgets/images/icons/ddays09.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b1ceba624ef4362158f0b3a4caedb7d3b9d5d59
Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/icons/ddays09.png differ
diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/ddays10.png b/share/qtcreator/welcomescreen/widgets/images/icons/ddays10.png
new file mode 100644
index 0000000000000000000000000000000000000000..39a6bc8f5224c085ec14018af198d0093412a7c5
Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/icons/ddays10.png differ
diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/qtquick.png b/share/qtcreator/welcomescreen/widgets/images/icons/qtquick.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb1222772590ff466699d856a510a8c79dd3ec51
Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/icons/qtquick.png differ
diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/qwidget.png b/share/qtcreator/welcomescreen/widgets/images/icons/qwidget.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bdc0d43e5d566b2a7f1532835dad74fe8ac74f0
Binary files /dev/null and b/share/qtcreator/welcomescreen/widgets/images/icons/qwidget.png differ