diff --git a/android.qrc b/android.qrc new file mode 100644 index 000000000..a597f160a --- /dev/null +++ b/android.qrc @@ -0,0 +1,10 @@ + + + img/android/search.png + img/android/menu.png + res/android/Roboto-Bold.ttf + res/android/Roboto-Light.ttf + res/android/Roboto-Regular.ttf + res/android/Roboto-Thin.ttf + + diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f8e2ee1c8..fe64e726f 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 000000000..d1ff36226 --- /dev/null +++ b/android/build.gradle @@ -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 --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 000000000..8fdbd03c1 --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,9 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +androidBuildToolsVersion=21.1.2 +androidCompileSdkVersion=20 +buildDir=.build +qt5AndroidDir=/opt/qt/5.4/android_armv5/src/android/java diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..8c0fb64a8 Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..1e61d1fd3 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -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.12-all.zip diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 000000000..91a7e269e --- /dev/null +++ b/android/gradlew @@ -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 --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 000000000..aec99730b --- /dev/null +++ b/android/gradlew.bat @@ -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 --git a/android/local.properties b/android/local.properties new file mode 100644 index 000000000..f7b883f4d --- /dev/null +++ b/android/local.properties @@ -0,0 +1,6 @@ +## This file is automatically generated by QtCreator. +# +# This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. + +sdk.dir=/opt/android/android-sdk-linux diff --git a/android/res/values/libs.xml b/android/res/values/libs.xml new file mode 100644 index 000000000..4d68673cb --- /dev/null +++ b/android/res/values/libs.xml @@ -0,0 +1,25 @@ + + + + https://download.qt-project.org/ministro/android/qt5/qt-5.4 + + + + + + + + + + + + + + + + + + + + diff --git a/img/android/menu.png b/img/android/menu.png new file mode 100644 index 000000000..75394b35b Binary files /dev/null and b/img/android/menu.png differ diff --git a/img/android/search.png b/img/android/search.png new file mode 100644 index 000000000..099b4c528 Binary files /dev/null and b/img/android/search.png differ diff --git a/qtox.pro b/qtox.pro index 5a47f5cef..a6c909917 100644 --- a/qtox.pro +++ b/qtox.pro @@ -120,6 +120,7 @@ android { }} } + RESOURCES += android.qrc } @@ -378,3 +379,12 @@ contains(DEFINES, QTOX_PLATFORM_EXT) { src/platform/autorun_xdg.cpp \ src/platform/autorun_osx.cpp } + +DISTFILES += \ + android/gradle/wrapper/gradle-wrapper.jar \ + android/AndroidManifest.xml \ + android/gradlew.bat \ + android/res/values/libs.xml \ + android/build.gradle \ + android/gradle/wrapper/gradle-wrapper.properties \ + android/gradlew diff --git a/res/android/Roboto-Bold.ttf b/res/android/Roboto-Bold.ttf new file mode 100644 index 000000000..0f0869cd0 Binary files /dev/null and b/res/android/Roboto-Bold.ttf differ diff --git a/res/android/Roboto-BoldItalic.ttf b/res/android/Roboto-BoldItalic.ttf new file mode 100644 index 000000000..ecb1d7295 Binary files /dev/null and b/res/android/Roboto-BoldItalic.ttf differ diff --git a/res/android/Roboto-Italic.ttf b/res/android/Roboto-Italic.ttf new file mode 100644 index 000000000..053605165 Binary files /dev/null and b/res/android/Roboto-Italic.ttf differ diff --git a/res/android/Roboto-Light.ttf b/res/android/Roboto-Light.ttf new file mode 100644 index 000000000..d97616153 Binary files /dev/null and b/res/android/Roboto-Light.ttf differ diff --git a/res/android/Roboto-LightItalic.ttf b/res/android/Roboto-LightItalic.ttf new file mode 100644 index 000000000..f6c2b01d9 Binary files /dev/null and b/res/android/Roboto-LightItalic.ttf differ diff --git a/res/android/Roboto-Regular.ttf b/res/android/Roboto-Regular.ttf new file mode 100644 index 000000000..9cbafd652 Binary files /dev/null and b/res/android/Roboto-Regular.ttf differ diff --git a/res/android/Roboto-Thin.ttf b/res/android/Roboto-Thin.ttf new file mode 100644 index 000000000..29be04cc4 Binary files /dev/null and b/res/android/Roboto-Thin.ttf differ diff --git a/res/android/Roboto-ThinItalic.ttf b/res/android/Roboto-ThinItalic.ttf new file mode 100644 index 000000000..55c412568 Binary files /dev/null and b/res/android/Roboto-ThinItalic.ttf differ diff --git a/res/android/RobotoCondensed-Bold.ttf b/res/android/RobotoCondensed-Bold.ttf new file mode 100644 index 000000000..02d3d15cd Binary files /dev/null and b/res/android/RobotoCondensed-Bold.ttf differ diff --git a/res/android/RobotoCondensed-BoldItalic.ttf b/res/android/RobotoCondensed-BoldItalic.ttf new file mode 100644 index 000000000..f64d0099f Binary files /dev/null and b/res/android/RobotoCondensed-BoldItalic.ttf differ diff --git a/res/android/RobotoCondensed-Italic.ttf b/res/android/RobotoCondensed-Italic.ttf new file mode 100644 index 000000000..4d81136d2 Binary files /dev/null and b/res/android/RobotoCondensed-Italic.ttf differ diff --git a/res/android/RobotoCondensed-Light.ttf b/res/android/RobotoCondensed-Light.ttf new file mode 100644 index 000000000..681b76021 Binary files /dev/null and b/res/android/RobotoCondensed-Light.ttf differ diff --git a/res/android/RobotoCondensed-LightItalic.ttf b/res/android/RobotoCondensed-LightItalic.ttf new file mode 100644 index 000000000..dafa3a0b5 Binary files /dev/null and b/res/android/RobotoCondensed-LightItalic.ttf differ diff --git a/res/android/RobotoCondensed-Regular.ttf b/res/android/RobotoCondensed-Regular.ttf new file mode 100644 index 000000000..9707f66a0 Binary files /dev/null and b/res/android/RobotoCondensed-Regular.ttf differ diff --git a/src/android.ui b/src/android.ui index 5bc9214a6..4351c1b66 100644 --- a/src/android.ui +++ b/src/android.ui @@ -30,880 +30,362 @@ 0 - - - - 0 - 0 - + + + 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true + + + + + 56 + 56 + + + + + + + + + 103 + 58 + 183 + + + + + + + 103 + 58 + 183 + + + + + + + + + 103 + 58 + 183 + + + + + + + 103 + 58 + 183 + + + + + + + + + 103 + 58 + 183 + + + + + + + 103 + 58 + 183 + + + + + + + + true + + + + 24 - - - 0 - 0 - + + 12 - - - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Maximum - - - - 5 - 20 - - - - - - - - 0 - - - - - true - - - - 1 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - - - 11 - 75 - true - - - - Qt::ImhNoPredictiveText|Qt::ImhPreferLatin - - - Your name - - - - - - - - 1 - 0 - - - - - - - - - 193 - 193 - 193 - - - - - - - 193 - 193 - 193 - - - - - - - - - 193 - 193 - 193 - - - - - - - 193 - 193 - 193 - - - - - - - - - 14 - 14 - 14 - - - - - - - 14 - 14 - 14 - - - - - - - - - 8 - - - - Qt::ImhNoPredictiveText|Qt::ImhPreferLatin - - - Your status - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - - 20 - 40 - - - - Qt::NoFocus - - - - - - - 10 - 10 - - - - false - - - false - - - false - - - true - - - - - - - - - - - - - 0 - 0 - + + 12 - - Qt::LeftToRight + + + + + 0 + 0 + + + + + 24 + 24 + + + + + + + :/img/android/menu.png + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 128 + 128 + 128 + + + + + + + 128 + 128 + 128 + + + + + + + 128 + 128 + 128 + + + + + + + + + 24 + + + + qTox + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 24 + 24 + + + + + 24 + 24 + + + + + 24 + 24 + + + + + + + :/img/android/search.png + + + true + + + + + + + + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + + + QAbstractItemView::NoEditTriggers + + + false + + + QAbstractItemView::NoSelection + + + + 0 + 36 + + + + QListView::ListMode + + + false + + + + Someone - - true + + + + Someone else - - QFrame::NoFrame + + + + Groupbot - - Qt::ScrollBarAlwaysOff + + + + That guy who I don't remember adding - - true + + + + NASA manager - - - - 0 - 0 - 320 - 385 - - - - - - - - - - true + + + + Lorem - - - 0 - 0 - + + + + Ipsum - - + + + + Dolor - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 55 - 35 - - - - - 55 - 35 - - - - Qt::NoFocus - - - Add friends - - - false - - - - - - - - - - :/img/add.png:/img/add.png - - - false - - - false - - - false - - - - - - - - 55 - 35 - - - - Qt::NoFocus - - - Create a group chat - - - false - - - - - - - :/img/group_button.png:/img/group_button.png - - - true - - - - - - - - 55 - 35 - - - - - 55 - 35 - - - - Qt::NoFocus - - - View completed file transfers - - - - - - - :/img/transfer.png:/img/transfer.png - - - true - - - - - - - - 55 - 35 - - - - - 55 - 35 - - - - Qt::NoFocus - - - Change your settings - - - - - - - :/img/settings.png:/img/settings.png - - - true - - - - - - - - + + + + - - - AdjustingScrollArea - QScrollArea -
src/widget/adjustingscrollarea.h
- 1 - - - CroppingLabel - QLabel -
src/widget/croppinglabel.h
- - - + + + diff --git a/src/widget/androidgui.cpp b/src/widget/androidgui.cpp index 8dce7820b..dabaffb43 100644 --- a/src/widget/androidgui.cpp +++ b/src/widget/androidgui.cpp @@ -16,6 +16,8 @@ #include #include #include +#include +#include AndroidGUI::AndroidGUI(QWidget *parent) : QWidget(parent), @@ -23,79 +25,31 @@ AndroidGUI::AndroidGUI(QWidget *parent) : { ui->setupUi(this); - ui->friendList->setStyleSheet(Style::resolve(Style::getStylesheet(":ui/friendList/friendList.css"))); + QFontDatabase::addApplicationFont(":/res/android/Roboto-Bold.ttf"); + QFont font("Roboto1200310", 24); + qDebug() << "Font: "<headTitle->setFont(font); - profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png"); - profilePicture->setPixmap(QPixmap(":/img/contact_dark.png")); - profilePicture->setClickable(true); - ui->myProfile->insertWidget(0, profilePicture); - ui->myProfile->insertSpacing(1, 7); - - ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}")); - ui->statusHead->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css")); - - contactListWidget = new FriendListWidget(); - ui->friendList->setWidget(contactListWidget); - ui->friendList->setLayoutDirection(Qt::RightToLeft); - - ui->nameLabel->setEditable(true); - ui->statusLabel->setEditable(true); - - ui->statusPanel->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css")); - - QMenu *statusButtonMenu = new QMenu(ui->statusButton); - QAction* setStatusOnline = statusButtonMenu->addAction(AndroidGUI::tr("Online","Button to set your status to 'Online'")); - setStatusOnline->setIcon(QIcon(":ui/statusButton/dot_online.png")); - QAction* setStatusAway = statusButtonMenu->addAction(AndroidGUI::tr("Away","Button to set your status to 'Away'")); - setStatusAway->setIcon(QIcon(":ui/statusButton/dot_idle.png")); - QAction* setStatusBusy = statusButtonMenu->addAction(AndroidGUI::tr("Busy","Button to set your status to 'Busy'")); - setStatusBusy->setIcon(QIcon(":ui/statusButton/dot_busy.png")); - ui->statusButton->setMenu(statusButtonMenu); - - ui->statusButton->setProperty("status", "offline"); - Style::repolish(ui->statusButton); - - // Disable some widgets until we're connected to the DHT - ui->statusButton->setEnabled(false); - - Style::setThemeColor(Settings::getInstance().getThemeColor()); - Style::setThemeColor(1); - reloadTheme(); - - connect(ui->nameLabel, &CroppingLabel::textChanged, this, &AndroidGUI::onUsernameChanged); - connect(ui->statusLabel, &CroppingLabel::textChanged, this, &AndroidGUI::onStatusMessageChanged); + Q_INIT_RESOURCE(android); } AndroidGUI::~AndroidGUI() { - delete profilePicture; - delete contactListWidget; + } void AndroidGUI::reloadTheme() { - QString statusPanelStyle = Style::getStylesheet(":/ui/window/statusPanel.css"); - ui->tooliconsZone->setStyleSheet(Style::resolve("QPushButton{background-color:@themeDark;border:none;}QPushButton:hover{background-color:@themeMediumDark;border:none;}")); - ui->statusPanel->setStyleSheet(statusPanelStyle); - ui->statusHead->setStyleSheet(statusPanelStyle); - ui->friendList->setStyleSheet(Style::getStylesheet(":ui/friendList/friendList.css")); - ui->statusButton->setStyleSheet(Style::getStylesheet(":ui/statusButton/statusButton.css")); - for (Friend* f : FriendList::getAllFriends()) - f->getFriendWidget()->reloadTheme(); - - for (Group* g : GroupList::getAllGroups()) - g->getGroupWidget()->reloadTheme(); } void AndroidGUI::onSelfAvatarLoaded(const QPixmap& pic) { - profilePicture->setPixmap(pic); + } void AndroidGUI::onConnected() { - ui->statusButton->setEnabled(true); if (beforeDisconnect == Status::Offline) emit statusSet(Status::Online); else @@ -104,17 +58,6 @@ void AndroidGUI::onConnected() void AndroidGUI::onDisconnected() { - QString stat = ui->statusButton->property("status").toString(); - if (stat == "online") - beforeDisconnect = Status::Online; - else if (stat == "busy") - beforeDisconnect = Status::Busy; - else if (stat == "away") - beforeDisconnect = Status::Away; - else - beforeDisconnect = Status::Offline; - - ui->statusButton->setEnabled(false); emit statusSet(Status::Offline); } @@ -126,8 +69,6 @@ void AndroidGUI::onUsernameChanged(const QString& newUsername, const QString& ol void AndroidGUI::setUsername(const QString& username) { - ui->nameLabel->setText(username); - ui->nameLabel->setToolTip(username); // for overlength names QString sanename = username; sanename.remove(QRegExp("[\\t\\n\\v\\f\\r\\x0000]")); nameMention = QRegExp("\\b" + QRegExp::escape(username) + "\\b", Qt::CaseInsensitive); @@ -136,37 +77,17 @@ void AndroidGUI::setUsername(const QString& username) void AndroidGUI::onStatusMessageChanged(const QString& newStatusMessage, const QString& oldStatusMessage) { - ui->statusLabel->setText(oldStatusMessage); // restore old status message until Core tells us to set it - ui->statusLabel->setToolTip(oldStatusMessage); // for overlength messsages Nexus::getCore()->setStatusMessage(newStatusMessage); } void AndroidGUI::setStatusMessage(const QString &statusMessage) { - ui->statusLabel->setText(statusMessage); - ui->statusLabel->setToolTip(statusMessage); // for overlength messsages + } void AndroidGUI::onStatusSet(Status status) { - //We have to use stylesheets here, there's no way to - //prevent the button icon from moving when pressed otherwise - switch (status) - { - case Status::Online: - ui->statusButton->setProperty("status" ,"online"); - break; - case Status::Away: - ui->statusButton->setProperty("status" ,"away"); - break; - case Status::Busy: - ui->statusButton->setProperty("status" ,"busy"); - break; - case Status::Offline: - ui->statusButton->setProperty("status" ,"offline"); - break; - } - Style::repolish(ui->statusButton); + } void AndroidGUI::keyPressEvent(QKeyEvent* event)