Added correct font, removed unused images

Change-Id: I9967ec097ecc5740b5991a8f745d7b5094bc5ee7
Reviewed-by: Lasse Räihä <lasse.raiha@digia.com>

11 files changed, 130 insertions, 33 deletions

diff --git a/QtDemo/qml/QtDemo/Group.qml b/QtDemo/qml/QtDemo/Group.qml
index e3dbc51..ce05178 100644
--- a/QtDemo/qml/QtDemo/Group.qml
+++ b/QtDemo/qml/QtDemo/Group.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import "style.js" as Style
 
 Item {
     id: group
@@ -65,7 +66,7 @@ Item {
     }*/
 
     property int fontSize: 120
-    property string uiFont: "Purisa"
+    property string uiFont: Style.FONT_FAMILY
     property bool bold: true
     property int fontTransition: 6
 
@@ -74,7 +75,7 @@ Item {
         x: textX
         y: textY
         font.pixelSize: group.fontSize
-        font.family: "Purisa"
+        font.family: Style.FONT_FAMILY
         font.bold: group.bold
         color: "#42200a"
         smooth: true
@@ -85,7 +86,7 @@ Item {
             x:group.fontTransition
             y:-group.fontTransition
             font.pixelSize: group.fontSize
-            font.family: "Purisa"
+            font.family: Style.FONT_FAMILY
             font.bold: group.bold
             smooth: true
         }
diff --git a/QtDemo/qml/QtDemo/HelpScreen.qml b/QtDemo/qml/QtDemo/HelpScreen.qml
index bd61414..5d0bed0 100644
--- a/QtDemo/qml/QtDemo/HelpScreen.qml
+++ b/QtDemo/qml/QtDemo/HelpScreen.qml
@@ -39,13 +39,13 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import "style.js" as Style
 
 Item {
     id: root
     anchors.fill:parent
     property int delay: 500
     property int rotationAngle:0
-    property int showInstruction: 0
 
     SequentialAnimation {
         id: closeAnimation
@@ -53,6 +53,8 @@ Item {
         ScriptAction{
             script: {
                 pointer.visible = false
+                instructionText.text = ""
+                instructionText2.text = ""
                 highlightImage.smooth = false
                 highlight.size = Math.max(root.height, root.width)*2.5
             }
@@ -118,27 +120,25 @@ Item {
         opacity: .8
     }
 
-    Image {
-        anchors {horizontalCenter: parent.horizontalCenter; top: parent.top; topMargin: parent.height*.1}
-        source: "images/txt_tapDevices.png"
-        visible: root.showInstruction === 1
-        scale: parent.width/1000
-    }
-
-    Image {
-        anchors {horizontalCenter: parent.horizontalCenter; top: parent.top; topMargin: parent.height*.1}
-        source: "images/txt_useArrows.png"
-        visible: root.showInstruction === 2
-        scale: parent.width/1000
-    }
-
-    Image {
-        anchors {horizontalCenter: parent.horizontalCenter; top: parent.top; topMargin: parent.height*.1}
-        source: "images/txt_useHome.png"
-        visible: root.showInstruction === 3
-        scale: parent.width/1000
+Text{
+    id: instructionText
+    anchors {horizontalCenter: parent.horizontalCenter; top: parent.top; topMargin: parent.height*.05}
+    text: ""
+    font.pixelSize: parent.width*.075
+    font.family: Style.FONT_FAMILY
+    smooth: true
+    color: "white"
+
+    Text{
+        id: instructionText2
+        anchors {horizontalCenter: parent.horizontalCenter; top: parent.bottom; topMargin: -parent.height/2}
+        text: ""
+        font.pixelSize: parent.font.pixelSize
+        font.family: Style.FONT_FAMILY
+        smooth: true
+        color: "white"
     }
-
+}
 
     Item{
         id: pointer
@@ -180,7 +180,6 @@ Item {
             }
 
         }
-
     }
 
     SequentialAnimation {
@@ -189,7 +188,8 @@ Item {
 
         PauseAnimation { duration: 1000 }
         PropertyAction { target: handImage; property: "mirror"; value: true}
-        PropertyAction { target: root; property: "showInstruction"; value: 1}
+        PropertyAction { target: instructionText; property: "text"; value: "Tap on the devices to"}
+        PropertyAction { target: instructionText2; property: "text"; value: "open applications"}
         PropertyAction { target: pointer; property: "visible"; value: true}
         PropertyAction { target: highlight; property: "hidden"; value: false}
 
@@ -227,7 +227,8 @@ Item {
         SequentialAnimation{
             id: navigationAnimation
             PropertyAction { target: handImage; property: "mirror"; value: false}
-            PropertyAction { target: root; property: "showInstruction"; value: 2}
+            PropertyAction { target: instructionText; property: "text"; value: "Use the Arrow to navigate"}
+            PropertyAction { target: instructionText2; property: "text"; value: "between applications"}
             ScriptAction{
                 script: {
                     highlight.size= Math.min(root.width, root.height)*.4
@@ -259,7 +260,8 @@ Item {
             }
             PauseAnimation { duration: 5000 }
 
-            PropertyAction { target: root; property: "showInstruction"; value: 3}
+            PropertyAction { target: instructionText; property: "text"; value: "Use the Home button to"}
+            PropertyAction { target: instructionText2; property: "text"; value: "return to the beginning"}
             ScriptAction{
                 script: {
                     highlight.size= Math.min(root.width, root.height)*.3
diff --git a/QtDemo/qml/QtDemo/Slide.qml b/QtDemo/qml/QtDemo/Slide.qml
index b6cb3fe..b98dfc5 100644
--- a/QtDemo/qml/QtDemo/Slide.qml
+++ b/QtDemo/qml/QtDemo/Slide.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import "style.js" as Style
 
 Item {
     id: slide
@@ -90,8 +91,7 @@ Item {
                 id: splashScreenText
                 color: 'white'
                 font.pixelSize: parent.width *.13
-                font.family: "Purisa"
-                font.bold: true
+                font.family: Style.FONT_FAMILY
                 text: slide.name
                 anchors.centerIn: parent
                 smooth: true
diff --git a/QtDemo/qml/QtDemo/SplashScreen.qml b/QtDemo/qml/QtDemo/SplashScreen.qml
index c43de59..a425b04 100644
--- a/QtDemo/qml/QtDemo/SplashScreen.qml
+++ b/QtDemo/qml/QtDemo/SplashScreen.qml
@@ -40,6 +40,7 @@
 
 import QtQuick 2.0
 import QtQuick.Particles 2.0
+import "style.js" as Style
 //based on the SmokeText component from SameGame
 
 Item {
@@ -63,8 +64,7 @@ Item {
             id: txt
             color: 'white'
             font.pixelSize: parent.width *.13
-            font.family: "Purisa"
-            font.bold: true
+            font.family: Style.FONT_FAMILY
             anchors.centerIn: parent
             smooth: true
         }
diff --git a/QtDemo/qml/QtDemo/fonts/OFL.txt b/QtDemo/qml/QtDemo/fonts/OFL.txt
new file mode 100644
index 0000000..5e51e46
--- /dev/null
+++ b/QtDemo/qml/QtDemo/fonts/OFL.txt
@@ -0,0 +1,92 @@
+Copyright (c) 2010-2012 Patrick Wagesreiter (mail@patrickwagesreiter.at)

+This Font Software is licensed under the SIL Open Font License, Version 1.1.

+This license is copied below, and is also available with a FAQ at:

+http://scripts.sil.org/OFL

+

+

+-----------------------------------------------------------

+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

+-----------------------------------------------------------

+

+PREAMBLE

+The goals of the Open Font License (OFL) are to stimulate worldwide

+development of collaborative font projects, to support the font creation

+efforts of academic and linguistic communities, and to provide a free and

+open framework in which fonts may be shared and improved in partnership

+with others.

+

+The OFL allows the licensed fonts to be used, studied, modified and

+redistributed freely as long as they are not sold by themselves. The

+fonts, including any derivative works, can be bundled, embedded, 

+redistributed and/or sold with any software provided that any reserved

+names are not used by derivative works. The fonts and derivatives,

+however, cannot be released under any other type of license. The

+requirement for fonts to remain under this license does not apply

+to any document created using the fonts or their derivatives.

+

+DEFINITIONS

+"Font Software" refers to the set of files released by the Copyright

+Holder(s) under this license and clearly marked as such. This may

+include source files, build scripts and documentation.

+

+"Reserved Font Name" refers to any names specified as such after the

+copyright statement(s).

+

+"Original Version" refers to the collection of Font Software components as

+distributed by the Copyright Holder(s).

+

+"Modified Version" refers to any derivative made by adding to, deleting,

+or substituting -- in part or in whole -- any of the components of the

+Original Version, by changing formats or by porting the Font Software to a

+new environment.

+

+"Author" refers to any designer, engineer, programmer, technical

+writer or other person who contributed to the Font Software.

+

+PERMISSION & CONDITIONS

+Permission is hereby granted, free of charge, to any person obtaining

+a copy of the Font Software, to use, study, copy, merge, embed, modify,

+redistribute, and sell modified and unmodified copies of the Font

+Software, subject to the following conditions:

+

+1) Neither the Font Software nor any of its individual components,

+in Original or Modified Versions, may be sold by itself.

+

+2) Original or Modified Versions of the Font Software may be bundled,

+redistributed and/or sold with any software, provided that each copy

+contains the above copyright notice and this license. These can be

+included either as stand-alone text files, human-readable headers or

+in the appropriate machine-readable metadata fields within text or

+binary files as long as those fields can be easily viewed by the user.

+

+3) No Modified Version of the Font Software may use the Reserved Font

+Name(s) unless explicit written permission is granted by the corresponding

+Copyright Holder. This restriction only applies to the primary font name as

+presented to the users.

+

+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font

+Software shall not be used to promote, endorse or advertise any

+Modified Version, except to acknowledge the contribution(s) of the

+Copyright Holder(s) and the Author(s) or with their explicit written

+permission.

+

+5) The Font Software, modified or unmodified, in part or in whole,

+must be distributed entirely under this license, and must not be

+distributed under any other license. The requirement for fonts to

+remain under this license does not apply to any document created

+using the Font Software.

+

+TERMINATION

+This license becomes null and void if any of the above conditions are

+not met.

+

+DISCLAIMER

+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF

+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL

+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM

+OTHER DEALINGS IN THE FONT SOFTWARE.

diff --git a/QtDemo/qml/QtDemo/fonts/PatrickHandSC-Regular.ttf b/QtDemo/qml/QtDemo/fonts/PatrickHandSC-Regular.ttf
new file mode 100644
index 0000000..49dfe40
--- /dev/null
+++ b/QtDemo/qml/QtDemo/fonts/PatrickHandSC-Regular.ttf
diff --git a/QtDemo/qml/QtDemo/images/txt_tapDevices.png b/QtDemo/qml/QtDemo/images/txt_tapDevices.png
deleted file mode 100644
index 4c44962..0000000
--- a/QtDemo/qml/QtDemo/images/txt_tapDevices.png
+++ /dev/null
diff --git a/QtDemo/qml/QtDemo/images/txt_useArrows.png b/QtDemo/qml/QtDemo/images/txt_useArrows.png
deleted file mode 100644
index ee9f600..0000000
--- a/QtDemo/qml/QtDemo/images/txt_useArrows.png
+++ /dev/null
diff --git a/QtDemo/qml/QtDemo/images/txt_useHome.png b/QtDemo/qml/QtDemo/images/txt_useHome.png
deleted file mode 100644
index fd94967..0000000
--- a/QtDemo/qml/QtDemo/images/txt_useHome.png
+++ /dev/null
diff --git a/QtDemo/qml/QtDemo/main.qml b/QtDemo/qml/QtDemo/main.qml
index e0d6055..f35623c 100644
--- a/QtDemo/qml/QtDemo/main.qml
+++ b/QtDemo/qml/QtDemo/main.qml
@@ -123,7 +123,7 @@ Rectangle{
 
     FontLoader {
         id: fontLoader
-        source: "fonts/Purisa-Bold.ttf"
+        source: "fonts/PatrickHandSC-Regular.ttf"
     }
 
     gradient: Gradient {
diff --git a/QtDemo/qml/QtDemo/style.js b/QtDemo/qml/QtDemo/style.js
index 4de4635..c63c2cc 100644
--- a/QtDemo/qml/QtDemo/style.js
+++ b/QtDemo/qml/QtDemo/style.js
@@ -45,3 +45,5 @@ var APP_ANIMATION_DELAY = 1000
 
 var LOGO_WIDTH = 800 //1006
 var LOGO_HEIGHT = 960 //1200
+
+var FONT_FAMILY = "Patrick Hand SC"