Merge pull request #1 from locusf/master

Proper closing button and black toolbar.

src/qml/CloseButton.qml

@@ -27,7 +27,7 @@ Image {
     id: closeButton
     signal clicked()
 
-    source: 'image://theme/icon-m-framework-close-thumbnail'
+    source: 'theme/icon-m-framework-close-thumbnail.png'
 
     MouseArea {
         anchors.fill: parent

src/qml/MainScreen.qml

@@ -91,7 +91,9 @@ Page {
         value: "100"
     }
 
-    tools: Item {
+    tools: Rectangle {
+        color: "black"
+        anchors.fill: parent
         Image {
             id: batteryimg
             width: 32
@@ -100,7 +102,7 @@ Page {
         Label {
             anchors.left: batteryimg.right
             id: batterylbl
-            color: "black"
+            color: "white"
             font.pointSize: 8
         }
     }

src/resources-qml.qrc

@@ -31,5 +31,6 @@
         <file>qml/images/battery5.png</file>
         <file>qml/images/battery6.png</file>
         <file>qml/compositor/WindowWrapperMystic.qml</file>
+        <file>qml/theme/icon-m-framework-close-thumbnail.png</file>
     </qresource>
 </RCC>