Merge lp:~zsombi/ubuntu-ui-toolkit/40-visualize-options into lp:~bzoltan/ubuntu-ui-toolkit/new_list_item

[Zsombor Egri]

ListItemOptions visualisation.

[lp:~zsombi/ubuntu-ui-toolkit/40-visualize-options]

1241. By Zsombor Egri on 2014-09-15

prereq

1242. By Zsombor Egri on 2014-09-15

prereq

1243. By Zsombor Egri on 2014-09-15

icon color for trailing panel

1244. By Zsombor Egri on 2014-09-15

prereq

1245. By Zsombor Egri on 2014-09-15

prereq merge

1246. By Zsombor Egri on 2014-09-15

fix visible

1247. By Zsombor Egri on 2014-09-16

prereq

1248. By Zsombor Egri on 2014-09-17

prereq

1249. By Zsombor Egri on 2014-09-17

add more options to test app

1250. By Zsombor Egri on 2014-09-17

prereq

1251. By Zsombor Egri on 2014-09-17

options fixed

1252. By Zsombor Egri on 2014-09-17

prereq

1253. By Zsombor Egri on 2014-09-17

document restrictions when used with Flickables

1254. By Zsombor Egri on 2014-09-18

prereq

1255. By Zsombor Egri on 2014-09-18

actions transfer fix

1256. By Zsombor Egri on 2014-09-19

prereq sync

1257. By Zsombor Egri on 2014-09-24

prereq sync

1258. By Zsombor Egri on 2014-09-25

prereq sync

1259. By Zsombor Egri on 2014-09-29

prereq sync

1260. By Zsombor Egri on 2014-10-02

prereq sync

1261. By Zsombor Egri on 2014-10-13

prereq sync

1262. By Zsombor Egri on 2014-10-20

prereq sync

1263. By Zsombor Egri on 2014-10-22

prereq sync

1264. By Zsombor Egri on 2014-10-22

prereq sync

1265. By Zsombor Egri on 2014-10-23

prereq sync

1266. By Zsombor Egri on 2014-10-23

prereq sync

1267. By Zsombor Egri on 2014-10-24

prereq sync

1268. By Zsombor Egri on 2014-10-30

prereq sync

1269. By Zsombor Egri on 2014-10-30

disabled actions are shown 50% dimmed

1270. By Zsombor Egri on 2014-11-04

prereq sync

1271. By Zsombor Egri on 2014-11-07

prereq sync

1272. By Zsombor Egri on 2014-11-07

fixing panel and test app due to prereq changes

1273. By Zsombor Egri on 2014-11-07

small fixes

1274. By Zsombor Egri on 2014-11-07

prereq sync

1275. By Zsombor Egri on 2014-11-07

prereq sync

1276. By Zsombor Egri on 2014-11-07

test fixed

1277. By Zsombor Egri on 2014-11-10

prereq sync

1278. By Zsombor Egri on 2014-11-12

prereq sync

1279. By Zsombor Egri on 2014-11-12

tests added

1280. By Zsombor Egri on 2014-11-12

API updated

1281. By Zsombor Egri on 2014-11-12

prereq sync

1282. By Zsombor Egri on 2014-11-17

prereq sync

1283. By Zsombor Egri on 2014-11-17

use correct signal to forward children changes

1284. By Zsombor Egri on 2014-11-18

prereq sync

1285. By Zsombor Egri on 2014-11-19

prereq sync

1286. By Zsombor Egri on 2014-11-20

prereq sync

1287. By Zsombor Egri on 2014-11-24

prereq sync

1288. By Zsombor Egri on 2014-11-24

ListItemPanel fixes

1289. By Zsombor Egri on 2014-11-24

highlight when pressed

1290. By Zsombor Egri on 2014-11-24

highlight fix

1291. By Zsombor Egri on 2014-11-24

highlight fix

1292. By Zsombor Egri on 2014-11-24

revert UCStyledItemBase changes from rev 1290 so we do not forward child mouse events as normal mouse events, as we can get loads of similar mouse events (i.e. press events) on ListItem when a child is pressed. Instead handle mouse events in child filter

1293. By Zsombor Egri on 2014-11-25

calling super-class method

Unmerged revisions

1293. By Zsombor Egri on 2014-11-25

calling super-class method

1292. By Zsombor Egri on 2014-11-24

