- remove IFSC stuff

- new design for startpage
- some rework

android-sources/AndroidManifest.xml

@@ -1,44 +1,54 @@
 <?xml version="1.0"?>
-<manifest package="com.itsblue.blueROCKtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.03.1" android:versionCode="13" android:installLocation="auto">
+<manifest package="com.itsblue.blueROCKtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="blueROCK" android:icon="@drawable/icon">
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="blueROCK" android:screenOrientation="unspecified" android:launchMode="singleTop">
+         Remove the comment if you do not require these default permissions. -->
+    <!-- %%INSERT_PERMISSIONS -->
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
+    <!-- %%INSERT_FEATURES -->
+
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:icon="@drawable/icon">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-
             <!-- Application arguments -->
             <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
             <!-- Application arguments -->
-
+            <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
-            <meta-data android:name="android.app.lib_name" android:value="blueROCK"/>
             <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
             <meta-data android:name="android.app.repository" android:value="default"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
             <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
             <!-- Deploy Qt libs as part of package -->
-            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
-            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
-            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
             <!-- Run with local libs -->
-            <meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
             <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
-            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
+            <meta-data android:name="android.app.load_local_libs_resource_id" android:resource="@array/load_local_libs"/>
-            <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidBearer.jar:jar/QtAndroidExtras.jar"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
-            <meta-data android:name="android.app.static_init_classes" android:value=""/>
+            <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
             <!-- Used to specify custom system library path to run with local system libs -->
             <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
             <!--  Messages maps -->
             <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
             <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
             <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+            <meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
             <!--  Messages maps -->
-
             <!-- Splash screen -->
+            <!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
+                 then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
+                 use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
+                 are done populating your window with content. -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
             <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
             <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
             <!-- Splash screen -->
-
             <!-- Background running -->
             <!-- Warning: changing this value to true may cause unexpected crashes if the
                           application still try to draw after
@@ -46,38 +56,21 @@
                           signal is sent! -->
             <meta-data android:name="android.app.background_running" android:value="false"/>
             <!-- Background running -->
-
             <!-- auto screen scale factor -->
             <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
             <!-- auto screen scale factor -->
-
             <!-- extract android style -->
             <!-- available android:values :
+                * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
                 * full - useful QWidget & Quick Controls 1 apps
                 * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
                 * none - useful for apps that don't use any of the above Qt modules
                 -->
-            <meta-data android:name="android.app.extract_android_style" android:value="full"/>
+            <meta-data android:name="android.app.extract_android_style" android:value="default"/>
             <!-- extract android style -->
         </activity>
-
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
-
     </application>
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
+<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
-    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-
-    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
-         Remove the comment if you do not require these default permissions. -->
-        <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
-
-    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
-         Remove the comment if you do not require these default features. -->
-        <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
-
-<uses-permission android:name="com.android.vending.BILLING"/>
 </manifest>

android-sources/build.gradle

@@ -0,0 +1,77 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.6.0'
+    }
+}
+
+repositories {
+    google()
+    jcenter()
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
+}
+
+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 '28.0.3'
+
+    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 = ['resources']
+            renderscript.srcDirs = ['src']
+            assets.srcDirs = ['assets']
+            jniLibs.srcDirs = ['libs']
+       }
+    }
+
+    tasks.withType(JavaCompile) {
+        options.incremental = true
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    // Do not compress Qt binary resources file
+    aaptOptions {
+        noCompress 'rcc'
+    }
+
+    defaultConfig {
+        resConfig "en"
+        minSdkVersion = qtMinSdkVersion
+        targetSdkVersion = qtTargetSdkVersion
+    }
+}

android-sources/gradle.properties

@@ -0,0 +1,11 @@
+# Project-wide Gradle settings.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+
+# Gradle caching allows reusing the build artifacts from a previous
+# build with the same inputs. However, over time, the cache size will
+# grow. Uncomment the following line to enable it.
+#org.gradle.caching=true

android-sources/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

android-sources/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# 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\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# 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
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+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" -a "$nonstop" = "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"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # 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
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

android-sources/gradlew.bat

@@ -0,0 +1,84 @@
+@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
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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=
+
+@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 Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_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=%*
+
+: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

android-sources/res/values/libs.xml

