Integrating search functionality from AntTheLimey
authorRichard Fairhurst <richard@systemeD.net>
Sat, 7 May 2011 13:21:30 +0000 (14:21 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sat, 7 May 2011 13:21:30 +0000 (14:21 +0100)
embedded/save.svg
embedded/save_disabled.svg
embedded/search.svg [new file with mode: 0644]
embedded/upload.svg
embedded/upload_disabled.svg
net/systemeD/halcyon/styleparser/RuleSet.as
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/Toolbox.mxml
net/systemeD/potlatch2/find/FindDialog.mxml
potlatch2.mxml
styles/Application.css

index 0f5627a..67415d5 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-        id="svg2383" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
-        viewBox="3 3 18 18" enable-background="new 3 3 18 18" xml:space="preserve">
-<defs>
-       
-       
-               <inkscape:perspective  id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1">
-               </inkscape:perspective>
-</defs>
-<sodipodi:namedview  id="base" showgrid="true" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:zoom="11.197802" inkscape:cx="17.258093" inkscape:cy="3.7405397" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:current-layer="layer1" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="875" inkscape:window-height="723" inkscape:window-x="123" inkscape:window-y="47">
-       </sodipodi:namedview>
-<g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-       <g id="g2384" transform="scale(0.75,0.75)">
-               <path id="rect3163" fill="#009ADE" d="M4.891,4C4.392,4,4,4.392,4,4.891v22.218C4,27.607,4.392,28,4.891,28h22.218
-                       C27.607,28,28,27.607,28,27.109v-2.063h-1.219V23.57H28V4.891C28,4.392,27.607,4,27.109,4H4.891z M16,12.039
-                       c2.182,0,3.961,1.78,3.961,3.961c0,2.182-1.779,3.961-3.961,3.961c-2.181,0-3.961-1.779-3.961-3.961
-                       C12.039,13.819,13.819,12.039,16,12.039z"/>
-               
-                       <path id="path3170" sodipodi:ry="5.8047104" sodipodi:rx="5.8047104" sodipodi:cy="16.550539" sodipodi:cx="-1.2502453" sodipodi:type="arc" fill="none" stroke="#816868" stroke-width="1.425" d="
-                       M19.951,16c0,2.182-1.768,3.951-3.951,3.951c-2.183,0-3.952-1.768-3.952-3.951s1.77-3.952,3.952-3.952S19.951,13.818,19.951,16z"
-                       />
-               <path id="rect3175" fill="none" stroke="#816868" stroke-width="1.425" d="M16,5.428L16,5.428c0.259,0,0.469,0.303,0.469,0.675
-                       v3.406c0,0.372-0.21,0.675-0.469,0.675l0,0c-0.259,0-0.469-0.303-0.469-0.675V6.103C15.531,5.731,15.741,5.428,16,5.428z"/>
-               
-                       <path id="path3177" sodipodi:ry="0.22325809" sodipodi:rx="0.22325809" sodipodi:cy="10.433268" sodipodi:cx="6.8316979" sodipodi:type="arc" fill="#523D3D" d="
-                       M9.827,12.092c0,0.242-0.195,0.436-0.435,0.436c-0.241,0-0.436-0.195-0.436-0.435c0-0.001,0-0.001,0-0.001
-                       c-0.001-0.24,0.195-0.435,0.436-0.435C9.631,11.657,9.827,11.852,9.827,12.092L9.827,12.092z"/>
-               <path id="rect3179" fill="#EAEDED" d="M7.408,22.173h8.611c0.329,0,0.596,0.267,0.596,0.595v3.297
-                       c0,0.328-0.267,0.595-0.596,0.595H7.408c-0.329,0-0.595-0.267-0.595-0.595v-3.297C6.813,22.44,7.079,22.173,7.408,22.173z"/>
-       </g>
-</g>
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="save.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs2385">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective2391" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.197802"
+     inkscape:cx="17.258093"
+     inkscape:cy="3.7405397"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="875"
+     inkscape:window-height="723"
+     inkscape:window-x="123"
+     inkscape:window-y="47" />
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2384"
+       transform="scale(0.75,0.75)">
+      <path
+         id="rect3163"
+         d="M 1.1875,0 C 0.52269997,0 -2.6888214e-17,0.52269997 0,1.1875 L 0,30.8125 C 0,31.4773 0.52269997,32 1.1875,32 L 30.8125,32 C 31.4773,32 32,31.477301 32,30.8125 L 32,28.0625 L 30.375,28.0625 L 30.375,26.09375 L 32,26.09375 L 32,1.1875 C 32,0.52269997 31.477301,-4.3657207e-17 30.8125,0 L 1.1875,0 z M 16,10.71875 C 18.908428,10.71875 21.28125,13.091572 21.28125,16 C 21.28125,18.908428 18.908428,21.28125 16,21.28125 C 13.091572,21.281251 10.71875,18.908428 10.71875,16 C 10.71875,13.091572 13.091572,10.71875 16,10.71875 z"
+         style="fill:#292929;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(0.9076923,0,0,0.9076923,17.134838,0.9772032)"
+         d="M 4.5544651,16.550539 A 5.8047104,5.8047104 0 1 1 -7.0549557,16.550539 A 5.8047104,5.8047104 0 1 1 4.5544651,16.550539 z"
+         sodipodi:ry="5.8047104"
+         sodipodi:rx="5.8047104"
+         sodipodi:cy="16.550539"
+         sodipodi:cx="-1.2502453"
+         id="path3170"
+         style="fill:none;fill-opacity:1;stroke:#816868;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <rect
+         rx="0.89999998"
+         y="1.9048082"
+         x="15.374877"
+         height="6.3405299"
+         width="1.2502453"
+         id="rect3175"
+         style="fill:none;fill-opacity:1;stroke:#816868;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(2.6000001,0,0,2.6000001,-10.573504,-16.336016)"
+         d="M 7.054956,10.433268 A 0.22325809,0.22325809 0 1 1 6.6084398,10.433268 A 0.22325809,0.22325809 0 1 1 7.054956,10.433268 z"
+         sodipodi:ry="0.22325809"
+         sodipodi:rx="0.22325809"
+         sodipodi:cy="10.433268"
+         sodipodi:cx="6.8316979"
+         id="path3177"
+         style="fill:#523d3d;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <rect
+         rx="0.79342103"
+         y="24.230619"
+         x="3.750736"
+         height="5.9833174"
+         width="13.068825"
+         id="rect3179"
+         style="fill:#eaeded;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
 </svg>
index 80d85e6..93296e6 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-        id="svg2383" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
-        viewBox="0 0 18 18" enable-background="new 0 0 18 18" xml:space="preserve">
-<defs>
-       
-       
-               <inkscape:perspective  id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1" inkscape:vp_z="32 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 16 : 1" sodipodi:type="inkscape:persp3d">
-               </inkscape:perspective>
-</defs>
-<sodipodi:namedview  id="base" inkscape:cy="3.7405397" inkscape:cx="17.258093" inkscape:zoom="11.197802" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" showgrid="true" inkscape:window-y="47" inkscape:window-x="123" inkscape:window-height="723" inkscape:window-width="875" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:current-layer="layer1" inkscape:pageshadow="2" inkscape:pageopacity="0.0">
-       </sodipodi:namedview>
-<g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-       <g id="g2384" transform="scale(0.75,0.75)">
-               <path id="rect3163" fill="#ADADAD" d="M0.939,0.092c-0.499,0-0.891,0.392-0.891,0.891v22.218c0,0.497,0.392,0.891,0.891,0.891
-                       h22.218c0.497,0,0.891-0.393,0.891-0.891v-2.063h-1.219v-1.477h1.219V0.984c0-0.499-0.393-0.891-0.891-0.891H0.939z M12.048,8.131
-                       c2.182,0,3.961,1.78,3.961,3.961c0,2.182-1.779,3.961-3.961,3.961c-2.181,0-3.961-1.779-3.961-3.961
-                       C8.087,9.911,9.867,8.131,12.048,8.131z"/>
-               
-                       <path id="path3170" sodipodi:cx="-1.2502453" sodipodi:cy="16.550539" sodipodi:rx="5.8047104" sodipodi:ry="5.8047104" sodipodi:type="arc" fill="none" stroke="#818181" stroke-width="1.425" d="
-                       M15.999,12.092c0,2.182-1.768,3.951-3.951,3.951s-3.952-1.768-3.952-3.951s1.77-3.952,3.952-3.952S15.999,9.91,15.999,12.092z"/>
-               <path id="rect3175" fill="none" stroke="#818181" stroke-width="1.425" d="M12.048,1.52L12.048,1.52
-                       c0.259,0,0.469,0.303,0.469,0.675v3.406c0,0.372-0.21,0.675-0.469,0.675l0,0c-0.259,0-0.469-0.303-0.469-0.675V2.195
-                       C11.579,1.824,11.789,1.52,12.048,1.52z"/>
-               
-                       <path id="path3177" sodipodi:cx="6.8316979" sodipodi:cy="10.433268" sodipodi:rx="0.22325809" sodipodi:ry="0.22325809" sodipodi:type="arc" fill="#525252" d="
-                       M5.875,8.184c0,0.242-0.195,0.436-0.435,0.436c-0.241,0-0.436-0.195-0.436-0.435c0-0.001,0-0.001,0-0.001
-                       C5.003,7.945,5.199,7.749,5.44,7.749C5.679,7.749,5.875,7.945,5.875,8.184L5.875,8.184z"/>
-               <path id="rect3179" fill="#EDEDED" d="M3.456,18.266h8.61c0.331,0,0.596,0.267,0.596,0.595v3.297c0,0.328-0.266,0.595-0.596,0.595
-                       h-8.61c-0.329,0-0.595-0.267-0.595-0.595v-3.297C2.861,18.533,3.127,18.266,3.456,18.266z"/>
-       </g>
-</g>
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="save.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs2385">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective2391" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.197802"
+     inkscape:cx="0.78164521"
+     inkscape:cy="3.7405397"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="1021"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2388">
+    <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
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#adadad;fill-opacity:1;stroke:none"
+       d="M 0.890625,0 C 0.39202498,0 0,0.39202498 0,0.890625 l 0,22.21875 C 0,23.607975 0.39202498,24 0.890625,24 l 22.21875,0 C 23.607975,24 24,23.607976 24,23.109375 l 0,-2.0625 -1.21875,0 0,-1.476563 1.21875,0 0,-18.679687 C 24,0.39202498 23.607976,0 23.109375,0 L 0.890625,0 z M 12,8.0390625 c 2.181321,0 3.960938,1.7796165 3.960938,3.9609375 0,2.181321 -1.779617,3.960938 -3.960938,3.960938 C 9.818679,15.960938 8.0390625,14.181321 8.0390625,12 8.0390625,9.818679 9.818679,8.0390625 12,8.0390625 z"
+       id="rect3163" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#c1b2b2;stroke-width:1.89999998000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3170"
+       sodipodi:cx="-1.2502453"
+       sodipodi:cy="16.550539"
+       sodipodi:rx="5.8047104"
+       sodipodi:ry="5.8047104"
+       d="m 4.5544651,16.550539 a 5.8047104,5.8047104 0 1 1 -11.6094208,0 5.8047104,5.8047104 0 1 1 11.6094208,0 z"
+       transform="matrix(0.68076923,0,0,0.68076923,12.851128,0.7329024)" />
+    <rect
+       style="fill:none;stroke:#c1b3b3;stroke-width:1.42499994999999990;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3175"
+       width="0.937684"
+       height="4.7553973"
+       x="11.531157"
+       y="1.4286062"
+       rx="0.67499995" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#c4b0b0;fill-opacity:1;stroke:none"
+       id="path3177"
+       sodipodi:cx="6.8316979"
+       sodipodi:cy="10.433268"
+       sodipodi:rx="0.22325809"
+       sodipodi:ry="0.22325809"
+       d="m 7.054956,10.433268 a 0.22325809,0.22325809 0 1 1 -0.4465162,0 0.22325809,0.22325809 0 1 1 0.4465162,0 z"
+       transform="matrix(1.9500001,0,0,1.9500001,-7.930128,-12.252012)" />
+    <rect
+       style="fill:#eaeded;fill-opacity:1;stroke:none"
+       id="rect3179"
+       width="9.8016186"
+       height="4.4874878"
+       x="2.8130519"
+       y="18.172964"
+       rx="0.59506577" />
+  </g>
 </svg>
diff --git a/embedded/search.svg b/embedded/search.svg
new file mode 100644 (file)
index 0000000..f06e194
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 11 Build 196, SVG Export Plug-In . SVG Version: 6.0.0 Build 78)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"    "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+       <!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+       <!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+       <!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+       <!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+       <!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+       <!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+       <!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+       <!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+       <!ENTITY ns_svg "http://www.w3.org/2000/svg">
+       <!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg 
+        width="16" height="15.71" viewBox="0 0 16 15.71">
+               
+               <g id="layer1">
+
+    <path
+       style="fill:#000000;fill-opacity:0.3;fill-rule:evenodd;stroke:none"
+       d="M 7.1875 0.4375 C 3.5583203 0.68135784 0.6403418 2.5439031 0.09375 4.90625 L 0 4.90625 L 0 9.3125 L 0 10.59375 L 0 12.6875 C 0 14.5157 1.4843 16 3.3125 16 L 12.6875 16 C 14.5157 16 16 14.5157 16 12.6875 L 16 10.59375 L 16 9.3125 L 16 4.90625 L 15.90625 4.90625 C 15.31917 2.3689146 12.002 0.43750001 8 0.4375 C 7.724 0.4375 7.4563281 0.41943646 7.1875 0.4375 z "
+       id="rect2395" />
+
+    <path
+       style="fill:#000000;fill-opacity:0.3;fill-rule:evenodd;stroke:none"
+       d="M 7.1875,15.991972 C 3.5583203,15.748114 0.6403418,13.885569 0.09375,11.523222 l -0.09375,0 0,-4.4062502 0,-1.28125 0,-2.09375 c 0,-1.8282 1.4843,-3.31250004 3.3125,-3.31250004 l 9.375,0 c 1.8282,0 3.3125,1.48430004 3.3125,3.31250004 l 0,2.09375 0,1.28125 0,4.4062502 -0.09375,0 C 15.31917,14.060557 12.002,15.991972 8,15.991972 c -0.276,0 -0.5436719,0.01806 -0.8125,0 z"
+       id="rect2395" />
+
+<!-- hand-editing SVGs sucks. Thanks, Illustrator. -->
+                       <circle fill="none" stroke="#FFFFFF" cx="7.126" cy="6.613" r="3.625"/> 
+                       <line fill="none" stroke="#FFFFFF" stroke-width="2" x1="9.188" y1="9.582" x2="12.22" y2="12.613"/>
+               </g>
+       </svg>
index 8843446..30c1ece 100644 (file)
@@ -1,26 +1,83 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-        id="svg2383" 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
-        viewBox="0 0 18 18" enable-background="new 0 0 18 18" xml:space="preserve">
-<defs>
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="upload.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   x="0px"
+   y="0px"
+   width="18px"
+   height="18px"
+   viewBox="0 0 18 18"
+   enable-background="new 0 0 18 18"
+   xml:space="preserve"><metadata
+   id="metadata3059"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
+<defs
+   id="defs3048">
        
        
-               <inkscape:perspective  sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1">
+               <inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 16 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="32 : 16 : 1"
+   id="perspective2391"
+   inkscape:persp3d-origin="16 : 10.666667 : 1">
                </inkscape:perspective>
 </defs>
