1
=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
2
--- src/app/webbrowser/HistoryViewWide.qml	2016-03-01 09:59:31 +0000
3
+++ src/app/webbrowser/HistoryViewWide.qml	2016-04-07 14:01:51 +0000
4
@@ -109,7 +109,7 @@
5
109
109
6
110
        spacing: units.gu(1)
110
        spacing: units.gu(1)
7
111
111
9
112
        Item {
112
        FocusScope {
10
113
            width: units.gu(40)
113
            width: units.gu(40)
11
114
            height: parent.height
114
            height: parent.height
12
115
115
13
@@ -118,54 +118,17 @@
14
118
                objectName: "lastVisitDateListView"
118
                objectName: "lastVisitDateListView"
15
119
119
16
120
                anchors.fill: parent
120
                anchors.fill: parent
17
121
                focus: true
18
121
122
19
122
                currentIndex: 0
123
                currentIndex: 0
60
123
                onCurrentIndexChanged: {
124
                onCurrentIndexChanged: urlsListView.ViewItems.selectedIndices = []
21
124
                    if (currentItem) {
22
125
                        historyLastVisitDateModel.lastVisitDate = currentItem.lastVisitDate
23
126
                    }
24
127
                    urlsListView.ViewItems.selectedIndices = []
25
128
                }
26
129
27
130
                // Manually track the current date, so that we can detect when
28
131
                // the ListView automatically changes the currentItem as result
29
132
                // of a change in the model that removes the currentItem.
30
133
                // When this happens, we reset the currentItem to "all dates".
31
134
                property date currentDate
32
135
33
136
                // Ignore currentItemChanged signals while we are changing the
34
137
                // currentIndex manually (as a result of either UP and DOWN key
35
138
                // presses, or clicking on items)
36
139
                // Any other emission of currentItemChanged will therefore be
37
140
                // from ListView changing it automatically.
38
141
                function explicitlyChangeCurrentIndex(changeAction) {
39
142
                    explicitlySettingCurrentIndex = true
40
143
                    changeAction()
41
144
                    explicitlySettingCurrentIndex = false
42
145
                    currentDate = currentItem.lastVisitDate
43
146
                }
44
147
                property bool explicitlySettingCurrentIndex: false
45
148
                Keys.onDownPressed: explicitlyChangeCurrentIndex(incrementCurrentIndex)
46
149
                Keys.onUpPressed: explicitlyChangeCurrentIndex(function() {
47
150
                    if (lastVisitDateListView.currentIndex == 0 && searchMode) {
48
151
                        searchQuery.focus = true
49
152
                    } else {
50
153
                        lastVisitDateListView.decrementCurrentIndex()
51
154
                    }
52
155
                })
53
156
54
157
                onCurrentItemChanged: {
55
158
                    if (explicitlySettingCurrentIndex) return;
56
159
                    if (currentItem.lastVisitDate.valueOf() !== currentDate.valueOf()) {
57
160
                        currentIndex = 0
58
161
                    }
59
162
                }
61
163
125
62
164
                model: HistoryLastVisitDateListModel {
126
                model: HistoryLastVisitDateListModel {
63
165
                    sourceModel: historyLastVisitDateModel.model
127
                    sourceModel: historyLastVisitDateModel.model
64
166
                }
128
                }
65
167
129
66
168
                delegate: ListItem {
130
                delegate: ListItem {
67
131
                    id: lastVisitDateDelegate
68
169
                    objectName: "lastVisitDateDelegate"
132
                    objectName: "lastVisitDateDelegate"
69
170
133
70
171
                    property var lastVisitDate: model.lastVisitDate
134
                    property var lastVisitDate: model.lastVisitDate
71
@@ -215,7 +178,7 @@
72
215
                        }
178
                        }
73
216
179
74
217
                        fontSize: "small"
180
                        fontSize: "small"
76
218
                        color: (!lastVisitDateListView.activeFocus && (lastVisitDateListView.currentIndex == index)) ? UbuntuColors.orange : UbuntuColors.darkGrey
181
                        color: (!lastVisitDateListView.activeFocus && lastVisitDateDelegate.ListView.isCurrentItem) ? UbuntuColors.orange : UbuntuColors.darkGrey
77
219
                    }
182
                    }
78
220
183
79
221
                    divider {
184
                    divider {
80
@@ -227,10 +190,34 @@
81
227
                        Behavior on opacity { UbuntuNumberAnimation {} }
190
                        Behavior on opacity { UbuntuNumberAnimation {} }
82
228
                    }
191
                    }
