Refactoring

Change-Id: I65835595167cccff8fee68a5b43f2a3e83a04b1b
Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>

4 files changed, 3 insertions, 18 deletions

diff --git a/QtDemo/qml/QtDemo/Slide.qml b/QtDemo/qml/QtDemo/Slide.qml
index 3485d16..d5d4171 100644
--- a/QtDemo/qml/QtDemo/Slide.qml
+++ b/QtDemo/qml/QtDemo/Slide.qml
@@ -16,7 +16,6 @@ Item {
     property bool loaded: false
     property bool loading: false
     property real targetScale: 1
-    property real targetAngle: 0
     property int startX: 0
     property int startY: 0
     property bool animationRunning: navigationAnimation.running || zoomAnimation.running
@@ -28,7 +27,7 @@ Item {
     property real deltaRot: 0
     property int deltaY: 0
     property int swing: 5
-    property bool dirty: targetAngle !== parent.angle || rotation !==0
+    property bool dirty: parent.angle !== 0 || rotation !==0
 
     function targetWidth()
     {
diff --git a/QtDemo/qml/QtDemo/WorldCanvas.qml b/QtDemo/qml/QtDemo/WorldCanvas.qml
index 0edd09d..1ef452e 100644
--- a/QtDemo/qml/QtDemo/WorldCanvas.qml
+++ b/QtDemo/qml/QtDemo/WorldCanvas.qml
@@ -41,7 +41,7 @@ Item{
             yOffset = -target.y;
             rotationOriginX = target.x;
             rotationOriginY = target.y;
-            angle = target.targetAngle;
+            angle = 0
             zoomInTarget = target.targetScale;
             if (updateScalingFactor)
                 scalingFactor = zoomInTarget
diff --git a/QtDemo/qml/QtDemo/engine.js b/QtDemo/qml/QtDemo/engine.js
index 31384e5..22a46af 100644
--- a/QtDemo/qml/QtDemo/engine.js
+++ b/QtDemo/qml/QtDemo/engine.js
@@ -27,7 +27,6 @@ var demoWidths = [322, 322, 322, 642, 482, 642, 642, 726]
 var demoHeights = [482, 482, 482, 402, 322, 402, 402, 456]
 var maskHorizontalOffsets = [1, 1, 1, 1, 1, 1, 1, 1]
 var maskVerticalOffsets = [26, 32, 15, 24, 45, 33, 33, 56]
-var targetAngles = [0, 0, 0, 0, 0, 0, 0, 0]
 
 var navigationList = [5,1,2,0,4,3,6,7,8,11,12,10,9]
 var currentDemoIndex = -1
@@ -52,7 +51,6 @@ function createNew(x,y,url,device,name){
         object.demoHeight = demoHeights[device]
         object.maskVerticalOffset = maskVerticalOffsets[device]
         object.maskHorizontalOffset = maskHorizontalOffsets[device]
-        object.targetAngle = targetAngles[device]
         object.uid = objects.length
         object.name = name
         object.startX = x-object.width/2
@@ -126,8 +124,7 @@ function selectTarget(uid){
         currentDemoIndex = navigationList.indexOf(idx)
         return {"x": positions[idx].x,
             "y":  positions[idx].y,
-            "targetScale": objects[idx].targetScale,
-            "targetAngle": objects[idx].targetAngle}
+            "targetScale": objects[idx].targetScale}
     }
 
     return null;
diff --git a/QtDemo/qml/QtDemo/main.qml b/QtDemo/qml/QtDemo/main.qml
index afdfd21..7117bac 100644
--- a/QtDemo/qml/QtDemo/main.qml
+++ b/QtDemo/qml/QtDemo/main.qml
@@ -77,17 +77,6 @@ Rectangle{
     WorldCanvas { id:canvas }
     NavigationPanel{ id: navigationPanel }
 
-    /*Image{
-        id: logo
-        source: "QtLogo.png"
-        anchors.left: parent.left
-        anchors.top: parent.top
-        anchors.margins: parent.height * 0.02
-        width: parent.height * 0.1
-        height: width
-        opacity: 1.0
-    }*/
-
     QuitDialog {
         id: quitDialog
         visible: false