change km/h to mph

6 files changed, 103 insertions, 86 deletions

diff --git a/app/Speed.qml b/app/Speed.qml
index bb99f40..2deabc6 100644
--- a/app/Speed.qml
+++ b/app/Speed.qml
@@ -86,6 +86,6 @@ Item {
         fillMode: Image.PreserveAspectFit
         asynchronous: true
         smooth: true
-        source: "images/meters/speed_kmh.svg"
+        source: "images/meters/speed_mph.svg"
     }
 }
diff --git a/app/images/images.qrc b/app/images/images.qrc
index b1bee21..2c6c904 100644
--- a/app/images/images.qrc
+++ b/app/images/images.qrc
@@ -21,6 +21,7 @@
         <file>meters/tacho_frame.svg</file>
         <file>meters/speed_1.svg</file>
         <file>meters/speed_kmh.svg</file>
+        <file>meters/speed_mph.svg</file>
         <file>homescreen/homebg_bottom.svg</file>
         <file>camera/camera_bg.svg</file>
         <file>camera/camerainfo_bg.svg</file>
diff --git a/app/images/meters/speed_kmh.svg b/app/images/meters/speed_kmh.svg
index daa2916..2602845 100644
--- a/app/images/meters/speed_kmh.svg
+++ b/app/images/meters/speed_kmh.svg
@@ -8,10 +8,34 @@
    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"
    version="1.1"
    width="480"
    height="480"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="speed_kmh.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="1.3906433"
+     inkscape:cx="261.23193"
+     inkscape:cy="159.31719"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -25,77 +49,15 @@
   </metadata>
   <defs
      id="defs6" />
-  <image
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAeAAAAHgCAYAAAB91L6VAAAABHNCSVQICAgIfAhkiAAADktJREFU
-eJzt3W1sndVhB/C/r+1gm8WEvLBk8RYYpCNIVM1GG4oGFaCEAhkJpUgMRRAxscEmgYQqhPYVaUIC
-EQU+REhF8CGaorVoihwVpcpgYyNSaFEQL4M2kI7MEHCSmZjG9uJrP/vg+1zfGL/EvKVLfj/pyvbj
-4/Oca+ne/z3nOec8CQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMJ2m2gP4ijWf6gbA/wNNGXuttOT0DaemJK1JKrVHkhS1
-r5WMPf/mCceBL6AycxE4ozVlLHjnZCygWnP6BXEZvq3Hjh27ob+///KMhW0ZvK0Zf/5zMvb8gS9I
-AMP0mpO0joyM/G1RFJv6+/u/Xzt2OgVwS5KWQ4cOfbujo+OGoig6Mt7jbUnSUhTFpqIoNr3xxhvf
-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
-AAAAv6v+D7fnLbIo6K96AAAAAElFTkSuQmCC
-"
-     x="0"
-     y="0"
-     width="480"
-     height="480"
-     id="image10" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="195"
+     y="344.81076"
+     id="text4154"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       x="195"
+       y="344.81076"
+       id="tspan4158">km/h</tspan></text>
 </svg>
diff --git a/app/images/meters/speed_mph.svg b/app/images/meters/speed_mph.svg
new file mode 100644
index 0000000..0114aed
--- /dev/null
+++ b/app/images/meters/speed_mph.svg
@@ -0,0 +1,63 @@
+<?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"
+   version="1.1"
+   width="480"
+   height="480"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="speed_kmh.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="1.3906433"
+     inkscape:cx="261.23193"
+     inkscape:cy="159.31719"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata8">
+    <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="defs6" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     x="195"
+     y="344.81076"
+     id="text4154"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       x="195"
+       y="344.81076"
+       id="tspan4158">mph</tspan></text>
+</svg>
diff --git a/app/main.cpp b/app/main.cpp
index 87ea458..a4db84c 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -101,16 +101,7 @@ int main(int argc, char *argv[])
     hs->init(port, token.c_str());
     // Set the event handler for Event_TapShortcut which will activate the surface for windowmanager
     hs->set_event_handler(LibHomeScreen::Event_TapShortcut, [qwm, myname](json_object *object){
-        json_object *appnameJ = nullptr;
-        if(json_object_object_get_ex(object, "application_name", &appnameJ))
-        {
-            const char *appname = json_object_get_string(appnameJ);
-            if(QString::compare(myname, appname, Qt::CaseInsensitive) == 0)
-            {
-                qDebug("Surface %s got tapShortcut\n", appname);
-                qwm->activateSurface(myname, "split.main");
-            }
-        }
+        qwm->activateSurface(myname, "split.main");
     });
 #endif
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
diff --git a/app/main.qml b/app/main.qml
index 5172440..1c52928 100644
--- a/app/main.qml
+++ b/app/main.qml
@@ -36,7 +36,7 @@ ApplicationWindow {
     property string transmissionMode: 'MT'

     property bool isAutoMode: false

     property bool isSport: false

-    property string wshift: "N"

+    property string wshift: "D"

 

     WebSocket {

         id: websocket