-<sodipodi:namedview  showgrid="true" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:zoom="11.197802" inkscape:cx="17.258093" inkscape:cy="3.7405397" id="base" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:current-layer="layer1" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="875" inkscape:window-height="723" inkscape:window-x="123" inkscape:window-y="47">
+<sodipodi:namedview
+   showgrid="true"
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1.0"
+   inkscape:zoom="11.197802"
+   inkscape:cx="0.78164521"
+   inkscape:cy="3.7405397"
+   id="base"
+   inkscape:pageopacity="0.0"
+   inkscape:pageshadow="2"
+   inkscape:current-layer="svg2383"
+   inkscape:grid-bbox="true"
+   inkscape:document-units="px"
+   inkscape:window-width="1680"
+   inkscape:window-height="1021"
+   inkscape:window-x="1280"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1">
        </sodipodi:namedview>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.0161" y1="18.0352" x2="9.0161" y2="4.882813e-004">
-       <stop  offset="0" style="stop-color:#0000FF"/>
-       <stop  offset="1" style="stop-color:#6666FF"/>
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="9.0161"
+   y1="18.0352"
+   x2="9.0161"
+   y2="4.882813e-004">
+       <stop
+   offset="0"
+   style="stop-color:#08ff00;stop-opacity:1;"
+   id="stop3053" />
+       <stop
+   offset="1"
+   style="stop-color:#66ff6f;stop-opacity:1;"
+   id="stop3055" />
 </linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813
