Ubuntu UI Toolkit

Merge lp:~kalikiana/ubuntu-ui-toolkit/pagesearch into lp:ubuntu-ui-toolkit

pagesearch
Merge into trunk

Proposed by Cris Dywan on 2013-07-10

Status:

Work in progress

Proposed branch:

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch

Merge into:

lp:ubuntu-ui-toolkit

Diff against target:

477 lines (+387/-0)

9 files modified

components.api (+11/-0)
examples/examples.pro (+1/-0)
examples/search/MessageList.qml (+44/-0)
examples/search/search.desktop (+8/-0)
examples/search/search.pro (+18/-0)
examples/search/search.qml (+150/-0)
modules/Ubuntu/Components/Page.qml (+39/-0)
modules/Ubuntu/Components/Search.qml (+115/-0)
modules/Ubuntu/Components/qmldir (+1/-0)

To merge this branch:

bzr merge lp:~kalikiana/ubuntu-ui-toolkit/pagesearch

High

Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-07-11
Ubuntu SDK team		2013-07-10	Pending
Review via email: mp+173996@code.launchpad.net

Commit message

Implement Page-based search in header and an example

Revision history for this message

Cris Dywan (kalikiana) wrote on 2013-07-10:

This is a fake merge request. I want to see the diff, jenkins etc but I don't expect review yet.

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch updated on 2013-07-10

584. By Cris Dywan on 2013-07-10

Merge lp:ubuntu-ui-toolkit

