1
=== modified file 'modules/Ubuntu/Components/ListItemPanel.qml'
2
--- modules/Ubuntu/Components/ListItemPanel.qml	2014-09-15 08:41:36 +0000
3
+++ modules/Ubuntu/Components/ListItemPanel.qml	2014-09-15 08:41:37 +0000
4
@@ -22,7 +22,7 @@
5
22
  */
22
  */
6
23
Item {
23
Item {
7
24
    id: panel
24
    id: panel
9
25
    width: units.gu(20)
25
    width: optionsRow.childrenRect.width
10
26
26
11
27
    readonly property Item contentItem: parent ? parent.contentItem : null
27
    readonly property Item contentItem: parent ? parent.contentItem : null
12
28
    /*
28
    /*
13
@@ -48,6 +48,60 @@
14
48
48
15
49
    Rectangle {
49
    Rectangle {
16
50
        anchors.fill: parent
50
        anchors.fill: parent
18
51
        color: leadingPanel ? UbuntuColors.red : UbuntuColors.green
51
        // FIXME: use Palette colors instead when available
19
52
        color: leadingPanel ? UbuntuColors.red : "#00000000"
20
53
    }
21
54
22
55
    Row {
23
56
        id: optionsRow
24
57
        anchors {
25
58
            left: parent.left
26
59
            top: parent.top
27
60
            bottom: parent.bottom
28
61
            leftMargin: spacing
29
62
        }
30
63
31
64
        property real maxItemWidth: panel.parent ? (panel.parent.width / panel.optionList.length) : 0
32
65
33
66
        Repeater {
34
67
            model: panel.optionList
35
68
            AbstractButton {
36
69
                action: modelData
37
70
                width: (!visible || !enabled) ?
38
71
                           0 : MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, optionsRow.maxItemWidth)
39
72
                anchors {
40
73
                    top: parent.top
41
74
                    bottom: parent.bottom
42
75
                }
43
76
44
77
                Loader {
45
78
                    id: delegateLoader
46
79
                    height: parent.height
47
80
                    sourceComponent: panel.delegate ? panel.delegate : defaultDelegate
48
81
                    property Action option: modelData
49
82
                    onItemChanged: {
50
83
                        // this is needed only for testing purposes
51
84
                        if (item && item.objectName === "") {
52
85
                            item.objectName = "list_option_" + index
53
86
                        }
54
87
                    }
55
88
                }
56
89
            }
57
90
        }
58
91
    }
59
92
60
93
    Component {
61
94
        id: defaultDelegate
62
95
        Item {
63
96
            width: height
64
97
            Icon {
65
98
                width: units.gu(2.5)
66
99
                height: width
67
100
                name: option.iconName
68
101
                // FIXME: use Palette colors instead when available
69
102
                color: panel.leadingPanel ? "white" : UbuntuColors.lightGrey
70
103
                anchors.centerIn: parent
71
104
            }
72
105
        }
73
52
    }
106
    }
74
53
}
107
}
75
54
108
76
=== modified file 'tests/resources/listitems/ListItemTest.qml'
77
--- tests/resources/listitems/ListItemTest.qml	2014-09-15 08:41:36 +0000
78
+++ tests/resources/listitems/ListItemTest.qml	2014-09-15 08:41:37 +0000
79
@@ -27,16 +27,29 @@
80
27
    Action {
27
    Action {
81
28
        objectName: "stock"
28
        objectName: "stock"
82
29
        id: stock
29
        id: stock
83
30
        iconName: "starred"
84
31
        onTriggered: print(iconName, "triggered")
85
30
    }
32
    }
86
31
33
87
32
    ListItemOptions {
34
    ListItemOptions {
88
33
        id: leading
35
        id: leading
89
34
        objectName: "StockLeading"
36
        objectName: "StockLeading"
90
35
        Action {
37
        Action {
95
36
        }
38
            iconName: "delete"
96
37
        Action {
39
            onTriggered: print(iconName, "triggered")
97
38
        }
40
        }
98
39
        Action {
41
        Action {
99
42
            iconName: "alarm-clock"
100
43
            enabled: false
101
44
            onTriggered: print(iconName, "triggered")
102
45
        }
103
46
        Action {
104
47
            iconName: "camcorder"
105
48
            onTriggered: print(iconName, "triggered")
106
49
        }
107
50
        Action {
108
51
            iconName: "stock_website"
109
52
            onTriggered: print(iconName, "triggered")
110
40
        }
53
        }
111
41
    }
54
    }
112
42
55
113
43
56
114
=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
115
--- tests/unit_x11/tst_components/tst_listitem.qml	2014-09-15 08:41:36 +0000
116
+++ tests/unit_x11/tst_components/tst_listitem.qml	2014-09-15 08:41:37 +0000
117
@@ -26,14 +26,18 @@
118
26
26
119
27
    Action {
27
    Action {
120
28
        id: stockAction
28
        id: stockAction
121
29
        iconName: "starred"
122
29
    }
30
    }
123
30
    ListItemOptions {
31
    ListItemOptions {
124
31
        id: leading
32
        id: leading
125
32
        Action {
33
        Action {
130
33
        }
34
            iconName: "starred"
131
34
        Action {
35
        }
132
35
        }
36
        Action {
133
36
        Action {
37
            iconName: "starred"
134
38
        }
135
39
        Action {
136
40
            iconName: "starred"
137
37
        }
41
        }
138
38
    }
42
    }
139
39
    ListItemOptions {
43
    ListItemOptions {
140
@@ -46,11 +50,13 @@
141
46
        id: wrongOption
50
        id: wrongOption
142
47
        Action {
51
        Action {
143
48
            id: goodAction
52
            id: goodAction
144
53
            iconName: "starred"
145
49
        }
54
        }
146
50
        QtObject {
55
        QtObject {
147
51
            id: badAction
56
            id: badAction
148
52
        }
57
        }
149
53
        Action {
58
        Action {
150
59
            iconName: "starred"
151
54
        }
60
        }
152
55
    }
61
    }
153
56
    ListItemOptions {
62
    ListItemOptions {
Status:	Superseded
Proposed branch:	lp:~zsombi/ubuntu-ui-toolkit/40-visualize-options
Merge into:	lp:~bzoltan/ubuntu-ui-toolkit/new_list_item
Prerequisite:	lp:~zsombi/ubuntu-ui-toolkit/35-options-panel-swipe
Diff against target:	153 lines (+83/-10) 3 files modified modules/Ubuntu/Components/ListItemPanel.qml (+56/-2) tests/resources/listitems/ListItemTest.qml (+17/-4) tests/unit_x11/tst_components/tst_listitem.qml (+10/-4)
To merge this branch:	bzr merge lp:~zsombi/ubuntu-ui-toolkit/40-visualize-options
Related bugs:	Link a bug report
Related blueprints:	SDK: Design a new ListItem and layouts (Undefined)
Reviewer	Review Type	Date Requested	Status
Ubuntu SDK team		2014-09-15	Pending
Review via email: mp+234635@code.launchpad.net