v.1.1-1 Release

Full remake of package
Code Cleanup
Bugfix

harbour-kvadraasolve.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+X-Nemo-Application-Type=silica-qt5
+Name=KvadraaSolve
+Icon=harbour-kvadraasolve
+Exec=harbour-kvadraasolve
+

harbour-kvadraasolve.pro

@@ -0,0 +1,23 @@
+# The name of your app.
+# NOTICE: name defined in TARGET has a corresponding QML filename.
+#         If name defined in TARGET is changed, following needs to be
+#         done to match new name:
+#         - corresponding QML filename must be changed
+#         - desktop icon filename must be changed
+#         - desktop filename must be changed
+#         - icon definition filename in desktop file must be changed
+TARGET = harbour-kvadraasolve
+
+CONFIG += sailfishapp
+
+SOURCES += src/harbour-kvadraasolve.cpp
+
+OTHER_FILES += qml/harbour-kvadraasolve.qml \
+    qml/cover/CoverPage.qml \
+    qml/pages/KvadraaSolve.qml \
+    qml/pages/About.qml \
+    qml/pages/Thanks.qml \
+    rpm/harbour-kvadraasolve.spec \
+    rpm/harbour-kvadraasolve.yaml \
+    harbour-kvadraasolve.desktop
+

qml/harbour-kvadraasolve.qml

