diff options
| author | Lasse Räihä <lasse.raiha@digia.com> | 2013-06-19 09:28:35 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@digia.com> | 2013-06-19 09:29:57 +0300 |
| commit | 1aace1990fec1e7a2a4022026c6c0b44b1e8a074 (patch) | |
| tree | 93021275f934ca59775cac15639a0c3cee08f4f3 | |
| parent | f1165b18fa708d8a4d98272d9e971b1ec453ef9a (diff) | |
Fixed radio-bug. Removed tweetsearch.
Change-Id: Icb3961a772038d3c26250240eccb4580531fcb6e
Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>
| -rw-r--r-- | QtDemo/qml/QtDemo/Slide.qml | 4 | ||||
| -rw-r--r-- | QtDemo/qml/QtDemo/engine.js | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/QtDemo/qml/QtDemo/Slide.qml b/QtDemo/qml/QtDemo/Slide.qml index 240465c..36e0b08 100644 --- a/QtDemo/qml/QtDemo/Slide.qml +++ b/QtDemo/qml/QtDemo/Slide.qml @@ -168,7 +168,7 @@ Item { { splashScreenText.visible = true loadTimer.start(); - } else if (slide.name==="Internet Radio"){ + } else if (slide.url==="demos/radio/radio.qml"){ for (var i =0; i<demoContainer.children.length; i++){ if (demoContainer.children[i].objectName === "demoApp"){ demoContainer.children[i].focus = true; @@ -226,7 +226,7 @@ Item { return; } - if (slide.name === "Internet Radio") + if (slide.url === "demos/radio/radio.qml") return; //Always alive app.forceActiveFocus(); diff --git a/QtDemo/qml/QtDemo/engine.js b/QtDemo/qml/QtDemo/engine.js index cb4de7e..2618807 100644 --- a/QtDemo/qml/QtDemo/engine.js +++ b/QtDemo/qml/QtDemo/engine.js @@ -41,7 +41,6 @@ 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: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"}, @@ -77,7 +76,7 @@ var demoWidths = [269, 322, 322, 642, 480, 482, 688, 691, 726] var demoHeights = [404, 482, 482, 402, 320, 322, 431, 432, 456] var maskHorizontalOffsets = [1, 1, 1, 1, -52, 1, 1, 1, 1] var maskVerticalOffsets = [20, 32, 15, 24, 15, 45, 59, 57, 56] -var navigationList = [1,2,0,3,4,5,7,6,8,9,13,12,10,11] +var navigationList = [1,0,2,3,4,6,5,7,8,12,11,9,10] var groupNavigationList = [0,1,2,3,4,5] var currentDemoIndex = -1 var currentGroupIndex = -1 |