Updated Simple Theme by Beholder, fixed small bug in config dialogs

project/java/Settings.java

@@ -114,7 +114,7 @@ class Settings
 		}
 		Globals.ScreenKbControlsShown[0] = Globals.AppNeedsArrowKeys;
 		Globals.ScreenKbControlsShown[1] = Globals.AppNeedsTextInput;
-		for( int i = 2; i < 7; i++ )
+		for( int i = 2; i < 8; i++ )
 			Globals.ScreenKbControlsShown[i] = ( i - 2 < Globals.AppTouchscreenKeyboardKeysAmount );
 		for( int i = 8; i < 12; i++ )
 			Globals.ScreenKbControlsShown[i] = true;

project/jni/application/ballfield/AndroidAppSettings.cfg

@@ -18,7 +18,7 @@ AppHandlesJoystickSensitivity=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE RETURN"
-AppTouchscreenKeyboardKeysAmount=7
+AppTouchscreenKeyboardKeysAmount=6
 AppTouchscreenKeyboardKeysAmountAutoFire=2
 RedefinedKeysScreenKb="SPACE RETURN"
 MultiABI=n

project/jni/sdl-1.3/src/video/android/SDL_androidinput.c

@@ -1329,7 +1329,6 @@ JAVA_EXPORT_NAME(Settings_nativeGetKeymapKeyScreenKb) ( JNIEnv*  env, jobject th
 JNIEXPORT void JNICALL
 JAVA_EXPORT_NAME(Settings_nativeSetKeymapKeyScreenKb) ( JNIEnv*  env, jobject thiz, jint keynum, jint key)
 {
-	__android_log_print(ANDROID_LOG_INFO, "libSDL", "nativeSetKeymapKeyScreenKb(): %d %d", keynum, key);
 	if( keynum < 0 || keynum > SDL_ANDROID_SCREENKEYBOARD_BUTTON_5 - SDL_ANDROID_SCREENKEYBOARD_BUTTON_0 + 4 )
 		return;
 		
@@ -1341,7 +1340,6 @@ JNIEXPORT void JNICALL
 JAVA_EXPORT_NAME(Settings_nativeSetScreenKbKeyUsed) ( JNIEnv*  env, jobject thiz, jint keynum, jint used)
 {
 	SDL_Rect rect = {0, 0, 0, 0};
-	__android_log_print(ANDROID_LOG_INFO, "libSDL", "nativeSetScreenKbKeyUsed(): %d %d", keynum, used);
 	int key = -1;
 	if( keynum == 0 )
 		key = SDL_ANDROID_SCREENKEYBOARD_BUTTON_DPAD;

project/jni/sdl-1.3/src/video/android/SDL_touchscreenkeyboard.c

@@ -850,7 +850,6 @@ int SDL_ANDROID_SetScreenKeyboardButtonPos(int buttonId, SDL_Rect * pos)
 	if( buttonId == SDL_ANDROID_SCREENKEYBOARD_BUTTON_DPAD )
 	{
 		arrows = *pos;
-		__android_log_print(ANDROID_LOG_INFO, "libSDL", "SetScreenKeyboardButtonPos(): arrows %dx%d-%dx%d", (int)pos->x, (int)pos->y, (int)pos->w, (int)pos->h);
 		if(touchscreenKeyboardTheme == 0)
 		{
 			prepareFontCharWireframe(FONT_LEFT, arrows.w / 2, arrows.h / 2);
@@ -862,7 +861,6 @@ int SDL_ANDROID_SetScreenKeyboardButtonPos(int buttonId, SDL_Rect * pos)
 	else
 	{
 		buttons[buttonId - SDL_ANDROID_SCREENKEYBOARD_BUTTON_0] = *pos;
-		__android_log_print(ANDROID_LOG_INFO, "libSDL", "SetScreenKeyboardButtonPos(): button %d %dx%d-%dx%d", buttonId - SDL_ANDROID_SCREENKEYBOARD_BUTTON_0, (int)pos->x, (int)pos->y, (int)pos->w, (int)pos->h);
 		if(touchscreenKeyboardTheme == 0)
 		{
 			int i = buttonId - SDL_ANDROID_SCREENKEYBOARD_BUTTON_0;

project/themes/converter/convert.sh

@@ -65,10 +65,10 @@ rm -f ../../res/raw/simpletheme.raw
 
 for F in \
 dpad \
-pad_left \
-pad_right \
-pad_up \
-pad_down \
+dpad_left \
+dpad_right \
+dpad_up \
+dpad_down \
 \
 1auto_pressed \
 1auto \