Allow selecting tileset.

[FreeShisen] / src / de / cwde / freeshisen / ShisenShoActivity.java

diff --git a/src/de/cwde/freeshisen/ShisenShoActivity.java b/src/de/cwde/freeshisen/ShisenShoActivity.java
index 0478d07416286e8bf7172bebd64f96f4bdfee43a..311c7b126be34799e60a0b654d0ab875667fcd66 100644 (file)
--- a/src/de/cwde/freeshisen/ShisenShoActivity.java
+++ b/src/de/cwde/freeshisen/ShisenShoActivity.java
@@ -28,8 +28,6 @@ public class ShisenShoActivity extends Activity {
                PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
                requestWindowFeature(Window.FEATURE_NO_TITLE);
-               //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-               //              WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
                view = ShisenSho.app().getView();
                ShisenSho.app().activity = this;
@@ -75,8 +73,11 @@ public class ShisenShoActivity extends Activity {
                case R.id.undo:
                case R.id.clean:
                        return view.onOptionsItemSelected(item);
+               case R.id.hiscore:
+                       startActivity(new Intent("de.cwde.freeshisen.HISCORE", null));
+                       return true;
                case R.id.options:
-                       startActivityForResult(new Intent("de.cwde.freeshisen.SETTINGS", null), 0);
+                       startActivity(new Intent("de.cwde.freeshisen.SETTINGS", null));
                        return true;
                case R.id.about:
                        onAboutActivate();
@@ -91,8 +92,9 @@ public class ShisenShoActivity extends Activity {
                PackageInfo pInfo;
                try {
                        pInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_META_DATA);
-                       String aboutTitle = String.format("About %s", getString(R.string.app_name));
-                       String versionString = String.format("Version: %s", pInfo.versionName);
+                       String appname = getString(R.string.app_name);
+                       String aboutTitle = "About " + appname;
+                       String versionString = appname + " "+ pInfo.versionName;
                        String aboutText = getString(R.string.aboutText);
 
                        // Set up the TextView
@@ -103,7 +105,7 @@ public class ShisenShoActivity extends Activity {
                        // Set some padding
                        message.setPadding(5, 5, 5, 5);
                        // Set up the final string
-                       message.setText(versionString + "\n" + s);
+                       message.setText(versionString + s);
                        // Now linkify the text
                        Linkify.addLinks(message, Linkify.ALL);
 
@@ -111,7 +113,7 @@ public class ShisenShoActivity extends Activity {
                        .setTitle(aboutTitle)
                        .setCancelable(true)
                        .setIcon(R.drawable.icon)
-                       .setPositiveButton(getString(android.R.string.ok), null)
+                       .setPositiveButton(android.R.string.ok, null)
                        .setView(message).create()
                        .show();
                } catch (NameNotFoundException e) {