New happy shiny and totally not ugly startup menu dialog.

2010-11-29 19:07:02 +02:00
parent 2d5c038baf
commit fecd323b20
8 changed files with 100 additions and 46 deletions
--- a/project/java/Globals.java
+++ b/project/java/Globals.java
@@ -47,15 +47,15 @@ class Globals {
 	// Phone-specific config
 	// It will download app data to /sdcard/alienblaster if set to true,
 	// otherwise it will download it to /data/data/de.schwardtnet.alienblaster/files
-	public static boolean DownloadToSdcard = false;
+	public static boolean DownloadToSdcard = true;
 	public static boolean PhoneHasTrackball = false;
 	public static boolean PhoneHasArrowKeys = false;
 	public static boolean UseAccelerometerAsArrowKeys = false;
-	public static boolean UseTouchscreenKeyboard = false;
+	public static boolean UseTouchscreenKeyboard = true;
 	public static int TouchscreenKeyboardSize = 0;
-	public static int TouchscreenKeyboardTheme = 0;
-	public static int AccelerometerSensitivity = 0;
-	public static int AccelerometerCenterPos = 0;
+	public static int TouchscreenKeyboardTheme = 1;
+	public static int AccelerometerSensitivity = 2;
+	public static int AccelerometerCenterPos = 2;
 	public static int TrackballDampening = 0;
 	public static int AudioBufferConfig = 0;
 	public static boolean OptionalDataDownload[] = null;
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -139,22 +139,84 @@ class Settings
 		showDownloadConfig(p);
 	}

+	static int MainMenuLastSelected = 0;
 	static void showConfigMainMenu(final MainActivity p)
 	{
-		final CharSequence[] items = { p.getResources().getString(R.string.storage_question),
-										p.getResources().getString(R.string.accel_medium),
-										p.getResources().getString(R.string.accel_slow) };
+		ArrayList<CharSequence> items = new ArrayList<CharSequence> ();
+
+		items.add(p.getResources().getString(R.string.storage_question));
+
+		if( Globals.DataDownloadUrl.split("\\^").length > 1 )
+			items.add(p.getResources().getString(R.string.optional_downloads));
+
+		items.add(p.getResources().getString(R.string.controls_additional));
+
+		if( Globals.AppNeedsArrowKeys || Globals.MoveMouseWithJoystick )
+			items.add(p.getResources().getString(R.string.controls_question));
+
+		if( ! ( ! Globals.UseAccelerometerAsArrowKeys || Globals.AppHandlesJoystickSensitivity ) )
+			items.add(p.getResources().getString(R.string.accel_question));
+
+		if( Globals.UseTouchscreenKeyboard )
+			items.add(p.getResources().getString(R.string.controls_screenkb));
+
+		if( Globals.AppUsesMouse )
+			items.add(p.getResources().getString(R.string.leftclick_question));
+
+		items.add(p.getResources().getString(R.string.audiobuf_question));
+
+		items.add(p.getResources().getString(R.string.ok));

 		AlertDialog.Builder builder = new AlertDialog.Builder(p);
-		builder.setTitle(R.string.accel_question);
-		builder.setSingleChoiceItems(items, Globals.AccelerometerSensitivity, new DialogInterface.OnClickListener() 
+		//builder.setTitle();
+		builder.setSingleChoiceItems(items.toArray(new CharSequence[0]), MainMenuLastSelected, new DialogInterface.OnClickListener() 
 		{
 			public void onClick(DialogInterface dialog, int item) 
 			{
-				Globals.AccelerometerSensitivity = item;
-
+				MainMenuLastSelected = item;
 				dialog.dismiss();
-				showAccelerometerCenterConfig(p);
+
+				if( item == 0 )
+					showDownloadConfig(p);
+
+				if( Globals.DataDownloadUrl.split("\\^").length <= 1 )
+					item += 1;
+				else
+					if( item == 1 )
+						showOptionalDownloadConfig(p);
+
+				if( item == 2 )
+					showAdditionalInputConfig(p);
+
+				if( ! Globals.AppNeedsArrowKeys && ! Globals.MoveMouseWithJoystick )
+					item += 1;
+				else
+					if( item == 3 )
+						showKeyboardConfig(p);
+
+				if( ! Globals.UseAccelerometerAsArrowKeys || Globals.AppHandlesJoystickSensitivity )
+					item += 1;
+				else
+					if( item == 4 )
+						showAccelerometerConfig(p);
+		
+				if( ! Globals.UseTouchscreenKeyboard )
+					item += 1;
+				else
+					if( item == 5 )
+						showScreenKeyboardConfig(p);
+
+				if( ! Globals.AppUsesMouse )
+					item += 1;
+				else
+					if( item == 6 )
+						showLeftClickConfig(p);
+
+				if( item == 7 )
+					showAudioConfig(p);
+				
+				if( item == 8 )
+					showTouchPressureMeasurementTool(p);
 			}
 		});
 		AlertDialog alert = builder.create();
@@ -186,7 +248,7 @@ class Settings
 				Globals.DownloadToSdcard = (item == 1);

 				dialog.dismiss();
-				showOptionalDownloadConfig(p);
+				showConfigMainMenu(p);
 			}
 		});
 		AlertDialog alert = builder.create();
