Minor fixes to font scaling and world layout

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

9 files changed, 27 insertions, 42 deletions

diff --git a/QtDemo/qml/QtDemo/Group.qml b/QtDemo/qml/QtDemo/Group.qml
index ce05178..6ee3304 100644
--- a/QtDemo/qml/QtDemo/Group.qml
+++ b/QtDemo/qml/QtDemo/Group.qml
@@ -45,27 +45,14 @@ Item {
     id: group
     objectName: "group"
 
-    /*color: "transparent"
-    border.color: "red"
-    border.width: 10*/
-
     property int uid: 0
     property real targetScale: 1
-    property string textSource: "images/txt_feeds.png"
     property int textX: 0
     property int textY: 0
     property string name: "Text"
     property real imageScale: 6.0
 
-    /*Image {
-        x: group.textX
-        y: group.textY
-        source: group.textSource
-        smooth: true
-        scale: group.imageScale
-    }*/
-
-    property int fontSize: 120
+    property int fontSize: 160
     property string uiFont: Style.FONT_FAMILY
     property bool bold: true
     property int fontTransition: 6
@@ -91,5 +78,4 @@ Item {
             smooth: true
         }
     }
-
 }
diff --git a/QtDemo/qml/QtDemo/HelpScreen.qml b/QtDemo/qml/QtDemo/HelpScreen.qml
index 5d0bed0..da8b5d7 100644
--- a/QtDemo/qml/QtDemo/HelpScreen.qml
+++ b/QtDemo/qml/QtDemo/HelpScreen.qml
@@ -120,25 +120,25 @@ Item {
         opacity: .8
     }
 
-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}
+        id: instructionText
+        anchors {horizontalCenter: parent.horizontalCenter; top: parent.top; topMargin: parent.height*.05}
         text: ""
