Merge pull request #28 from QuasarApp/testNewBuild

Test new build

.gitignore

@@ -37,11 +37,15 @@ ui_*.h
 Makefile*
 *build-*
 
+hanoi_towers/build/
+installer/installer
+
 *.snap
 installer/packages/HanoiTowers/parts
 installer/packages/HanoiTowers/prime
 installer/packages/HanoiTowers/stage
 installer/packages/HanoiTowers/data/*
+.snapcraft
 
 # QtCreator
 installer/HanoiTowersInstaller
@@ -57,5 +61,5 @@ CMakeLists.txt.user*
 
 snap/plugins/__pycache__/
 *.snap
-
+data/
 \.buildconfig

.gitmodules

@@ -1,3 +1,6 @@
-[submodule "CQtDeployer"]
-	path = CQtDeployer
-	url = https://github.com/QuasarApp/Console-QtDeployer.git
+[submodule "CQtDeployerBinaries"]
+	path = CQtDeployerBinaries
+	url = https://github.com/QuasarApp/CQtDeployerBinaries.git
+[submodule "QuasarAppLib"]
+	path = QuasarAppLib
+	url = https://github.com/QuasarApp/QuasarAppLib.git

Hanoi-Towers.pro

@@ -1,39 +1,6 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 
-include($$PWD/installer/deploy/deployFiles.pri)
-message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES)
+SUBDIRS += hanoi_towers
 
-ENABLE_SNAP = 1 #only linux
-ENABLE_INSTALLER = 0 #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 )
-
-        }
-    }
-}
+include($$PWD/installer/installer.pri)

hanoi_towers/SwitchLvl.qml

@@ -27,7 +27,7 @@ Rectangle {
 
             color: Qt.rgba(0.5,0.5,0.5,1 / (Math.abs(spin.currentIndex - modelData)))
             text: "" + (modelData + 1)
-
+            width: tumbler.width
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter
             font.pixelSize: (spin.height / 4) / (Math.abs(spin.currentIndex - modelData) + 1 )

hanoi_towers/about.qml

@@ -39,7 +39,7 @@ Item {
 * Programmer: Yankovich N. Andrei.
 * This game is distributed under the LGPLv3 license.
 * Contact: https://github.com/EndrII
-* Copyright (C) 2018 Yankovich N. Andrei.")
+* Copyright (C) 2018-2019 Yankovich N. Andrei.")
     }
     MouseArea {
         anchors.fill: parent

hanoi_towers/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="df.mobily.hanoi_towers" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.1" android:versionCode="13" android:installLocation="auto">
+<manifest package="df.mobily.hanoi_towers" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.2" android:versionCode="14" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="landscape" android:launchMode="singleTop">
             <intent-filter>
@@ -63,7 +63,7 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
+    <uses-sdk android:minSdkVersion="16" 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.

hanoi_towers/game.qml

@@ -61,11 +61,11 @@ Rectangle {
         id: towerheight
         font.bold: true
         font.pointSize: height / text.length * 2
-        horizontalAlignment: Text.AlignCenter
+        horizontalAlignment: Text.AlignHCenter
         height: mouseContener.height
 
         styleColor: "#973c3c"
-        verticalAlignment: Text.AlignCenter
+        verticalAlignment: Text.AlignVCenter
         text: qsTr("Tower height:")
 
         anchors.left: mouseContener.right

hanoi_towers/hanoi_towers.pro

@@ -10,9 +10,6 @@ SOURCES += main.cpp \
 RESOURCES += qml.qrc
 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 =
 
@@ -36,10 +33,13 @@ 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
-!isEmpty(target.path): INSTALLS += target
+CONFIG(release, debug|release): {
+    DESTDIR = $$PWD/build/release
+
+} else {
+    DESTDIR = $$PWD/build/debug
+}
+
 
 DISTFILES += \
     android/AndroidManifest.xml \

hanoi_towers/languages/en.ts

@@ -118,7 +118,7 @@
 * Programmer: Yankovich N. Andrei.
 * This game is distributed under the LGPLv3 license.
 * Contact: https://github.com/EndrII
-* Copyright (C) 2018 Yankovich N. Andrei.</source>
+* Copyright (C) 2018-2019 Yankovich N. Andrei.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

hanoi_towers/languages/ja.ts

@@ -130,8 +130,22 @@
 * Programmer: Yankovich N. Andrei.
 * This game is distributed under the LGPLv3 license.
 * Contact: https://github.com/EndrII
+* Copyright (C) 2018-2019 Yankovich N. Andrei.</source>
+        <translation type="unfinished">QuasarAppの製品
+*開発者：
+*プログラマー：Yankovich N. Andrei。
+*このゲームはLGPLv3ライセンスの下で配布されています。
+*お問い合わせ先：https://github.com/EndrII
+* Copyright（C）2018 Yankovich N. Andrei。 {3 ?} {2018-2019 ?}</translation>
+    </message>
+    <message>
+        <source>Product of QuasarApp
+* Developers:
+* Programmer: Yankovich N. Andrei.
+* This game is distributed under the LGPLv3 license.
+* Contact: https://github.com/EndrII
 * Copyright (C) 2018 Yankovich N. Andrei.</source>
-        <translation>QuasarAppの製品
+        <translation type="vanished">QuasarAppの製品
 *開発者：
 *プログラマー：Yankovich N. Andrei。
 *このゲームはLGPLv3ライセンスの下で配布されています。

hanoi_towers/languages/ru.ts

@@ -122,8 +122,22 @@
 * Programmer: Yankovich N. Andrei.
 * This game is distributed under the LGPLv3 license.
 * Contact: https://github.com/EndrII
+* Copyright (C) 2018-2019 Yankovich N. Andrei.</source>
+        <translation type="unfinished">Продукт QuasarApp
+* Разработчики:
+* Программист: Янкович А. Н. 
+* Эта игра распостроняеться в соотвецтвии с лицензией LGPLv3.
+* Сайт игры: https://quasarapp.github.io/Hanoi-Towers/
+* Copyright (C) 2018 Янкович А. Н. {3 ?} {2018-2019 ?}</translation>
+    </message>
+    <message>
+        <source>Product of QuasarApp
+* Developers:
+* Programmer: Yankovich N. Andrei.
+* This game is distributed under the LGPLv3 license.
+* Contact: https://github.com/EndrII
 * Copyright (C) 2018 Yankovich N. Andrei.</source>
-        <translation>Продукт QuasarApp
+        <translation type="vanished">Продукт QuasarApp
 * Разработчики:
 * Программист: Янкович А. Н. 
 * Эта игра распостроняеться в соотвецтвии с лицензией LGPLv3.

hanoi_towers/languages/tr.ts

@@ -122,8 +122,22 @@
 * Programmer: Yankovich N. Andrei.
 * This game is distributed under the LGPLv3 license.
 * Contact: https://github.com/EndrII
+* Copyright (C) 2018-2019 Yankovich N. Andrei.</source>
+        <translation type="unfinished">QuasarApp ürünü
+* Geliştiriciler:
+* Programcı: Yankovich N. Andrei.
+* Bu oyun LGPLv3 lisansı altında dağıtılmaktadır.
+* İletişim: https://github.com/EndrII
+* Telif Hakkı (C) 2018 Yankovich N. Andrei. {3 ?} {2018-2019 ?}</translation>
+    </message>
+    <message>
+        <source>Product of QuasarApp
+* Developers:
+* Programmer: Yankovich N. Andrei.
+* This game is distributed under the LGPLv3 license.
+* Contact: https://github.com/EndrII
 * Copyright (C) 2018 Yankovich N. Andrei.</source>
-        <translation>QuasarApp ürünü
+        <translation type="vanished">QuasarApp ürünü
 * Geliştiriciler:
 * Programcı: Yankovich N. Andrei.
 * Bu oyun LGPLv3 lisansı altında dağıtılmaktadır.

hanoi_towers/languages/ua.ts

@@ -122,8 +122,22 @@
 * Programmer: Yankovich N. Andrei.
 * This game is distributed under the LGPLv3 license.
 * Contact: https://github.com/EndrII
+* Copyright (C) 2018-2019 Yankovich N. Andrei.</source>
+        <translation type="unfinished">Продукт компанії QuasarApp
+* Розробники:
+* Програміст: Янкович Н. Андрій.
+* Ця гра поширюється під ліцензією LGPLv3.
+* Контакт: https://github.com/EndrII
+* Авторське право (C) 2018 Янкович Н. Андрій. {3 ?} {2018-2019 ?}</translation>
+    </message>
+    <message>
+        <source>Product of QuasarApp
+* Developers:
+* Programmer: Yankovich N. Andrei.
+* This game is distributed under the LGPLv3 license.
+* Contact: https://github.com/EndrII
 * Copyright (C) 2018 Yankovich N. Andrei.</source>
-        <translation>Продукт компанії QuasarApp
+        <translation type="vanished">Продукт компанії QuasarApp
 * Розробники:
 * Програміст: Янкович Н. Андрій.
 * Ця гра поширюється під ліцензією LGPLv3.

installer/config/controlScript.js

@@ -9,6 +9,8 @@ function Controller()
 function runProgramControl() {
     if (systemInfo.kernelType === "winnt") {
         installer.setValue("RunProgram", "@TargetDir@/HanoiTowers.exe");
+    } else {
+        installer.setValue("RunProgram", "@TargetDir@/HanoiTowers.sh");
     }
 }
 

installer/config/ru.qm

@@ -0,0 +1 @@
+<�d��!�`���

installer/config/ru.ts

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+</TS>