Merge pull request #14 from QuasarApp/snap

fix snap

.gitignore

@@ -44,3 +44,9 @@ Makefile*
 # QtCtreator CMake
 CMakeLists.txt.user*
 
+
+snap/plugins/__pycache__/
+
+*.snap
+
+\.buildconfig

README.md

@@ -1,6 +1,8 @@
 # Welcome to the Hanoi Towers!
 # ![Hanoi Towers Logo](/source/res/icon.png)
 
+***************************
+[![Snap Status](https://build.snapcraft.io/badge/QuasarApp/Hanoi-Towers.svg)](https://build.snapcraft.io/user/QuasarApp/Hanoi-Towers)
 ***************************
 ## What is Hanoi Towers
 The Hanoi Tower is one of the most popular puzzles of the 19th century. Three bars are given, on one of which eight rings are strung, the rings differ in size and smaller. The problem is to transfer the pyramid from the eight rings for the least number of moves to another rod. At a time, only one ring is allowed to carry, and you can not put a larger ring on less

snap/gui/HanoiTower.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.3
+Version=1.4
 Name=Hanoi Towers
 Comment=Hanoi Towers Game.
 Exec=hanoi-towers
@@ -10,5 +10,5 @@ Categories=Games;Application;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=hanoi-towers
 X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=1.3
+X-GNOME-Bugzilla-Version=1.4
 StartupNotify=true

snap/snapcraft.yaml

@@ -1,4 +1,4 @@
-name: hanoi-towers
+name: hanoi-towers-new
 version: '1.4' 
 summary: Hanoi Towers Game
 description: |
@@ -11,32 +11,27 @@ icon: source/res/icon.png
 
 apps:
   hanoi-towers:
-    command: qt5-launch $SNAP/opt/QuasarApp/hanoi-towers
+    command: qt5-launch hanoi-towers
 #    desktop: usr/share/applications/desc.desktop
-    plugs: [unity7, home, opengl, x11]
+    plugs: [desktop, unity7, home, opengl, x11, wayland]
 
 
 parts:
   hanoi-towers:
     plugin: qmake
-    qt-version: qt5
-    project-files: [hanoi_towers.pro]
-    source: source
-    install: |
-     install -d $SNAPCRAFT_PART_INSTALL/opt/QuasarApp
-     install hanoi-towers $SNAPCRAFT_PART_INSTALL/opt/QuasarApp/hanoi-towers 
+    source: source/
     build-packages:
+      - qtbase5-dev
       - qtdeclarative5-dev
     stage-packages:
       # Here for the plugins-- they're not linked in automatically.
       - libqt5gui5
-      - libqt5qml5 
+      - libqt5qml5
       - libqt5quick5
-      - qml-module-qtquick2 
-      - qml-module-qtquick-dialogs 
-      - qml-module-qtquick-controls 
+      - qml-module-qtquick2
+      - qml-module-qtquick-dialogs
+      - qml-module-qtquick-controls
       - qml-module-qtgraphicaleffects
-      - libpng16-16
-      - zlib1g
     after: [qt5conf] # A wiki part
-        
+
+

source/Tower.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
 Rectangle {

source/base/BaseText.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.4
-import QtQuick.Controls 2.0
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
 Text{
     Theme{

source/base/Theme.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.0
-import QtQuick.Window 2.0
+import QtQuick 2.9
+import QtQuick.Window 2.1
 import "utils.js" as Utils
 
 Item {

source/hanoi_towers.pro

@@ -39,7 +39,8 @@ DISTFILES += \
     android/res/values/libs.xml \
     android/build.gradle \
     android/gradle/wrapper/gradle-wrapper.properties \
-    android/gradlew.bat
+    android/gradlew.bat \
+    import.qml
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 

source/import.qml

@@ -0,0 +1,22 @@
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Extras 1.4
+import QtQuick.Dialogs 1.2
+import QtGraphicalEffects 1.0
+import QtQuick.Window 2.1
+
+/*
+    QmlImports.qml
+
+    Declaration of QML Imports required by project.
+
+    This is necessary if we want to keep qml files in a folder
+    separate from .pro file because  of the way qmlimportscanner works.
+    If these imports are not declared, qmake will not recognize them,
+    and QtQuick will not be packaged with statically built apps and imported
+    at runtime.
+
+    This must be kept in the same directory as your .pro file
+*/
+
+QtObject {}

source/main.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
 ApplicationWindow {
     visible: true

source/plate.qml

@@ -1,4 +1,4 @@
-import QtQuick 2.0
+import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
 Rectangle{