-        font.pixelSize: parent.font.pixelSize
+        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
diff --git a/QtDemo/qml/QtDemo/Slide.qml b/QtDemo/qml/QtDemo/Slide.qml
index b98dfc5..240465c 100644
--- a/QtDemo/qml/QtDemo/Slide.qml
+++ b/QtDemo/qml/QtDemo/Slide.qml
@@ -90,7 +90,7 @@ Item {
             Text {
                 id: splashScreenText
                 color: 'white'
-                font.pixelSize: parent.width *.13
+                font.pixelSize: parent.width *.2
                 font.family: Style.FONT_FAMILY
                 text: slide.name
                 anchors.centerIn: parent
diff --git a/QtDemo/qml/QtDemo/SplashScreen.qml b/QtDemo/qml/QtDemo/SplashScreen.qml
index a425b04..42dd8d3 100644
--- a/QtDemo/qml/QtDemo/SplashScreen.qml
+++ b/QtDemo/qml/QtDemo/SplashScreen.qml
@@ -63,7 +63,7 @@ Item {
         Text {
             id: txt
             color: 'white'
-            font.pixelSize: parent.width *.13
+            font.pixelSize: parent.width *.2
             font.family: Style.FONT_FAMILY
             anchors.centerIn: parent
             smooth: true
diff --git a/QtDemo/qml/QtDemo/engine.js b/QtDemo/qml/QtDemo/engine.js
index 92f43be..cb4de7e 100644
--- a/QtDemo/qml/QtDemo/engine.js
+++ b/QtDemo/qml/QtDemo/engine.js
@@ -41,10 +41,10 @@
 var positions = [
             {x:-1100,  y:-1650, gid: 0, url: "demos/rssnews/rssnews.qml", device: 3, name: "Rss Reader"},
             {x:-2100, y:-1550, gid: 0, url: "demos/gridrssnews/main.qml", device: 7, name: "Rss Reader"},
-            {x:-1500, y:-1200, gid: 0, url: "demos/tweetsearch/tweetsearch.qml", device: 2, name: "Tweet\nSearch"},
+            {x:-1500, y:-1200, gid: 0, url: "demos/tweetsearch/tweetsearch.qml", device: 2, name: " Tweet\nSearch"},
 
             {x:1300,  y:-1600, gid: 1, url: "demos/canvasclock/canvasClock.qml", device: 4, name: "Canvas\n Clock"},
-            {x:2020,  y:-1520, gid: 1, url: "demos/heartmonitor/main.qml", device: 5, name: " Heart\nMonitor"},
+            {x:2020,  y:-1520, gid: 1, url: "demos/heartmonitor/main.qml", device: 5, name: "  Heart\nMonitor"},
 
             {x:1000,  y:-300, gid: 2, url: "demos/calqlatr/Calqlatr.qml", device: 0, name: "Calqlatr"},
             {x:-500,  y:-250,  gid: 2, url: "demos/touchgallery/main.qml", device: 2, name: "Widget\nGallery"},
@@ -54,19 +54,19 @@ var positions = [
             {x:-2500, y:100, gid: 3, url: "demos/samegame/samegame.qml", device: 1, name: "SameGame"},
 
             {x:1200,  y:1200, gid: 5, url: "demos/shaders/main.qml", device: 6, name: "Shaders"},
-            {x:2200,  y:1400, gid: 5, url: "demos/particledemo/particledemo.qml", device: 7, name: "Particle\n Paint"},
+            {x:2200,  y:1400, gid: 5, url: "demos/particledemo/particledemo.qml", device: 7, name: "Particle\n  Paint"},
 
-            {x:-800,  y:1200, gid: 4, url: "demos/video/main.qml", device: 8, name: "Video"},
-            {x:-1600, y:1500, gid: 4, url: "demos/radio/radio.qml", device: 5, name: "Internet\n  Radio"}
+            {x:-800,  y:1180, gid: 4, url: "demos/video/main.qml", device: 8, name: "Video"},
+            {x:-1600, y:1500, gid: 4, url: "demos/radio/radio.qml", device: 4, name: "Internet\n  Radio"}
         ]
 
 var groupPositions = [
-            {x:-2880, y:-2100, width: 2400, height: 1200, textX: 50, textY: 50, textSource: "images/txt_feeds.png", name: "Feeds"},
-            {x:700, y:-2100, width: 1700, height: 1200, textX: 50, textY: 50, textSource: "images/txt_canvas.png", name: "Canvas"},
-            {x:-900, y:-800, width: 2650, height: 1300, textX: 50, textY: 50, textSource: "images/txt_applications.png", name: "Applications"},
-            {x:-3000, y:-500, width: 1750, height: 1150, textX: 50, textY: 50, textSource: "images/txt_games.png", name: "Games"},
-            {x:-2100, y:850, width: 1950, height: 1150, textX: 50, textY: 150, textSource: "images/txt_multimedia.png", name: "Multimedia"},
-            {x:510, y:600, width: 2450, height: 1500, textX: 50, textY: 50, textSource: "images/txt_particles.png", name: "Particles & Shaders"}
+            {x:-2880, y:-2100, width: 2400, height: 1200, textX: 50, textY: 50, name: "Feeds"},
+            {x:700, y:-2100, width: 1700, height: 1200, textX: 50, textY: 50, name: "Canvas"},
+            {x:-900, y:-800, width: 2650, height: 1300, textX: 50, textY: 50, name: "Applications"},
+            {x:-3000, y:-500, width: 1750, height: 1150, textX: 50, textY: 50, name: "Games"},
+            {x:-2200, y:850, width: 2050, height: 1150, textX: 50, textY: 150, name: "Multimedia"},
+            {x:510, y:600, width: 2450, height: 1500, textX: 50, textY: 50, name: "Particles & Shaders"}
         ]
 
 var imageSources = ["phone1.png","phone2.png", "phone3.png","tablet1.png", "car_device.png", "medical_device.png", "laptop1.png", "laptop2.png", "tv.png"]
@@ -134,7 +134,6 @@ function createGroup(x,y,width,height,textX,textY,textSource,name){
         object.height = height
         object.textX = textX
         object.textY = textY
-        object.textSource = textSource
         object.name = name
 
         groups.push(object)
diff --git a/QtDemo/qml/QtDemo/fonts/Purisa-Bold.ttf b/QtDemo/qml/QtDemo/fonts/Purisa-Bold.ttf
deleted file mode 100644
index 05986e1..0000000
--- a/QtDemo/qml/QtDemo/fonts/Purisa-Bold.ttf
+++ /dev/null
diff --git a/QtDemo/qml/QtDemo/fonts/Purisa-BoldOblique.ttf b/QtDemo/qml/QtDemo/fonts/Purisa-BoldOblique.ttf
deleted file mode 100644
index d2cc638..0000000
--- a/QtDemo/qml/QtDemo/fonts/Purisa-BoldOblique.ttf
+++ /dev/null
diff --git a/QtDemo/qml/QtDemo/fonts/Purisa-Oblique.ttf b/QtDemo/qml/QtDemo/fonts/Purisa-Oblique.ttf
deleted file mode 100644
index 6d34f02..0000000
--- a/QtDemo/qml/QtDemo/fonts/Purisa-Oblique.ttf
+++ /dev/null
diff --git a/QtDemo/qml/QtDemo/fonts/Purisa.ttf b/QtDemo/qml/QtDemo/fonts/Purisa.ttf
deleted file mode 100644
index 7233af7..0000000
--- a/QtDemo/qml/QtDemo/fonts/Purisa.ttf
+++ /dev/null