@@ -201,7 +263,7 @@ class Settings
 		{
 			Globals.OptionalDataDownload = new boolean[1];
 			Globals.OptionalDataDownload[0] = true;
-			showAdditionalInputConfig(p);
+			showConfigMainMenu(p);
 			return;
 		}
 		
@@ -231,7 +293,7 @@ class Settings
 			public void onClick(DialogInterface dialog, int item) 
 			{
 				dialog.dismiss();
-				showAdditionalInputConfig(p);
+				showConfigMainMenu(p);
 			}
 		});

@@ -285,15 +347,7 @@ class Settings
 			public void onClick(DialogInterface dialog, int item) 
 			{
 				dialog.dismiss();
-				showAccelerometerConfig(p);
-			}
-		});
-		builder.setNegativeButton(p.getResources().getString(R.string.ok), new DialogInterface.OnClickListener() 
-		{
-			public void onClick(DialogInterface dialog, int item) 
-			{
-				dialog.dismiss();
-				showAccelerometerConfig(p);
+				showConfigMainMenu(p);
 			}
 		});

@@ -337,7 +391,7 @@ class Settings
 		if( ! Globals.UseAccelerometerAsArrowKeys || Globals.AppHandlesJoystickSensitivity )
 		{
 			Globals.AccelerometerCenterPos = 2; // Fixed horizontal center position
-			showScreenKeyboardConfig(p);
+			showConfigMainMenu(p);
 			return;
 		}
 		
@@ -354,7 +408,7 @@ class Settings
 				Globals.AccelerometerCenterPos = item;

 				dialog.dismiss();
-				showScreenKeyboardConfig(p);
+				showConfigMainMenu(p);
 			}
 		});
 		AlertDialog alert = builder.create();
@@ -399,7 +453,7 @@ class Settings
 		if( ! Globals.UseTouchscreenKeyboard )
 		{
 			Globals.TouchscreenKeyboardTheme = 0;
-			showAudioConfig(p);
+			showConfigMainMenu(p);
 			return;
 		}
 		
@@ -420,7 +474,7 @@ class Settings
 					Globals.TouchscreenKeyboardTheme = 0;

 				dialog.dismiss();
-				showAudioConfig(p);
+				showConfigMainMenu(p);
 			}
 		});
 		AlertDialog alert = builder.create();
@@ -443,7 +497,7 @@ class Settings
 			{
 				Globals.AudioBufferConfig = item;
 				dialog.dismiss();
-				showLeftClickConfig(p);
+				showConfigMainMenu(p);
 			}
 		});
 		AlertDialog alert = builder.create();
@@ -485,7 +539,7 @@ class Settings
 		if( ! Globals.AppNeedsTwoButtonMouse )
 		{
 			Globals.RightClickMethod = Globals.RIGHT_CLICK_NONE;
-			showKeyboardConfig(p);
+			showConfigMainMenu(p);
 			return;
 		}
 		final CharSequence[] items = {	p.getResources().getString(R.string.rightclick_none),
@@ -501,7 +555,7 @@ class Settings
 			{
 				Globals.RightClickMethod = item;
 				dialog.dismiss();
-				showKeyboardConfig(p);
+				showConfigMainMenu(p);
 			}
 		});
 		AlertDialog alert = builder.create();