-       l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006
-       c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168
-       L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137
-       c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0
-       l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"/>
-</svg>
+<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="url(#SVGID_1_)"
+   d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813  l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006  c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168  L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137  c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0  l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"
+   id="path3057" />
+</svg>
\ No newline at end of file
index 763c208..411cdf7 100644 (file)
@@ -1,28 +1,88 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1"
-        id="svg2383" 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"
-        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
-        viewBox="0 0 18 18" enable-background="new 0 0 18 18" xml:space="preserve">
-<defs>
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="upload_disabled.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   x="0px"
+   y="0px"
+   width="18px"
+   height="18px"
+   viewBox="0 0 18 18"
+   enable-background="new 0 0 18 18"
+   xml:space="preserve"><metadata
+   id="metadata3905"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
+<defs
+   id="defs3893">
        
        
-               <inkscape:perspective  sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1">
+               <inkscape:perspective
+   sodipodi:type="inkscape:persp3d"
+   inkscape:vp_x="0 : 16 : 1"
+   inkscape:vp_y="0 : 1000 : 0"
+   inkscape:vp_z="32 : 16 : 1"
+   id="perspective2391"
+   inkscape:persp3d-origin="16 : 10.666667 : 1">
                </inkscape:perspective>
 </defs>
-<sodipodi:namedview  showgrid="true" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:zoom="11.197802" inkscape:cx="17.258093" inkscape:cy="3.7405397" id="base" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:current-layer="layer1" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="875" inkscape:window-height="723" inkscape:window-x="123" inkscape:window-y="47">
+<sodipodi:namedview
+   showgrid="true"
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1.0"
+   inkscape:zoom="11.197802"
+   inkscape:cx="8.1359176"
+   inkscape:cy="3.7405397"
+   id="base"
+   inkscape:pageopacity="0.0"
+   inkscape:pageshadow="2"
+   inkscape:current-layer="svg2383"
+   inkscape:grid-bbox="true"
+   inkscape:document-units="px"
+   inkscape:window-width="875"
+   inkscape:window-height="722"
+   inkscape:window-x="1459"
+   inkscape:window-y="137"
+   inkscape:window-maximized="0">
        </sodipodi:namedview>
-<g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+<g
+   id="layer1"
+   inkscape:label="Layer 1"
+   inkscape:groupmode="layer">
 </g>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.0161" y1="18.0352" x2="9.0161" y2="4.882813e-004">
-       <stop  offset="0" style="stop-color:#999999"/>
-       <stop  offset="1" style="stop-color:#CCCCCC"/>
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="9.0161"
+   y1="18.0352"
+   x2="9.0161"
+   y2="4.882813e-004">
+       <stop
+   offset="0"
+   style="stop-color:#5555bb;stop-opacity:1;"
+   id="stop3899" />
+       <stop
+   offset="1"
+   style="stop-color:#5d5ded;stop-opacity:1;"
+   id="stop3901" />
 </linearGradient>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813
-       l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006
-       c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168
-       L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137
-       c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0
-       l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"/>
-</svg>
+<path
+   fill-rule="evenodd"
+   clip-rule="evenodd"
+   fill="url(#SVGID_1_)"
+   d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813  l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006  c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168  L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137  c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0  l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"
+   id="path3903" />
+</svg>
\ No newline at end of file
index fed1ea7..33c20b9 100644 (file)
@@ -304,7 +304,7 @@ package net.systemeD.halcyon.styleparser {
 
                private function loadedImage(event:Event):void {
                        var fn:String=event.target.info['filename'];
-                       images[fn]=event.target.data;
+                       images[fn]=event.target.data; if (images[fn].length==0) return;
 
                        var loader:ExtendedLoader = new ExtendedLoader();
                        loader.info['filename']=fn;
index 26acee8..b107fe0 100644 (file)
@@ -21,7 +21,7 @@
                </mx:HBox>
 
                <mx:TileList dataProvider="{dndRep.currentItem.getFeaturesForType('point', true)}" width="100%" height="1"
-                                    updateComplete="resizePOIGrid(event)" styleName="dndPanelTileList">
+                                    rowHeight="32" columnWidth="32" updateComplete="resizePOIGrid(event)" styleName="dndPanelTileList">
                        <mx:itemRenderer>
                                <mx:Component>
                                        <mx:VBox toolTip="{data.name}">
@@ -44,7 +44,7 @@
                                                                DragManager.doDrag(dragInitiator, dragSource, event, dragProxy);
                                                        }
                                                ]]></mx:Script>
