diff --git a/project/java/Settings.java b/project/java/Settings.java index b379c8a1c..add51ae0b 100644 --- a/project/java/Settings.java +++ b/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)); + } } } diff --git a/project/java/SettingsMenuKeyboard.java b/project/java/SettingsMenuKeyboard.java index cb616da10..d0d67148e 100644 --- a/project/java/SettingsMenuKeyboard.java +++ b/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); diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index 0e3e29719..2c20b9728 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/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 diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 0d054fb46..e4c5bf2aa 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 0d054fb46d9ebc7fad1cc03db66f5d8d55e5fa88 +Subproject commit e4c5bf2aa65bf4cd64a42d12aea0472f66918823 diff --git a/project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp b/project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp index 31d60e3ee..786f17cb4 100644 --- a/project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp @@ -657,7 +657,7 @@ namespace boost { namespace property_tree template inline Type basic_ptree::get_value() const { - return get_value( + return get_value( typename translator_between::type()); } diff --git a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp index d3615c119..28e24f946 100644 --- a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp @@ -16,6 +16,10 @@ #include // For std::size_t #include // For placement new +#ifdef ANDROID +#include +#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
(pool); + //header *new_header = reinterpret_cast
(pool); + header *new_header = (header *)((void*)pool); + + new_header->previous_begin = m_begin; m_begin = raw_memory; m_ptr = pool + sizeof(header); diff --git a/project/jni/boost/include/boost/utility/addressof.hpp b/project/jni/boost/include/boost/utility/addressof.hpp index 95cd92fca..cd38d99a9 100644 --- a/project/jni/boost/include/boost/utility/addressof.hpp +++ b/project/jni/boost/include/boost/utility/addressof.hpp @@ -36,8 +36,12 @@ template struct addressof_impl { static inline T * f( T & v, long ) { - return reinterpret_cast( - &const_cast(reinterpret_cast(v))); + T *ptr; +/* return reinterpret_cast( + &const_cast(reinterpret_cast(v)));*/ + ptr = (T*)(&v); +// memcpy(&ptr, &v, sizeof(T*)); + return ptr; } static inline T * f( T * v, int ) diff --git a/project/res/raw/simpletheme.raw b/project/res/raw/simpletheme.raw index 9b3129e07..c17e1f9ac 100644 Binary files a/project/res/raw/simpletheme.raw and b/project/res/raw/simpletheme.raw differ diff --git a/project/res/raw/sun.raw b/project/res/raw/sun.raw index e28d4830a..7c426d8e8 100644 Binary files a/project/res/raw/sun.raw and b/project/res/raw/sun.raw differ diff --git a/project/res/raw/ultimatedroid.raw b/project/res/raw/ultimatedroid.raw index ea81a73b5..8fc810919 100644 Binary files a/project/res/raw/ultimatedroid.raw and b/project/res/raw/ultimatedroid.raw differ diff --git a/project/themes/Keen/keen-01.png b/project/themes/Keen/keen-01.png new file mode 100644 index 000000000..ca2d7e5b5 Binary files /dev/null and b/project/themes/Keen/keen-01.png differ diff --git a/project/themes/Keen/keen-02.png b/project/themes/Keen/keen-02.png new file mode 100644 index 000000000..74b2ab671 Binary files /dev/null and b/project/themes/Keen/keen-02.png differ diff --git a/project/themes/Keen/keen-03.png b/project/themes/Keen/keen-03.png new file mode 100644 index 000000000..57498b08b Binary files /dev/null and b/project/themes/Keen/keen-03.png differ diff --git a/project/themes/Keen/keen-04.png b/project/themes/Keen/keen-04.png new file mode 100644 index 000000000..5e8a25a1e Binary files /dev/null and b/project/themes/Keen/keen-04.png differ diff --git a/project/themes/Keen/keen-05.png b/project/themes/Keen/keen-05.png new file mode 100644 index 000000000..8344de875 Binary files /dev/null and b/project/themes/Keen/keen-05.png differ diff --git a/project/themes/Keen/keen-06.png b/project/themes/Keen/keen-06.png new file mode 100644 index 000000000..565347d27 Binary files /dev/null and b/project/themes/Keen/keen-06.png differ diff --git a/project/themes/Keen/keen-07.png b/project/themes/Keen/keen-07.png new file mode 100644 index 000000000..a93acbcda Binary files /dev/null and b/project/themes/Keen/keen-07.png differ diff --git a/project/themes/Keen/keen-08.png b/project/themes/Keen/keen-08.png new file mode 100644 index 000000000..be6b98e61 Binary files /dev/null and b/project/themes/Keen/keen-08.png differ diff --git a/project/themes/Keen/keen-09.png b/project/themes/Keen/keen-09.png new file mode 100644 index 000000000..260f10980 Binary files /dev/null and b/project/themes/Keen/keen-09.png differ diff --git a/project/themes/Keen/keen-10.png b/project/themes/Keen/keen-10.png new file mode 100644 index 000000000..296010c3a Binary files /dev/null and b/project/themes/Keen/keen-10.png differ diff --git a/project/themes/convert.sh b/project/themes/convert.sh index 040cc8b69..63ffdc2ad 100755 --- a/project/themes/convert.sh +++ b/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 diff --git a/readme.txt b/readme.txt index 8e576b268..f3e2d57e9 100644 --- a/readme.txt +++ b/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.