diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg index 31747f555..cfc247821 100644 --- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg @@ -42,6 +42,9 @@ InhibitSuspend=y # Create Android service, so the app is less likely to be killed while in background CreateService=n +# Screen follows mouse cursor, when it's covered by soft keyboard, this works only in software video mode (y) or (n) +ScreenFollowsMouse=y + # Video color depth - 16 BPP is the fastest and supported for all modes, 24 bpp is supported only # with SwVideoMode=y, SDL_OPENGL mode supports everything. (16)/(24)/(32) VideoDepthBpp=16 diff --git a/project/jni/application/xserver-debian/AndroidData/update5-armeabi-v7a.tgz b/project/jni/application/xserver-debian/AndroidData/update5-armeabi-v7a.tgz index dd4051d2f..546d67258 100644 Binary files a/project/jni/application/xserver-debian/AndroidData/update5-armeabi-v7a.tgz and b/project/jni/application/xserver-debian/AndroidData/update5-armeabi-v7a.tgz differ diff --git a/project/jni/application/xserver-debian/AndroidData/update5-x86.tgz b/project/jni/application/xserver-debian/AndroidData/update5-x86.tgz index f019eb233..781d999c7 100644 Binary files a/project/jni/application/xserver-debian/AndroidData/update5-x86.tgz and b/project/jni/application/xserver-debian/AndroidData/update5-x86.tgz differ diff --git a/project/jni/application/xserver-debian/AndroidData/update6-armeabi-v7a.tgz b/project/jni/application/xserver-debian/AndroidData/update6-armeabi-v7a.tgz new file mode 100644 index 000000000..0f810872a Binary files /dev/null and b/project/jni/application/xserver-debian/AndroidData/update6-armeabi-v7a.tgz differ diff --git a/project/jni/application/xserver-debian/AndroidData/update6-x86.tgz b/project/jni/application/xserver-debian/AndroidData/update6-x86.tgz new file mode 100644 index 000000000..504ae9f04 Binary files /dev/null and b/project/jni/application/xserver-debian/AndroidData/update6-x86.tgz differ diff --git a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg index f7a953227..73e2caa90 100644 --- a/project/jni/application/xserver-gimp/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-gimp/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="GIMP Inkscape" AppFullName=org.gimp.inkscape # Application version code (integer) -AppVersionCode=28219 +AppVersionCode=281420 # Application user-visible version name (string) -AppVersionName="2.8.2.19" +AppVersionName="2.8.14.20" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -18,7 +18,7 @@ AppVersionName="2.8.2.19" # If the URL does not contain 'http://' it is treated as file from 'project/jni/application/src/AndroidData' dir - # these files are put inside .apk package by build system # You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version, first associated with the file -AppDataDownloadUrl="!!Data files|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/14.05.01/dist-gimp-wheezy-.tar.gz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall2.sh^!!Update|:update1.tar.gz:update1.tgz^!!Update|:update2.tar.gz:update2-.tgz^!!Update|:update3.tar.gz:update3-.tgz^!!Update|:update4.tar.gz:update4.tgz" +AppDataDownloadUrl="!!Data files|:data.tar.gz:obb:main.281420|:data.tar.gz:http://sourceforge.net/projects/libsdl-android/files/ubuntu/jessie/dist-gimp-jessie-.tar.gz/download^!!XSDL data files|:data-1.tar.gz:data-1.tgz^!!XSDL fonts|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall2.sh^!!Update|:update1.tar.gz:update1.tgz^!!Update|:update2.tar.gz:update2-.tgz^!!Update|:update3.tar.gz:update3-.tgz^!!Update|:update4.tar.gz:update4.tgz^!!Update|:update6.tar.gz:update6-.tgz" # Reset SDL config when updating application to the new version (y) / (n) ResetSdlConfigForThisVersion=y @@ -28,7 +28,7 @@ DeleteFilesOnUpgrade="%" # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ -ReadmeText='This app will now download 270Mb of data.' +ReadmeText='' # libSDL version to use (1.2/1.3/2.0) LibSdlVersion=1.2 @@ -113,6 +113,9 @@ RightMouseButtonLongPress=n # Show SDL mouse cursor, for applications that do not draw cursor at all (y) or (n) ShowMouseCursor=n +# Screen follows mouse cursor, when it's covered by soft keyboard, this works only in software video mode (y) or (n) +ScreenFollowsMouse=y + # Generate more touch events, by default SDL generates one event per one video frame, this is useful for drawing apps (y) or (n) GenerateSubframeTouchEvents=y @@ -188,10 +191,11 @@ RedefinedKeysScreenKb="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 RedefinedKeysScreenKbNames="LCTRL LALT LSHIFT RETURN SPACE DELETE KP_PLUS KP_MINUS 1 2" # On-screen keys theme -# 0 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) -# 1 = Simple Theme by Beholder (white, with gamepad joystick) +# 0 = Ultimate Droid by Sean Stieber (green, with cross joystick) +# 1 = Simple Theme by Beholder (white, with cross joystick) # 2 = Sun by Sirea (yellow, with round joystick) # 3 = Keen by Gerstrong (multicolor, with round joystick) +# 4 = Retro by Santiago Radeff (red/white, with cross joystick) TouchscreenKeysTheme=0 # Redefine gamepad keys to SDL keysyms, button order is: @@ -245,7 +249,7 @@ AppSubdirsBuild='' AppBuildExclude='' # Application command line parameters, including app name as 0-th param -AppCmdline='XSDL -nohelp -screenbuttons -exec $SECURE_STORAGE_DIR/usr/bin/xli -onroot -border black -center $SECURE_STORAGE_DIR/loading.gif ; $SECURE_STORAGE_DIR/img/proot.sh ./startx.sh' +AppCmdline='XSDL -nohelp -screenbuttons -exec $SECURE_STORAGE_DIR/usr/bin/xli -onroot -border black -center $SECURE_STORAGE_DIR/loading.gif ; $SECURE_STORAGE_DIR/img/proot.sh ./startx.sh' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/project/jni/application/xserver-gimp/AndroidData/logo.png b/project/jni/application/xserver-gimp/AndroidData/logo.png index b49b42506..a4ac722e0 100644 Binary files a/project/jni/application/xserver-gimp/AndroidData/logo.png and b/project/jni/application/xserver-gimp/AndroidData/logo.png differ diff --git a/project/jni/application/xserver-gimp/AndroidData/update6-armeabi-v7a.tgz b/project/jni/application/xserver-gimp/AndroidData/update6-armeabi-v7a.tgz new file mode 120000 index 000000000..75bea3a43 --- /dev/null +++ b/project/jni/application/xserver-gimp/AndroidData/update6-armeabi-v7a.tgz @@ -0,0 +1 @@ +../../xserver-debian/AndroidData/update6-armeabi-v7a.tgz \ No newline at end of file diff --git a/project/jni/application/xserver-gimp/AndroidData/update6-x86.tgz b/project/jni/application/xserver-gimp/AndroidData/update6-x86.tgz new file mode 120000 index 000000000..d5fa151e3 --- /dev/null +++ b/project/jni/application/xserver-gimp/AndroidData/update6-x86.tgz @@ -0,0 +1 @@ +../../xserver-debian/AndroidData/update6-x86.tgz \ No newline at end of file