on xenial help sign in
Undo unecessary changes
commitfd77a846ae4ed47b7b476f2c16af46395f53274c authorJosh Arenson <joshua.arenson@canonical.com> dateWed 27 Apr 2016, 09:43 (11 years ago) parentdeb0503
2 files changed+5−53
qml/Components/SearchHistoryModel/SearchHistoryModel.qml+2−5 tests/qmltests/Dash/tst_DashPageHeader.qml+3−48
qml/Components/SearchHistoryModel/SearchHistoryModel.qml+2−5
@@ -20,9 +20,6 @@ import QtQuick 2.4
2020// TODO sanitize input, move to persistent storage
2121
2222ListModel {
23−
24− property int searchesToRemember: 3
25−
2623 function addQuery(newQuery) {
2724 // strip whitespaces
2825 newQuery = newQuery.replace(/^\s+|\s+$/g, '');
@@ -37,9 +34,9 @@ ListModel {
3734 }
3835 // add a new entry
3936 insert(0, { "query": newQuery })
40− if (count > searchesToRemember) {
37+ if (count > 3) {
4138 // remove entries if there's more than three
42− remove(searchesToRemember)
39+ remove(3)
4340 }
4441 }
4542}
tests/qmltests/Dash/tst_DashPageHeader.qml+3−48
@@ -151,13 +151,13 @@ Item {
151151 searchEnabled = true;
152152 pageHeader.searchHistory.clear();
153153
154− for (var i = 0; i < 20; i++) {
155− pageHeader.searchHistory.addQuery("Search" + String(i));
156− }
154+ pageHeader.searchHistory.addQuery("Search1");
155+ pageHeader.searchHistory.addQuery("Search2");
157156
158157 pageHeader.triggerSearch();
159158
160159 tryCompare(pageHeader.extraPanel, "visible", true);
160+
161161 var searchTextField = findChild(pageHeader, "searchTextField");
162162 compare(searchTextField.focus, true);
163163
@@ -290,19 +290,6 @@ Item {
290290 }
291291 }
292292
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−
306293 Row {
307294 spacing: units.gu(1)
308295 anchors {
@@ -320,38 +307,6 @@ Item {
320307 }
321308 }
322309
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−
355310 Row {
356311 spacing: units.gu(1)
357312 anchors {