From 2aa55af392f527b9357ca227d853a2ee5e340f35 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 4 Feb 2011 13:49:09 +1000
Subject: Only ask for name when the user goes on the high score list.

Task-number: QTBUG-14714
---
 .../declarative/samegame/SamegameCore/samegame.js  | 41 +++++++++++++++++++---
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js
index e618a10..16c48c4 100755
--- a/demos/declarative/samegame/SamegameCore/samegame.js
+++ b/demos/declarative/samegame/SamegameCore/samegame.js
@@ -8,6 +8,7 @@ var blockSrc = "SamegameCore/BoomBlock.qml";
 var scoresURL = "";
 var gameDuration;
 var component = Qt.createComponent(blockSrc);
+var highScoreBar = 0;
 
 // Index function used instead of a 2D array
 function index(column, row)
@@ -152,11 +153,15 @@ function victoryCheck()
     // Checks for game over
     if (deservesBonus || !(floodMoveCheck(0, maxRow - 1, -1))) {
         gameDuration = new Date() - gameDuration;
-        nameInputDialog.show("You won! Please enter your name:                 ");
-        nameInputDialog.initialWidth = nameInputDialog.text.width + 20;
-        if (nameInputDialog.name == "")
-            nameInputDialog.width = nameInputDialog.initialWidth;
-        nameInputDialog.text.opacity = 0; // Just a spacer
+        if(gameCanvas.score > highScoreBar){
+            nameInputDialog.show("You won! Please enter your name:                 ");
+            nameInputDialog.initialWidth = nameInputDialog.text.width + 20;
+            if (nameInputDialog.name == "")
+                nameInputDialog.width = nameInputDialog.initialWidth;
+            nameInputDialog.text.opacity = 0; // Just a spacer
+        }else{
+            dialog.show("You won!");
+        }
     }
 }
 
@@ -202,6 +207,30 @@ function createBlock(column,row)
     return true;
 }
 
+function initHighScoreBar()
+{
+    if(scoresURL != "")
+        return true;//don't query remote scores
+    var db = openDatabaseSync(
+        "SameGameScores",
+        "1.0",
+        "Local SameGame High Scores",
+        100
+    );
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(name TEXT, score NUMBER, gridSize TEXT, time NUMBER)');
+            // Only show results for the current grid size
+            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'
+                + maxColumn + "x" + maxRow + '" ORDER BY score desc LIMIT 10');
+            if(rs.rows.length < 10)
+                highScoreBar = 0;
+            else 
+                highScoreBar = rs.rows.item(rs.rows.length - 1).score;
+        }
+    );
+}
+
 function saveHighScore(name)
 {
     if (scoresURL != "")
@@ -234,6 +263,8 @@ function saveHighScore(name)
                     + rs.rows.item(i).score + ' points in '
                     + rs.rows.item(i).time + ' seconds.\n';
             }
+            if(rs.rows.length == 10)
+                highScoreBar = rs.rows.item(9).score;
             dialog.show(r);
         }
     );
-- 
cgit v0.12


From b82332fec19ee977eceaf2d533ee027020a474e0 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Fri, 4 Feb 2011 14:02:21 +1000
Subject: Make -no-opengl exist on other platforms

Task-Number: QTBUG-15830
---
 tools/qml/main.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 5846ff0..67154dd 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -161,7 +161,9 @@ void usage()
     qWarning("  -P <directory> ........................... prepend to the plugin search path");
 #if defined(Q_WS_MAC)
     qWarning("  -no-opengl ............................... don't use a QGLWidget for the viewport");
+    qWarning("  -opengl .................................. use a QGLWidget for the viewport (default)");
 #else
+    qWarning("  -no-opengl ............................... don't use a QGLWidget for the viewport (default)");
     qWarning("  -opengl .................................. use a QGLWidget for the viewport");
 #endif
     qWarning("  -script <path> ........................... set the script to use");
@@ -380,13 +382,10 @@ static void parseCommandLineOptions(const QStringList &arguments)
         } else if (arg == "-translation") {
             if (lastArg) usage();
             opts.translationFile = arguments.at(++i);
-#if defined(Q_WS_MAC)
         } else if (arg == "-no-opengl") {
             opts.useGL = false;
-#else
         } else if (arg == "-opengl") {
             opts.useGL = true;
-#endif
         } else if (arg == "-qmlbrowser") {
             opts.useNativeFileBrowser = false;
         } else if (arg == "-warnings") {
-- 
cgit v0.12