-                                               <mx:Image id="foo" source="{data.dndimage}" height="20" width="20" mouseMove="dragPOI(event, data.tags)" toolTip="{data.name}" />
+                                               <mx:Image id="foo" source="{data.dndimage}" height="24" width="24" mouseMove="dragPOI(event, data.tags)" toolTip="{data.name}" />
                                        </mx:VBox>
                                </mx:Component>
                        </mx:itemRenderer>
index 241d5f4..a553ab6 100644 (file)
@@ -2,13 +2,18 @@
 <mx:Panel
        xmlns:mx="http://www.adobe.com/2006/mxml"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
-       borderThicknessRight="1" borderThicknessLeft="1" borderThicknessBottom="3"
-       title="Edit Pathways and Areas" layout="horizontal" styleName="theToolBox">
+       height="76" width="129" layout="absolute"
+       styleName="theToolBox">
 
         <!-- the animation effect that controls the rotation of the reverse arrow.
               We could get more fancy by using previous angle in angleFrom, and a longer duration, to give a nice animated effect -->
         <mx:Rotate id="rotate" angleFrom="{angle-1}" angleTo="{angle}" target="{arrowBox}" originX="{arrowBox.width/2}" originY="{arrowBox.height/2}" duration="4"/>
 
+
+               <mx:Image data="@Embed('../../../embedded/close_small.png')"
+                       includeInLayout="false" id="toolboxClose" click="toggle();" 
+                       y="-6" x="115" />
+
                <!-- Top row -->
 
                <mx:Button icon="@Embed('../../../embedded/delete.svg')"
                        enabled="{canDo('delete')}" 
                        alpha="{getAlpha('delete')}" 
                        toolTip="{deleteToolTipText()}" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="4" x="6" paddingLeft="6" paddingRight="0" />
 
-        <mx:HBox id="reverseButton" width="24" height="24" y="4" x="36" borderStyle="solid" cornerRadius="12" 
-                         click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
+        <mx:HBox id="reverseButton" width="28" height="28" y="4" x="36" borderStyle="solid" cornerRadius="4"
+                  click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
             <mx:ViewStack id="rotateButtonStack" creationPolicy="all">
                 <mx:HBox id="arrowBoxWrapper"><!-- changing the viewstack back onto a rotated hbox causes positioning glitches, hence this wrapper -->
                     <!-- I can totally recommend adding borderStyle="solid" to arrowBox when debugging -->
                        enabled="{canDo('split')}" 
                        alpha="{getAlpha('split')}" 
                        toolTip="Split way (X)" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="4" x="66" paddingLeft="8" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/merge.svg')" 
                        id="mergeButton"
                        click='doMerge();'
                        enabled="{canDo('merge')}" 
                        alpha="{getAlpha('merge')}" 
                        toolTip="Merge ways" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="4" x="96" paddingLeft="3" paddingRight="0" />
 
                <!-- Second row -->
 
                        enabled="{canDo('straighten')}" 
                        alpha="{getAlpha('straighten')}" 
                        toolTip="Straighten way" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="34" x="6" paddingLeft="5" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/circle.svg')" 
                        id="circulariseButton"
                        click='doCircularise();' 
                        enabled="{canDo('circularise')}" 
                        alpha="{getAlpha('circularise')}" 
                        toolTip="Make circular" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="34" x="36" paddingLeft="4" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/quadrilateralise.svg')" 
                        id="quadrilateraliseButton"
                        click='doQuadrilateralise();' 
                        enabled="{canDo('quadrilateralise')}" 
                        alpha="{getAlpha('quadrilateralise')}" 
-                       toolTip="Make right-angled (Q)" 
-                       width="24" height="24" />
+                       toolTip="Make right-angled (Q)"
+                       width="28" height="28" textAlign="left" y="34" x="66" paddingLeft="6" paddingRight="0" />
                <mx:Button icon="@Embed('../../../embedded/parallel.svg')" 
                        id="parralleliseButton"
                        click='doParallelise();' 
                        enabled="{canDo('parallelise')}" 
                        alpha="{getAlpha('parallelise')}" 
                        toolTip="Create parallel way (P)" 