@@ -546,7 +600,7 @@ class Settings
 		if( ! Globals.PhoneHasTrackball )
 		{
 			Globals.TrackballDampening = 0;
-			showTouchPressureMeasurementTool(p);
+			showConfigMainMenu(p);
 			return;
 		}
 		
@@ -564,7 +618,7 @@ class Settings
 				Globals.TrackballDampening = item;

 				dialog.dismiss();
-				showTouchPressureMeasurementTool(p);
+				showConfigMainMenu(p);
 			}
 		});
 		AlertDialog alert = builder.create();
--- a/project/java/translations/values-de/strings.xml
+++ b/project/java/translations/values-de/strings.xml
@@ -58,7 +58,7 @@
 <string name="accel_fixed_horiz">Fixiert auf Tisch Schreibtisch Orientierung</string>
 <string name="accel_question_center">Beschleunigungsmesser Mittelstellung</string>
 <string name="audiobuf_verysmall">Sehr kleine (schnelle Geräte, weniger Verzögerung)</string>
-<string name="rightclick_question">Rechter Mausklick ausgelöst durch:</string>
+<string name="rightclick_question">Rechter Mausklick ausgelöst durch</string>
 <string name="rightclick_menu">Menütaste</string>
 <string name="rightclick_multitouch">Touch-Screen mit dem zweiten Finger</string>
 <string name="rightclick_pressure">Touchscreen mit Kraft</string>
@@ -67,7 +67,7 @@
 <string name="pointandclick_showcreenunderfinger">Show-Bildschirm unter dem Finger in einem separaten Fenster</string>
 <string name="measurepressure_touchplease">Bitte schieben Sie den Finger über den Bildschirm für zwei Sekunden</string>
 <string name="rightclick_none">Deaktivieren der rechten Maustaste</string>
-<string name="leftclick_question">Linke Maustaste:</string>
+<string name="leftclick_question">Linke Maustaste</string>
 <string name="leftclick_normal">Normal</string>
 <string name="leftclick_near_cursor">Tippen Sie auf nahe Mauszeiger</string>
 <string name="leftclick_multitouch">Touch-Screen mit dem zweiten Finger</string>
--- a/project/java/translations/values-fi/strings.xml
+++ b/project/java/translations/values-fi/strings.xml
@@ -58,7 +58,7 @@
 <string name="accel_fixed_horiz">Korjattu taulukko työpöytä suuntautumiseen</string>
 <string name="accel_question_center">Kiihtyvyysmittari keskiasentoon</string>
 <string name="audiobuf_verysmall">Hyvin pieni (nopea laitteita, vähemmän lag)</string>
-<string name="rightclick_question">Napsauta hiiren kakkospainikkeella alkunsa:</string>
+<string name="rightclick_question">Napsauta hiiren kakkospainikkeella alkunsa</string>
 <string name="rightclick_menu">Valikkonäppäin</string>
 <string name="rightclick_multitouch">Kosketusnäyttö on toinen sormi</string>
 <string name="rightclick_pressure">Kosketusnäyttö voimalla</string>
@@ -67,7 +67,7 @@
 <string name="pointandclick_showcreenunderfinger">Näytä näytön alle sormi erillisessä ikkunassa</string>
 <string name="measurepressure_touchplease">Ole hyvä ja liu\u0026#39;uttamalla sormea näytöllä kaksi sekuntia</string>
 <string name="rightclick_none">Poista oikealla hiiren klikkauksella</string>
-<string name="leftclick_question">Vasen hiiren nappi:</string>
+<string name="leftclick_question">Vasen hiiren nappi</string>
 <string name="leftclick_normal">Normaali</string>
 <string name="leftclick_near_cursor">Touch lähellä hiiren kursori</string>
 <string name="leftclick_multitouch">Kosketusnäyttö on toinen sormi</string>
--- a/project/java/translations/values-fr/strings.xml
+++ b/project/java/translations/values-fr/strings.xml
@@ -61,7 +61,7 @@
    <string name="audiobuf_medium">Moyenne</string>
    <string name="audiobuf_large">Grande (en cas de son par saccades)</string>
    <string name="audiobuf_question">Taille du tampon audio</string>
-<string name="rightclick_question">Faites un clic droit déclenchée par:</string>
+<string name="rightclick_question">Faites un clic droit déclenchée par</string>
 <string name="rightclick_menu">Sur la touche Menu</string>
 <string name="rightclick_multitouch">écran tactile avec le deuxième doigt</string>
 <string name="rightclick_pressure">écran tactile avec une force</string>