83
229
192
85
230
                    onClicked: ListView.view.explicitlyChangeCurrentIndex(function() { ListView.view.currentIndex = index })
193
                    onClicked: ListView.view.currentIndex = index
86
194
87
195
                    ListView.onRemove: {
88
196
                        if (ListView.isCurrentItem) {
89
197
                            // For some reason, setting the current index here
90
198
                            // results in it being reset to its previous value
91
199
                            // right away. Delaying it with a timer so the
92
200
                            // operation is queued does the trick.
93
201
                            resetIndexTimer.restart()
94
202
                        }
95
203
                    }
96
231
                }
204
                }
97
232
205
98
233
                highlight: ListViewHighlight {}
206
                highlight: ListViewHighlight {}
99
207
100
208
                Timer {
101
209
                    id: resetIndexTimer
102
210
                    interval: 0
103
211
                    onTriggered: lastVisitDateListView.currentIndex = 0
104
212
                }
105
213
            }
106
214
107
215
            Keys.onUpPressed: {
108
216
                if (searchMode) {
109
217
                    searchQuery.focus = true
110
218
                } else {
111
219
                    event.accepted = false
112
220
                }
113
234
            }
221
            }
114
235
222
115
236
            Scrollbar {
223
            Scrollbar {
116
@@ -254,7 +241,7 @@
117
254
241
118
255
                model: SortFilterModel {
242
                model: SortFilterModel {
119
256
                    id: historyLastVisitDateModel
243
                    id: historyLastVisitDateModel
121
257
                    property date lastVisitDate
244
                    readonly property date lastVisitDate: lastVisitDateListView.currentItem ? lastVisitDateListView.currentItem.lastVisitDate : ""
122
258
                    filter {
245
                    filter {
123
259
                        property: "lastVisitDateString"
246
                        property: "lastVisitDateString"
124
260
                        pattern: new RegExp(lastVisitDate.isValid() ? "^%1$".arg(Qt.formatDate(lastVisitDate, "yyyy-MM-dd")) : "")
247
                        pattern: new RegExp(lastVisitDate.isValid() ? "^%1$".arg(Qt.formatDate(lastVisitDate, "yyyy-MM-dd")) : "")
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-04-07
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-04-07
Ubuntu Phablet Team		2016-04-07	Pending
Review via email: mp+291258@code.launchpad.net
1	=== modified file 'src/app/webbrowser/HistoryViewWide.qml'
2	--- src/app/webbrowser/HistoryViewWide.qml 2016-03-01 09:59:31 +0000
3	+++ src/app/webbrowser/HistoryViewWide.qml 2016-04-07 14:01:51 +0000
4	@@ -109,7 +109,7 @@
5	109		109
6	110	spacing: units.gu(1)	110	spacing: units.gu(1)
7	111		111
9	112	Item {	112	FocusScope {
10	113	width: units.gu(40)	113	width: units.gu(40)
11	114	height: parent.height	114	height: parent.height
12	115		115
13	@@ -118,54 +118,17 @@
14	118	objectName: "lastVisitDateListView"	118	objectName: "lastVisitDateListView"
15	119		119
16	120	anchors.fill: parent	120	anchors.fill: parent
17			121	focus: true
18	121		122
19	122	currentIndex: 0	123	currentIndex: 0
60	123	onCurrentIndexChanged: {	124	onCurrentIndexChanged: urlsListView.ViewItems.selectedIndices = []
21	124	if (currentItem) {
22	125	historyLastVisitDateModel.lastVisitDate = currentItem.lastVisitDate
23	126	}
24	127	urlsListView.ViewItems.selectedIndices = []
25	128	}
26	129
27	130	// Manually track the current date, so that we can detect when
28	131	// the ListView automatically changes the currentItem as result
29	132	// of a change in the model that removes the currentItem.
30	133	// When this happens, we reset the currentItem to "all dates".
31	134	property date currentDate
32	135
33	136	// Ignore currentItemChanged signals while we are changing the
34	137	// currentIndex manually (as a result of either UP and DOWN key
35	138	// presses, or clicking on items)
36	139	// Any other emission of currentItemChanged will therefore be
37	140	// from ListView changing it automatically.
38	141	function explicitlyChangeCurrentIndex(changeAction) {
39	142	explicitlySettingCurrentIndex = true
40	143	changeAction()
41	144	explicitlySettingCurrentIndex = false
42	145	currentDate = currentItem.lastVisitDate
43	146	}
44	147	property bool explicitlySettingCurrentIndex: false
45	148	Keys.onDownPressed: explicitlyChangeCurrentIndex(incrementCurrentIndex)
46	149	Keys.onUpPressed: explicitlyChangeCurrentIndex(function() {
47	150	if (lastVisitDateListView.currentIndex == 0 && searchMode) {
48	151	searchQuery.focus = true
49	152	} else {
50	153	lastVisitDateListView.decrementCurrentIndex()
51	154	}
52	155	})
53	156
54	157	onCurrentItemChanged: {
55	158	if (explicitlySettingCurrentIndex) return;
56	159	if (currentItem.lastVisitDate.valueOf() !== currentDate.valueOf()) {
57	160	currentIndex = 0
58	161	}
59	162	}
61	163		125
62	164	model: HistoryLastVisitDateListModel {	126	model: HistoryLastVisitDateListModel {
63	165	sourceModel: historyLastVisitDateModel.model	127	sourceModel: historyLastVisitDateModel.model
64	166	}	128	}
65	167		129
66	168	delegate: ListItem {	130	delegate: ListItem {
67			131	id: lastVisitDateDelegate
68	169	objectName: "lastVisitDateDelegate"	132	objectName: "lastVisitDateDelegate"
69	170		133
70	171	property var lastVisitDate: model.lastVisitDate	134	property var lastVisitDate: model.lastVisitDate
71	@@ -215,7 +178,7 @@
72	215	}	178	}
73	216		179
74	217	fontSize: "small"	180	fontSize: "small"
76	218	color: (!lastVisitDateListView.activeFocus && (lastVisitDateListView.currentIndex == index)) ? UbuntuColors.orange : UbuntuColors.darkGrey	181	color: (!lastVisitDateListView.activeFocus && lastVisitDateDelegate.ListView.isCurrentItem) ? UbuntuColors.orange : UbuntuColors.darkGrey
77	219	}	182	}
78	220		183
79	221	divider {	184	divider {
80	@@ -227,10 +190,34 @@
81	227	Behavior on opacity { UbuntuNumberAnimation {} }	190	Behavior on opacity { UbuntuNumberAnimation {} }
82	228	}	191	}
83	229		192
85	230	onClicked: ListView.view.explicitlyChangeCurrentIndex(function() { ListView.view.currentIndex = index })	193	onClicked: ListView.view.currentIndex = index
86			194
87			195	ListView.onRemove: {
88			196	if (ListView.isCurrentItem) {
89			197	// For some reason, setting the current index here
90			198	// results in it being reset to its previous value
91			199	// right away. Delaying it with a timer so the
92			200	// operation is queued does the trick.
93			201	resetIndexTimer.restart()
94			202	}
95			203	}
96	231	}	204	}
97	232		205
98	233	highlight: ListViewHighlight {}	206	highlight: ListViewHighlight {}
99			207
100			208	Timer {
101			209	id: resetIndexTimer
102			210	interval: 0
103			211	onTriggered: lastVisitDateListView.currentIndex = 0
104			212	}
105			213	}
106			214
107			215	Keys.onUpPressed: {
108			216	if (searchMode) {
109			217	searchQuery.focus = true
110			218	} else {
111			219	event.accepted = false
112			220	}
113	234	}	221	}
114	235		222
115	236	Scrollbar {	223	Scrollbar {
116	@@ -254,7 +241,7 @@
117	254		241
118	255	model: SortFilterModel {	242	model: SortFilterModel {
119	256	id: historyLastVisitDateModel	243	id: historyLastVisitDateModel
121	257	property date lastVisitDate	244	readonly property date lastVisitDate: lastVisitDateListView.currentItem ? lastVisitDateListView.currentItem.lastVisitDate : ""
122	258	filter {	245	filter {
123	259	property: "lastVisitDateString"	246	property: "lastVisitDateString"
124	260	pattern: new RegExp(lastVisitDate.isValid() ? "^%1$".arg(Qt.formatDate(lastVisitDate, "yyyy-MM-dd")) : "")	247	pattern: new RegExp(lastVisitDate.isValid() ? "^%1$".arg(Qt.formatDate(lastVisitDate, "yyyy-MM-dd")) : "")