From a24e0f7b1423953baf4237be7f5f3935471742e0 Mon Sep 17 00:00:00 2001
From: Niraj Venkat <venkatn93@gmail.com>
Date: Tue, 16 Jun 2015 09:50:03 -0700
Subject: [PATCH] Finishing up new address bar layout

---
 .../resources/images/address-bar.001.svg      | 81 -------------------
 interface/resources/images/address-bar.svg    | 26 ++++--
 interface/resources/images/arrowcontainer.svg |  3 -
 interface/resources/images/darkgreyarrow.svg  | 14 +++-
 interface/resources/images/left-arrow.svg     | 50 ++++++++++++
 interface/resources/qml/AddressBarDialog.qml  | 50 +++---------
 6 files changed, 94 insertions(+), 130 deletions(-)
 delete mode 100644 interface/resources/images/address-bar.001.svg
 delete mode 100644 interface/resources/images/arrowcontainer.svg
 create mode 100644 interface/resources/images/left-arrow.svg

diff --git a/interface/resources/images/address-bar.001.svg b/interface/resources/images/address-bar.001.svg
deleted file mode 100644
index 7734b95be5..0000000000
--- a/interface/resources/images/address-bar.001.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   width="1440"
-   height="200"
-   data-icon="map-marker"
-   data-container-transform="translate(24)"
-   viewBox="0 0 1440 200"
-   id="svg4136"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="address-bar.001.svg">
-  <metadata
-     id="metadata4144">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4142" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1835"
-     inkscape:window-height="1057"
-     id="namedview4140"
-     showgrid="false"
-     inkscape:zoom="0.8671875"
-     inkscape:cx="536.9343"
-     inkscape:cy="52.468468"
-     inkscape:window-x="77"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4136" />
-  <rect
-     style="fill:#ededed;fill-opacity:1;stroke:none;stroke-linejoin:round;stroke-opacity:1"
-     id="rect4141"
-     width="1280"
-     height="140"
-     x="160"
-     y="30"
-     rx="16.025024"
-     ry="17.019567" />
-  <rect
-     style="fill:#dadada;fill-opacity:1;stroke:#cbcbcb;stroke-width:0.33821851;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-     id="rect4135"
-     width="292.86267"
-     height="139.66179"
-     x="150.32542"
-     y="30.169102"
-     rx="16.817432"
-     ry="20.612938" />
-  <circle
-     style="fill:#b8b8b8;fill-opacity:1;stroke:none;stroke-opacity:1"
-     id="path4146"
-     cx="100"
-     cy="100"
-     r="100" />
-  <path
-     d="m 100,36.000005 c -22.1,0 -40,17.9 -40,39.999995 0,30 40,88 40,88 0,0 40,-58 40,-88 0,-22.099995 -17.9,-39.999995 -40,-39.999995 z m 0,22 c 9.9,0 18,8.099995 18,17.999995 0,9.9 -8.1,18 -18,18 -9.9,0 -18,-8.1 -18,-18 0,-9.9 8.1,-17.999995 18,-17.999995 z"
-     id="path4138"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/interface/resources/images/address-bar.svg b/interface/resources/images/address-bar.svg
index 0a472cbe4e..dd907aa6c9 100644
--- a/interface/resources/images/address-bar.svg
+++ b/interface/resources/images/address-bar.svg
@@ -15,7 +15,7 @@
    viewBox="0 0 1440 200"
    id="svg4136"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="address-bar.svg">
+   sodipodi:docname="address-bar.002.svg">
   <metadata
      id="metadata4144">
     <rdf:RDF>
@@ -39,14 +39,14 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1840"
+     inkscape:window-width="1835"
      inkscape:window-height="1057"
      id="namedview4140"
      showgrid="false"
-     inkscape:zoom="0.8671875"
-     inkscape:cx="707.02439"
+     inkscape:zoom="0.61319416"
+     inkscape:cx="132.58366"
      inkscape:cy="52.468468"
-     inkscape:window-x="72"
+     inkscape:window-x="77"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4136" />
@@ -59,6 +59,15 @@
      y="30"
      rx="16.025024"
      ry="17.019567" />
+  <rect
+     style="fill:#dadada;fill-opacity:1;stroke:#cbcbcb;stroke-width:0.33821851;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4135"
+     width="292.86267"
+     height="139.66179"
+     x="150.32542"
+     y="30.169102"
+     rx="16.817432"
+     ry="20.612938" />
   <circle
      style="fill:#b8b8b8;fill-opacity:1;stroke:none;stroke-opacity:1"
      id="path4146"
@@ -69,4 +78,11 @@
      d="m 100,36.000005 c -22.1,0 -40,17.9 -40,39.999995 0,30 40,88 40,88 0,0 40,-58 40,-88 0,-22.099995 -17.9,-39.999995 -40,-39.999995 z m 0,22 c 9.9,0 18,8.099995 18,17.999995 0,9.9 -8.1,18 -18,18 -9.9,0 -18,-8.1 -18,-18 0,-9.9 8.1,-17.999995 18,-17.999995 z"
      id="path4138"
      inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#bdbdbd;fill-opacity:1;stroke:none;stroke-width:0.30000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4136"
+     width="4"
+     height="100"
+     x="310.12924"
+     y="50" />
 </svg>
