Merge pull request #23 from QuasarApp/v1_5

added instal framework
QuasarApp · Sep 8, 2018 · 7a68e01 · 7a68e01
2 parents c3d84cc + 41dbbce
commit 7a68e01
Show file tree

Hide file tree

Showing 88 changed files with 793 additions and 319 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,8 +37,14 @@ ui_*.h
 Makefile*
 *build-*
 
-# QtCreator
+*.snap
+installer/packages/HanoiTowers/parts
+installer/packages/HanoiTowers/prime
+installer/packages/HanoiTowers/stage
+installer/packages/HanoiTowers/data/*
 
+# QtCreator
+installer/HanoiTowersInstaller
 *.autosave
 
 # QtCtreator Qml
@@ -50,7 +56,6 @@ CMakeLists.txt.user*
 
 
 snap/plugins/__pycache__/
-
 *.snap
 
 \.buildconfig
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "CQtDeployer"]
+	path = CQtDeployer
+	url = https://github.com/QuasarApp/Console-QtDeployer.git
diff --git a/CQtDeployer b/CQtDeployer
diff --git a/Hanoi-Towers.pro b/Hanoi-Towers.pro
@@ -0,0 +1,39 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+include($$PWD/installer/deploy/deployFiles.pri)
+message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES)
+
+ENABLE_SNAP = 1 #only linux
+ENABLE_INSTALLER = 1 #only desctop
+
+SUBDIRS += hanoi_towers \
+        CQtDeployer
+
+equals( ENABLE_INSTALLER, 1) {
+    !android:{
+        message(desktopVersion: enabled)
+        CONFIG(release, debug|release): {
+
+            SUBDIRS += installer
+
+        } else {
+            message( Selected Debug mode. The installer will not be created )
+
+        }
+    }
+}
+
+equals( ENABLE_SNAP, 1) {
+    !android:{
+        message(desktopVersion: enabled)
+        CONFIG(release, debug|release): {
+
+            SUBDIRS += installer/packages/HanoiTowers/snap.pro
+
+        } else {
+            message( Selected Debug mode. The snap will not be created )
+
+        }
+    }
+}
diff --git a/source/AndroidManifest.xml → hanoi_towers/AndroidManifest.xml b/source/AndroidManifest.xml → hanoi_towers/AndroidManifest.xml
diff --git a/source/Help.qml → hanoi_towers/Help.qml b/source/Help.qml → hanoi_towers/Help.qml
diff --git a/source/PopUp.qml → hanoi_towers/PopUp.qml b/source/PopUp.qml → hanoi_towers/PopUp.qml
diff --git a/source/SwitchLvl.qml → hanoi_towers/SwitchLvl.qml b/source/SwitchLvl.qml → hanoi_towers/SwitchLvl.qml
diff --git a/source/Tower.qml → hanoi_towers/Tower.qml b/source/Tower.qml → hanoi_towers/Tower.qml
diff --git a/source/about.qml → hanoi_towers/about.qml b/source/about.qml → hanoi_towers/about.qml
diff --git a/source/android/AndroidManifest.xml → hanoi_towers/android/AndroidManifest.xml b/source/android/AndroidManifest.xml → hanoi_towers/android/AndroidManifest.xml
diff --git a/source/android/build.gradle → hanoi_towers/android/build.gradle b/source/android/build.gradle → hanoi_towers/android/build.gradle
diff --git a/hanoi_towers/android/gradle.properties b/hanoi_towers/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=27.0.2
+androidCompileSdkVersion=23
+buildDir=.build
+qt5AndroidDir=/media/E/Qt/5.10.1/android_armv7/src/android/java
diff --git a/hanoi_towers/android/gradle.properties~ b/hanoi_towers/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=27.0.2
+androidCompileSdkVersion=23
+buildDir=.build
+qt5AndroidDir=/media/E/Qt/5.10.1/android_armv7/src/android/java
diff --git a/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar b/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/source/android/gradlew → hanoi_towers/android/gradlew b/source/android/gradlew → hanoi_towers/android/gradlew
diff --git a/source/android/gradlew.bat → hanoi_towers/android/gradlew.bat b/source/android/gradlew.bat → hanoi_towers/android/gradlew.bat
diff --git a/hanoi_towers/android/local.properties b/hanoi_towers/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=/media/E/Android/Sdk
diff --git a/hanoi_towers/android/local.properties~ b/hanoi_towers/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=/media/E/Android/Sdk
diff --git a/source/android/res/drawable-hdpi/icon.png → ...towers/android/res/drawable-hdpi/icon.png b/source/android/res/drawable-hdpi/icon.png → ...towers/android/res/drawable-hdpi/icon.png
diff --git a/source/android/res/drawable-ldpi/icon.png → ...towers/android/res/drawable-ldpi/icon.png b/source/android/res/drawable-ldpi/icon.png → ...towers/android/res/drawable-ldpi/icon.png
diff --git a/source/android/res/drawable-mdpi/icon.png → ...towers/android/res/drawable-mdpi/icon.png b/source/android/res/drawable-mdpi/icon.png → ...towers/android/res/drawable-mdpi/icon.png
diff --git a/source/android/res/values/libs.xml → hanoi_towers/android/res/values/libs.xml b/source/android/res/values/libs.xml → hanoi_towers/android/res/values/libs.xml
diff --git a/source/backEnd.cpp → hanoi_towers/backEnd.cpp b/source/backEnd.cpp → hanoi_towers/backEnd.cpp
diff --git a/source/backEnd.h → hanoi_towers/backEnd.h b/source/backEnd.h → hanoi_towers/backEnd.h
diff --git a/source/base/BaseButton.qml → hanoi_towers/base/BaseButton.qml b/source/base/BaseButton.qml → hanoi_towers/base/BaseButton.qml
diff --git a/source/base/BaseRadioButton.qml → hanoi_towers/base/BaseRadioButton.qml b/source/base/BaseRadioButton.qml → hanoi_towers/base/BaseRadioButton.qml
diff --git a/source/base/BaseText.qml → hanoi_towers/base/BaseText.qml b/source/base/BaseText.qml → hanoi_towers/base/BaseText.qml
diff --git a/source/base/BoseCheckBox.qml → hanoi_towers/base/BoseCheckBox.qml b/source/base/BoseCheckBox.qml → hanoi_towers/base/BoseCheckBox.qml
diff --git a/source/base/Theme.qml → hanoi_towers/base/Theme.qml b/source/base/Theme.qml → hanoi_towers/base/Theme.qml
diff --git a/source/base/utils.js → hanoi_towers/base/utils.js b/source/base/utils.js → hanoi_towers/base/utils.js
diff --git a/source/game.qml → hanoi_towers/game.qml b/source/game.qml → hanoi_towers/game.qml
diff --git a/source/hanoi_towers.pro → hanoi_towers/hanoi_towers.pro b/source/hanoi_towers.pro → hanoi_towers/hanoi_towers.pro
@@ -8,7 +8,10 @@ SOURCES += main.cpp \
     backEnd.cpp
 
 RESOURCES += qml.qrc
-TARGET=hanoi-towers
+TARGET = hanoi-towers
+
+include($$PWD/../installer/deploy/targetList.pri)
+include($$PWD/../installer/deploy/deployFiles.pri)
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
@@ -27,6 +30,12 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
+TARGET=HanoiTowers
+
+QT_DIR = $$dirname(QMAKE_QMAKE)
+LUPDATE = $$QT_DIR/lupdate
+LRELEASE = $$QT_DIR/lrelease
+
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
@@ -47,8 +56,12 @@ DISTFILES += \
     android/res/values/libs.xml \
     android/build.gradle \
     android/gradle/wrapper/gradle-wrapper.properties \
-    android/gradlew.bat
-
+    android/gradlew.bat \
+    languages/ru.ts \
+    languages/ja.ts \
+    languages/tr.ts \
+    languages/en.ts \
+    languages/ua.ts
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 
 HEADERS += \
@@ -58,7 +71,14 @@ TRANSLATIONS += \
     languages/ru.ts \
     languages/ja.ts \
     languages/tr.ts \
-    languages/en.ts
+    languages/en.ts \
+    languages/ua.ts
+
+commands += "$$LUPDATE $$PWD/hanoi_towers.pro"
+commands += "$$LRELEASE $$PWD/hanoi_towers.pro"
 
+for(command, commands) {
+    system($$command)|error("Failed to run: $$command")
+}
 
 RC_ICONS = res/icon.ico
diff --git a/source/import.qml → hanoi_towers/import.qml b/source/import.qml → hanoi_towers/import.qml
diff --git a/hanoi_towers/languages/en.qm b/hanoi_towers/languages/en.qm
diff --git a/source/languages/en.ts → hanoi_towers/languages/en.ts b/source/languages/en.ts → hanoi_towers/languages/en.ts
@@ -12,27 +12,27 @@
 <context>
     <name>Config</name>
     <message>
-        <location filename="../menu/Config.qml" line="27"/>
+        <location filename="../menu/Config.qml" line="28"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="34"/>
+        <location filename="../menu/Config.qml" line="35"/>
         <source>Return to main menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="68"/>
+        <location filename="../menu/Config.qml" line="76"/>
         <source>Standart color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="78"/>
+        <location filename="../menu/Config.qml" line="88"/>
         <source>Random color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="87"/>
+        <location filename="../menu/Config.qml" line="99"/>
         <source>Animation</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42,7 +42,7 @@
     <message>
         <location filename="../menu/Header.qml" line="6"/>
         <source></source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../menu/Header.qml" line="15"/>
@@ -76,30 +76,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="42"/>
+        <location filename="../menu/MainMenu.qml" line="69"/>
         <source>start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="55"/>
+        <location filename="../menu/MainMenu.qml" line="82"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="68"/>
+        <location filename="../menu/MainMenu.qml" line="95"/>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="81"/>
+        <location filename="../menu/MainMenu.qml" line="108"/>
         <source>exit</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SwitchLvl</name>
     <message>
-        <location filename="../SwitchLvl.qml" line="62"/>
+        <location filename="../SwitchLvl.qml" line="61"/>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
@@ -125,33 +125,33 @@
 <context>
     <name>game</name>
     <message>
-        <location filename="../game.qml" line="61"/>
+        <location filename="../game.qml" line="80"/>
         <source>lvl </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../game.qml" line="82"/>
+        <location filename="../game.qml" line="104"/>
         <source>step </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../game.qml" line="93"/>
+        <location filename="../game.qml" line="69"/>
         <source>Tower height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../game.qml" line="98"/>
+        <location filename="../game.qml" line="115"/>
         <source>Return to main menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../game.qml" line="162"/>
+        <location filename="../game.qml" line="180"/>
         <source>You have passed the level in %0 steps and unlocked level %1
  Minimum steps for this lvl: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../game.qml" line="169"/>
+        <location filename="../game.qml" line="187"/>
         <source>You have passed the level in %0 steps.
 Minimum steps for this lvl: %1</source>
         <translation type="unfinished"></translation>

diff --git a/source/languages/ja.qm → hanoi_towers/languages/ja.qm b/source/languages/ja.qm → hanoi_towers/languages/ja.qm
diff --git a/source/languages/ja.ts → hanoi_towers/languages/ja.ts b/source/languages/ja.ts → hanoi_towers/languages/ja.ts
@@ -12,27 +12,27 @@
 <context>
     <name>Config</name>
     <message>
-        <location filename="../menu/Config.qml" line="27"/>
+        <location filename="../menu/Config.qml" line="28"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="34"/>
+        <location filename="../menu/Config.qml" line="35"/>
         <source>Return to main menu</source>
         <translation>メインメニューに戻る</translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="68"/>
+        <location filename="../menu/Config.qml" line="76"/>
         <source>Standart color</source>
         <translation>クラシックバックライト</translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="78"/>
+        <location filename="../menu/Config.qml" line="88"/>
         <source>Random color</source>
         <translation>多色バックライト</translation>
     </message>
     <message>
-        <location filename="../menu/Config.qml" line="87"/>
+        <location filename="../menu/Config.qml" line="99"/>
         <source>Animation</source>
         <translation>アニメーション</translation>
     </message>
@@ -80,30 +80,30 @@
         <translation>ハノイタワーズ</translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="42"/>
+        <location filename="../menu/MainMenu.qml" line="69"/>
         <source>start</source>
         <translation>スタート</translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="55"/>
+        <location filename="../menu/MainMenu.qml" line="82"/>
         <source>About</source>
         <translation>約</translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="68"/>
+        <location filename="../menu/MainMenu.qml" line="95"/>
         <source>Config</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../menu/MainMenu.qml" line="81"/>
+        <location filename="../menu/MainMenu.qml" line="108"/>
         <source>exit</source>
         <translation>出口</translation>
     </message>
 </context>
 <context>
     <name>SwitchLvl</name>
     <message>
-        <location filename="../SwitchLvl.qml" line="62"/>
+        <location filename="../SwitchLvl.qml" line="61"/>
         <source>Start</source>
         <translation>スタート</translation>
     </message>
@@ -146,34 +146,34 @@
         <translation type="vanished">約</translation>
     </message>
     <message>
-        <location filename="../game.qml" line="61"/>
+        <location filename="../game.qml" line="80"/>
         <source>lvl </source>
         <translation>レベル </translation>
     </message>
     <message>
-        <location filename="../game.qml" line="82"/>
+        <location filename="../game.qml" line="104"/>
         <source>step </source>
         <translation>ステップ </translation>
     </message>
     <message>
-        <location filename="../game.qml" line="93"/>
+        <location filename="../game.qml" line="69"/>
         <source>Tower height:</source>
         <translation>タワーの高さ：</translation>
     </message>
     <message>
-        <location filename="../game.qml" line="98"/>
+        <location filename="../game.qml" line="115"/>
         <source>Return to main menu</source>
         <translation>メインメニューに戻る</translation>
     </message>
     <message>
-        <location filename="../game.qml" line="162"/>
+        <location filename="../game.qml" line="180"/>
         <source>You have passed the level in %0 steps and unlocked level %1
  Minimum steps for this lvl: %2</source>
         <translation>あなたは %0 ステップでレベルを通過し、レベル %1 をロック解除しました
   このlvlの最小手順：%2</translation>
     </message>
     <message>
-        <location filename="../game.qml" line="169"/>
+        <location filename="../game.qml" line="187"/>
         <source>You have passed the level in %0 steps.
 Minimum steps for this lvl: %1</source>
         <translation>%0ステップでレベルを通過しました。

diff --git a/source/languages/ru.qm → hanoi_towers/languages/ru.qm b/source/languages/ru.qm → hanoi_towers/languages/ru.qm