Merge lp:~seb128/ubuntu-system-settings/storage-bar-border into lp:ubuntu-system-settings

[Sebastien Bacher]

storage: use a rectangle so we can have a border around the bar

Tweak some of the margins and vertical spaces as well to look a bit better
and be aligned on other elements

storage: use a rectangle so we can have a border around the bar

Tweak some of the margins and vertical spaces as well to look a bit better
and be aligned on other elements

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/71

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/71/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

I'd prefer to use the anchors properties instead of assigning the width, that is instead of having:

 anchors.horizontalCenter: parent.horizontalCenter
 width: parent.width - units.gu(4)

have

 anchors.left: parent.left
 anchors.right: parent.right
 anchors.leftMargin: units.gu(2)
 anchors.rightMargin: anchors.leftMargin

which makes it more declarative, but it's just my preference.

review: Approve

=== modified file 'plugins/about/Storage.qml'
--- plugins/about/Storage.qml	2013-07-08 14:19:23 +0000
+++ plugins/about/Storage.qml	2013-07-09 08:53:28 +0000
@@ -62,7 +62,6 @@
             }
 
             StorageBar {
-                barHeight: units.gu(3)
                 colors: spaceColors
             }
 
@@ -70,7 +69,7 @@
                 model: spaceColors
                 Item {
                     height: units.gu(3)
-                    width: parent.width*0.9
+                    width: parent.width-units.gu(4)
                     anchors.horizontalCenter: parent.horizontalCenter
                     Row {
                         spacing: units.gu(1)

=== modified file 'plugins/about/StorageBar.qml'
--- plugins/about/StorageBar.qml	2013-06-17 18:52:58 +0000
+++ plugins/about/StorageBar.qml	2013-07-09 08:53:28 +0000
@@ -2,30 +2,33 @@
 import Ubuntu.Components 0.1
 
 Item {
-    property int barHeight
     property var colors
 
     anchors.horizontalCenter: parent.horizontalCenter
-    width: parent.width*0.9
-    height: barHeight + 2*units.gu(1)
+    height: units.gu(5)
+    width: parent.width - units.gu(4)
 
-    Row {
-        id: spaceRow
-        Rectangle {
-            color: colors[1]
-            height: barHeight
-            width: 50
-        }
-        Rectangle {
-            color: colors[2]
-            height: barHeight
-            width: 30
-        }
-    }
     Rectangle {
+        border.width: 1
         color: colors[0]
-        anchors.left: spaceRow.right
-        anchors.right: parent.right
-        height: barHeight
+        height: units.gu(3)
+        width: parent.width
+
+        Row {
+            anchors.centerIn: parent
+            height: parent.height-2
+            width: parent.width-2
+            Rectangle {
+                color: colors[1]
+                height: parent.height
+                width: 50
+            }
+            Rectangle {
+                color: colors[2]
+                height: parent.height
+                width: 30
+            }
+        }
+
     }
 }