git.iko.soy/unity8
on xenial help sign in
Undo unecessary changes
fd77a84Josh Arenson
qml/Components/SearchHistoryModel/SearchHistoryModel.qml+2−5
compare with xenial
unifiedsplit
@@ -20,9 +20,6 @@ import QtQuick 2.4
20// TODO sanitize input, move to persistent storage
20// TODO sanitize input, move to persistent storage
21
21
22ListModel {
22ListModel {
23−
24− property int searchesToRemember: 3
25−
26 function addQuery(newQuery) {
23 function addQuery(newQuery) {
27 // strip whitespaces
24 // strip whitespaces
28 newQuery = newQuery.replace(/^\s+|\s+$/g, '');
25 newQuery = newQuery.replace(/^\s+|\s+$/g, '');
@@ -37,9 +34,9 @@ ListModel {
37 }
34 }
38 // add a new entry
35 // add a new entry
39 insert(0, { "query": newQuery })
36 insert(0, { "query": newQuery })
40− if (count > searchesToRemember) {
37+ if (count > 3) {
41 // remove entries if there's more than three
38 // remove entries if there's more than three
42− remove(searchesToRemember)
39+ remove(3)
43 }
40 }
44 }
41 }
45}
42}
tests/qmltests/Dash/tst_DashPageHeader.qml+3−48
@@ -151,13 +151,13 @@ Item {
151 searchEnabled = true;
151 searchEnabled = true;
152 pageHeader.searchHistory.clear();
152 pageHeader.searchHistory.clear();
153
153
154− for (var i = 0; i < 20; i++) {
154+ pageHeader.searchHistory.addQuery("Search1");
155− pageHeader.searchHistory.addQuery("Search" + String(i));
155+ pageHeader.searchHistory.addQuery("Search2");
156− }
157
156
158 pageHeader.triggerSearch();
157 pageHeader.triggerSearch();
159
158
160 tryCompare(pageHeader.extraPanel, "visible", true);
159 tryCompare(pageHeader.extraPanel, "visible", true);
160+
161 var searchTextField = findChild(pageHeader, "searchTextField");
161 var searchTextField = findChild(pageHeader, "searchTextField");
162 compare(searchTextField.focus, true);
162 compare(searchTextField.focus, true);
163
163
@@ -290,19 +290,6 @@ Item {
290 }
290 }
291 }
291 }
292
292
293− Row {
294− spacing: units.gu(1)
295− anchors {
296− left: parent.left
297− right: parent.right
298− }
299− Button {
300− text: "Search! (Add Query)"
301− onClicked: pageHeader.searchHistory.addQuery(pageHeader.searchQuery);
302− width: units.gu(40)
303− }
304− }
305−
306 Row {
293 Row {
307 spacing: units.gu(1)
294 spacing: units.gu(1)
308 anchors {
295 anchors {
@@ -320,38 +307,6 @@ Item {
320 }
307 }
321 }
308 }
322
309
323− Row {
324− spacing: units.gu(1)
325− anchors {
326− left: parent.left
327− right: parent.right
328− }
329−
330− Label {
331− text: "Searches to remember: " + pageHeader.searchHistory.searchesToRemember
332− anchors.verticalCenter: parent.verticalCenter
333− }
334− }
335−
336− Row {
337− id: sliderRow
338− spacing: units.gu(1)
339− anchors {
340− left: parent.left
341− right: parent.right
342− margins: units.gu(1)
343− }
344−
345− Slider {
346− id: slider
347− maximumValue: 20
348− minimumValue: 1
349− width: units.gu(40)
350− value: pageHeader.searchHistory.searchesToRemember
351− onValueChanged: pageHeader.searchHistory.searchesToRemember = Math.round(value)
352− }
353− }
354−
355 Row {
310 Row {
356 spacing: units.gu(1)
311 spacing: units.gu(1)
357 anchors {
312 anchors {