git.iko.soy/unity8
on xenial help sign in
Rework the search to be in a bottom item instead of popover

Lays work for the dash navigation (removed for now) appearing there too

commit85ff01ff5f6768cd926a0b0d3a871144fc955b03 authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 10 Sep 2015, 09:58 (11 years ago) parent01a333b
4 files changed+139−80
compare with xenial
unifiedsplit
qml/Dash/GenericScopeView.qml+21−10 qml/Dash/PageHeader.qml+9−55 qml/Dash/PageHeaderExtraPanel.qml+85 tests/qmltests/Dash/tst_PageHeader.qml+24−15
qml/Dash/GenericScopeView.qml+21−10
@@ -16,6 +16,7 @@
1616
1717import QtQuick 2.0
1818import Ubuntu.Components 1.1
19+import "../Components/SearchHistoryModel"
1920import Utils 0.1
2021import Unity 0.2
2122import Dash 0.1
@@ -25,7 +26,7 @@ import "../Components/ListItems" as ListItems
2526FocusScope {
2627 id: scopeView
2728
28− readonly property bool navigationDisableParentInteractive: categoryView.pageHeader.bottomItem[0].disableParentInteractive
29+ readonly property bool navigationDisableParentInteractive: peExtraPanel.visible /*TODO bring back the dash navigation */
2930 property bool forceNonInteractive: false
3031 property var scope: null
3132 property UnitySortFilterProxyModel categories: categoryFilter
@@ -617,6 +618,8 @@ FocusScope {
617618 objectName: "scopePageHeader"
618619 width: parent.width
619620 title: scopeView.scope ? scopeView.scope.name : ""
621+ extraPanel: peExtraPanel
622+ searchHistory: SearchHistoryModel
620623 searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.ctr("Label: Hint for dash search line edit", "Search")
621624 showBackButton: scopeView.hasBackAction
622625 searchEntryEnabled: true
@@ -627,19 +630,27 @@ FocusScope {
627630 paginationCount: scopeView.paginationCount
628631 paginationIndex: scopeView.paginationIndex
629632
630− bottomItem: DashNavigation {
631− scope: scopeView.scope
632− anchors { left: parent.left; right: parent.right }
633− windowHeight: scopeView.height
634− windowWidth: scopeView.width
635− scopeStyle: scopeView.scopeStyle
636− }
637−
638633 onBackClicked: scopeView.backClicked()
639634 onSettingsClicked: subPageLoader.openSubPage("settings")
640635 onFavoriteClicked: scopeView.scope.favorite = !scopeView.scope.favorite
641636 onSearchTextFieldFocused: scopeView.showHeader()
642637 }
638+
639+ PageHeaderExtraPanel {
640+ id: peExtraPanel
641+ width: parent.width
642+ anchors {
643+ top: categoryView.pageHeader.bottom
644+ topMargin: -categoryView.pageHeader.signatureLineHeight
645+ }
646+ z: 1
647+ visible: false
648+ searchHistory: SearchHistoryModel
649+ onHistoryItemClicked: {
650+ SearchHistoryModel.addQuery(text);
651+ categoryView.pageHeader.searchQuery = text;
652+ }
653+ }
643654 }
644655
645656 Item {
@@ -647,7 +658,7 @@ FocusScope {
647658 anchors.left: parent.left
648659 anchors.right: parent.right
649660 anchors.bottom: parent.bottom
650− height: parent.height - pullToRefresh.contentY + (categoryView.pageHeader.bottomItem[0].height - categoryView.pageHeader.height)
661+ height: parent.height - pullToRefresh.contentY - categoryView.pageHeader.height
651662 clip: true
652663
653664 PullToRefresh {
qml/Dash/PageHeader.qml+9−55
@@ -20,23 +20,24 @@ import Ubuntu.Components.Themes.Ambiance 1.1
2020import Ubuntu.Components.Popups 1.0
2121import Ubuntu.Components.ListItems 1.0
2222import "../Components"
23−import "../Components/SearchHistoryModel"
2423
2524Item {
2625 id: root
2726 objectName: "pageHeader"
28− implicitHeight: headerContainer.height + bottomContainer.height + (showSignatureLine ? units.gu(2) : 0)
27+ implicitHeight: headerContainer.height + bottomContainer.height + signatureLineHeight
28+ readonly property real signatureLineHeight: showSignatureLine ? units.gu(2) : 0
2929
3030 property bool showBackButton: false
3131 property bool backIsClose: false
3232 property string title
33+ property var extraPanel
3334
3435 property bool storeEntryEnabled: false
3536 property bool searchEntryEnabled: false
3637 property bool settingsEnabled: false
3738 property bool favoriteEnabled: false
3839 property bool favorite: false
39− property ListModel searchHistory: SearchHistoryModel
40+ property ListModel searchHistory
4041 property alias searchQuery: searchTextField.text
4142 property alias searchHint: searchTextField.placeholderText
4243 property bool showSignatureLine: true
@@ -69,9 +70,8 @@ Item {
6970 }
7071
7172 function closePopup(keepFocus) {
72− if (headerContainer.popover != null) {
73− headerContainer.popover.unfocusOnDestruction = !keepFocus;
74− PopupUtils.close(headerContainer.popover);
73+ if (extraPanel.visible) {
74+ extraPanel.visible = false;
7575 } else if (!keepFocus) {
7676 unfocus();
7777 }
@@ -95,13 +95,9 @@ Item {
9595 function openSearchHistory() {
9696 if (openSearchAnimation.running) {
9797 openSearchAnimation.openSearchHistory = true;
98− } else if (root.searchHistory.count > 0 && headerContainer.popover == null) {
99− headerContainer.popover = PopupUtils.open(popoverComponent, searchTextField,
100− {
101− "contentWidth": searchTextField.width,
102− "edgeMargins": units.gu(1)
103− }
104− );
98+ } else if (root.searchHistory.count > 0) {
99+ // Show extraPanel
100+ extraPanel.visible = true;
105101 }
106102 }
107103
@@ -142,7 +138,6 @@ Item {
142138 contentY: showSearch ? 0 : height
143139
144140 property bool showSearch: false
145− property var popover: null
146141
147142 Background {
148143 id: background
@@ -321,47 +316,6 @@ Item {
321316 }
322317 }
323318
324− Component {
325− id: popoverComponent
326− Popover {
327− id: popover
328− autoClose: false
329−
330− property bool unfocusOnDestruction: false
331−
332− Component.onDestruction: {
333− headerContainer.popover = null;
334− if (unfocusOnDestruction) {
335− root.unfocus();
336− }
337− }
338−
339− Column {
340− anchors {
341− top: parent.top
342− left: parent.left
343− right: parent.right
344− }
345−
346− Repeater {
347− id: recentSearches
348− objectName: "recentSearches"
349− model: searchHistory
350−
351− delegate: Standard {
352− showDivider: index < recentSearches.count - 1
353− text: query
354− onClicked: {
355− searchHistory.addQuery(text);
356− searchTextField.text = text;
357− closePopup(/* keepFocus */false);
358− }
359− }
360− }
361− }
362− }
363− }
364−
365319 Rectangle {
366320 id: bottomBorder
367321 visible: showSignatureLine
qml/Dash/PageHeaderExtraPanel.qmlnew file+85
@@ -0,0 +1,85 @@
1+/*
2+ * Copyright (C) 2013-2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.2
18+import Ubuntu.Components 1.1
19+import Ubuntu.Components.ListItems 1.0
20+
21+Item {
22+ id: root
23+
24+ implicitHeight: recentSearchesRepeater.count > 0 ? searchColumn.height + recentSearchesLabels.height + recentSearchesLabels.anchors.margins : 0
25+
26+ property ListModel searchHistory
27+
28+ signal historyItemClicked(string text)
29+
30+ Rectangle {
31+ color: "white"
32+ anchors.fill: parent
33+ }
34+
35+ Label {
36+ id: recentSearchesLabels
37+ text: i18n.tr("Recent Searches")
38+ visible: recentSearchesRepeater.count > 0
39+ anchors {
40+ top: parent.top
41+ left: parent.left
42+ margins: units.gu(1)
43+ }
44+ }
45+
46+ Label {
47+ text: i18n.tr("Clear All")
48+ fontSize: "small"
49+ visible: recentSearchesRepeater.count > 0
50+ anchors {
51+ top: parent.top
52+ right: parent.right
53+ margins: units.gu(1)
54+ }
55+
56+ AbstractButton {
57+ anchors.fill: parent
58+ onClicked: searchHistory.clear();
59+ }
60+ }
61+
62+ Column {
63+ id: searchColumn
64+ anchors {
65+ top: recentSearchesLabels.bottom
66+ left: parent.left
67+ right: parent.right
68+ }
69+
70+ Repeater {
71+ id: recentSearchesRepeater
72+ objectName: "recentSearchesRepeater"
73+ model: searchHistory
74+
75+ delegate: Standard {
76+ showDivider: index < recentSearchesRepeater.count - 1
77+ height: units.gu(4)
78+ text: query
79+ iconName: "search"
80+ iconFrame: false
81+ onClicked: root.historyItemClicked(text)
82+ }
83+ }
84+ }
85+}
tests/qmltests/Dash/tst_PageHeader.qml+24−15
@@ -18,6 +18,7 @@ import QtQuick 2.0
1818import QtTest 1.0
1919import ".."
2020import "../../../qml/Dash"
21+import "../../../qml/Components/SearchHistoryModel"
2122import Ubuntu.Components 0.1
2223import Unity 0.2
2324import Unity.Test 0.1 as UT
@@ -25,7 +26,7 @@ import Unity.Test 0.1 as UT
2526Item {
2627 id: root
2728 width: units.gu(110)
28− height: units.gu(30)
29+ height: units.gu(50)
2930
3031 UT.UnityTestCase {
3132 name: "PageHeaderLabelTest"
@@ -54,7 +55,7 @@ Item {
5455 pageHeader.searchHistory.clear();
5556
5657 // Check initial state
57− tryCompareFunction(function() { return headerContainer.popover === null; }, true);
58+ tryCompare(pageHeader.extraPanel, "visible", true);
5859 compare(pageHeader.searchHistory.count, 0);
5960 }
6061
@@ -146,7 +147,7 @@ Item {
146147 doResetSearch();
147148 }
148149
149− function test_popover() {
150+ function test_extraPanel() {
150151 searchEnabled = true;
151152 pageHeader.searchHistory.clear();
152153
@@ -155,22 +156,18 @@ Item {
155156
156157 pageHeader.triggerSearch();
157158
158− var headerContainer = findChild(pageHeader, "headerContainer");
159− verify(headerContainer !== null, "headerContainer != null");
160− tryCompareFunction(function() { return headerContainer.popover !== null; }, true);
161−
162− tryCompare(headerContainer.popover, "visible", true);
159+ tryCompare(pageHeader.extraPanel, "visible", true);
163160
164161 var searchTextField = findChild(pageHeader, "searchTextField");
165162 compare(searchTextField.focus, true);
166163
167− var recentSearches = findChild(headerContainer.popover, "recentSearches");
168− verify(recentSearches, "Could not find recent searches in the popover");
164+ var recentSearches = findChild(pageHeader.extraPanel, "recentSearchesRepeater");
165+ verify(recentSearches, "Could not find recent searches");
169166 waitForRendering(recentSearches);
170167 mouseClick(recentSearches.itemAt(0));
171168
172169 compare(pageHeader.searchQuery, "Search2");
173− tryCompareFunction(function() { return headerContainer.popover === null; }, true);
170+ tryCompare(pageHeader.extraPanel, "visible", false);
174171 compare(searchTextField.focus, false);
175172 }
176173
@@ -212,9 +209,7 @@ Item {
212209 pageHeader.triggerSearch();
213210
214211 var headerContainer = findChild(pageHeader, "headerContainer");
215− verify(headerContainer !== null, "headerContainer != null");
216− tryCompareFunction(function() { return headerContainer.popover !== null; }, true);
217− compare(headerContainer.popover.visible, true);
212+ tryCompare(pageHeader.extraPanel, "visible", true);
218213
219214 pageHeader.searchQuery = data.searchText;
220215
@@ -225,7 +220,7 @@ Item {
225220 }
226221
227222 tryCompare(headerContainer, "showSearch", !data.hideSearch);
228− tryCompareFunction(function() { return headerContainer.popover === null; }, true);
223+ tryCompare(pageHeader.extraPanel, "visible", false);
229224
230225 doResetSearch();
231226 }
@@ -251,8 +246,10 @@ Item {
251246 right: parent.right
252247 }
253248
249+ searchHistory: SearchHistoryModel
254250 searchEntryEnabled: true
255251 title: "%^$%^%^&%^&%^$%GHR%"
252+ extraPanel: peExtraPanel
256253 scopeStyle: QtObject {
257254 readonly property color foreground: Theme.palette.normal.baseText
258255 readonly property url headerLogo: showImageCheckBox.checked ? pageHeader.titleImageSource : ""
@@ -264,6 +261,18 @@ Item {
264261 onBackClicked: lastBackClicked = new Date()
265262 }
266263
264+ PageHeaderExtraPanel {
265+ id: peExtraPanel
266+ width: parent.width
267+ z: 1
268+ visible: false
269+ searchHistory: SearchHistoryModel
270+ onHistoryItemClicked: {
271+ SearchHistoryModel.addQuery(text);
272+ pageHeader.searchQuery = text;
273+ }
274+ }
275+
267276 Row {
268277 spacing: units.gu(1)
269278 anchors {