diff --git a/CMakeLists.txt b/CMakeLists.txt index 0471f47..6d7d0e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ # cmake_minimum_required(VERSION 3.14) -project(RENAME_ME LANGUAGES CXX) +project(DoctorPill LANGUAGES CXX) if(TARGET ${PROJECT_NAME}) message("The ${PROJECT_NAME} arledy included in main Project") return() @@ -32,47 +32,47 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test QUIET) include(submodules/CMake/QuasarApp.cmake) updateGitVars() -set(RENAME_ME_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") -set(RENAME_ME_PACKAGE_ID "quasarapp.core.RENAME_ME") +set(DoctorPill_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") +set(DoctorPill_PACKAGE_ID "quasarapp.core.DoctorPill") -if (NOT DEFINED RENAME_ME_TESTS) - set(RENAME_ME_TESTS ON) +if (NOT DEFINED DoctorPill_TESTS) + set(DoctorPill_TESTS ON) if (DEFINED TARGET_PLATFORM_TOOLCHAIN) if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32") - set(RENAME_ME_TESTS OFF) + set(DoctorPill_TESTS OFF) endif() endif() if (ANDROID OR IOS) - set(RENAME_ME_TESTS OFF) + set(DoctorPill_TESTS OFF) endif() if (NOT QT_VERSION_MAJOR) - set(RENAME_ME_TESTS OFF) + set(DoctorPill_TESTS OFF) endif() endif() -if (NOT DEFINED RENAME_ME_EXAMPLE) - set(RENAME_ME_EXAMPLE ON) +if (NOT DEFINED DoctorPill_EXAMPLE) + set(DoctorPill_EXAMPLE ON) if (NOT QT_VERSION_MAJOR) - set(RENAME_ME_EXAMPLE OFF) + set(DoctorPill_EXAMPLE OFF) endif() endif() initAll() updateGitVars() -set(RENAME_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") +set(DOCTOR_PILL_VERSION "0.${GIT_COMMIT_COUNT}.${GIT_COMMIT_HASH}") add_subdirectory(src/Library) -if (DEFINED RENAME_ME_EXAMPLE) +if (DEFINED DoctorPill_EXAMPLE) add_subdirectory(src/Example) endif() -if (RENAME_ME_TESTS) +if (DoctorPill_TESTS) add_subdirectory(tests) else() message("The ${PROJECT_NAME} tests is disabled.") @@ -80,4 +80,4 @@ endif() addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf) -addDeployFromCustomFile("RENAME_ME" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json") +addDeployFromCustomFile("DoctorPill" "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/DoctorPill.json") diff --git a/README.md b/README.md index 0a44cbb..dd0285c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # CMakeProject Template repository for cmake project -Fork me and replase RENAME_ME to Name of your new project. +Fork me and replase DoctorPill to Name of your new project. 1. Clone this repository 2. Run ./init.sh NewProjectName diff --git a/doxygen.conf b/doxygen.conf index 7bb6729..06442a2 100644 --- a/doxygen.conf +++ b/doxygen.conf @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = RENAME_ME +PROJECT_NAME = DoctorPill # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/init.sh b/init.sh deleted file mode 100755 index 4ab4efd..0000000 --- a/init.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -echo "Project name: $1" - -if [ $# -ne 1 ] -then - echo "You call this script wtth wrong arguments." - echo "Example for start script:" - echo "./init.sh MyCmakeProject" - exit 1 -fi - -REPLACESTRING="s+RENAME_ME+$1+g" -echo $REPLACESTRING - -find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} + -find . -not -path '*/\.*' -type f -exec sed -i $REPLACESTRING {} + - -find src -type d -name '*RENAME_ME*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/RENAME_ME/'$1'/"); mv "$x" "$NEWSTR"' \; - -find src -type f -name '*RENAME_ME*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/RENAME_ME/'$1'/"); mv "$x" "$NEWSTR"' \; -find Deploy -type f -name '*RENAME_ME*' -exec sh -c 'x="{}"; NEWSTR=$(echo "$x" | sed "s/RENAME_ME/'$1'/"); mv "$x" "$NEWSTR"' \; - -set -e - -git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | - while read path_key path - do - url_key=$(echo $path_key | sed 's/\.path/.url/') - url=$(git config -f .gitmodules --get "$url_key") - git submodule add $url $path - done - - - diff --git a/src/Example/CMakeLists.txt b/src/Example/CMakeLists.txt index 7fef8f5..cbf6297 100644 --- a/src/Example/CMakeLists.txt +++ b/src/Example/CMakeLists.txt @@ -59,7 +59,7 @@ if (ANDROID) set(ANDROID_API_VERSION $ENV{ANDROID_API_VERSION}) set(OPENSSL_ROOT_PATH "$ENV{OPENSSL_ROOT_DIR}") - set(RENAME_ME_EXTRA_LIBS + set(DoctorPill_EXTRA_LIBS ${PROJECT_NAME} # libName ) @@ -75,7 +75,7 @@ if (ANDROID) "${SIGPATH}/quasarapp.keystore" "${SIGPASS_QUASARAPP}" "${TARGET_DIR}" - "${RENAME_ME_EXTRA_LIBS}") + "${DoctorPill_EXTRA_LIBS}") else() message("NO_SIGN_APP") @@ -83,7 +83,7 @@ if (ANDROID) addDeployAPK(${CURRENT_PROJECT} "${CMAKE_CURRENT_LIST_DIR}/android" "${TARGET_DIR}" - "${RENAME_ME_EXTRA_LIBS}") + "${DoctorPill_EXTRA_LIBS}") endif() set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml") @@ -109,19 +109,19 @@ elseif(IOS) # set_xcode_property(${CURRENT_PROJECT} PRODUCT_BUNDLE_IDENTIFIER ${CHEATCARD_PACKAGE_ID} All) set_target_properties(${CURRENT_PROJECT} PROPERTIES - MACOSX_BUNDLE_GUI_IDENTIFIER ${RENAME_ME_PACKAGE_ID} - MACOSX_BUNDLE_BUNDLE_VERSION ${RENAME_ME_VERSION} - MACOSX_BUNDLE_SHORT_VERSION_STRING ${RENAME_ME_VERSION} + MACOSX_BUNDLE_GUI_IDENTIFIER ${DoctorPill_PACKAGE_ID} + MACOSX_BUNDLE_BUNDLE_VERSION ${DoctorPill_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${DoctorPill_VERSION} ) else() # Desctop deploying message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT}) - set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/RENAME_ME.json") + set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/Deploy/DoctorPill.json") configure_file("${DeployFile}.in" ${DeployFile} @ONLY) - addDeployFromCustomFile("RENAME_ME" ${DeployFile}) + addDeployFromCustomFile("DoctorPill" ${DeployFile}) endif() @@ -132,17 +132,4 @@ if(QT_VERSION_MAJOR EQUAL 6) endif() -set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts) - -prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}") - diff --git a/src/Example/Deploy/DoctorPill.json b/src/Example/Deploy/DoctorPill.json new file mode 100644 index 0000000..28b46d1 --- /dev/null +++ b/src/Example/Deploy/DoctorPill.json @@ -0,0 +1,19 @@ +{ + "bin": [ + "src/build/Debug/DoctorPillEaxample", + "src/build/Debug/DoctorPillEaxample.exe" + ], + "clear": true, + "libDir": "/home/andrei/gitHub/DoctorPill", + "recursiveDepth": "10", + "deploySystem": false, + "qmlDir": "../", + "ignoreEnv": [ + "/home/andrei/gitHub/DoctorPill/Distro" + ], + "extraLib": "crypto", + "targetDir": "/home/andrei/gitHub/DoctorPill/Distro", + "deployVersion": "0.1.2f207ec", + +} + diff --git a/src/Example/Deploy/RENAME_ME.json.in b/src/Example/Deploy/DoctorPill.json.in similarity index 68% rename from src/Example/Deploy/RENAME_ME.json.in rename to src/Example/Deploy/DoctorPill.json.in index c99d099..fc78cc6 100644 --- a/src/Example/Deploy/RENAME_ME.json.in +++ b/src/Example/Deploy/DoctorPill.json.in @@ -1,7 +1,7 @@ { "bin": [ - "src/build/Debug/RENAME_MEEaxample", - "src/build/Debug/RENAME_MEEaxample.exe" + "src/build/Debug/DoctorPillEaxample", + "src/build/Debug/DoctorPillEaxample.exe" ], "clear": true, "libDir": "@CMAKE_SOURCE_DIR@", @@ -13,7 +13,7 @@ ], "extraLib": "crypto", "targetDir": "@CMAKE_SOURCE_DIR@/Distro", - "deployVersion": "@RENAME_VERSION@", + "deployVersion": "@DOCTOR_PILL_VERSION@", } diff --git a/src/Example/android/AndroidManifest.xml.in b/src/Example/android/AndroidManifest.xml.in deleted file mode 100644 index 7f7beef..0000000 --- a/src/Example/android/AndroidManifest.xml.in +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0"?> -<manifest package="@RENAME_ME_PACKAGE_ID@" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="@RENAME_ME_VERSION@" android:versionCode="@GIT_COMMIT_COUNT@" android:installLocation="auto"> - <!-- 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. --> - <!-- %%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.qt.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true" android:requestLegacyExternalStorage="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.qt.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="landscape" android:launchMode="singleTop" android:theme="@style/splashScreenTheme"> - <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="-- %%INSERT_APP_ARGUMENTS%% --"/> - <!-- Application arguments --> - <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> - <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="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/> - <!-- Run with local libs --> - <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_resource_id" android:resource="@array/load_local_libs"/> - <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="-- %%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 - "applicationStateChanged(Qt::ApplicationSuspended)" - signal is sent! --> - <meta-data android:name="android.app.background_running" android:value="false"/> - <!-- Background running --> - <!-- 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="default"/> - <!-- extract android style --> - <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splashscreen"/> - <meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/splashscreen_port"/> - <meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/splashscreen_land"/> - </activity> - <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices --> - </application> - -</manifest> diff --git a/src/Example/android/build.gradle.in b/src/Example/android/build.gradle.in deleted file mode 100644 index 82159d4..0000000 --- a/src/Example/android/build.gradle.in +++ /dev/null @@ -1,78 +0,0 @@ -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 '30.0.2' - - 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" - multiDexEnabled true - minSdkVersion = 28 - targetSdkVersion = @ANDROID_API_VERSION@ - } -} diff --git a/src/Example/android/gradle.properties b/src/Example/android/gradle.properties deleted file mode 100644 index 987f413..0000000 --- a/src/Example/android/gradle.properties +++ /dev/null @@ -1,14 +0,0 @@ -# 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.useAndroidX=true - -android.enableJetifier=true diff --git a/src/Example/android/gradle/wrapper/gradle-wrapper.jar b/src/Example/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c..0000000 Binary files a/src/Example/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/src/Example/android/gradle/wrapper/gradle-wrapper.properties b/src/Example/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 442d913..0000000 --- a/src/Example/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/src/Example/android/gradlew b/src/Example/android/gradlew deleted file mode 100644 index 4f906e0..0000000 --- a/src/Example/android/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## 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='"-Xmx64m" "-Xms64m"' - -# 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 or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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" - -exec "$JAVACMD" "$@" diff --git a/src/Example/android/gradlew.bat b/src/Example/android/gradlew.bat deleted file mode 100644 index ac1b06f..0000000 --- a/src/Example/android/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@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 Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@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="-Xmx64m" "-Xms64m" - -@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 execute - -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 execute - -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 - -: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 %* - -: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/src/Example/android/res/drawable/splashscreen.xml b/src/Example/android/res/drawable/splashscreen.xml deleted file mode 100644 index c358344..0000000 --- a/src/Example/android/res/drawable/splashscreen.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape android:shape="rectangle"> - <solid android:color="#ffffff"/> - </shape> - </item> - <item> - <bitmap android:src="@drawable/logo" android:gravity="fill"/> - </item> -</layer-list> diff --git a/src/Example/android/res/drawable/splashscreen_land.xml b/src/Example/android/res/drawable/splashscreen_land.xml deleted file mode 100644 index 0ec7108..0000000 --- a/src/Example/android/res/drawable/splashscreen_land.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape android:shape="rectangle"> - <solid android:color="#ffffff"/> - </shape> - </item> - <item> - <bitmap android:src="@drawable/logo_land" android:gravity="fill"/> - </item> -</layer-list> diff --git a/src/Example/android/res/drawable/splashscreen_port.xml b/src/Example/android/res/drawable/splashscreen_port.xml deleted file mode 100644 index ac70dcc..0000000 --- a/src/Example/android/res/drawable/splashscreen_port.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape android:shape="rectangle"> - <solid android:color="#ffffff"/> - </shape> - </item> - <item> - <bitmap android:src="@drawable/logo_port" android:gravity="fill"/> - </item> -</layer-list> diff --git a/src/Example/android/res/values-land/splashscreentheme.xml b/src/Example/android/res/values-land/splashscreentheme.xml deleted file mode 100644 index 800b923..0000000 --- a/src/Example/android/res/values-land/splashscreentheme.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources> - <style name="splashScreenTheme"> - <item name="android:windowBackground">@drawable/splashscreen_land</item> - </style> -</resources> diff --git a/src/Example/android/res/values-port/splashscreentheme.xml b/src/Example/android/res/values-port/splashscreentheme.xml deleted file mode 100644 index a20302e..0000000 --- a/src/Example/android/res/values-port/splashscreentheme.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources> - <style name="splashScreenTheme"> - <item name="android:windowBackground">@drawable/splashscreen_port</item> - </style> -</resources> diff --git a/src/Example/android/res/values/libs.xml b/src/Example/android/res/values/libs.xml deleted file mode 100644 index 6b1a4a2..0000000 --- a/src/Example/android/res/values/libs.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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> diff --git a/src/Example/android/res/values/splashscreentheme.xml b/src/Example/android/res/values/splashscreentheme.xml deleted file mode 100644 index 53b3673..0000000 --- a/src/Example/android/res/values/splashscreentheme.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<resources> - <style name="splashScreenTheme"> - <item name="android:windowBackground">@drawable/splashscreen</item> - </style> -</resources> diff --git a/src/Example/android/src/com/quasarapp/androidtools/MainActivity.java b/src/Example/android/src/com/quasarapp/androidtools/MainActivity.java deleted file mode 100644 index 7652d22..0000000 --- a/src/Example/android/src/com/quasarapp/androidtools/MainActivity.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2021-2021 QuasarApp. - * Distributed under the lgplv3 software license, see the accompanying - * Everyone is permitted to copy and distribute verbatim copies - * of this license document, but changing it is not allowed. -*/ - -package com.quasarapp.androidtools; - -import org.qtproject.qt.android.bindings.QtActivity; -import android.view.View; - -public class MainActivity extends QtActivity -{ -@Override -public void onWindowFocusChanged(boolean hasFocus) { - super.onWindowFocusChanged(hasFocus); - if (hasFocus) { - hideSystemUI(); - } -} - -private void hideSystemUI() { - // Enables regular immersive mode. - // For "lean back" mode, remove SYSTEM_UI_FLAG_IMMERSIVE. - // Or for "sticky immersive," replace it with SYSTEM_UI_FLAG_IMMERSIVE_STICKY - View decorView = getWindow().getDecorView(); - decorView.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_IMMERSIVE - // Set the content to appear under the system bars so that the - // content doesn't resize when the system bars hide and show. - | View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - // Hide the nav bar and status bar - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_FULLSCREEN); -} - -// Shows the system bars by removing all the flags -// except for the ones that make the content appear under the system bars. -private void showSystemUI() { - View decorView = getWindow().getDecorView(); - decorView.setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN); -} - -} diff --git a/src/Example/languages/en.ts b/src/Example/languages/en.ts deleted file mode 100644 index 6401616..0000000 --- a/src/Example/languages/en.ts +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.1"> -</TS> diff --git a/src/Library/CMakeLists.txt b/src/Library/CMakeLists.txt index 0b694ba..6cfbc70 100644 --- a/src/Library/CMakeLists.txt +++ b/src/Library/CMakeLists.txt @@ -7,18 +7,18 @@ cmake_minimum_required(VERSION 3.14) -add_definitions(-DRENAME_ME_LIBRARY) +add_definitions(-DDoctorPill_LIBRARY) file(GLOB SOURCE_CPP - "*RENAME_ME/*.cpp" + "*DoctorPill/*.cpp" "private/*.cpp" ) if (${QT_VERSION_MAJOR}) file(GLOB SOURCE_QRC "*.qrc" - "RENAME_ME/*.qrc" + "DoctorPill/*.qrc" "private/*.qrc" ) @@ -37,10 +37,19 @@ endif() target_include_directories(${PROJECT_NAME} PUBLIC ${PUBLIC_INCUDE_DIR}) target_include_directories(${PROJECT_NAME} PRIVATE ${PRIVATE_INCUDE_DIR}) -set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts) +set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts) -prepareQM(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}") +prepareQM(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}") set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE) diff --git a/src/Library/DoctorPill.qrc b/src/Library/DoctorPill.qrc new file mode 100644 index 0000000..3816532 --- /dev/null +++ b/src/Library/DoctorPill.qrc @@ -0,0 +1,9 @@ +<RCC> + <qresource prefix="/"> + <file>DoctorPillModule/qmldir</file> + <file>DoctorPillModule/DoctorPill.qml</file> + </qresource> + <qresource prefix="/DoctorPillTr"> + <file>languages/en.qm</file> + </qresource> +</RCC> diff --git a/src/Library/RENAME_ME/RENAME_ME.cpp b/src/Library/DoctorPill/DoctorPill.cpp similarity index 78% rename from src/Library/RENAME_ME/RENAME_ME.cpp rename to src/Library/DoctorPill/DoctorPill.cpp index 8c5f4c3..0eec033 100644 --- a/src/Library/RENAME_ME/RENAME_ME.cpp +++ b/src/Library/DoctorPill/DoctorPill.cpp @@ -5,13 +5,13 @@ //# of this license document, but changing it is not allowed. //# -#include "RENAME_ME.h" +#include "DoctorPill.h" -namespace RENAME_ME { +namespace DoctorPill { bool init() { - initRENAME_MEResources(); + initDoctorPillResources(); return true; } diff --git a/src/Library/RENAME_ME/RENAME_ME.h b/src/Library/DoctorPill/DoctorPill.h similarity index 61% rename from src/Library/RENAME_ME/RENAME_ME.h rename to src/Library/DoctorPill/DoctorPill.h index f3fcef9..b9cc4b8 100644 --- a/src/Library/RENAME_ME/RENAME_ME.h +++ b/src/Library/DoctorPill/DoctorPill.h @@ -5,12 +5,12 @@ //# of this license document, but changing it is not allowed. //# -#include "RENAME_ME_global.h" +#include "DoctorPill_global.h" -inline void initRENAME_MEResources() { Q_INIT_RESOURCE(RENAME_ME); } +inline void initDoctorPillResources() { Q_INIT_RESOURCE(DoctorPill); } -namespace RENAME_ME { +namespace DoctorPill { -bool RENAME_ME_EXPORT init(); +bool DoctorPill_EXPORT init(); }; diff --git a/src/Library/RENAME_ME/RENAME_ME_global.h b/src/Library/DoctorPill/DoctorPill_global.h similarity index 59% rename from src/Library/RENAME_ME/RENAME_ME_global.h rename to src/Library/DoctorPill/DoctorPill_global.h index ae8a813..6c780cf 100644 --- a/src/Library/RENAME_ME/RENAME_ME_global.h +++ b/src/Library/DoctorPill/DoctorPill_global.h @@ -5,16 +5,16 @@ //# of this license document, but changing it is not allowed. //# -#ifndef RENAME_ME_GLOBAL_H -#define RENAME_ME_GLOBAL_H +#ifndef DoctorPill_GLOBAL_H +#define DoctorPill_GLOBAL_H #include <QtCore/qglobal.h> -#if defined(RENAME_ME_LIBRARY) -# define RENAME_ME_EXPORT Q_DECL_EXPORT +#if defined(DoctorPill_LIBRARY) +# define DoctorPill_EXPORT Q_DECL_EXPORT #else -# define RENAME_ME_EXPORT Q_DECL_IMPORT +# define DoctorPill_EXPORT Q_DECL_IMPORT #endif -#endif //RENAME_ME_GLOBAL_H +#endif //DoctorPill_GLOBAL_H diff --git a/src/Library/RENAME_MEModule/RENAME_ME.qml b/src/Library/DoctorPillModule/DoctorPill.qml similarity index 100% rename from src/Library/RENAME_MEModule/RENAME_ME.qml rename to src/Library/DoctorPillModule/DoctorPill.qml diff --git a/src/Library/RENAME_MEModule/qmldir b/src/Library/DoctorPillModule/qmldir similarity index 50% rename from src/Library/RENAME_MEModule/qmldir rename to src/Library/DoctorPillModule/qmldir index 897fe9d..56870f8 100644 --- a/src/Library/RENAME_MEModule/qmldir +++ b/src/Library/DoctorPillModule/qmldir @@ -1,3 +1,3 @@ module QuasarAppCreditsModule -RENAME_ME 1.0 RENAME_ME.qml +DoctorPill 1.0 DoctorPill.qml diff --git a/src/Library/RENAME_ME.qrc b/src/Library/RENAME_ME.qrc deleted file mode 100644 index d4670a7..0000000 --- a/src/Library/RENAME_ME.qrc +++ /dev/null @@ -1,9 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>RENAME_MEModule/qmldir</file> - <file>RENAME_MEModule/RENAME_ME.qml</file> - </qresource> - <qresource prefix="/RENAME_METr"> - <file>languages/en.qm</file> - </qresource> -</RCC> diff --git a/src/Example/languages/de.ts b/src/Library/languages/de.ts similarity index 100% rename from src/Example/languages/de.ts rename to src/Library/languages/de.ts diff --git a/src/Example/languages/es.ts b/src/Library/languages/es.ts similarity index 100% rename from src/Example/languages/es.ts rename to src/Library/languages/es.ts diff --git a/src/Example/languages/fr.ts b/src/Library/languages/fr.ts similarity index 100% rename from src/Example/languages/fr.ts rename to src/Library/languages/fr.ts diff --git a/src/Example/languages/ja.ts b/src/Library/languages/ja.ts similarity index 100% rename from src/Example/languages/ja.ts rename to src/Library/languages/ja.ts diff --git a/src/Example/languages/pl.ts b/src/Library/languages/pl.ts similarity index 100% rename from src/Example/languages/pl.ts rename to src/Library/languages/pl.ts diff --git a/src/Example/languages/ru.ts b/src/Library/languages/ru.ts similarity index 100% rename from src/Example/languages/ru.ts rename to src/Library/languages/ru.ts diff --git a/src/Example/languages/tr.ts b/src/Library/languages/tr.ts similarity index 100% rename from src/Example/languages/tr.ts rename to src/Library/languages/tr.ts diff --git a/src/Example/languages/uk.ts b/src/Library/languages/uk.ts similarity index 100% rename from src/Example/languages/uk.ts rename to src/Library/languages/uk.ts diff --git a/src/Example/languages/zh.ts b/src/Library/languages/zh.ts similarity index 100% rename from src/Example/languages/zh.ts rename to src/Library/languages/zh.ts diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index db3fa4a..99f4e41 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -18,7 +18,7 @@ set(PUBLIC_INCUDE_DIR ${PUBLIC_INCUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/units") add_executable(${CURRENT_PROJECT} ${SOURCE_CPP}) -target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test RENAME_ME) +target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::Test DoctorPill) target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) diff --git a/tests/tstMain.cpp b/tests/tstMain.cpp index d8b895b..d3a1d0d 100644 --- a/tests/tstMain.cpp +++ b/tests/tstMain.cpp @@ -57,7 +57,7 @@ tstMain::tstMain() { char * argv[] = {nullptr}; _app = new QCoreApplication(argc, argv); - QCoreApplication::setApplicationName("testRENAME_ME"); + QCoreApplication::setApplicationName("testDoctorPill"); QCoreApplication::setOrganizationName("QuasarApp"); auto path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);