Merge lp:~gerboland/unity-2d/dash_checkboxes into lp:unity-2d/3.0

[Gerry Boland]

[dash] Tickboxes replaced with Checkboxes, as per latest design spec.

Checkboxes are wider than old tickboxes, so some widths in the dash changed.

Proper operation depends on
lp:~gerboland/unity-2d/button_distinguish_mouseOver_selected_states

[Florian Boucault (fboucault)]

TickBox: color of the border and of the interior of the rectangle should be the same: full white with 0.8 opacity

Margin on the right looks much smaller on the mockups (measured around 15 pixels between the border of the rightmost tickbox and the inner border of the dash).

review: Needs Fixing

[Florian Boucault (fboucault)]

TickBox: color of the border when unselected is full white with 0.5 opacity

[Bob The Builder (bobthebuilder-deactivatedaccount)]

Attempt to merge into lp:unity-2d failed due to conflicts:

text conflict in places/TickBox.qml

[lp:~gerboland/unity-2d/dash_checkboxes]

668. By Gerry Boland on 2011-08-09

Merged lp:unity-2d

=== modified file 'places/SearchRefineOptionType.qml'
--- places/SearchRefineOptionType.qml	2011-08-09 16:18:45 +0000
+++ places/SearchRefineOptionType.qml	2011-08-09 17:46:09 +0000
@@ -51,8 +51,8 @@
         property int columns: 2
         property int rowsPerColumn: Math.ceil(count/columns)
 
-        cellHeight: 35
-        cellWidth: width/columns
+        cellHeight: 42 //30px for button + 12px for vertical padding
+        cellWidth: width/columns //145px for button + 10px for horizonal padding
 
         anchors.top: header.bottom
         anchors.topMargin: 15
@@ -69,8 +69,8 @@
         KeyNavigation.up: header
 
         delegate: TickBox {
-            height: filters.cellHeight
-            width: filters.cellWidth-5
+            height: filters.cellHeight-13 //29 = filters.cellHeight - vertical padding (10) - fix (3)
+            width: filters.cellWidth-13 //144 = filters.cellWidth - horizontal padding (12) - fix (1)
             /* Not checking for placeEntryModel != undefined leads to a segfault
                when switching places */
             text: placeEntryModel != undefined ? column_0 : ""

=== modified file 'places/TickBox.qml'
--- places/TickBox.qml	2011-08-09 16:18:45 +0000
+++ places/TickBox.qml	2011-08-09 17:46:09 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 1.0
+import Effects 1.0
 
 AbstractButton {
     id: tickBox
@@ -28,39 +29,37 @@
     width: childrenRect.width
     height: childrenRect.height
 
+    effect: DropShadow {
+         blurRadius: 8
+         color: "white"
+         offset.x: 0
+         offset.y: 0
+         enabled: ( tickBox.state == "selected" )
+    }
+
+    Rectangle {
+        id: container
+        width: parent.width //should be 144
+        height: parent.height //should be 29
+        border.color: "white"
+        border.width: 1
+        color: ( checked ) ? "white" : "#00000000"
+        opacity: if (checked) return 0.8
+                 else if (parent.state == "selected") return 1
+                 else return 0.5
+        radius: 5
+    }
+
     TextCustom {
         id: label
-
-        anchors.left: box.right
-        anchors.leftMargin: 8
-        anchors.right: tickBox.right
-        anchors.top: parent.top
-        font.pixelSize: 16
+        anchors.fill: container
+        width: parent.width
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        font.pixelSize: 15
+        color: ( checked ) ? "black" : "white"
         text: tickBox.text
         elide: Text.ElideRight
-    }
-
-    Image {
-        id: box
-
-        opacity: !canUncheck && checked ? 0 : 1
-        anchors.top: parent.top
-        anchors.left: parent.left
-        source: "artwork/tick_box.png"
-        width: sourceSize.width
-        height: sourceSize.height
-    }
-
-    Image {
-        id: tick
-
-        anchors.top: box.top
-        anchors.topMargin: 2
-        anchors.left: box.left
-        anchors.leftMargin: 3
-        opacity: checked ? 1.0 : ( parent.state == "selected" || parent.state == "hovered" ) ? 0.4 : 0.0
-        source: "artwork/tick.png"
-        width: sourceSize.width
-        height: sourceSize.height
+        opacity: ( !canUncheck ) ? 0 : 1
     }
 }

=== modified file 'places/dash.qml'
--- places/dash.qml	2011-08-09 14:57:33 +0000
+++ places/dash.qml	2011-08-09 17:46:09 +0000
@@ -208,9 +208,9 @@
             anchors.topMargin: search_entry.anchors.topMargin
             height: parent.height
             headerHeight: search_entry.height
-            width: 295
+            width: 310
             anchors.right: parent.right
-            anchors.rightMargin: 19
+            anchors.rightMargin: 3
         }
 
         Loader {