# HG changeset patch # User John Tsiombikas # Date 1422019467 -7200 # Node ID 6321cfa2ad62b629b6d101be4741070aa08b07d2 initial diff -r 000000000000 -r 6321cfa2ad62 android/AndroidManifest.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/android/AndroidManifest.xml Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 000000000000 -r 6321cfa2ad62 android/build.gradle --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/android/build.gradle Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,51 @@ +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.12.1' + } +} + +apply plugin: 'android' + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} + +android { + /******************************************************* + * The following variables: + * - androidBuildToolsVersion, + * - androidCompileSdkVersion + * - qt5AndroidDir - holds the path to qt android files + * needed to build any Qt application + * on Android. + * + * are defined in gradle.properties file. This file is + * updated by QtCreator and androiddeployqt tools. + * Changing them manually might break the compilation! + *******************************************************/ + + compileSdkVersion androidCompileSdkVersion.toInteger() + + buildToolsVersion androidBuildToolsVersion + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java'] + aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl'] + res.srcDirs = [qt5AndroidDir + '/res', 'res'] + resources.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + assets.srcDirs = ['assets'] + jniLibs.srcDirs = ['libs'] + } + } + + lintOptions { + abortOnError false + } +} diff -r 000000000000 -r 6321cfa2ad62 android/gradle/wrapper/gradle-wrapper.jar Binary file android/gradle/wrapper/gradle-wrapper.jar has changed diff -r 000000000000 -r 6321cfa2ad62 android/gradle/wrapper/gradle-wrapper.properties --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/android/gradle/wrapper/gradle-wrapper.properties Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip diff -r 000000000000 -r 6321cfa2ad62 android/gradlew --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/android/gradlew Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> $.*$$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff -r 000000000000 -r 6321cfa2ad62 android/gradlew.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/android/gradlew.bat Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff -r 000000000000 -r 6321cfa2ad62 android/res/values/libs.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/android/res/values/libs.xml Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,25 @@ + + + + https://download.qt-project.org/ministro/android/qt5/qt-5.4 + + + + + + + + + + + + + + + + + + + + diff -r 000000000000 -r 6321cfa2ad62 main.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/main.cc Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,11 @@ +#include "mainwin.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWin w; + w.show(); + + return a.exec(); +} diff -r 000000000000 -r 6321cfa2ad62 mainwin.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mainwin.cc Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,44 @@ +#include "mainwin.h" +#include "ui_mainwin.h" + +MainWin::MainWin(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWin) +{ + ui->setupUi(this); +} + +MainWin::~MainWin() +{ + delete ui; +} + +void MainWin::on_bn_p1_reset_clicked() +{ + ui->spin_p1_life->setValue(20); +} + +void MainWin::on_bn_p2_reset_clicked() +{ + ui->spin_p2_life->setValue(20); +} + +void MainWin::on_bn_p1_inc10_clicked() +{ + ui->spin_p1_life->setValue(ui->spin_p1_life->value() + 10); +} + +void MainWin::on_bn_p1_dec10_clicked() +{ + ui->spin_p1_life->setValue(ui->spin_p1_life->value() - 10); +} + +void MainWin::on_bn_p2_inc10_clicked() +{ + ui->spin_p2_life->setValue(ui->spin_p2_life->value() + 10); +} + +void MainWin::on_bn_p2_dec10_clicked() +{ + ui->spin_p2_life->setValue(ui->spin_p2_life->value() - 10); +} diff -r 000000000000 -r 6321cfa2ad62 mainwin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mainwin.h Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,35 @@ +#ifndef MAINWIN_H +#define MAINWIN_H + +#include + +namespace Ui { +class MainWin; +} + +class MainWin : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWin(QWidget *parent = 0); + ~MainWin(); + +private slots: + void on_bn_p1_reset_clicked(); + + void on_bn_p2_reset_clicked(); + + void on_bn_p1_inc10_clicked(); + + void on_bn_p1_dec10_clicked(); + + void on_bn_p2_inc10_clicked(); + + void on_bn_p2_dec10_clicked(); + +private: + Ui::MainWin *ui; +}; + +#endif // MAINWIN_H diff -r 000000000000 -r 6321cfa2ad62 mainwin.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mainwin.ui Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,413 @@ + + + MainWin + + + + 0 + 0 + 623 + 380 + + + + MainWin + + + + + + + Player 1 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + Reset + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + 38 + 20 + + + + + + + + + + + 24 + + + + +10 + + + + + + + + 0 + 0 + + + + + 24 + + + + +1 + + + + + + + + 0 + 0 + + + + + 50 + + + + true + + + Qt::AlignCenter + + + true + + + QAbstractSpinBox::NoButtons + + + -99 + + + 20 + + + + + + + + 0 + 0 + + + + + 24 + + + + -1 + + + + + + + + 24 + + + + -10 + + + + + + + + + + + + Player 2 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + Reset + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + 32 + 20 + + + + + + + + + + + 24 + + + + +10 + + + + + + + + 0 + 0 + + + + + 24 + + + + +1 + + + + + + + + 0 + 0 + + + + + 50 + + + + true + + + Qt::AlignCenter + + + true + + + QAbstractSpinBox::NoButtons + + + -99 + + + 20 + + + + + + + + 0 + 0 + + + + + 24 + + + + -1 + + + + + + + + 24 + + + + -10 + + + + + + + + + + + + + + + + bn_p1_dec + clicked() + spin_p1_life + stepDown() + + + 209 + 277 + + + 232 + 196 + + + + + bn_p1_inc + clicked() + spin_p1_life + stepUp() + + + 241 + 131 + + + 251 + 181 + + + + + bn_p2_dec + clicked() + spin_p2_life + stepDown() + + + 536 + 252 + + + 540 + 190 + + + + + bn_p2_inc + clicked() + spin_p2_life + stepUp() + + + 510 + 135 + + + 506 + 189 + + + + + diff -r 000000000000 -r 6321cfa2ad62 simple_mtglife.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/simple_mtglife.pro Fri Jan 23 15:24:27 2015 +0200 @@ -0,0 +1,35 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2015-01-23T12:00:15 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = simple_mtglife +TEMPLATE = app + + +SOURCES += main.cc\ + mainwin.cc + +HEADERS += mainwin.h + +FORMS += mainwin.ui + +CONFIG += mobility +MOBILITY = + +DISTFILES += \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/AndroidManifest.xml \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew \ + android/gradlew.bat + +ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +