From deb51eaaa175500bd9315cdcb26875bfae1125fd Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Mon, 5 Sep 2016 23:04:44 +0800
Subject: [PATCH] gui: update version number in logo

---
 artiq/browser/experiments.py           |  2 +-
 artiq/frontend/artiq_dashboard.py      |  2 +-
 artiq/gui/{logo20.svg => logo_ver.svg} | 41 +++++++++++---------------
 3 files changed, 20 insertions(+), 25 deletions(-)
 rename artiq/gui/{logo20.svg => logo_ver.svg} (79%)

diff --git a/artiq/browser/experiments.py b/artiq/browser/experiments.py
index d6098da72..7fbd045ad 100644
--- a/artiq/browser/experiments.py
+++ b/artiq/browser/experiments.py
@@ -392,7 +392,7 @@ class ExperimentsArea(QtWidgets.QMdiArea):
     def __init__(self, root, datasets_sub):
         QtWidgets.QMdiArea.__init__(self)
         self.pixmap = QtGui.QPixmap(os.path.join(
-            artiq_dir, "gui", "logo20.svg"))
+            artiq_dir, "gui", "logo_ver.svg"))
         self.current_dir = root
         self.dataset = None
 
diff --git a/artiq/frontend/artiq_dashboard.py b/artiq/frontend/artiq_dashboard.py
index d5d64e835..dd3aed1f7 100755
--- a/artiq/frontend/artiq_dashboard.py
+++ b/artiq/frontend/artiq_dashboard.py
@@ -77,7 +77,7 @@ class MdiArea(QtWidgets.QMdiArea):
     def __init__(self):
         QtWidgets.QMdiArea.__init__(self)
         self.pixmap = QtGui.QPixmap(os.path.join(
-            artiq_dir, "gui", "logo20.svg"))
+            artiq_dir, "gui", "logo_ver.svg"))
 
     def paintEvent(self, event):
         QtWidgets.QMdiArea.paintEvent(self, event)
diff --git a/artiq/gui/logo20.svg b/artiq/gui/logo_ver.svg
similarity index 79%
rename from artiq/gui/logo20.svg
rename to artiq/gui/logo_ver.svg
index b0c8ec09e..2d93e0d4a 100644
--- a/artiq/gui/logo20.svg
+++ b/artiq/gui/logo_ver.svg
@@ -2,7 +2,6 @@
 <!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 
 <svg
-   xmlns:i="&amp;ns_ai;"
    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#"
@@ -20,10 +19,10 @@
    xml:space="preserve"
    id="svg2"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="Artiq_logo_final_cleaned.svg"><metadata
+   sodipodi:docname="logo_ver.svg"><metadata
      id="metadata548"><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><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
      id="defs546" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -41,9 +40,9 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:zoom="0.417193"
-     inkscape:cx="-963.25369"
-     inkscape:cy="-371.05578"
+     inkscape:zoom="0.834386"
+     inkscape:cx="-244.98179"
+     inkscape:cy="163.75581"
      inkscape:window-x="0"
      inkscape:window-y="44"
      inkscape:window-maximized="1"
@@ -128,22 +127,7 @@
        inkscape:connector-curvature="0"
        style="fill:#ffffff"
        id="path421"