@@ -70,7 +70,7 @@
 <string name="pointandclick_showcreenunderfinger">Afficher l\u0026#39;écran sous le doigt dans une fenêtre séparée</string>
 <string name="measurepressure_touchplease">S\u0026#39;il vous plaît glisser les doigts sur l\u0026#39;écran pendant deux secondes</string>
 <string name="rightclick_none">cliquez sur Désactiver droit de la souris</string>
-<string name="leftclick_question">cliquez gauche de la souris:</string>
+<string name="leftclick_question">cliquez gauche de la souris</string>
 <string name="leftclick_normal">Normal</string>
 <string name="leftclick_near_cursor">curseur de la souris près Touch</string>
 <string name="leftclick_multitouch">écran tactile avec le deuxième doigt</string>
--- a/project/java/translations/values-ru/strings.xml
+++ b/project/java/translations/values-ru/strings.xml
@@ -42,7 +42,7 @@
 <string name="accel_medium">Средний</string>
 <string name="accel_slow">Медленно</string>
 <string name="accel_question">Чувствительность акселерометра</string>
-<string name="rightclick_question">Правая кнопка мыши:</string>
+<string name="rightclick_question">Правая кнопка мыши</string>
 <string name="rightclick_menu">Клавиша меню</string>
 <string name="rightclick_multitouch">Касание экрана вторым пальцем</string>
 <string name="rightclick_pressure">Нажатие на экран с силой</string>
@@ -61,7 +61,7 @@
 <string name="accel_fixed_horiz">Фиксировано на горизонт</string>
 <string name="accel_question_center">Центральное положение акселерометра</string>
 <string name="rightclick_none">Правая кнопка мыши отключена</string>
-<string name="leftclick_question">Левая кнопка мыши:</string>
+<string name="leftclick_question">Левая кнопка мыши</string>
 <string name="leftclick_normal">Нормальный</string>
 <string name="leftclick_near_cursor">Касание возле курсора мыши</string>
 <string name="leftclick_multitouch">Касание двумя пальцами</string>
--- a/project/java/translations/values-uk/strings.xml
+++ b/project/java/translations/values-uk/strings.xml
@@ -42,7 +42,7 @@
 <string name="accel_medium">середньо</string>
 <string name="accel_slow">повільно</string>
 <string name="accel_question">Чутливість акселерометру</string>
-<string name="rightclick_question">Права кнопка миші:</string>
+<string name="rightclick_question">Права кнопка миші</string>
 <string name="rightclick_menu">Кнопка меню</string>
 <string name="rightclick_multitouch">Торкання екрана другим пальцем</string>
 <string name="rightclick_pressure">Натиск на екран силою</string>
@@ -61,7 +61,7 @@
 <string name="accel_fixed_horiz">Фiксоване до горизонту</string>
 <string name="accel_question_center">Центральне положення акселерометра</string>
 <string name="rightclick_none">Вiдключена</string>
-<string name="leftclick_question">Ліва кнопка миші:</string>
+<string name="leftclick_question">Ліва кнопка миші</string>
 <string name="leftclick_normal">Нормальна</string>
 <string name="leftclick_near_cursor">Дотик біля курсору миші</string>
 <string name="leftclick_multitouch">Натиск на екран другим пальцем</string>
--- a/project/java/translations/values/strings.xml
+++ b/project/java/translations/values/strings.xml
@@ -59,13 +59,13 @@
    <string name="accel_fixed_horiz">Fixed to table desk orientation</string>
    <string name="accel_question_center">Accelerometer center position</string>

-    <string name="rightclick_question">Right mouse click:</string>
+    <string name="rightclick_question">Right mouse click</string>
    <string name="rightclick_menu">Menu key</string>
    <string name="rightclick_multitouch">Touch screen with second finger</string>
    <string name="rightclick_pressure">Touch screen with force</string>
    <string name="rightclick_none">Disable right mouse click</string>

-    <string name="leftclick_question">Left mouse click:</string>
+    <string name="leftclick_question">Left mouse click</string>
    <string name="leftclick_normal">Normal</string>
    <string name="leftclick_near_cursor">Touch near mouse cursor</string>
    <string name="leftclick_multitouch">Touch screen with second finger</string>