@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+    <array name="qt_sources">
+        <item>https://download.qt.io/ministro/android/qt5/qt-5.14</item>
+    </array>
+
+    <!-- The following is handled automatically by the deployment tool. It should
+         not be edited manually. -->
+
+    <array name="bundled_libs">
+        <!-- %%INSERT_EXTRA_LIBS%% -->
+    </array>
+
+    <array name="qt_libs">
+        <!-- %%INSERT_QT_LIBS%% -->
+    </array>
+
+    <array name="load_local_libs">
+        <!-- %%INSERT_LOCAL_LIBS%% -->
+    </array>
+
+</resources>

blueROCK.pro

@@ -2,16 +2,7 @@ QT += quick qml quickcontrols2 purchasing widgets
 CONFIG += c++11
 
 VERSION = 0.04
-
+TARGET = blueROCK
-android {
-    QT += androidextras
-    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
-}
-
-ios {
-    QMAKE_ASSET_CATALOGS += resources/shared/Assets.xcassets
-    xcode_product_bundle_identifier_setting.value = "de.itsblue.bluerock"
-}
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
@@ -53,5 +44,44 @@ HEADERS += \
 DISTFILES += \
     CHANGELOG.md \
     android-sources/AndroidManifest.xml \
+    android-sources/build.gradle \
+    android-sources/gradle.properties \
+    android-sources/gradle/wrapper/gradle-wrapper.jar \
+    android-sources/gradle/wrapper/gradle-wrapper.properties \
+    android-sources/gradlew \
+    android-sources/gradlew.bat \
+    android-sources/res/values/libs.xml \
     resources/shared/icons/bluerock/index.theme \
     $$files(resources/shared/icons/*.png, true)
+
+android {
+    QT += androidextras
+
+    defineReplace(droidVersionCode) {
+            segments = $$split(1, ".")
+            for (segment, segments): vCode = "$$first(vCode)$$format_number($$segment, width=3 zeropad)"
+
+            contains(ANDROID_TARGET_ARCH, arm64-v8a): \
+                suffix = 1
+            else:contains(ANDROID_TARGET_ARCH, armeabi-v7a): \
+                suffix = 0
+            # add more cases as needed
+
+            return($$first(vCode)$$first(suffix))
+    }
+
+    ANDROID_VERSION_NAME = $$VERSION
+    ANDROID_VERSION_CODE = $$droidVersionCode($$ANDROID_VERSION_NAME)
+
+    include(/home/dorian/Android/Sdk/android_openssl/openssl.pri)
+    ANDROID_ABIS = armeabi-v7a arm64-v8a
+    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
+}
+
+ios {
+    QMAKE_ASSET_CATALOGS += resources/shared/Assets.xcassets
+    xcode_product_bundle_identifier_setting.value = "de.itsblue.bluerock"
+}
+
+ANDROID_ABIS = armeabi-v7a arm64-v8a
+

headers/appsettings.h

@@ -10,8 +10,6 @@ class AppSettings : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(NOTIFY themeChanged)
-
 public:
     explicit AppSettings(QObject *parent = nullptr);
     // This is the Constructor of the AppSettings class

resources/qml/Components/CompetitionCalendarDelegate.qml

@@ -0,0 +1,169 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.3
+
+ItemDelegate {
+    id: competitionDel
+
+    property bool over
+    property var thisData: control.widgetData["competitions"][index]
+
+    property string name: thisData["name"]
+    property string date: thisData["date_span"]
+    property var cats: thisData["cats"]
+    property int catId: thisData["cat_id"] === undefined ? 0:thisData["cat_id"]
+
+    property bool thisIsFavored: control.compFavorites.indexOf(parseInt(thisData['WetId'])) >= 0
+    property bool includedByFavorites: control.displayedCompCats.indexOf(-1) >= 0 && thisIsFavored
+    property bool includedByFilter: control.displayedCompCats.indexOf(parseInt(thisData['cat_id'])) >= 0
+    property bool thisIsVisible: includedByFavorites || includedByFilter
+
+    function updateVisibility() {
+        competitionDel.includedByFilter = control.displayedCompCats.indexOf(parseInt(competitionDel.thisData['cat_id'])) >= 0
+        competitionDel.thisIsFavored = control.compFavorites.indexOf(parseInt(thisData['WetId'])) >= 0
+        competitionDel.includedByFavorites = control.displayedCompCats.indexOf(-1) >= 0 && thisIsFavored
+    }
+
+    width: control.width
+    height: thisIsVisible ? compDelCol.height + 10 : 0
+
+    enabled: ((thisData["cats"] !== undefined && thisData["cats"].length > 0) || competitionDel.thisData["homepage"] !== undefined || getCompInfoUrls(index).length > 0) && height > 0
+    //visible: includedByFilter
+
+    opacity: 0
+    scale: 0.9
+
+    Connections {
+        target: control
+        function onDisplayedCompCatsChanged() {
+            competitionDel.updateVisibility()
+        }
+
+        function onCompFavoritesChanged() {
+            competitionDel.updateVisibility()
+        }
+    }
+
+    onThisDataChanged: {
+        if(thisIsVisible){
+            fadeInPa.start()
+        }
+    }
+
+    onThisIsVisibleChanged: {
+        if(thisIsVisible){
+            fadeInPa.start()
+        }
+        else {
+            fadeOutPa.start()
+        }
+    }
+
+    Behavior on height {
+        NumberAnimation {
+            duration: 400
+        }
+    }
+
+    onClicked: {
+        control.openComp(index)
+    }
+
+    ParallelAnimation {
+        id: fadeInPa
+        NumberAnimation { target: competitionDel; property: "opacity"; from: 0; to: 1.0; duration: 400 }
+        NumberAnimation { target: competitionDel; property: "scale"; from: 0.8; to: 1.0; duration: 400 }
+    }
+
+    ParallelAnimation {
+        id: fadeOutPa
+        NumberAnimation { target: competitionDel; property: "opacity"; from: 1; to: 0; duration: 400 }
+        NumberAnimation { target: competitionDel; property: "scale"; from: 1; to: 0.8; duration: 400 }
+    }
+
+    Rectangle {
+        id: delBackroundRect
+
+        anchors.fill: parent
+
+        opacity: 0.5
+
+        color: control.getCompCatData(catId) === undefined ? "white":control.getCompCatData(catId)["bgcolor"]
+    }
+
+    Column {
+        id: compDelCol
+
+        anchors.centerIn: parent
+
+        width: parent.width * 0.97
+
+        spacing: 10
+
+        RowLayout {
+            width: parent.width
+            Label {
+                id: nameLa
+
+                width: parent.width
+                Layout.fillWidth: true
+
+                font.bold: true
+                wrapMode: Text.WordWrap
+
+                text: name
+
+            }
+
+            ToolButton {
+                id: bookmarkTb
+                icon.name: competitionDel.thisIsFavored ? "pinFilled":"pin"
+                onClicked: {
+                    control.editFavorites(!competitionDel.thisIsFavored, parseInt(thisData['WetId']))
+                }
+
+                Layout.alignment: Layout.Right
+
+                Behavior on icon.name {
+                    SequentialAnimation {
+                        NumberAnimation {
+                            property: "scale"
+                            target: bookmarkTb
+                            duration: 75
+                            to: 0.8
+                        }
+                        NumberAnimation {
+                            property: "scale"
+                            target: bookmarkTb
+                            duration: 75
+                            to: 1
+                        }
+                    }
+                }
+            }
+        }
+
+        Label {
+            id: dateLa
+
+            color: "grey"
+
+            text: date
+        }
+    }
+
+    Rectangle {
+        id: bottomLineRa
+
+        anchors {
+            bottom: parent.bottom
+            left: parent.left
+            right: parent.right
+        }
+
+        height: 1
+
+        color: "lightgrey"
+
+    }
+}

resources/qml/Components/FancyButton.qml

@@ -26,11 +26,11 @@ ToolButton {
     property string image
     property color backgroundColor: "white"
     property color textColor: "black"
-    property real imageScale: 1
+    property real imageScale: 1.3
     property double glowRadius: 0.001
     property double glowSpread: 0.2
     property bool glowVisible: true
-    property double glowScale: 0.75
+    property double glowScale: 0.92
     property double glowOpacity: 1
 
     Behavior on backgroundColor {
@@ -65,7 +65,7 @@ ToolButton {
 
             anchors.fill: parent
 
-            radius: height * 0.5
+            radius: height * 0.2
 
             color: control.down ? Qt.darker(control.backgroundColor, 1.03) : control.backgroundColor
 

resources/qml/Components/PullRefresher.qml

@@ -162,7 +162,7 @@ Item {
 
     Connections {
         target: control.target
-        onDragEnded: {
+        function onDragEnded(userPosition) {
             if(userPosition >= control.dragOutPosition * control.dragRefreshPositionMultiplier){
                 control.state = "refreshing"
                 preRefreshTimer.start()

resources/qml/Pages/StartPage.qml

@@ -16,8 +16,9 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.0
+import QtQuick 2.9
 import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.0
 
 import "../Components"
 
@@ -25,47 +26,56 @@ Page {
     id: root
 
     title: "start"
-    property Component headerComponent: null
 
-    Label {
+    signal headerComponentChanged()
+
+    RowLayout {
+        id: headerLayout
+
         anchors {
             horizontalCenter: parent.horizontalCenter
             top: parent.top
             topMargin: root.height * 0.03
         }
 
-        font.pixelSize: anchors.topMargin
+        height: menuGr.buttonSize * 0.3
+        spacing: anchors.topMargin * 0.5
+
+        Image {
+            Layout.preferredHeight: parent.height
+            Layout.preferredWidth: height
+
+            fillMode: Image.PreserveAspectFit
+            mipmap: true
+
+            source: "qrc:/icons/blueRockHold.png"
+        }
+
+        Label {
+            Layout.preferredHeight: parent.height
+            Layout.fillWidth: true
+
+            font.pixelSize: parent.height * 0.6
             font.bold: true
 
+            verticalAlignment: Text.AlignVCenter
+
             text: "blueROCK"
         }
+    }
 
     Grid {
         id: menuGr
 
         anchors.centerIn: parent
 
-        rows: app.landscape() ? 1:3
+        rows: app.landscape() ? 1:2
-        columns:  app.landscape() ? 3:1
+        columns:  app.landscape() ? 2:1
 
         spacing: !app.landscape() ? parent.height * 0.08:parent.width * 0.1
 
         property int buttonSize: app.landscape() ? parent.width * 0.2:parent.height * 0.2
 
-        FancyButton {
-            id: ifscBt
-
-            height: menuGr.buttonSize
-            width: height
-
-            image: "qrc:/icons/ifsc.png"
-
-            onClicked: {
-                app.openWidget({nation:"ICC"})
-            }
-
-        }
-
         FancyButton {
             id: davBt
 
@@ -96,17 +106,34 @@ Page {
 
     }
 
+    ToolButton {
+        id: ifscDisclaimerButton
+
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: bottomDigitalrockDisclaimerLabel.top
+        }
+
+        text: "WHERE ARE THE IFSC RESULTS?"
+        font.bold: true
+
+        onClicked: ifscDisclaimerDialog.open()
+    }
+
     Label {
+        id: bottomDigitalrockDisclaimerLabel
         anchors {
             horizontalCenter: parent.horizontalCenter
             bottom: parent.bottom
-            bottomMargin: root.height * 0.03
+            bottomMargin: headerLayout.anchors.topMargin
         }
 
         width: parent.width * 0.9
         height: anchors.bottomMargin
 
-        wrapMode: "Wrap"
+        fontSizeMode: Label.Fit
+        minimumPixelSize: 1
+
         horizontalAlignment: Text.AlignHCenter
 
         text: "Resultservice and rankings provided by <a href='http://www.digitalROCK.de'>digital ROCK</a>."
@@ -116,4 +143,34 @@ Page {
         }
     }
 
+    Dialog {
+        id: ifscDisclaimerDialog
+
+        parent: Overlay.overlay
+
+        x: (parent.width - width) * 0.5
+        y: (parent.height - height) * 0.5
+
+        width: parent.width * 0.8
+        height: implicitHeight
+
+        title: "Where are the IFSC results?"
+        modal: true
+
+        standardButtons: Dialog.Close
+
+        contentItem: Label {
+            wrapMode: Text.Wrap
+            text:
+                "Unfortunately, the IFSC has restricted the access to their data and <b>is not willing to share results with blueROCK anymore</b>. " +
+                "Because of this, blueROCK is no longer able to access and display IFSC results.<br><br>" +
+                "You can find current IFSC results <a href=\"https://ifsc.results.info\">over here</a> and on <a href=\"https://ifsc-climbing.org\">their website</a>."
+
+            onLinkActivated: {
+                Qt.openUrlExternally(link)
+            }
+        }
+
+    }
+
 }

resources/qml/Widgets/CalendarWidget.qml

@@ -31,8 +31,6 @@ DataListView {
     property Component headerComponent: RowLayout {
 
         height: parent.height
-        //width: 10//childrenRect.width
-
         spacing: 0
 
         ToolButton {
@@ -369,9 +367,8 @@ DataListView {
 
     Connections {
         target: parent.selector
-        onSelectionFinished: {
+        function onSelectionFinished(index, data) {
             if(data.comp !== undefined){
-                //console.log(data.status)
                 app.openWidget({comp: data.comp, cat: data.cat, type:data.status === 4 ? 'starters':''})
             }
             else if(data.year !== undefined){
@@ -399,171 +396,7 @@ DataListView {
         height: 10
     }
 
-    delegate: ItemDelegate {
+    delegate: CompetitionCalendarDelegate {
-        id: competitionDel
-
-        property bool over
-        property var thisData: control.widgetData["competitions"][index]
-
-        property string name: thisData["name"]
-        property string date: thisData["date_span"]
-        property var cats: thisData["cats"]
-        property int catId: thisData["cat_id"] === undefined ? 0:thisData["cat_id"]
-
-        property bool thisIsFavored: control.compFavorites.indexOf(parseInt(thisData['WetId'])) >= 0
-        property bool includedByFavorites: control.displayedCompCats.indexOf(-1) >= 0 && thisIsFavored
-        property bool includedByFilter: control.displayedCompCats.indexOf(parseInt(thisData['cat_id'])) >= 0
-        property bool thisIsVisible: includedByFavorites || includedByFilter
-
-        function updateVisibility() {
-            competitionDel.includedByFilter = control.displayedCompCats.indexOf(parseInt(competitionDel.thisData['cat_id'])) >= 0
-            competitionDel.thisIsFavored = control.compFavorites.indexOf(parseInt(thisData['WetId'])) >= 0
-            competitionDel.includedByFavorites = control.displayedCompCats.indexOf(-1) >= 0 && thisIsFavored
-        }
-
-        width: parent.width
-        height: thisIsVisible ? compDelCol.height + 10 : 0
-
-        enabled: ((thisData["cats"] !== undefined && thisData["cats"].length > 0) || competitionDel.thisData["homepage"] !== undefined || getCompInfoUrls(index).length > 0) && height > 0
-        //visible: includedByFilter
-
-        opacity: 0
-        scale: 0.9
-
-        Connections {
-            target: control
-            onDisplayedCompCatsChanged: {
-                competitionDel.updateVisibility()
-            }
-
-            onCompFavoritesChanged: {
-                competitionDel.updateVisibility()
-            }
-        }
-
-        onThisDataChanged: {
-            if(thisIsVisible){
-                fadeInPa.start()
-            }
-        }
-
-        onThisIsVisibleChanged: {
-            if(thisIsVisible){
-                fadeInPa.start()
-            }
-            else {
-                fadeOutPa.start()
-            }
-        }
-
-        Behavior on height {
-            NumberAnimation {
-                duration: 400
-            }
-        }
-
-        onClicked: {
-            control.openComp(index)
-        }
-
-        ParallelAnimation {
-            id: fadeInPa
-            NumberAnimation { target: competitionDel; property: "opacity"; from: 0; to: 1.0; duration: 400 }
-            NumberAnimation { target: competitionDel; property: "scale"; from: 0.8; to: 1.0; duration: 400 }
-        }
-
-        ParallelAnimation {
-            id: fadeOutPa
-            NumberAnimation { target: competitionDel; property: "opacity"; from: 1; to: 0; duration: 400 }
-            NumberAnimation { target: competitionDel; property: "scale"; from: 1; to: 0.8; duration: 400 }
-        }
-
-        Rectangle {
-            id: delBackroundRect
-
-            anchors.fill: parent
-
-            opacity: 0.5
-
-            color: control.getCompCatData(catId) === undefined ? "white":control.getCompCatData(catId)["bgcolor"]
-        }
-
-        Column {
-            id: compDelCol
-
-            anchors.centerIn: parent
-
-            width: parent.width * 0.97
-
-            spacing: 10
-
-            RowLayout {
-                width: parent.width
-                Label {
-                    id: nameLa
-
-                    width: parent.width
-
-                    font.bold: true
-
-                    wrapMode: Text.WordWrap
-
-                    text: name
-
-                    Layout.fillWidth: true
-                }
-
-                ToolButton {
-                    id: bookmarkTb
-                    icon.name: competitionDel.thisIsFavored ? "pinFilled":"pin"
-                    onClicked: {
-                        control.editFavorites(!competitionDel.thisIsFavored, parseInt(thisData['WetId']))
-                    }
-
-                    Layout.alignment: Layout.Right
-
-                    Behavior on icon.name {
-                        SequentialAnimation {
-                            NumberAnimation {
-                                property: "scale"
-                                target: bookmarkTb
-                                duration: 75
-                                to: 0.8
-                            }
-                            NumberAnimation {
-                                property: "scale"
-                                target: bookmarkTb
-                                duration: 75
-                                to: 1
-                            }
-                        }
-                    }
-                }
-            }
-
-            Label {
-                id: dateLa
-
-                color: "grey"
-
-                text: date
-            }
-        }
-
-        Rectangle {
-            id: bottomLineRa
-
-            anchors {
-                bottom: parent.bottom
-                left: parent.left
-                right: parent.right
-            }
-
-            height: 1
-
-            color: "lightgrey"
-
-        }
     }
 
     section.property: "month"

resources/qml/Widgets/ResultWidget.qml

@@ -17,7 +17,7 @@
 */
 
 import QtQuick 2.9
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.4
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 import QtQuick.Controls.Material 2.3
@@ -37,12 +37,22 @@ DataListView {
     property bool titleIsPageTitle: true
 
     property Component headerComponent: RowLayout {
-        id: headerComponent
 
         height: parent.height
-
         spacing: 0
 
+        layoutDirection: Qt.RightToLeft
+
+        ToolButton {
+            id: moreToolBt
+
+            onClicked: {
+                control.changeCat()
+            }
+
+            icon.name: "menu"
+        }
+
         ToolButton {
             id: flowToolBt
 
@@ -52,7 +62,7 @@ DataListView {
 
             onClicked: {
                 if(speedFlowChartBackgroundRect.state === "hidden"){
-                    speedFlowChartBackgroundRect.state ="visible"
+                    speedFlowChartBackgroundRect.state = "visible"
                     control.positionViewAtBeginning()
                 }
                 else {
@@ -62,18 +72,6 @@ DataListView {
 
             icon.name: "flowchart"
         }
-
-        ToolButton {
-            id: moreToolBt
-
-            Layout.alignment: Layout.Right
-
-            onClicked: {
-                control.changeCat()
-            }
-
-            icon.name: "menu"
-        }
     }
 
     property var widgetData: currentWidgetData
@@ -163,7 +161,7 @@ DataListView {
 
     Connections {
         target: selector
-        onSelectionFinished: {
+        function onSelectionFinished(index, data) {
             if(data.cat !== undefined){
                 updateData({cat: data.cat}, true)
             }
@@ -763,15 +761,15 @@ DataListView {
 
                 Connections {
                     target: speedFlowChartProduct
-                    onPurchaseRestored: {
+                    function onPurchaseRestored() {
                         speedFlowChartLockedOverlay.state = appSettings.read("speedBackendPurchase") === "1" ? "unlocked":"locked"
                     }
 
-                    onPurchaseSucceeded: {
+                    function onPurchaseSucceeded() {
                         speedFlowChartLockedOverlay.state = appSettings.read("speedBackendPurchase") === "1" ? "unlocked":"locked"
                     }
 
-                    onPurchaseFailed: {
+                    function onPurchaseFailed() {
                         purchaseBt.text = qsTr("Purchase failed")
                         purchaseBt.enabled = false
                         buttonTextResetTimer.start()

resources/qml/main.qml

@@ -45,96 +45,8 @@ Window {
 
         property var compCats: {
 
-            // --- ICC ---
-
-            /*'int' : {
-                'label'  : 'International',
-                'nation' : 'ICC',
-                'wettk_reg' : '^[0-9]{2,2}[_^E]{1}[^YJ]{1,1}.*',
-                'serie_reg' : '^[0-9]{2,2}_(WC|TR){1,1}.*',
-                'rang_title': 'CUWR continuously updated WORLDRANKING',
-                'bgcolor'   : '#B8C8FF',
-                'nat_team_ranking' : '',
-                'cat_id' : [68,86]//[68,69,70,86,259]
-            },*/
-            'worldcup': {
-                'label' : 'World Cups',
-                'nation' : 'ICC',
-                'bgcolor'   : '#B8C8FF',
-                'sort_rank': 1,
-                'cat_id' : [69]
-            },
-            'youth' : {
-                'label'  : 'Youth Events',
-                'nation' : 'ICC',
-                'wettk_reg' : '^[0-9]{2,2}(EYC|_J|_Y){1,1}.*',
-                'serie_reg' : '^[0-9]{2,2}_EYC',
-                'rang_title': '',
-                'bgcolor'   : '#D8E8FF',
-                'sort_rank': 2,
-                'cat_id' : [71,258]
-            },
-            'cont': {
-                'label' : 'Continental Events',
-                'nation' : 'ICC',
-                'bgcolor'   : '#B8C8FF',
-                'sort_rank': 3,
-                'cat_id' : [262]
-            },
-            'masters' : {
-                'label'  : 'Masters and Promo Events',
-                'nation' : 'ICC',
-                'wettk_reg' : '^[0-9]{2,2}_[^PWERASL]{1}.*',
-        //		'serie_reg' : '^[0-9]{2,2}_(WC|TR){1,1}.*',
-        //		'rang_title': 'CUWR continuously updated WORLDRANKING',
-                'bgcolor'   : '#F0F0F0',
-                'sort_rank': 4,
-                'cat_id' : [70]
-            },
-            'para' : {
-                'label'  : 'Paraclimbing Events',
-                'nation' : 'ICC',
-                'wettk_reg' : '^[0-9]{2,2}_PE.*',
-                'bgcolor'   : '#F0F0F0',
-                'sort_rank': 5,
-                'cat_id' : [256,259]
-            },
-            'games': {
-                'label': 'Games',
-                'nation': 'ICC',
-                'bgcolor'   : '#B8C8FF',
-                'sort_rank': 6,
-                'cat_id': [68,86]
-            },
-
             // --- GER ---
 
-            /*'ger_boulder' : {
-                'label'  : 'Bouldern',
-                'nation' : 'GER',
-                'wettk_reg' : '^[0-9]{2,2}_B+.*',
-                'serie_reg' : '^[0-9]{2,2}_BC',
-                'bgcolor'   : '#FFDBA8', //'#f59d30'
-                'cat_id' : [59]
-            },
-            'ger' : {
-                'label'  : 'Lead',
-                'nation' : 'GER',
-                'wettk_reg' : '^[0-9]{2,2}[_J]{1,1}[^WLJ]+.*',
-                'serie_reg' : '^[0-9]{2,2}_DC',
-                'bgcolor'   : '#A8F0A8', //'#69b9a9'
-                'cat_id' : [57]
-            },
-            'ger_speed' : {
-                'label'  : 'Speed',
-                'nation' : 'GER',
-                'wettk_reg' : '^[0-9]{2,2}[_J]{1,1}[^WLJ]+.*',
-                'serie_reg' : '',
-                'rang_title': '',
-                'bgcolor'   : '#A8F0A8', //'#e72e5d'
-                'cat_id' : [60]
-            },*/
-
             'ger_meisterschaft' : {
                 'label' : 'Deutsche Meisterschaft',
                 'nation' : 'GER',
@@ -212,6 +124,7 @@ Window {
             //app.openAthlete(53139) // dorian: 53139 , rustam: 6933 , helen: 53300
             //openWidget({nation:'GER'})
             //mainStack.push("Pages/AthleteSearchPage.qml")
+            //openWidget({comp: 11651, cat: 25})
         }
 
         Shortcut {
@@ -235,8 +148,6 @@ Window {
         StackView {
             id: mainStack
 
-            //enabled: !loadingDl.opened
-
             anchors {
                 top: toolBar.bottom
                 left: parent.left
@@ -411,28 +322,18 @@ Window {
 
                     height: parent.height
 
-                    Layout.alignment: Layout.Right
+                    onItemChanged: {
+                        if(item === null)
+                            return
 
-                    onStatusChanged: {
-                        //console.log("loader status changed: " + status)
-
-                        if(status == 0){
-                            extraComponentLoader.Layout.preferredWidth = 0
-                        }
-                        else {
                         extraComponentLoader.item.width = extraComponentLoader.item.implicitWidth
                         extraComponentLoader.Layout.preferredWidth = extraComponentLoader.item.width
                         widthChangedCon.target = extraComponentLoader.item
                     }
 
-                        //console.log("set loader width to: " + extraComponentLoader.Layout.preferredWidth + " for a item width of: " + extraComponentLoader.item.implicitWidth)
-                    }
-
-                    //sourceComponent: mainStack.currentItem.headerComponent
-
                     Connections {
                         target: mainStack
-                        onCurrentItemChanged: {
+                        function onCurrentItemChanged() {
                             secondCon.target = mainStack.currentItem
                             disappearNa.start()
                         }
@@ -440,14 +341,15 @@ Window {
 
                     Connections {
                         id: secondCon
-                        onHeaderComponentChanged: {
+                        target: null
+                        function onHeaderComponentChanged() {
                             disappearNa.start()
                         }
                     }
 
                     Connections {
                         id: widthChangedCon
-                        onImplicitWidthChanged:{
+                        function onImplicitWidthChanged() {
                             extraComponentLoader.item.width = extraComponentLoader.item.implicitWidth
                             extraComponentLoader.Layout.preferredWidth = extraComponentLoader.item.implicitWidth
                         }

resources/qml/qml.qrc

@@ -19,5 +19,6 @@
         <file>Pages/AthleteSearchPage.qml</file>
         <file>Components/SpeedFlowChart.qml</file>
         <file>Components/SwipeGallery.qml</file>
+        <file>Components/CompetitionCalendarDelegate.qml</file>
     </qresource>
 </RCC>

resources/shared/shared.qrc

@@ -28,7 +28,6 @@
         <file>icons/bluerock/index.theme</file>
         <file>icons/dig_rock.klein.jpg</file>
         <file>icons/dig_rock.klein.png</file>
-        <file>icons/favicon.png</file>
         <file>icons/bluerock/20x20/calendar.png</file>
         <file>icons/bluerock/20x20@2/calendar.png</file>
         <file>icons/bluerock/20x20@3/calendar.png</file>
@@ -77,5 +76,6 @@
         <file>screenshots/SpeedFlowchartDemo/1.png</file>
         <file>screenshots/SpeedFlowchartDemo/2.png</file>
         <file>screenshots/SpeedFlowchartDemo/3.png</file>
+        <file>icons/blueRockHold.png</file>
     </qresource>
 </RCC>

sources/serverconn.cpp

@@ -22,10 +22,10 @@ ServerConn::ServerConn(QObject *parent) : QObject(parent)
 {
 }
 
-QVariant ServerConn::getWidgetData(QVariantMap params){
+QVariant ServerConn::getWidgetData(QVariantMap params) {
     QString requestUrl;
-    if(params["nation"].toString() == "ICC"){
+    if(params["nation"].toString() == "ICC") {
-        requestUrl = "https://ifsc-egw.wavecdn.net/egw/ranking/json.php?";
+        requestUrl = "https://www.digitalrock.de/egroupware/ranking/json.php?";
         params["nation"] = "";
     }
     else if (params["nation"].toString() == "GER") {
@@ -39,7 +39,7 @@ QVariant ServerConn::getWidgetData(QVariantMap params){
         requestUrl = "https://www.digitalrock.de/egroupware/ranking/json.php?";
     }
 
-    for(QVariantMap::const_iterator iter = params.begin(); iter != params.end(); ++iter){
+    for(QVariantMap::const_iterator iter = params.begin(); iter != params.end(); ++iter) {
         requestUrl += iter.key() + "=" + iter.value().toString() + "&";
     }
 
@@ -49,7 +49,7 @@ QVariant ServerConn::getWidgetData(QVariantMap params){
 
     QVariantMap ret = this->senddata(QUrl(requestUrl));
 
-    if(ret["status"] != 200){
+    if(ret["status"] != 200) {
         // request was a failure
         return QVariantMap({{"status", ret["status"]}, {"data", ""}});
     }
@@ -85,7 +85,7 @@ QVariantMap ServerConn::senddata(QUrl serviceUrl, QUrlQuery pdata)
 
     QNetworkReply *reply;
 
-    if(pdata.isEmpty()){
+    if(pdata.isEmpty()) {
         // if no post data is given -> send a GET request
         reply = networkManager->get(request);
     }