-       d="m 542.927,603.421 c 3.252,-5.109 4.9,-11.218 4.9,-18.153 0,-21.831 -16.283,-31.774 -31.414,-31.774 -15.129,0 -31.414,9.943 -31.414,31.774 0,21.683 16.174,31.56 31.199,31.56 5.541,0 10.949,-1.321 15.637,-3.82 l 0.885,-0.472 1.725,3.244 14.828,0 0,-0.794 -6.68,-11.039 0.334,-0.526 z m -26.514,0.053 c -8.094,0 -16.805,-5.697 -16.805,-18.206 0,-12.415 8.711,-18.069 16.805,-18.069 8.094,0 16.807,5.654 16.807,18.069 0,12.508 -8.713,18.206 -16.807,18.206 z" /></g><g
-     style="fill:#ffffff"
-     id="g423"
-     transform="translate(-250.847,-184.784)"><path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff"
-       id="path425"
-       d="m 556.841,538.933 -0.145,0.182 c 0.328,-1.058 0.766,-2.006 1.348,-2.881 0.584,-0.875 1.277,-1.604 2.08,-2.225 0.801,-0.62 1.713,-1.094 2.734,-1.422 1.021,-0.328 2.152,-0.511 3.355,-0.511 1.35,0 2.59,0.219 3.719,0.62 1.131,0.401 2.08,0.984 2.881,1.714 0.803,0.729 1.424,1.604 1.861,2.589 0.438,0.985 0.656,2.079 0.656,3.246 0,1.24 -0.184,2.334 -0.584,3.246 -0.4,0.911 -0.912,1.75 -1.531,2.479 -0.621,0.729 -1.312,1.386 -2.078,1.969 -0.768,0.584 -1.533,1.167 -2.299,1.715 -0.619,0.438 -1.24,0.875 -1.859,1.312 -0.619,0.437 -1.168,0.839 -1.678,1.203 -0.51,0.365 -0.912,0.657 -1.24,0.876 l -0.473,0.328 0.035,0.036 c 0.037,0 0.584,-0.036 1.605,-0.073 1.021,-0.036 2.443,-0.072 4.23,-0.072 l 5.871,0 0,4.704 -18.416,0 0,-4.121 c 1.822,-1.568 3.646,-3.136 5.434,-4.704 1.788,-1.568 3.609,-3.137 5.434,-4.705 0.729,-0.619 1.312,-1.312 1.75,-2.042 0.438,-0.73 0.656,-1.495 0.656,-2.261 0,-1.021 -0.365,-1.896 -1.094,-2.626 -0.729,-0.73 -1.715,-1.094 -2.953,-1.094 -0.693,0 -1.277,0.109 -1.787,0.328 -0.512,0.219 -0.949,0.511 -1.314,0.875 -0.363,0.365 -0.691,0.766 -0.947,1.204 -0.256,0.438 -0.438,0.875 -0.584,1.349 l -4.667,-1.238 z" /><path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff"
-       id="path427"
-       d="m 579.813,557.677 c -0.473,-0.474 -0.729,-1.058 -0.729,-1.75 0,-0.693 0.256,-1.276 0.729,-1.751 0.475,-0.474 1.059,-0.729 1.752,-0.729 0.691,0 1.275,0.256 1.75,0.729 0.475,0.475 0.729,1.058 0.729,1.751 0,0.692 -0.254,1.276 -0.729,1.75 -0.475,0.438 -1.059,0.693 -1.75,0.693 -0.693,0 -1.277,-0.256 -1.752,-0.693 z" /><path
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff"
-       id="path429"
-       d="m 599.286,532.076 c 1.824,0 3.465,0.364 4.924,1.058 1.459,0.692 2.699,1.641 3.684,2.845 0.984,1.203 1.75,2.589 2.297,4.193 0.547,1.604 0.803,3.319 0.803,5.143 0,1.824 -0.256,3.537 -0.803,5.142 -0.547,1.605 -1.312,2.99 -2.297,4.194 -0.984,1.203 -2.225,2.151 -3.684,2.845 -1.459,0.656 -3.1,1.021 -4.924,1.021 -1.822,0 -3.463,-0.364 -4.922,-1.021 -1.459,-0.693 -2.699,-1.642 -3.721,-2.845 -1.021,-1.204 -1.787,-2.626 -2.297,-4.23 -0.51,-1.604 -0.766,-3.318 -0.766,-5.143 0,-1.823 0.256,-3.537 0.766,-5.142 0.51,-1.605 1.275,-3.027 2.297,-4.23 1.022,-1.203 2.262,-2.151 3.721,-2.845 1.459,-0.692 3.1,-1.058 4.922,-1.058 l 0,0.073 z m 0,4.923 c -1.094,0 -2.041,0.219 -2.844,0.657 -0.803,0.438 -1.459,1.021 -1.969,1.75 -0.512,0.729 -0.912,1.604 -1.168,2.626 -0.254,1.021 -0.363,2.078 -0.363,3.209 0,1.131 0.145,2.188 0.4,3.209 0.256,1.021 0.656,1.896 1.166,2.662 0.512,0.767 1.168,1.35 1.971,1.787 0.803,0.437 1.75,0.656 2.844,0.656 1.094,0 2.043,-0.219 2.846,-0.656 0.801,-0.438 1.457,-1.021 1.969,-1.787 0.51,-0.766 0.912,-1.641 1.166,-2.662 0.256,-1.021 0.402,-2.115 0.402,-3.245 0,-1.131 -0.146,-2.225 -0.402,-3.246 -0.254,-1.021 -0.656,-1.896 -1.166,-2.626 -0.512,-0.729 -1.168,-1.312 -1.969,-1.75 -0.803,-0.438 -1.752,-0.656 -2.846,-0.656 l -0.037,0.072 z" /></g><path
+       d="m 542.927,603.421 c 3.252,-5.109 4.9,-11.218 4.9,-18.153 0,-21.831 -16.283,-31.774 -31.414,-31.774 -15.129,0 -31.414,9.943 -31.414,31.774 0,21.683 16.174,31.56 31.199,31.56 5.541,0 10.949,-1.321 15.637,-3.82 l 0.885,-0.472 1.725,3.244 14.828,0 0,-0.794 -6.68,-11.039 0.334,-0.526 z m -26.514,0.053 c -8.094,0 -16.805,-5.697 -16.805,-18.206 0,-12.415 8.711,-18.069 16.805,-18.069 8.094,0 16.807,5.654 16.807,18.069 0,12.508 -8.713,18.206 -16.807,18.206 z" /></g><path
      inkscape:connector-curvature="0"
      style="fill:#ffffff"
      id="path431"
