From: "Matteo F. Vescovi" <mfv@debian.org>
Date: Tue, 5 Oct 2021 23:08:38 +0200
Forwarded: not-needed
Subject: Use_systemwide_leaflet_js

---
 app/qtapp/rtkplot_qt/mapview.cpp    |  2 +-
 app/qtapp/rtkplot_qt/rtkplot_ll.htm |  6 +++---
 app/qtapp/rtkplot_qt/rtkplot_qt.qrc | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/qtapp/rtkplot_qt/mapview.cpp b/app/qtapp/rtkplot_qt/mapview.cpp
index fd77ce8..5afe500 100644
--- a/app/qtapp/rtkplot_qt/mapview.cpp
+++ b/app/qtapp/rtkplot_qt/mapview.cpp
@@ -178,7 +178,7 @@ void MapView::ShowMapLL(void)
     while (!ifp.atEnd()) {
         QString buff = ifp.readLine();
         out<<buff;
-        if (buff.contains("<script src=\"qrc:/leaflet/leaflet.js\"></script>")) out << "<script type=\"text/javascript\" src=\"https://getfirebug.com/firebug-lite.js\"></script>\n";
+        if (buff.contains("<script src=\"qrc://usr/share/javascript/leaflet/leaflet.js\"></script>")) out << "<script type=\"text/javascript\" src=\"https://getfirebug.com/firebug-lite.js\"></script>\n";
         if (!buff.contains("// start map tiles")) continue;
         for (i=0,j=1;i<6;i++) {
             if (plot->MapStrs[i][0]=="") continue;
diff --git a/app/qtapp/rtkplot_qt/rtkplot_ll.htm b/app/qtapp/rtkplot_qt/rtkplot_ll.htm
index f87b748..8c9eb91 100644
--- a/app/qtapp/rtkplot_qt/rtkplot_ll.htm
+++ b/app/qtapp/rtkplot_qt/rtkplot_ll.htm
@@ -8,8 +8,8 @@
 <title>RTKPLOT_MAP</title>
 
 <meta charset=UTF-8">
-<link rel="stylesheet" href="qrc:/leaflet/leaflet.css" />
-<script src="qrc:/leaflet/leaflet.js"></script>
+<link rel="stylesheet" href="qrc://usr/share/javascript/leaflet/leaflet.css" />
+<script src="qrc://usr/share/javscript/leaflet/leaflet.js"></script>
 
 <script>
 
@@ -19,7 +19,7 @@ var titles = [];
 
 var LeafIcon = L.Icon.extend({
     options: {
-        shadowUrl: 'qrc:/leaflet/images/marker-shadow.png',
+        shadowUrl: 'qrc://usr/share/javascript/leaflet/images/marker-shadow.png',
         shadowSize: [41, 41],
         shadowAnchor: [12, 41],
         iconSize: [25, 41],
diff --git a/app/qtapp/rtkplot_qt/rtkplot_qt.qrc b/app/qtapp/rtkplot_qt/rtkplot_qt.qrc
index b82b225..57b676d 100644
--- a/app/qtapp/rtkplot_qt/rtkplot_qt.qrc
+++ b/app/qtapp/rtkplot_qt/rtkplot_qt.qrc
@@ -111,13 +111,13 @@
         <file alias="image/marker_yellow.png">image/marker_yellow.png</file>
         <file alias="image/marker_yellowx2.png">image/marker_yellowx2.png</file>
     </qresource>
-    <qresource prefix="/leaflet">
-        <file alias="leaflet.js">leaflet/leaflet.js</file>
-        <file alias="leaflet.css">leaflet/leaflet.css</file>
-        <file alias="images/layers-2x.png">leaflet/images/layers-2x.png</file>
-        <file alias="images/layers.png">leaflet/images/layers.png</file>
-        <file alias="images/marker-icon-2x.png">leaflet/images/marker-icon-2x.png</file>
-        <file alias="images/marker-icon.png">leaflet/images/marker-icon.png</file>
-        <file alias="images/marker-shadow.png">leaflet/images/marker-shadow.png</file>
+    <qresource prefix="/usr/share/javascript/leaflet">
+        <file alias="leaflet.js">/usr/share/javascript/leaflet/leaflet.js</file>
+        <file alias="leaflet.css">/usr/share/javascript/leaflet/leaflet.css</file>
+        <file alias="images/layers-2x.png">/usr/share/javascript/leaflet/images/layers-2x.png</file>
+        <file alias="images/layers.png">/usr/share/javascript/leaflet/images/layers.png</file>
+        <file alias="images/marker-icon-2x.png">/usr/share/javascript/leaflet/images/marker-icon-2x.png</file>
+        <file alias="images/marker-icon.png">/usr/share/javascript/leaflet/images/marker-icon.png</file>
+        <file alias="images/marker-shadow.png">/usr/share/javascript/leaflet/images/marker-shadow.png</file>
     </qresource>
 </RCC>