elimu-ai#62, adding images, and removing text from quit dialog

VoltAir/VoltAir.pro

@@ -93,3 +93,6 @@ RESOURCES += \
     resources/voltair.qrc
 
 cache()
+
+DISTFILES += \
+    qml/ui/VoltairImage.qml

VoltAir/qml/Ui.qml

@@ -423,9 +423,13 @@ UiInternal {
         height: 0.6 * parent.height
         anchors.centerIn: parent
 
-        questionText: TR.value("quit.question")
-        cancelText: TR.value("no")
-        confirmText: TR.value("yes")
+        //questionText: TR.value("quit.question")
+        questionIcon: Util.getPathToImage("UI/exit.png")
+        cancelSelectedIconSource: Util.getPathToImage("UI/no.png")
+        cancelUnselectedIconSource: Util.getPathToImage("UI/no.png")
+
+        confirmSelectedIconSource: Util.getPathToImage("UI/yes.png")
+        confirmUnselectedIconSource: Util.getPathToImage("UI/yes.png")
 
         onHideCompleted: {
             if (root.state == "PAUSE_MENU") {

VoltAir/qml/ui/ConfirmDialog.qml

@@ -28,15 +28,26 @@ UiComponent {
     /**
      * @brief Question to ask the user to confirm whether they want to perform the action or not.
      */
-    property string questionText
+    //property string questionText//
+    property string questionIcon
+
     /**
      * @brief type:string Text that indicates to the user that the action should not be performed.
      */
-    property alias cancelText: cancelButton.buttonText
+    //property alias cancelText: cancelButton.buttonText//
+    //property string cancelText//
+
+    property alias cancelUnselectedIconSource: cancelButton.unselectedIconSource
+    property alias cancelSelectedIconSource: cancelButton.selectedIconSource
+
     /**
      * @brief type:string Text that indicates to the user that the action should be performed.
      */
-    property alias confirmText: confirmButton.buttonText
+    //property alias confirmText: confirmButton.buttonText
+    //property string confirmText
+
+    property alias confirmUnselectedIconSource: confirmButton.unselectedIconSource
+    property alias confirmSelectedIconSource: confirmButton.selectedIconSource
 
     /**
      * @brief Emitted when the cancel button is activated.
@@ -91,8 +102,9 @@ UiComponent {
         id: frame
         anchors.fill: parent
 
-        VoltAirText {
-            id: question
+
+        VoltairImage {
+            id: questionImage
 
             anchors.horizontalCenter: parent.horizontalCenter
             anchors.top: parent.top
@@ -101,10 +113,10 @@ UiComponent {
             width: 0.8 * parent.width
             height: 0.3 * parent.height
 
-            textElement.text: questionText
+            sourceImage: questionIcon
         }
 
-        MenuButton {
+        MenuIcon {
             id: cancelButton
 
             anchors.left: parent.left
@@ -124,7 +136,7 @@ UiComponent {
             }
         }
 
-        MenuButton {
+        MenuIcon {
             id: confirmButton
 
             anchors.right: parent.right
@@ -137,10 +149,14 @@ UiComponent {
 
             focusLeft: cancelButton
 
+            unselectedIconSource: Util.getPathToImage("UI/back.png")
+            selectedIconSource: Util.getPathToImage("UI/back_h.png")
+
             onReleased: {
                 root.confirmed()
             }
         }
+
     }
 
     onEscaped: {

VoltAir/qml/ui/VoltairImage.qml

@@ -0,0 +1,54 @@
+import QtGraphicalEffects 1.0
+import QtQuick 2.0
+import VoltAir 1.0
+
+/**
+ * @ingroup QQuickItem
+ * @brief Container for Image with default style settings and a drop shadow.
+*/
+
+Item {
+    id: root
+
+    property string sourceImage
+
+    /**
+     * @brief type:Text Reference to the internal @c Text element that is used by this VoltAirText.
+     */
+    //property alias textElement: text
+    /**
+     * @brief type:DropShadow Reference to the internal @c DropShadow element that is used by this VoltAirText.
+     */
+    property alias dropShadow: dropShadow
+
+    FontLoader {
+        id: voltAirFont
+        source: Util.getPathToFont("AndikaLowerCase-Regular_5dp.ttf")
+    }
+
+    Image {
+        id: image
+        source: sourceImage
+
+        anchors.fill: parent
+
+        verticalAlignment: Text.AlignVCenter
+        horizontalAlignment: Text.AlignHCenter
+
+        fillMode: Image.PreserveAspectFit
+    }
+
+    DropShadow {
+        id: dropShadow
+
+        anchors.fill: image
+        source: image
+
+        horizontalOffset: 1
+        verticalOffset: 2
+        radius: 6.0
+        spread: 0.6
+        samples: 16
+        color: "white"
+    }
+}