@@ -166,4 +150,15 @@
      inkscape:connector-curvature="0"
      style="fill:#ffffff"
      id="path493"
-     d="M 28.084,368.98 0,429.872 l 0,1.124 14.16,0 4.202,-8.945 25.208,0 4.195,8.945 14.16,0 0,-1.124 -28.172,-60.892 -5.669,0 z m -5.438,41.259 8.215,-19.134 8.424,19.134 -16.639,0 z" /></svg>
\ No newline at end of file
+     d="M 28.084,368.98 0,429.872 l 0,1.124 14.16,0 4.202,-8.945 25.208,0 4.195,8.945 14.16,0 0,-1.124 -28.172,-60.892 -5.669,0 z m -5.438,41.259 8.215,-19.134 8.424,19.134 -16.639,0 z" /><g
+     style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:expanded;font-size:45px;line-height:125%;font-family:'Novecento sans wide';-inkscape-font-specification:'Novecento sans wide, Semi-Bold Expanded';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="text3371"><path
+       d="m 318.27705,360.24104 c 2.295,-0.315 4.95,-2.115 4.95,-5.895 0,-3.96 -2.88,-6.57 -8.775,-6.57 -4.635,0 -8.685,1.62 -9.675,6.57 l 4.275,1.17 c 0.27,-1.98 1.395,-3.87 4.95,-3.87 2.925,0 4.635,1.305 4.635,3.51 0,2.295 -1.755,3.555 -4.77,3.555 l -2.475,0 0,3.42 2.655,0 c 2.925,0 4.86,1.215 4.86,3.69 0,2.295 -1.62,4.095 -4.86,4.095 -3.06,0 -5.04,-1.53 -5.625,-4.275 l -4.14,1.17 c 0.9,4.59 4.68,7.155 9.9,7.155 5.715,0 9.315,-3.015 9.315,-7.515 0,-3.69 -2.385,-5.76 -5.22,-6.03 l 0,-0.18 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:expanded;font-size:45px;line-height:125%;font-family:'Novecento sans wide';-inkscape-font-specification:'Novecento sans wide, Semi-Bold Expanded';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff"
+       id="path3376" /><path
+       d="m 330.56416,373.87604 c 1.89,0 2.88,-1.17 2.88,-2.7 0,-1.485 -0.99,-2.655 -2.88,-2.655 -1.89,0 -2.925,1.17 -2.925,2.655 0,1.485 0.99,2.7 2.925,2.7 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:expanded;font-size:45px;line-height:125%;font-family:'Novecento sans wide';-inkscape-font-specification:'Novecento sans wide, Semi-Bold Expanded';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff"
+       id="path3378" /><path
+       d="m 346.79791,347.77604 c -6.39,0 -10.26,4.455 -10.26,13.095 0,8.64 3.87,13.095 10.26,13.095 6.345,0 10.215,-4.455 10.215,-13.095 0,-8.64 -3.87,-13.095 -10.215,-13.095 z m 0,4.32 c 3.78,0 5.49,2.79 5.49,8.775 0,5.94 -1.71,8.775 -5.49,8.775 -3.825,0 -5.535,-2.835 -5.535,-8.775 0,-5.985 1.71,-8.775 5.535,-8.775 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:expanded;font-size:45px;line-height:125%;font-family:'Novecento sans wide';-inkscape-font-specification:'Novecento sans wide, Semi-Bold Expanded';text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff"
+       id="path3380" /></g></svg>
\ No newline at end of file