@@ -0,0 +1,72 @@
+/*
+  Copyright (C) 2013 Jolla Ltd.
+  Contact: Thomas Perl <[email protected]>
+  All rights reserved.
+
+  You may use this file under the terms of BSD license as follows:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Jolla Ltd nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
+  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import "pages"
+
+ApplicationWindow
+{
+    id: appwin
+    //initialPage: KvadraaSolve {}
+    initialPage: kvadraaSolveComponent
+    cover: Qt.resolvedUrl("cover/CoverPage.qml")
+
+    property KvadraaSolve _kvadraasolve
+    Component {
+            id: kvadraaSolveComponent
+            KvadraaSolve {
+                id: kvadraasolve
+                Component.onCompleted: appwin._kvadraasolve = kvadraasolve
+            }
+        }
+
+    function getX1() {
+        if (_kvadraasolve._x1 === null) return "Type A, B, C first"
+        else
+            return _kvadraasolve._x1;
+        }
+    function getX2() {
+
+        if (_kvadraasolve._x2 === null) return "Type A, B, C first"
+        else return _kvadraasolve._x2;
+        }
+    function getD() {
+
+        if (_kvadraasolve._d === null) return "Type A, B, C first"
+        else return _kvadraasolve._d;
+        }
+    function getEqu() {
+        return _kvadraasolve._equation;
+    }
+
+
+}
+

qml/pages/About.qml

@@ -0,0 +1,71 @@
+/*
+  Copyright (C) 2013 Jolla Ltd.
+  Contact: Thomas Perl <[email protected]>
+  All rights reserved.
+
+  You may use this file under the terms of BSD license as follows:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Jolla Ltd nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
+  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+
+
+Page {
+    id: page
+    Column {
+        anchors.fill: parent
+        anchors.margins: Theme.paddingLarge
+
+        PageHeader {
+            title: "About Page"
+        }
+
+        Label {
+            width: parent.width
+            horizontalAlignment: Text.AlignLeft
+            text: "Hello Sailors:)"
+        }
+        Label {
+            width: parent.width
+            horizontalAlignment: Text.AlignLeft
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+            textFormat: Text.RichText
+            //textFormat: Text.RichText
+            text: "<style>
+                    a {
+                        color: " +Theme.highlightColor +";\
+                        }
+                       </style>\
+This is my first training application.<br>
+ I'm still styding :)<br>
+Source code is in my GitHub repo (van-ess0/KvadraaSolve). <br>
+Contact me in Twitter <a href='http://twitter.com/Van_ess0'>@Van_ess0</a><br>
+Thanks for using and best wishes!<br>"
+            onLinkActivated: {
+               Qt.openUrlExternally(link)
+            }
+        }
+   }
+}

qml/pages/KvadraaSolve.qml

@@ -0,0 +1,214 @@
+/*
+  Copyright (C) 2013 Jolla Ltd.
+  Contact: Thomas Perl <[email protected]>
+  All rights reserved.
+
+  You may use this file under the terms of BSD license as follows:
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Jolla Ltd nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
+  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+import QtQuick 2.0
+import Sailfish.Silica 1.0
+import "../cover"
+
+Page {
+    id: page
+
+    property alias _equation: equ.qua
+    property alias _x1: x1.text
+    property alias _x2: x2.text
+    property alias _d: d.text
+
+    //Making string in the PullDownMenu and filling global variables
+    //for cover information
+    Item {
+        id: equ
+        property string ak: {if (a.text === '') 'A'; else a.text}
+        property string bk: {if (parseInt(b.text) < 0) b.text + 'X'; else if (b.text === '') '+BX'; else '+' + b.text + 'X' }
+        property string ck: {if (parseInt(c.text) < 0) c.text; else if (c.text === '') '+C'; else '+' + c.text}
+        property string qua: ak + 'X&#178;' + bk + ck + '=0'
+    }
+
+
+    // To enable PullDownMenu, place our content in a SilicaFlickable
+    SilicaFlickable {
+        anchors.fill: parent
+
+        // PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
+        PullDownMenu {
+            MenuItem {
+                text: "Thanks"
+                onClicked: pageStack.push(Qt.resolvedUrl("Thanks.qml"))
+            }
+            MenuItem {
+                text: "About"
+                onClicked: pageStack.push(Qt.resolvedUrl("About.qml"))
+            }
+            Label {
+                width: parent.width
+                //height: (parent.height - head.height)  / 10
+                horizontalAlignment: Text.AlignHCenter
+                textFormat: Text.RichText
+                text: equ.qua
+            }
+        }
+
+
+        // Tell SilicaFlickable the height of its content.
+        contentHeight: column.height
+
+        // Place our content in a Column.  The PageHeader is always placed at the top
+        // of the page, followed by our content.
+        Column {
+            id: column
+
+            width: page.width
+            height: page.height
+            anchors.margins: Theme.paddingLarge
+            spacing: Theme.paddingLarge
+
+
+            PageHeader {
+                id: head
+                title: "KvadraaSolve"
+            }
+
+            //Getting A in Ax^2+Bx+C=0
+            Item {
+                id:sqX
+                width: parent.width
+                height: (parent.height - head.height)  / 5
+                Label {
+                    id: aLabel
+                    width: parent.width / 10
+                    height: parent.height
+                    textFormat: Text.RichText
+                    font.bold: true
+                    //anchors.leftMargin: Theme.paddingLarge
+                    //anchors.rightMargin: Theme.paddingLarge
+
+                    //horizontalAlignment: Text.AlignLeft
+                    text: "X&#178;"
+                }
+                TextField {
+                    id: a
+                    width: parent.width - aLabel.width
+                    height: parent.height
+                    anchors.left: aLabel.right
+                    horizontalAlignment: Text.AlignRight
+                    //font.bold: true
+                    placeholderText: "Enter A"
+                    //text: "2"
+                    validator: IntValidator{}
+                    inputMethodHints: Qt.ImhDigitsOnly
+                    //focus: true
+                }
+              }
+            Item {
+                id: x
+                width: parent.width
+                height: (parent.height - head.height)  / 5
+                Label {
+                    id: bLabel
+                    width: parent.width / 10
+                    height: parent.height
+                    font.bold: true
+                    //anchors.leftMargin: Theme.paddingLarge
+                    //anchors.rightMargin: Theme.paddingLarge
+
+                    //horizontalAlignment: Text.AlignLeft
+                    text: "X"
+                }
+                TextField {
+                    id: b
+                    width: parent.width - bLabel.width
+                    height: parent.height
+                    anchors.left: bLabel.right
+                    horizontalAlignment: Text.AlignRight
+                    //font.bold: true
+                    placeholderText: "Enter B"
+                    //text: "3"
+                    validator: IntValidator{}
+                    inputMethodHints: Qt.ImhDigitsOnly
+                }
+            }
+
+                 Item {
+                     id:free
+                     width: parent.width
+                     height: (parent.height - head.height)  / 5
+                     Label {
+                         id: cLabel
+                         width: parent.width / 10
+                         height: parent.height
+                         font.bold: true
+                         //anchors.leftMargin: Theme.paddingLarge
+                         //anchors.rightMargin: Theme.paddingLarge
+                         //horizontalAlignment: Text.AlignLeft
+                         text: "Free"
+                     }
+                     TextField {
+                         id: c
+                         width: parent.width - cLabel.width
+                         height: parent.height
+                         anchors.left: cLabel.right
+                         horizontalAlignment: Text.AlignRight
+                         //font.bold: true
+                         placeholderText: "Enter C"
+                         //text: "-1"
+                         validator: IntValidator{}
+                         inputMethodHints: Qt.ImhDigitsOnly
+                     }
+                 }
+
+                     Label {
+                         id: d
+                         width: parent.width
+                         font.weight: Font.Light
+                         font.pointSize: 5
+                         //Text.fontSizeMode: 15
+                         property int discriminant: (parseInt(b.text) * parseInt(b.text) - 4 * parseInt(a.text) * parseInt(c.text))
+                         text: "D = " + discriminant
+                     }
+
+                     Label {
+                         id: x1
+                         width: parent.width
+                         font.weight: Font.Light
+                         //anchors.left: d.right
+                         property real x1var: ((-parseInt(b.text) + Math.sqrt(d.discriminant)) / (2 * parseInt(a.text)))
+                         text: 'X1 = ' + x1var
+                     }
+                     Label {
+                         id: x2
+                         width: parent.width
+                         font.weight: Font.Light
+                         property real x2var: ((-parseInt(b.text) - Math.sqrt(d.discriminant)) / (2 * parseInt(a.text)))
+                         text: 'X2 = ' + x2var
+                     }
+
+            }
+   }
+
+}