[ Kaleo ]
* ListItems Base & Standard: prevent the icon from going taller than
  5GU. . (LP: #1187128)
[ Timo Jyrinki ]
* Remove qmlrunner. On saucy, the less complicated way is to just use
  qmlscene with either environment variable set or with a command line
  parameter.
[ Ubuntu daily release ]
* Automatic snapshot from revision 605
[ Kaleo ]
* Add a CrossFadeImage component which crossfades when its source is
  updated.
* Standard animation durations adapted for new design: - SnapDuration
  goes from 125ms to 100ms - FastDuration goes from 250ms to 165ms -
  new BriskDuration is introduced at 333ms.
* GIconProvider: avoid using QPixmap which is not re-entrant. Fixes
  crashes. (LP: #1197784)
* Fine tuned UbuntuAnimation.StandardEasing to match design.
  Introduced new standard Ubuntu easing
  UbuntuAnimation.StandardEasingReverse.
* Panel.animating: do not rely on comparing real values that sometimes
  have rounding errors. (LP: #1199550)
[ Iain Lane ]
* Add a CrossFadeImage component which crossfades when its source is
  updated.
[ Loïc Molinari ]
* [UbuntuShape] Moved content flagging before implicit sizing to
  prevent assertion.
[ Ubuntu daily release ]
* Automatic snapshot from revision 602
[ Kaleo ]
* Pass import paths from main QQmlEngine to QQuickUtils' QQmlEngine.
  Fixes case where qmlscene is passed import paths via the -I
  argument.
[ Ubuntu daily release ]
* Automatic snapshot from revision 593
[ Kaleo ]
* Latest fix in ButtonStyle had 3 typos. Fixing them. .
* ListItem.SingleControl: Ensure that there is always enough vertical
  padding around the control. (LP: #1198116)
[ Christian Dywan ]
* Include alias types in qmlapicheck. (LP: #1192540)
[ Ubuntu daily release ]
* Automatic snapshot from revision 589
[ Kaleo ]
* Reintroduced QML proxy for ShapeItem C++ class in order to
  workaround CPU hog when no image was set to ShapeItem. (LP:
  #1197801)
[ Loïc Molinari ]
* Added workaround for QML buggy support for color props in ternary
  ops. (LP: #1197802)
[ Ubuntu daily release ]
* Automatic snapshot from revision 584

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-10:

FAILED: Continuous integration, rev:584
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/pagesearch/+merge/173996/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/309/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/964/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/968/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/309/rebuild

review: Needs Fixing (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch updated on 2013-07-11

585. By Cris Dywan on 2013-07-11: Mark onQueryReset default handler as internal

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-11:

FAILED: Continuous integration, rev:585
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/pagesearch/+merge/173996/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/319/rebuild

review: Needs Fixing (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch updated on 2013-07-11

586. By Cris Dywan on 2013-07-11: Build and install Search example

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-11:

FAILED: Continuous integration, rev:586
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/pagesearch/+merge/173996/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/320/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/990
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/177
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/994
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/994/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/848

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/320/rebuild

review: Needs Fixing (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch updated on 2013-07-11

587. By Cris Dywan on 2013-07-11: Use "search" icon so that the example works on phone and desktop

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-11:

FAILED: Continuous integration, rev:587
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/pagesearch/+merge/173996/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/321/rebuild

review: Needs Fixing (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch updated on 2013-07-11

588. By Cris Dywan on 2013-07-11: Provide an action to trigger search; remove built-in reset callback

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-11:

FAILED: Continuous integration, rev:588
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/pagesearch/+merge/173996/+edit-commit-message

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/322/rebuild

review: Needs Fixing (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch updated on 2013-07-11

589. By Cris Dywan on 2013-07-11: Save original header and restore on queryReset

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-07-11:

FAILED: Continuous integration, rev:589
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/pagesearch/+merge/173996/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/325/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1005
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/182
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/182
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1009
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/861

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/325/rebuild

review: Needs Fixing (continuous-integration)

lp:~kalikiana/ubuntu-ui-toolkit/pagesearch updated on 2013-07-18

590. By Cris Dywan on 2013-07-17

Merge lp:ubuntu-ui-toolkit

[ Kaleo ]
* Dialog: removed clipping that not clipping anything.
* Removed unused PointerStyleShader.
[ Ubuntu daily release ]
* Automatic snapshot from revision 626
[ Kaleo ]
* MainView: new API to choose the background colors. That requires: -
  HeaderStyle: removed background. - MainView: clip the contents when
  necessary. - PageTreeNode: new properties 'isLeaf' and
  'activeLeafNode'.
[ Leo Arias ]
* Fixed the pep8 errors and copyright notices.
[ Didier Roche ]
* fix icon -> iconSource for toolbar doc.
[ tpeeters ]
* Fix bug where Header did not get linked to the new Flickable when
  Page.flickable is automatically detected. (LP: #1200642, #1192591)
[ Ubuntu daily release ]
* Automatic snapshot from revision 623
[ Kaleo ]
* Removed unused artwork.
* Added experimental dark & gradient themes.
* Reverted standard easings to Quad because it seems
  QEasingCurve::BezierSpline does not ensure the target value is
  always reached. (LP: #1199662)
[ Loïc Molinari ]
* [UbuntuShape] Prevented dangling nodes in the scene graph. (LP:
  #1180794)
[ Ubuntu daily release ]
* Automatic snapshot from revision 618
[ Kaleo ]
* Introduce new theme color palette API centralising the definition of
  the colors used by the widgets to draw themselves. Adapted most
  widgets to use the theme color palette. The color palette defined in
  the Ambiance theme is the one from the new visual design. (LP:
  #1186968, #1197853)
* Switch: refresh to match new visual design.
* Tabs: more robust binding of the header component.
* CheckBox: refresh to match new visual design.
[ Loïc Molinari ]
* Added support for -Werror flagged debug builds and fixed warnings.
* [UbuntuShape] Fixed alignment support.
[ tpeeters ]
* Add API tests for MainView.
[ Ubuntu daily release ]
* Automatic snapshot from revision 613

591. By Cris Dywan on 2013-07-18

Define global Search and Quit actions and no toolbar

Unmerged revisions

591. By Cris Dywan on 2013-07-18

Define global Search and Quit actions and no toolbar

590. By Cris Dywan on 2013-07-17

Merge lp:ubuntu-ui-toolkit

589. By Cris Dywan on 2013-07-11

Save original header and restore on queryReset

588. By Cris Dywan on 2013-07-11

Provide an action to trigger search; remove built-in reset callback

587. By Cris Dywan on 2013-07-11

Use "search" icon so that the example works on phone and desktop

586. By Cris Dywan on 2013-07-11

Build and install Search example

585. By Cris Dywan on 2013-07-11

Mark onQueryReset default handler as internal

584. By Cris Dywan on 2013-07-10

Merge lp:ubuntu-ui-toolkit

583. By Cris Dywan on 2013-07-10

Implement Page-based search in header and an example

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Brian Blevins

Caco V. Topia

Cris Dywan

Jaroslavas Karmazinas

Ubuntu SDK team

to status/vote changes:

william

 === modified file 'components.api'
 --- components.api	2013-07-16 18:44:50 +0000
 +++ components.api	2013-07-18 15:14:30 +0000
@@ -107,6 +107,10 @@
  modules/Ubuntu/Components/Page.qml
  PageTreeNode
      property string title
++    property string searchLabel
++    signal queryUpdated(string keywords)
++    signal querySubmitted(string keywords)
++    signal queryReset
      property Flickable flickable
      property list<Action> actions
  modules/Ubuntu/Components/PageStack.qml
@@ -158,6 +162,13 @@
      property int align
      property bool __interactive
      property internal __private
++modules/Ubuntu/Components/Search.qml
++TextField
++    property Popover visiblePopover
++    function showSuggestions(searchField)
++    function hideSuggestions()
++    function searchWhileTyping(searchField)
++    function submitSearch(keywords)
  modules/Ubuntu/Components/Slider.qml
  AbstractButton
      property real minimumValue
 === modified file 'examples/examples.pro'
 --- examples/examples.pro	2013-07-03 05:52:08 +0000
 +++ examples/examples.pro	2013-07-18 15:14:30 +0000
@@ -5,6 +5,7 @@
      jokes \
      locale \
      unit-converter \
++    search \
      calculator
 === added directory 'examples/search'
 === added file 'examples/search/MessageList.qml'
 --- examples/search/MessageList.qml	1970-01-01 00:00:00 +0000
 +++ examples/search/MessageList.qml	2013-07-18 15:14:30 +0000
@@ -0,0 +1,44 @@
++/*
++ * Copyright 2013 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Christian Dywan <christian.dywan@canonical.com>
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++Rectangle {
++    property ListModel model: null
++    anchors.fill: parent
++
++    ListView {
++        id: emailView
++        model: parent.model
++        width: parent.width
++        height: parent.height
++        delegate: ListItem.Subtitled {
++            text: subject + " <em>" + when + "</em>"
++            subText: preview
++            icon: Icon {
++                name: "search"
++                width: units.gu(3)
++                height: units.gu(5)
++                visible: starred
++            }
++        }
++    }
++}
++
 === added file 'examples/search/search.desktop'
 --- examples/search/search.desktop	1970-01-01 00:00:00 +0000
 +++ examples/search/search.desktop	2013-07-18 15:14:30 +0000
@@ -0,0 +1,8 @@
++[Desktop Entry]
++Name=search
++Comment=My searchable app
++Exec=/usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/search/search.qml
++Icon=edit-find-symbolic
++Terminal=false
++Type=Application
++X-Ubuntu-Touch=true
 === added file 'examples/search/search.pro'
 --- examples/search/search.pro	1970-01-01 00:00:00 +0000
 +++ examples/search/search.pro	2013-07-18 15:14:30 +0000
@@ -0,0 +1,18 @@
++TEMPLATE = subdirs
++
++filetypes = qml png svg js qmltheme jpg qmlproject desktop wav
++
++OTHER_FILES = ""
++
++for(filetype, filetypes) {
++  OTHER_FILES += *.$$filetype
++}
++
++desktop_files.path = /usr/share/applications
++desktop_files.files = search.desktop
++
++other_files.path = /usr/lib/ubuntu-ui-toolkit/examples/search
++other_files.files = $$OTHER_FILES
++
++INSTALLS += other_files desktop_files
++
 === added file 'examples/search/search.qml'
 --- examples/search/search.qml	1970-01-01 00:00:00 +0000
 +++ examples/search/search.qml	2013-07-18 15:14:30 +0000
@@ -0,0 +1,150 @@
++/*
++ * Copyright 2013 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Christian Dywan <christian.dywan@canonical.com>
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++
++/*!
++    \brief In-app search.
++*/
++
++MainView {
++    id: mainView
++    objectName: "mainView"
++    applicationName: "search"
++    automaticOrientation: true
++    width: units.gu(40)
++    height: units.gu(70)
++
++    Action {
++        id: searchAction
++        iconSource: Qt.resolvedUrl("image://gicon/search")
++        text: i18n.tr("Search")
++        keywords: i18n.tr("Find")
++        onTriggered: {
++            tabs.selectedTabIndex = 1 // Search
++        }
++    }
++    Action {
++        id: quitAction
++        text: i18n.tr("Quit")
++        keywords: i18n.tr("Close")
++        onTriggered: {
++            Qt.quit()
++        }
++    }
++    actions: [ quitAction ]
++
++    Tabs {
++        id: tabs
++
++    Tab { title: tabInbox.title; Page {
++        id: tabInbox
++        title: i18n.tr("Inbox")
++        actions: [ searchAction ]
++
++        MessageList {
++            id: messagesInbox
++            model: emails
++        }
++    } }
++
++    Tab { title: tabSearch.title; Page {
++        id: tabSearch
++        title: i18n.tr("Search")
++        searchLabel: i18n.tr("Search email messages…")
++        Component.onCompleted: {
++            recentSearches.append({ "query": "ouya" })
++            recentSearches.append({ "query": "ubuntu" })
++            recentSearches.append({ "query": "retired" })
++        }
++
++        onQueryReset: {
++            tabs.selectedTabIndex = 0 // Inbox
++        }
++        onQuerySubmitted: {
++            results.clear()
++            for (var i = 0; i < emails.count; i++) {
++                var canonicalized = keywords.toLowerCase()
++                var row = emails.get(i)
++                if (row.subject.toLowerCase().indexOf(canonicalized) > -1
++                 || row.preview.toLowerCase().indexOf(canonicalized) > -1) {
++                    row = JSON.parse(JSON.stringify(row)) // don't modify the original
++                    row.subject = row.subject.replace(new RegExp(keywords, "gi"), "<b>$&</b>")
++                    row.preview = row.preview.replace(new RegExp(keywords, "gi"), "<b>$&</b>")
++                    results.append(row)
++                }
++            }
++        }
++
++        MessageList {
++            id: messagesSearch
++            model: results
++        }
++    } }
++
++    Tab { title: tabSettings.title; Page {
++        id: tabSettings
++        title: i18n.tr("Settings")
++        Button {
++            text: i18n.tr("No settings whatsoever")
++            width: units.gu(20)
++            height: units.gu(20)
++        }
++    } }
++
++    }
++
++    ListModel {
++        id: results
++    }
++
++    ListModel {
++        id: emails
++        ListElement {
++            subject: "Payment receipt #490524"
++            preview: "Habitually we avoid making it too obvious what you paid to ensure you don't remember how much money you pay just for geek stuff."
++            when: "2 days ago"
++            starred: false
++        }
++        ListElement {
++            subject: "Ubuntu Phone coming soon"
++            preview: "Brave humans can already try it on their Android phone and even develop apps for it right now."
++            when: "Tomorrow"
++            starred: false
++        }
++        ListElement {
++            subject: "The pope retired"
++            preview: "In his own words “I'm too young to stay forever in one place”"
++            when: "Last Month"
++            starred: false
++        }
++        ListElement {
++            subject: "OUYA now in store shelves"
++            preview: "Lorem ipsum dolor sit OUYA, quo vadis"
++            when: "Yesterday"
++            starred: true
++        }
++        ListElement {
++            subject: "Canabalt HD released"
++            preview: "Lorem ipsum even the pope dolor sit OUYA quo vadis Ubuntu"
++            when: "Eons ago"
++            starred: true
++        }
++    }
++}
 === modified file 'modules/Ubuntu/Components/Page.qml'
 --- modules/Ubuntu/Components/Page.qml	2013-07-16 14:23:32 +0000
 +++ modules/Ubuntu/Components/Page.qml	2013-07-18 15:14:30 +0000
@@ -86,6 +86,40 @@
      property Item tools: ToolbarItems { }
      /*!
++      If a label is defined, the page will display a search field in the header
++      and you need to handle querySubmitted to implement display of search results.
++     */
++    property string searchLabel: ""
++    /*!
++      The user is typing in the search field
++     */
++    signal queryUpdated(string keywords)
++    /*!
++      The user pressed Enter or selected a suggestion
++     */
++    signal querySubmitted(string keywords)
++    /*!
++      An active search was cancelled, usually using the clear button
++     */
++    signal queryReset
++    /*! \internal */
++    onQueryReset: {
++        internal.header.contents = internal.originalHeaderContents
++    }
++    /*!
++      The model stores a search history with items of the form "query": "foobar"
++      and can be used to add or remove items or provide custom suggestions
++     */
++    property ListModel recentSearches: ListModel { }
++
++    Component {
++        id: searchComponent
++        Search {
++            placeholderText: tabSearch.searchLabel
++        }
++    }
++
++    /*!
        Optional flickable that controls the header. This property
        is automatically set to the first child of the page that is Flickable
        and anchors to the top of the page or fills the page. For example:
@@ -163,6 +197,7 @@
          property Header header: page.__propagated && page.__propagated.header ? page.__propagated.header : null
          property Toolbar toolbar: page.__propagated && page.__propagated.toolbar ? page.__propagated.toolbar : null
++        property Component originalHeaderContents: null
          onHeaderChanged: internal.updateHeaderAndToolbar()
          onToolbarChanged: internal.updateHeaderAndToolbar()
@@ -172,6 +207,10 @@
                  if (internal.header) {
                      internal.header.title = page.title;
                      internal.header.flickable = page.flickable;
++                    if (searchLabel != "") {
++                        internal.originalHeaderContents = internal.header.contents
++                        internal.header.contents = searchComponent
++                    }
+                 }
                  if (tools) {
                      // TODO: remove __pageStack when ToolbarActions becomes deprecated
 === added file 'modules/Ubuntu/Components/Search.qml'
 --- modules/Ubuntu/Components/Search.qml	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/Search.qml	2013-07-18 15:14:30 +0000
@@ -0,0 +1,115 @@
++/*
++ * Copyright 2013 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++import QtQuick 2.0
++import Ubuntu.Components.Popups 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++TextField {
++    placeholderText: null
++    property Popover visiblePopover: null
++
++    function showSuggestions(searchField) {
++        if (visiblePopover)
++            return
++        visiblePopover = PopupUtils.open(suggestionsComponent, searchField, {
++            "contentWidth": searchField.width,
++            "edgeMargins": units.gu(1)
++        })
++    }
++    function hideSuggestions() {
++        if (!visiblePopover)
++            return
++        PopupUtils.close(visiblePopover)
++        visiblePopover = null
++    }
++    function searchWhileTyping(searchField) {
++        var keywords = searchField.text.replace(/^\s+|\s+$/g, '')
++        if (keywords == "") {
++            hideSuggestions()
++            queryReset()
++            return
++        }
++
++        if (searchField.activeFocus)
++            showSuggestions(searchField)
++        queryUpdated(keywords)
++    }
++    function submitSearch(keywords) {
++        hideSuggestions()
++        keywords = keywords.replace(/^\s+|\s+$/g, '')
++        for (var i = 0; i < recentSearches.count; i++)
++            if (recentSearches.get(i).query == keywords) {
++                recentSearches.move(i, 0, 1)
++                querySubmitted(keywords)
++                return
++            }
++        recentSearches.insert(0, { "query": keywords })
++        querySubmitted(keywords)
++    }
++
++    Component {
++        id: suggestionsComponent
++        Popover {
++            id: suggestionsPopover
++            Column {
++                anchors {
++                    top: parent.top
++                    left: parent.left
++                    right: parent.right
++                }
++                ListItem.Standard {
++                    enabled: false
++                    text: i18n.tr("Recent Searches")
++                }
++
++                Repeater {
++                    model: recentSearches
++                    delegate: ListItem.Standard {
++                        showDivider: index - model.count - 1
++                        text: query
++                        onClicked: submitSearch(text)
++                    }
++                }
++            }
++        }
++    }
++
++    id: searchField
++    popover: suggestionsComponent
++    font.bold: true
++    horizontalAlignment: Text.AlignRight
++    height: units.gu(7)
++    primaryItem: Button {
++        width: height
++        height: parent.height - units.gu(2)
++        onClicked: submitSearch(text)
++        color: 'transparent'
++        Icon {
++            name: "search"
++            width: parent.width
++            height: parent.height
++        }
++    }
++    onAccepted: submitSearch(text)
++    onTextChanged: {
++        searchWhileTyping(searchField)
++    }
++    onActiveFocusChanged: {
++        if (!activeFocus)
++            hideSuggestions()
++    }
++}
++
 === modified file 'modules/Ubuntu/Components/qmldir'
 --- modules/Ubuntu/Components/qmldir	2013-07-05 09:25:29 +0000
 +++ modules/Ubuntu/Components/qmldir	2013-07-18 15:14:30 +0000
@@ -25,6 +25,7 @@
  internal ModelSectionCounter ModelSectionCounter.qml
  Object 0.1 Object.qml
  Page 0.1 Page.qml
++internal Search Search.qml
  internal PageTreeNode PageTreeNode.qml
  PageStack 0.1 PageStack.qml
  internal Toolbar Toolbar.qml

Ubuntu UI Toolkit

Merge lp:~kalikiana/ubuntu-ui-toolkit/pagesearch into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers