Added Keen theme and patched boost a bit to make it work wit CG

project/java/Settings.java

@@ -614,8 +614,8 @@ class Settings
 		{
 			if(Globals.TouchscreenKeyboardTheme < 0)
 				Globals.TouchscreenKeyboardTheme = 0;
-			if(Globals.TouchscreenKeyboardTheme > 2)
-				Globals.TouchscreenKeyboardTheme = 2;
+			if(Globals.TouchscreenKeyboardTheme > 3)
+				Globals.TouchscreenKeyboardTheme = 3;
 
 			if( Globals.TouchscreenKeyboardTheme == 0 )
 			{
@@ -629,6 +629,10 @@ class Settings
 			{
 				nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.sun));
 			}
+			if( Globals.TouchscreenKeyboardTheme == 3 )
+			{
+				nativeSetupScreenKeyboardButtons(loadRaw(p, R.raw.keen));
+			}
 		}
 	}
 

project/java/SettingsMenuKeyboard.java

@@ -192,7 +192,8 @@ class SettingsMenuKeyboard extends SettingsMenu
 			final CharSequence[] items = {
 				p.getResources().getString(R.string.controls_screenkb_by, "Ultimate Droid", "Sean Stieber"),
 				p.getResources().getString(R.string.controls_screenkb_by, "Simple Theme", "Beholder"),
-				p.getResources().getString(R.string.controls_screenkb_by, "Sun", "Sirea")
+				p.getResources().getString(R.string.controls_screenkb_by, "Sun", "Sirea"),
+				p.getResources().getString(R.string.controls_screenkb_by, "Keen", "Gerstrong")
 				};
 
 			AlertDialog.Builder builder = new AlertDialog.Builder(p);

project/jni/application/commandergenius/AndroidAppSettings.cfg

@@ -163,10 +163,10 @@ MultiABI=n
 AppMinimumRAM=64
 
 # Application version code (integer)
-AppVersionCode=144000
+AppVersionCode=161000
 
 # Application user-visible version name (string)
-AppVersionName="1.4.4 Release"
+AppVersionName="1.6.1 Release"
 
 # Reset SDL config when updating application to the new version (y) / (n)
 ResetSdlConfigForThisVersion=n
@@ -177,7 +177,7 @@ DeleteFilesOnUpgrade="%"
 # Optional shared libraries to compile - removing some of them will save space
 # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed
 # Available libraries: mad (GPL-ed!) sdl_mixer sdl_image sdl_ttf sdl_net sdl_blitpool sdl_gfx sdl_sound intl xml2 lua jpeg png ogg flac tremor vorbis freetype xerces curl theora fluidsynth lzma lzo2 mikmod openal timidity zzip bzip2 yaml-cpp python boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread glu avcodec avdevice avfilter avformat avresample avutil swscale swresample bzip2 
-CompiledLibraries="tremor ogg sdl_image"
+CompiledLibraries="tremor ogg sdl_image boost_system"
 
 # Application uses custom build script AndroidBuild.sh instead of Android.mk (y) or (n)
 CustomBuildScript=n

project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp

@@ -657,7 +657,7 @@ namespace boost { namespace property_tree
     template<class Type> inline
     Type basic_ptree<K, D, C>::get_value() const
     {
-        return get_value<Type>(
+	return get_value<Type>(
             typename translator_between<data_type, Type>::type());
     }
 

project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp

@@ -16,6 +16,10 @@
 #include <cstdlib>      // For std::size_t
 #include <new>          // For placement new
 
+#ifdef ANDROID
+#include <android/log.h>
+#endif
+
 // On MSVC, disable "conditional expression is constant" warning (level 4). 
 // This warning is almost impossible to avoid with certain types of templated code
 #ifdef _MSC_VER
@@ -596,10 +600,14 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml
                 // Allocate
                 std::size_t alloc_size = sizeof(header) + (2 * BOOST_PROPERTY_TREE_RAPIDXML_ALIGNMENT - 2) + pool_size;     // 2 alignments required in worst case: one for header, one for actual allocation
                 char *raw_memory = allocate_raw(alloc_size);
+
                     
                 // Setup new pool in allocated memory
                 char *pool = align(raw_memory);
-                header *new_header = reinterpret_cast<header *>(pool);
+                //header *new_header = reinterpret_cast<header *>(pool);
+		header *new_header = (header *)((void*)pool);
+
+
                 new_header->previous_begin = m_begin;
                 m_begin = raw_memory;
                 m_ptr = pool + sizeof(header);

project/jni/boost/include/boost/utility/addressof.hpp

@@ -36,8 +36,12 @@ template<class T> struct addressof_impl
 {
     static inline T * f( T & v, long )
     {
-        return reinterpret_cast<T*>(
-            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));
+	T *ptr;
+/*        return reinterpret_cast<T*>(
+            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));*/
+	ptr = (T*)(&v);
+//	memcpy(&ptr, &v, sizeof(T*));
+	return ptr;
     }
 
     static inline T * f( T * v, int )

project/themes/convert.sh

@@ -139,3 +139,40 @@ rm ../res/raw/sun*.png.raw
 
 gzip -9 < ../res/raw/sun.raw > ../res/raw/sun.raw.gz
 mv -f ../res/raw/sun.raw.gz ../res/raw/sun.raw
+
+
+
+# Keen Icon Set by Gerstrong (Gerhard Stein)
+for f in Keen/*.png; do
+	newname=`echo $f | sed 's@.*/@@' | tr '[A-Z]' '[a-z]'`.raw
+	./converter $f ../res/raw/$newname 32
+done
+
+rm -f ../res/raw/keen.raw
+printf '\000\000\000\012' > ../res/raw/keen.raw # size, 012 = 10
+
+for F in \
+keen-01 \
+\
+keen-02 \
+keen-03 \
+keen-04 \
+keen-05 \
+keen-06 \
+keen-07 \
+keen-08 \
+keen-09 \
+keen-10 \
+; do
+	if [ \! -e ../res/raw/$F.png.raw ]; then
+		echo Cannot find ../res/raw/$F.png.raw - check if all files are in place
+		exit 1
+	fi
+	
+	cat ../res/raw/$F.png.raw >> ../res/raw/keen.raw
+done
+
+rm ../res/raw/keen*.png.raw
+
+gzip -9 < ../res/raw/keen.raw > ../res/raw/keen.raw.gz
+mv -f ../res/raw/keen.raw.gz ../res/raw/keen.raw

readme.txt

@@ -444,3 +444,4 @@ using them, otherwise you'll have to release your whole application sources unde
 The "Ultimate Droid" on-screen keyboard theme by Sean Stieber is licensed under Creative Commons - Attribution license.
 The "Simple Theme" on-screen keyboard theme by Dmitry Matveev is licensed under zlib license.
 The "Sun" on-screen keyboard theme by Sirea (Martina Smejkalova) is licensed under Creative Commons - Attribution license.
+The "Keen" on-screen keyboard theme by Gerstrong (Gerhard Stein) is licensed under GPL 2.0.