diff --git a/interface/resources/images/arrowcontainer.svg b/interface/resources/images/arrowcontainer.svg
deleted file mode 100644
index 7f8bd28944..0000000000
--- a/interface/resources/images/arrowcontainer.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="287 459 133 64" width="133pt" height="64pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-12 18:23Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><rect fill="white" width="1728" height="1466"/><g><title> Navi Bar</title><path d="M 293.07144 459.1429 L 413.57144 459.1429 C 416.88515 459.1429 419.57144 461.8292 419.57144 465.1429 L 419.57144 516.71432 C 419.57144 520.02803 416.88515 522.71432 413.57144 522.71432 L 293.07144 522.71432 C 289.75773 522.71432 287.07144 520.02803 287.07144 516.71432 L 287.07144 465.1429 C 287.07144 461.8292 289.75773 459.1429 293.07144 459.1429 Z" fill="#ccc"/></g></g></svg>
diff --git a/interface/resources/images/darkgreyarrow.svg b/interface/resources/images/darkgreyarrow.svg
index 6feb2be586..2d049d90d7 100644
--- a/interface/resources/images/darkgreyarrow.svg
+++ b/interface/resources/images/darkgreyarrow.svg
@@ -1,3 +1,11 @@
-<?xml version="1.0"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="315 474 23 34" width="23pt" height="34pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-12 18:23Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><rect fill="white" width="1728" height="1466"/><g><title> Navi Bar</title><path d="M 337.0727 474.23472 L 315.81902 490.9286 L 337.0727 507.62248 L 337.0727 474.23472 Z" fill="#535353"/></g></g></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns:xl="http://www.w3.org/1999/xlink"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="133.1 714.2 21.3 33.4"
+	 enable-background="new 133.1 714.2 21.3 33.4" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#535353" d="M133.1,714.2l21.3,16.7l-21.3,16.7V714.2z"/>
+	</g>
+</g>
+</svg>
diff --git a/interface/resources/images/left-arrow.svg b/interface/resources/images/left-arrow.svg
new file mode 100644
index 0000000000..cede9fa959
--- /dev/null
+++ b/interface/resources/images/left-arrow.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="133.1 714.2 21.3 33.4"
+   enable-background="new 133.1 714.2 21.3 33.4"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="left-arrow.svg"><metadata
+     id="metadata13"><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="defs11" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1835"
+     inkscape:window-height="1057"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="7.0658679"
+     inkscape:cx="10.65"
+     inkscape:cy="16.700001"
+     inkscape:window-x="77"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3"
+     transform="matrix(-1,0,0,1,287.5,0)"><g
+       id="g5"><path
+         d="m 133.1,714.2 21.3,16.7 -21.3,16.7 0,-33.4 z"
+         id="path7"
+         inkscape:connector-curvature="0"
+         style="fill:#535353" /></g></g></svg>
\ No newline at end of file
diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml
index 1ddce9b04d..e80c5f2aa5 100644
--- a/interface/resources/qml/AddressBarDialog.qml
+++ b/interface/resources/qml/AddressBarDialog.qml
@@ -39,68 +39,42 @@ DialogContainer {
         Image {
             id: backgroundImage
 
-            source: "../images/address-bar.001.svg"
+            source: "../images/address-bar.svg"
             width: 576 * root.scale
             height: 80 * root.scale
             property int inputAreaHeight: 56.0 * root.scale  // Height of the background's input area
             property int inputAreaStep: (height - inputAreaHeight) / 2
 
-            /*
             Image {
-                id: arrowContainer
+                id: backArrow
 
-                source: "../images/arrowcontainer.svg"
+                source: "../images/left-arrow.svg"
+                scale: 0.9
                 
                 anchors {
                     fill: parent
-                    leftMargin: parent.height + hifi.layout.spacing * 2
-                    rightMargin: parent.height + hifi.layout.spacing * 50
-                    topMargin: parent.inputAreaStep + hifi.layout.spacing
-                    bottomMargin: parent.inputAreaStep + hifi.layout.spacing
-                }
-            }*/
-
-            Image {
-                id: darkGreyArrowBack
-
-                source: "../images/darkgreyarrow.png"
-                
-                anchors {
-                    fill: parent
-                    leftMargin: parent.height + hifi.layout.spacing * 2
+                    leftMargin: parent.height + hifi.layout.spacing + 6
                     rightMargin: parent.height + hifi.layout.spacing * 60
                     topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
                     bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
                 }
             }
-
-            Image {
-                id: seperator
-
-                source: "../images/sepline.png"
-                
-                anchors {
-                    fill: parent
-                    leftMargin: parent.height + hifi.layout.spacing * 7
-                    rightMargin: parent.height + hifi.layout.spacing * 57
-                    topMargin: parent.inputAreaStep + hifi.layout.spacing
-                    bottomMargin: parent.inputAreaStep + hifi.layout.spacing
-                }
-            }
-
             
             Image {
-                id: lightGreyArrowForward
+                id: forwardArrow
 
-                source: "../images/lightgreyarrow.png"
+                source: "../images/darkgreyarrow.svg"
                 
                 anchors {
                     fill: parent
-                    leftMargin: parent.height + hifi.layout.spacing * 10
-                    rightMargin: parent.height + hifi.layout.spacing * 52
+                    leftMargin: parent.height + hifi.layout.spacing * 9
+                    rightMargin: parent.height + hifi.layout.spacing * 53
                     topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
                     bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
                 }
+
+                width: parent.width * 0.5
+                height: parent.height * 0.5
             }
 
             TextInput {