Merge branch 'QtDeployer'

README.md

@@ -19,7 +19,7 @@ supported platform:
 
 
 ## Install 
-You can download the latest version of the game [here](https://github.com/QuasarApp/QtDeployer/releases).
+You can download the latest version of the application [here](https://github.com/EndrII/Hanoi-Towers/releases).
 
 Or download from official services
   * Ubuntu

source/QML/About.qml

@@ -0,0 +1,50 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+
+Item {
+
+    id: ab
+    signal exit
+    property string type: qsTr("About")
+    Rectangle {
+        color: "#eee"
+        anchors.fill: parent
+    }
+    Image {
+        x: 0
+        y: 0
+        width: parent.width
+        height: parent.height * 0.2
+        fillMode: Image.PreserveAspectFit
+        source: "/icon"
+    }
+    Label {
+        id: txt
+        x: parent.width * 0.1
+        y: parent.height * 0.3
+        width: parent.width * 0.8
+        height: parent.height * 0.6
+        font.pixelSize: (ab.width < ab.height) ? ab.width / 30 : ab.height / 30
+        wrapMode: Text.Wrap
+        text: qsTr("This application forked by ShahriarSS
+Page of original soft: https://github.com/ShahriarSS/QtLinuxDeployer
+
+
+Developers of fork:
+* Programmer: Yankovich Andrei.
+* Designer: Bakovets Alina.
+
+ This application is distributed under the LGPLv3 license.
+
+ Contact: https://github.com/EndrII
+ Copyright (C) 12 Mar 2018 - Apr 10, 2018  ShahriarSS.
+ Copyright (C) Apr 10, 2018 QuasarApp.")
+    }
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            swipeview.currentIndex = 0
+        }
+    }
+}

source/QML/Header.qml

@@ -0,0 +1,28 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import QtQuick.Layouts 1.3
+
+TopBar {
+    property string message: "Qt Deployer"
+        text: message
+
+        ToolButton {
+            id: home
+            text: "➔"
+            rotation: 180
+            font.pointSize: largeFont
+            anchors.right: parent.right
+            onClicked: swipeview.currentIndex = 0
+            anchors.verticalCenter: parent.verticalCenter
+        }
+        ToolButton {
+            text: qsTr("About")
+            font.pointSize: smallFont
+            anchors.right: home.left
+            onClicked: {
+                swipeview.currentIndex = 4
+            }
+            anchors.verticalCenter: parent.verticalCenter
+        }
+    }

source/QML/PreparePage.qml

@@ -8,18 +8,9 @@ Page {
 	id: page
 	clip: true
 
-	header: TopBar {
-        text: qsTr("Prepare")
-
-		ToolButton {
-			text: "➔"
-			rotation: 180
-			font.pointSize: largeFont
-			anchors.right: parent.right
-			onClicked: swipeview.currentIndex = 0
-			anchors.verticalCenter: parent.verticalCenter
-		}
-	}
+    header: Header {
+        message: qsTr("Qt Deployer")
+    }
 
 	property string outdir
 	property var cpplibs: []

source/QML/ProcessPage.qml

@@ -10,18 +10,9 @@ Page {
 	property bool erase
 	property int state: MainManager.state
 
-	header: TopBar {
-        text: qsTr("Qt Deployer")
-
-		ToolButton {
-			text: "➔"
-			rotation: 180
-			font.pointSize: largeFont
-			anchors.right: parent.right
-			onClicked: swipeview.currentIndex = 0
-			anchors.verticalCenter: parent.verticalCenter
-		}
-	}
+    header: Header {
+        message: qsTr("Qt Deployer")
+    }
 
 	Button {
 		width: 200

source/QML/ResultPage.qml

@@ -6,18 +6,10 @@ import QtQuick.Layouts 1.3
 Page {
 	clip: true
 
-	header: TopBar {
-        text: qsTr("Result")
+    header: Header {
+        message: qsTr("Result")
+    }
 
-		ToolButton {
-			text: "➔"
-			rotation: 180
-			font.pointSize: largeFont
-			anchors.right: parent.right
-			onClicked: swipeview.currentIndex = 0
-			anchors.verticalCenter: parent.verticalCenter
-		}
-	}
 
 	ListView {
 		id: listview

source/QML/StartPage.qml

@@ -8,16 +8,10 @@ Page {
 	id: page
 	clip: true
 
-	header: TopBar {
-        text: qsTr("Qt Deployer")
-	}
+    header: Header {
+        message: qsTr("Qt Deployer")
+    }
 
-	Settings {
-		property alias qtdir: qtdir.content
-		property alias outdir: outdir.content
-		property alias execpath: execpath.content
-		property alias projectdir: projectdir.content
-	}
 
 	ColumnLayout {
 		spacing: 15

source/QML/main.qml

@@ -1,4 +1,5 @@
 import QtQuick 2.7
+import Qt.labs.platform 1.0
 import QtQuick.Controls 2.0
 import QtQuick.Controls.Material 2.0
 
@@ -38,6 +39,12 @@ ApplicationWindow {
 
 		ResultPage {
 			id: rp
-		}
+        }
+
+        About {
+            id: ab
+        }
+
 	}
+
 }

source/qml.qrc

@@ -10,6 +10,8 @@
         <file>QML/StartPage.qml</file>
         <file>QML/TopBar.qml</file>
         <file alias="icon">res/icon.png</file>
+        <file>QML/Header.qml</file>
+        <file>QML/About.qml</file>
     </qresource>
     <qresource prefix="/languages">
         <file alias="en">languages/en.qm</file>