Merge lp:~arashbm/cliffhanger/searchbox into lp:~flashback-dev/cliffhanger/trunk

[Arash Badie Modiri]

Removing search button from SearchBox component. Works with a timer like ubuntu-clock-app's SearchBox component.

[Nekhelesh Ramananthan (nik90)]

Thanks for your contribution. This is a nice improvement. There are just some small things that need fixing.

1. The image search_icon.svg is not present in your branch. Hence when I run it, it complains that image is missing.

2. Can you replace the line 34 + width: parent.width with anchors { right: parent.right } since we are already using achors for the left and top position.

review: Needs Fixing

[Arash Badie Modiri (arashbm)]

> 1. The image search_icon.svg is not present in your branch. Hence when I run
> it, it complains that image is missing.
Ouch! forgot to `bzr add` the file!

[lp:~arashbm/cliffhanger/searchbox]

8. By Arash Badie Modiri on 2013-11-14

adding missing search icon

9. By Arash Badie Modiri on 2013-11-14

cleaning up SearchBox styling

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

=== modified file 'components/SearchBox.qml'
--- components/SearchBox.qml	2013-11-12 17:43:07 +0000
+++ components/SearchBox.qml	2013-11-14 16:12:32 +0000
@@ -6,27 +6,33 @@
 
     property alias defaultText: searchField.placeholderText
     property alias search_term: searchField.text
-    signal searchClicked()
+    signal searchTriggered()
+
+    Component.onCompleted: search_timer.triggered.connect(searchTriggered)
 
     TextField {
         id: searchField
         anchors {
             left: parent.left
+            right: parent.right
             top: parent.top
         }
-        width: 2 * parent.width / 3
+
+        primaryItem: Image {
+            height: parent.height/1.5;
+            fillMode: Image.PreserveAspectFit
+            source: Qt.resolvedUrl("../graphics/search_icon.svg")
+        }
+
+        Timer {
+            id: search_timer
+            interval: 1100
+            repeat: false
+        }
+
+        placeholderText: i18n.tr("Search")
         hasClearButton: true
-    }
-
-    Button{
-        anchors {
-            left: searchField.right
-            top: parent.top
-            right: parent.right
-            leftMargin: units.gu(1)
-        }
-        text: "Search"
-        height: searchField.height
-        onClicked: searchBox.searchClicked()
+        onTextChanged: search_timer.restart()
     }
 }
+

=== modified file 'components/SearchPage.qml'
--- components/SearchPage.qml	2013-11-12 20:09:36 +0000
+++ components/SearchPage.qml	2013-11-14 16:12:32 +0000
@@ -20,7 +20,7 @@
             right: parent.right
             margins: units.gu(2)
         }
-        onSearchClicked: {
+        onSearchTriggered: {
             _search_results.clear()
             _searchWorker.sendMessage({"model": _search_results, "url": search_url + "&query=" + encodeURIComponent(_searchBox.search_term), "type": type})
         }

=== added file 'graphics/[e-mail]'
--- graphics/[e-mail]	1970-01-01 00:00:00 +0000
+++ graphics/[e-mail]	2013-11-14 16:12:32 +0000
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   id="svg3133"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="search.svg">
+  <defs
+     id="defs3135">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#e7e5e5;stop-opacity:1;"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#e2dfdf;stop-opacity:1"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3809"
+       x1="53.012165"
+       y1="-102.79017"
+       x2="53.012165"
+       y2="-66.661224"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3803"
+       id="linearGradient3813"
+       gradientUnits="userSpaceOnUse"
+       x1="53.012165"
+       y1="-102.79017"
+       x2="53.012165"
+       y2="-66.661224"
+       gradientTransform="translate(-625,0)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="27.957393"
+     inkscape:cy="7.2819708"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3842"
+     showgrid="true"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="true"
+     inkscape:snap-global="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="6"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       originx="-2.98e-06px"
+       originy="2.6171874e-06px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3138">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-2.98e-6,-1020.3622)"
+     style="display:inline">
+    <g
+       transform="matrix(0.99934414,0,0,1,-106.92982,549.00002)"
+       id="g3842"
+       style="display:inline">
+      <rect
+         style="opacity:0.05;color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3844"
+         width="32.021008"
+         height="32.000011"
+         x="107"
+         y="-503.36218"
+         transform="scale(1,-1)" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#808080;stroke-width:10.49972248;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path2995"
+         sodipodi:cx="35.999996"
+         sodipodi:cy="36.500011"
+         sodipodi:rx="33"
+         sodipodi:ry="33.5"
+         d="m 68.999996,36.500011 a 33,33.5 0 1 1 -65.9999998,0 33,33.5 0 1 1 65.9999998,0 z"
+         transform="matrix(0.30695569,0,0,0.30279797,111.9601,476.31005)" />
+      <path
+         style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 131.23812,494.07329 -1.51211,1.51111 4.26947,4.26666 1.5121,-1.5111 z"
+         id="path3765"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-size:xx-small;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#808080;fill-opacity:1;stroke:none;stroke-width:11.80387211;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 133.30117,495.55563 c -0.82645,0.004 -1.62501,0.54578 -1.9348,1.31198 -0.30979,0.7662 -0.11199,1.71055 0.47924,2.28802 l 3.12758,3.12885 c 1.43195,1.51965 1.74071,1.31459 3.0114,0.0447 1.27069,-1.26986 1.47821,-1.48946 -0.0447,-3.01141 l -3.12758,-3.12885 c -0.39175,-0.40166 -0.95004,-0.63566 -1.51111,-0.63333 z"
+         id="path3767"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cscczccc" />
+    </g>
+  </g>
+</svg>