-                       width="24" height="24" />
+                       width="28" height="28" textAlign="left" y="34" x="96" paddingLeft="8" paddingRight="0" />
 
        <mx:Script><![CDATA[
 
index 20c11cb..e54cc1c 100644 (file)
@@ -2,8 +2,8 @@
 <mx:TitleWindow
        xmlns:mx="http://www.adobe.com/2006/mxml" 
        layout="vertical" showCloseButton="true"
-       horizontalAlign="center" title="Find a place in OpenStreetMap (powered by Nominatim Search)"
-       width="458" height="350" verticalGap="0">
+       horizontalAlign="center" title="Search"
+       width="458" height="350" verticalGap="0" creationComplete="txtFind.setFocus()">
        <mx:Script><![CDATA[
         import flash.events.Event;
                import mx.core.Application;
@@ -18,7 +18,7 @@
                import net.systemeD.halcyon.Globals;
                
                private var nominatim:HTTPService = new HTTPService;
-               private var nominatimURL:String = "http://open.mapquestapi.com/nominatim/v1/search?";
+               private var nominatimURL:String = "http://open.mapquestapi.com/nominatim/v1/search?";   // ** FIXME - this should be user-configurable
                private var nomOptions:Object = { addressdetails:"1", limit:"10", format:"xml" };
         private var selectedResult:Object = {lat: "0", lon: "0"};
 
                }
                
                private function goneFetched(e:ResultEvent):void {
-                       var resultXML:XML = e.result as XML;
-            var resultList:XMLList = resultXML..place as XMLList;
-                       //Alert.show(resultXML);
-            searchResults = e.result..place as XMLList;
-            var sr2:XMLList = e.result.searchresults as XMLList;
-            var sr3:XMLList = e.result.searchresults.place as XMLList;
+                       searchResults = e.result.* as XMLList;
                }
 
-               protected function btnFind_clickHandler(event:MouseEvent):void
-               {
+               protected function btnFind_clickHandler(event:MouseEvent):void {
                        goFetch(txtFind.text);
                }
 
 
-               protected function txtFind_enterHandler(event:FlexEvent):void
-               {
+               protected function txtFind_enterHandler(event:FlexEvent):void {
                        goFetch(txtFind.text);
                }
 
        ]]>
        </mx:Script>
 
-       <mx:HBox>
-               <mx:TextInput id="txtFind" width="250" enter="txtFind_enterHandler(event)"/>
-               <mx:Button label="Find" id="btnFind" click="btnFind_clickHandler(event)"/>              
+       <mx:HBox horizontalAlign="left" width="100%">
+               <mx:Label text="Search for: " />
+               <mx:TextInput id="txtFind" width="100%" enter="txtFind_enterHandler(event)"/>
+               <mx:Button label="Search" id="btnFind" click="btnFind_clickHandler(event)"/>            
        </mx:HBox>
        
-       <mx:Spacer height="20"/>
+       <mx:Spacer height="10"/>
        
-       <mx:DataGrid id="dgResults" dataProvider="{searchResults}" change="setSelected(event)">
+       <mx:DataGrid id="dgResults" dataProvider="{searchResults}" change="setSelected(event)" width="100%" height="100%">
                <mx:columns>
                        <mx:DataGridColumn headerText="Name" dataField="@display_name" minWidth="200" />
                        <mx:DataGridColumn headerText="Type" dataField="@type"/>
                        <mx:DataGridColumn headerText="Class" dataField="@class"/>            
-                       <mx:DataGridColumn headerText="OSM ID" dataField="@osm_id"/>
+                       <mx:DataGridColumn headerText="ID" dataField="@osm_id"/>
         </mx:columns>
        </mx:DataGrid>
 
     <mx:ControlBar>
+       <mx:Label text="Results from Nominatim" />
         <mx:Spacer width="100%"/>
-        <mx:Button label="Go To" click="goToSelected();" styleName="titleWindowButton" />        
         <mx:Button label="Cancel" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
+        <mx:Button label="Jump to" click="goToSelected();" styleName="titleWindowButton" enabled="{dgResults.selectedItem != null? true : false}" />        
     </mx:ControlBar>
     
-</mx:TitleWindow>
\ No newline at end of file
+</mx:TitleWindow>
index cb680f2..1239b68 100644 (file)
        <mx:Style source="styles/Application.css"/>
 
     <mx:Glow id="glowImage" duration="100" 
-        alphaFrom="0" alphaTo="0.8"
+        alphaFrom="0.3" alphaTo="1.0" 
         blurXFrom="0.0" blurXTo="5.0" 
         blurYFrom="0.0" blurYTo="5.0" 
-        color="0x009ADE"/>
+        color="0xFF8000"/>
     <mx:Glow id="unglowImage" duration="100" 
-        alphaFrom="0.8" alphaTo="0"
+        alphaFrom="1.0" alphaTo="0.3" 
         blurXFrom="5.0" blurXTo="0.0" 
         blurYFrom="5.0" blurYTo="0.0" 
-        color="0x009ADE"/>
+        color="0xFF8000"/>
     <mx:WipeLeft id="wipeOut" duration="250"/>
     <mx:WipeRight id="wipeIn" duration="250"/>
 
@@ -53,7 +53,6 @@
         <mx:Button id="redo" label="Redo" click="MainUndoStack.getGlobalStack().redo();" styleName="appBarButton"
             enabled="{MainUndoStack.getGlobalStack().canRedo()}"/>
         <mx:Spacer width="100%"/>
-        <mx:Button id="findButton" label="Find" click="new FindDialog().init();" styleName="appBarButton" />           
         <mx:Button id="helpButton" label="Help" click="new HelpDialog().init();" styleName="appBarButton" />
         <mx:Button id="optionsButton" label="Options" click="new OptionsDialog().init();" styleName="appBarButton" />
         <mx:Button label="Save" icon="@Embed('embedded/upload.svg')" disabledIcon="@Embed('embedded/upload_disabled.svg')" styleName="appBarButton"
         <mx:Canvas id="map_area" resize="onResizeMap()"
             top="0" left="0" width="100%" height="100%" dragEnter="dragEnterHandler(event);" dragDrop="dragDropHandler(event);">
         </mx:Canvas>
-        <mx:Image source="@Embed('embedded/zoom_in.png')" right="7" top="3" click="theMap.zoomIn();"
+        <mx:Image source="@Embed('embedded/zoomIn.svg')" right="3" top="3" click="theMap.zoomIn();"
             rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom in - currently z'+getScale()}" />
-        <mx:Image source="@Embed('embedded/zoom_out.png')" right="7" top="30" click="theMap.zoomOut();"
+        <mx:Image source="@Embed('embedded/zoomOut.svg')" right="3" top="20" click="theMap.zoomOut();"
             rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom out - currently z'+getScale()}" />
-        <mx:TextArea id="dataWorking" text="" right="35" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
+        <mx:Image source="@Embed('embedded/search.svg')" right="3" top="40" click="new FindDialog().init();"
+            rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="Find place" />
+        <mx:TextArea id="dataWorking" text="" right="20" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
             enabled="false" borderThickness="0"
             showEffect="{wipeIn}" hideEffect="{wipeOut}"/>
         <mx:TextArea id="coordsbox" left="0" top="0" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="33"
@@ -88,6 +89,7 @@
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
                import net.systemeD.potlatch2.save.SaveManager;
+               import net.systemeD.potlatch2.find.*;
                import net.systemeD.potlatch2.collections.*;
                import net.systemeD.potlatch2.controller.*;
                import net.systemeD.potlatch2.help.*;
         import mx.core.DragSource;
         import mx.controls.Alert;
         import com.mindspace.l10n.events.LocaleEvent;
-               
-               import net.systemeD.potlatch2.find.*;
 
         public var theMap:Map;
         public var theController:EditController;
index 6db93a9..b76f207 100644 (file)
@@ -4,77 +4,108 @@ TitleWindow {
        borderAlpha: 1;
        borderThicknessLeft: 5;
        borderThicknessRight: 5;
-       cornerRadius: 12px;
-       backgroundColor: #eeeeee;
-       borderColor: #dddddd;
-       color: #3b7700;
-       fontWeight: bold;
-       fontSize: 11pt;
+       cornerRadius: 0px;
+       borderColor: #6495ED;
+       titleStyleName: "titleHeader";
 }
 
-PopUpButton, Button {
+.titleHeader { font-size: 14; font-weight: bold; color: white; }
+
+.titleWindowButton { 
        fontFamily: Arial;
        fontSize: 11;
        fontWeight: bold;
        cornerRadius: 12;
-       paddingLeft: 10;
-       paddingRight: 10;
+       paddingLeft: 5;
+       paddingRight: 5;
        highlightAlphas: 0, 0;
-       fillAlphas: 1, 1, 1, 1;
-       fillColors: #ffffff, #ffffff, #ffffff, #ffffff;
-       color: #51214d;
-       textRollOverColor: #51214d;
-       borderColor: #dddddd;
+       fillAlphas: 1,1;
+       fillColors: white, white;
+       color: black;
+       borderColor: haloBlue;
+}
+
+Button {
+       color: black;
+       textRollOverColor: black;
 }
 
 VScrollBar {
        cornerRadius: 0;
        highlightAlphas: 0, 0;
        fillAlphas: 0, 0, 0, 0;
-       fillColors: #ffffff, #ffffff, #ffffff, #ffffff;
+       fillColors: white, white, white, white;
        trackColors: #eeeeee, #eeeeee;
        borderColor: #999999;
        thumbOffset: 1;
 }
 
+CheckBox, List, StyleSelector, BackgroundSelector { color: black; }
+
+TabNavigator {
+       horizontalGap: 3;
+}
+
 TextInput {
        color: #333333;
 }
 
+Label {
+       fontWeight: normal;
+}
+
 /* Main window */
 
 Application {
-       padding-left: 0;
-       padding-right: 0;
-       padding-top: 0;
-       padding-bottom: 0;
-       backgroundColor: #eeeeee;
-       backgroundGradientColors: #eeeeee, #eeeeee;
-       backgroundGradientAlphas: 1, 1;
-       themeColor: #bbbbbb;
-       color: #333333;
-       backgroundGradientAlphas: 0, 0;
+       padding-left: 4;
+       padding-right: 4;
+       padding-top: 2;
+       padding-bottom: 4;
+       backgroundColor: #6495ED;
+       themeColor: #0000ff;
        borderStyle: none;
        fontFamily: Arial;
 }
 
 HDividedBox {
        dividerAlpha: 1;
-       dividerColor: #51214d;
-       backgroundColor: #009ade;
+       dividerColor: #0000ff;
+       backgroundColor: #6495ED;
+       dividerAffordance: 6;
+       horizontalGap: 6;
+/*   backgroundColor: #ffff99; */
 }
 
 ApplicationControlBar {
-       padding-top: 4;
-       padding-bottom: 1;
+       padding-top: 2;
+       padding-bottom: 0;
+       padding-left: 4;
+       padding-right: 4;
        highlightAlphas: 0, 0;
        fillAlphas: 1,1;
-       fillColors: #eeeeee, #eeeeee;
-       backgroundColor: #eeeeee;
+       fillColors: haloBlue, #6495ED;
+       /*fillColors: #ffffcc, #ffff99;*/
+       backgroundColor: #ffffcc;
        dropShadowEnabled: false;
        /*borderSkin: ClassReference("mx.skins.halo.ApplicationBackground");*/
 }
 
+.appBarButton {
+       fontFamily: Arial;
+       fontSize: 11;
+       fontWeight: bold;
+       cornerRadius: 12;
+       paddingLeft: 5;
+       paddingRight: 5;
+       highlightAlphas: 0, 0;
+       fillAlphas: 1,1;
+       fillColors: haloBlue, #6495ED;
+       color: white;
+       textRollOverColor: white;
+       disabledColor: #5555bb;
+       borderColor: haloBlue;
+}
+
 /* General text classes */
 
 .failText { color: red; }
@@ -90,7 +121,8 @@ ApplicationControlBar {
 /* Drag-and-drop panel */
 
 .dndPanelTileList {
-       borderColor: #ffffff;
+       borderColor: #dddddd;
+       backgroundColor: #dddddd;
 }
 
 .dndEditorContainer {
@@ -98,8 +130,8 @@ ApplicationControlBar {
        paddingTop: 3;
        paddingLeft: 3;
        paddingRight: 3;
-       backgroundColor: #eeeeee;
-       color: #3b7700;
+       backgroundColor: white;
+       color: #333333;
        fontSize: 11;
        fontWeight: bold;
 }
@@ -107,17 +139,19 @@ ApplicationControlBar {
 .dndPanelVbox {
        paddingRight: 3;
        paddingLeft: 3;
-       paddingTop: 15;
+       paddingTop: 5;
        verticalGap: 0;
+       backgroundColor: #dddddd;
        borderColor: #aaaaaa;
+       fontWeight: normal;
 }
 
 .catToggleButtonBar {
-       themeColor: #51214d;
+       themeColor: #0000ff;
        buttonStyleName: "mytoggleButtonBarButtonStyle";
 }
 
-.mytoggleButtonBarButtonStyle { fillColors: #dddddd, #dddddd, #dddddd, #dddddd; }
+.mytoggleButtonBarButtonStyle { fillColors: #dddddd, #eeeeee, #eeeeee, #eeeeee; borderColor: white; }
 
 .catToggleTiles {
        themeColor: #cccccc;
@@ -126,19 +160,20 @@ ApplicationControlBar {
 /* Drag-and-drop POI icons */
 
 .helpInfo {
-       fontSize: 13;
-       color: #777777;
-       textAlign: right;
-       paddingLeft: 30;
-       paddingRight: 15;
+       paddingLeft: 0;
+       paddingRight: 0;
+       paddingBottom: 6;
+}
+.dndRepeater {
+}
+.dndPanelCategory {
+       backgroundColor: white;
 }
-
 .dndPanelCategoryLabel {
-       paddingTop: 9;
-       color: #3b7700;
+       paddingTop: 0;
+       color: #444444;
        fontSize: 11;
        fontWeight: bold;
-       paddingBottom: 0;
 }
 
 /* Simple tag view - header */
@@ -148,19 +183,21 @@ ApplicationControlBar {
 }
 
 .featureSelector {
-       paddingTop: 3;
+       paddingTop: 0;
        paddingLeft: 3;
        paddingRight: 3;
-       verticalAlign: middle;
+       paddingBottom: 7;
 }
 
 .dndTagPopUpMenu {
-       fillColors: #dddddd, #dddddd, #dddddd, #dddddd;
+       fillColors: white, white, white, white;
        borderColor: #aaaaaa;
+       fontSize: 11;
+       fontWeight: bold;
 }
 
 .dndIconText {
-       color: #009ade;
+       color: black;
        fontSize: 14;
        fontWeight: bold;
 }
@@ -168,9 +205,10 @@ ApplicationControlBar {
 /* Simple tag view - editor container */
 
 .dndStackTab {
-       backgroundColor: #eeeeee;
+       backgroundColor: white;
        themeColor: #bbbbbb;
        cornerRadius: 0;
+       color: #333333;
        borderColor: #999999;
        tabStyleName: "myTabs";
        firstTabStyleName: "myTabs";
@@ -178,37 +216,29 @@ ApplicationControlBar {
        selectedTabTextStyleName: "mySelectedTabs";
 }
 
-.myTabs {
-       cornerRadius: 12;
-       fillColors: #ffffff, #ffffff;
-       borderColor: #999999;
-       themeColor: #999999;
-}
-
-.mySelectedTabs {}
+.myTabs { font-size: 11; font-weight: normal; cornerRadius: 0; fillColors: white, white; borderColor: #999999; themeColor: #999999; }
+.mySelectedTabs { fillColors: white, white; }
 
 .dndStackAccordion {
        themeColor: #bbbbbb;
        cornerRadius: 0;
        borderColor: #999999;
+       headerStyleName: "accordionHeader";
 }
 
+.accordionHeader { fillColors: #888888, #999999; fillAlphas: 1,1; color: white; fontWeight: bold; fontSize: 11; }
+
 /* Toolbox */
 
 .theToolBox {
-       backgroundColor: #eeeeee;
-       cornerRadius: 12;
-       headerHeight: 21;
-       titleStyleName: "mypanelTitle";
-       borderAlpha: 1.0;
+       headerColors: haloBlue, #6495ED;
+       headerAlphas: 1,1;
+       headerHeight: 6;
+       borderThicknessRight: 0; borderThicknessLeft: 0; borderThicknessBottom: 0;
+       paddingLeft: 4; paddingTop: 4;
 }
 
-.mypanelTitle {
-       textAlign: center;
-       color: #3b7700;
-       fontSize: 11;
-       fontWeight: bold;
-}
+.mypanelTitle { textAlign: center; color: #333333; fontSize: 10; fontWeight: bold; }
 
 /* Help */
 
@@ -224,11 +254,8 @@ ApplicationControlBar {
 }
 
 .helpTN {
-       borderColor: #dddddd;
-       cornerRadius: 5px;
+       cornerRadius: 0px;
        tabOffset: 10px;
-       color: #333333;
-       fontWeight: regular;
 }