1
=== modified file 'EventReminder.qml'
2
--- EventReminder.qml	2014-10-10 17:49:49 +0000
3
+++ EventReminder.qml	2014-11-11 12:50:57 +0000
4
@@ -49,58 +49,41 @@
5
49
            pop();
49
            pop();
6
50
        }
50
        }
7
51
    }
51
    }
9
52
52
    Scrollbar{
10
53
        id:scrollList
11
54
        flickableItem: _pageFlickable
12
55
        anchors.fill :parent
13
56
    }
14
53
    Flickable {
57
    Flickable {
15
54
        id: _pageFlickable
58
        id: _pageFlickable
16
55
59
17
60
18
56
        clip: true
61
        clip: true
19
57
        anchors.fill: parent
62
        anchors.fill: parent
29
58
        contentHeight: reminderModel.count * units.gu(7)
63
        contentHeight: _reminders.itemHeight * reminderModel.count + units.gu(2)
30
59
64
        ListItem.ItemSelector {
31
60
        Column {
65
            id: _reminders
32
61
            id: _reminderColumn
66
            expanded: true
33
62
67
            model: reminderModel
34
63
            anchors {
68
            delegate: selectorDelegate
35
64
                top: parent.top
69
            selectedIndex: reminderModel.get
36
65
                left: parent.left
70
            onSelectedIndexChanged: {
37
66
                right: parent.right
71
                root.reminderTime = reminderModel.get(selectedIndex).value
38
67
            }
72
            }
39
68
73
72
69
            Repeater {
74
            Component.onCompleted: {
73
70
                id: _reminders
75
                for(var i=0; i<reminderModel.count; i++) {
74
71
76
                    if (root.reminderTime === reminderModel.get(i).value){
75
72
                model: reminderModel
77
                        _reminders.selectedIndex = i
76
73
78
                        return;
45
74
                ListItem.Standard {
46
75
                    id: _reminderDelegate
47
76
48
77
                    property alias isChecked: reminderCheckbox.checked
49
78
50
79
                    text: label
51
80
                    control: CheckBox {
52
81
                        id: reminderCheckbox
53
82
54
83
                        checked: root.reminderTime === value
55
84
56
85
                        onClicked: {
57
86
                            root.reminderTime = value
58
87
                            if (checked) {
59
88
                                // Ensures only one reminder option is selected
60
89
                                for(var i=0; i<reminderModel.count; i++) {
61
90
                                    if(_reminders.itemAt(i).isChecked &&
62
91
                                            i !== index) {
63
92
                                        _reminders.itemAt(i).isChecked = false
64
93
                                    }
65
94
                                }
66
95
                            }
67
96
68
97
                            else {
69
98
                                checked = !checked
70
99
                            }
71
100
                        }
77
101
                    }
79
                    }
78
102
                }
80
                }
79
103
            }
81
            }
80
104
        }
82
        }
81
83
        Component {
82
84
            id: selectorDelegate
83
85
            OptionSelectorDelegate { text: label; }
84
86
        }
85
87
86
105
    }
88
    }
87
106
}
89
}
Status:	Merged
Approved by:	Kunal Parmar on 2014-11-23
Approved revision:	531
Merged at revision:	552
Proposed branch:	lp:~mihirsoni/ubuntu-calendar-app/ReminderDesignFix-3
Merge into:	lp:ubuntu-calendar-app
Diff against target:	87 lines (+25/-42) 1 file modified EventReminder.qml (+25/-42)
To merge this branch:	bzr merge lp:~mihirsoni/ubuntu-calendar-app/ReminderDesignFix-3
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Kunal Parmar		2014-10-24	Approve on 2014-11-23
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-11-11
Review via email: mp+239598@code.launchpad.net