revert UCStyledItemBase changes from rev 1290 so we do not forward child mouse events as normal mouse events, as we can get loads of similar mouse events (i.e. press events) on ListItem when a child is pressed. Instead handle mouse events in child filter

1291. By Zsombor Egri on 2014-11-24

highlight fix

1290. By Zsombor Egri on 2014-11-24

highlight fix

1289. By Zsombor Egri on 2014-11-24

highlight when pressed

1288. By Zsombor Egri on 2014-11-24

ListItemPanel fixes

1287. By Zsombor Egri on 2014-11-24

prereq sync

1286. By Zsombor Egri on 2014-11-20

prereq sync

1285. By Zsombor Egri on 2014-11-19

prereq sync

1284. By Zsombor Egri on 2014-11-18

prereq sync

=== modified file 'modules/Ubuntu/Components/ListItemPanel.qml'
--- modules/Ubuntu/Components/ListItemPanel.qml	2014-09-15 08:41:36 +0000
+++ modules/Ubuntu/Components/ListItemPanel.qml	2014-09-15 08:41:37 +0000
@@ -22,7 +22,7 @@
   */
 Item {
     id: panel
-    width: units.gu(20)
+    width: optionsRow.childrenRect.width
 
     readonly property Item contentItem: parent ? parent.contentItem : null
     /*
@@ -48,6 +48,60 @@
 
     Rectangle {
         anchors.fill: parent
-        color: leadingPanel ? UbuntuColors.red : UbuntuColors.green
+        // FIXME: use Palette colors instead when available
+        color: leadingPanel ? UbuntuColors.red : "#00000000"
+    }
+
+    Row {
+        id: optionsRow
+        anchors {
+            left: parent.left
+            top: parent.top
+            bottom: parent.bottom
+            leftMargin: spacing
+        }
+
+        property real maxItemWidth: panel.parent ? (panel.parent.width / panel.optionList.length) : 0
+
+        Repeater {
+            model: panel.optionList
+            AbstractButton {
+                action: modelData
+                width: (!visible || !enabled) ?
+                           0 : MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, optionsRow.maxItemWidth)
+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                }
+
+                Loader {
+                    id: delegateLoader
+                    height: parent.height
+                    sourceComponent: panel.delegate ? panel.delegate : defaultDelegate
+                    property Action option: modelData
+                    onItemChanged: {
+                        // this is needed only for testing purposes
+                        if (item && item.objectName === "") {
+                            item.objectName = "list_option_" + index
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: defaultDelegate
+        Item {
+            width: height
+            Icon {
+                width: units.gu(2.5)
+                height: width
+                name: option.iconName
+                // FIXME: use Palette colors instead when available
+                color: panel.leadingPanel ? "white" : UbuntuColors.lightGrey
+                anchors.centerIn: parent
+            }
+        }
     }
 }

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2014-09-15 08:41:36 +0000
+++ tests/resources/listitems/ListItemTest.qml	2014-09-15 08:41:37 +0000
@@ -27,16 +27,29 @@
     Action {
         objectName: "stock"
         id: stock
+        iconName: "starred"
+        onTriggered: print(iconName, "triggered")
     }
 
     ListItemOptions {
         id: leading
         objectName: "StockLeading"
         Action {
-        }
-        Action {
-        }
-        Action {
+            iconName: "delete"
+            onTriggered: print(iconName, "triggered")
+        }
+        Action {
+            iconName: "alarm-clock"
+            enabled: false
+            onTriggered: print(iconName, "triggered")
+        }
+        Action {
+            iconName: "camcorder"
+            onTriggered: print(iconName, "triggered")
+        }
+        Action {
+            iconName: "stock_website"
+            onTriggered: print(iconName, "triggered")
         }
     }
 

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2014-09-15 08:41:36 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2014-09-15 08:41:37 +0000
@@ -26,14 +26,18 @@
 
     Action {
         id: stockAction
+        iconName: "starred"
     }
     ListItemOptions {
         id: leading
         Action {
-        }
-        Action {
-        }
-        Action {
+            iconName: "starred"
+        }
+        Action {
+            iconName: "starred"
+        }
+        Action {
+            iconName: "starred"
         }
     }
     ListItemOptions {
@@ -46,11 +50,13 @@
         id: wrongOption
         Action {
             id: goodAction
+            iconName: "starred"
         }
         QtObject {
             id: badAction
         }
         Action {
+            iconName: "starred"
         }
     }
     ListItemOptions {