From 9594610f33b13270df2d2598068c00bc3f822c25 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 2 Oct 2019 18:45:44 +0200 Subject: [PATCH] GUI: fix F1, starting the manual with a URL fragment did not work any more because of the change of generally using %U (manual needs %u) --- src/qtgui/rclm_view.cpp | 2 +- src/sampleconf/mimeview | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qtgui/rclm_view.cpp b/src/qtgui/rclm_view.cpp index e7b38c8e..5be8aadb 100644 --- a/src/qtgui/rclm_view.cpp +++ b/src/qtgui/rclm_view.cpp @@ -506,6 +506,6 @@ void RclMain::startManual(const string& index) doc.url = path_pathtofileurl(usermanual); } doc.mimetype = "text/html"; + doc.addmeta(Rcl::Doc::keyapptg, "rclman"); startNativeViewer(doc); } - diff --git a/src/sampleconf/mimeview b/src/sampleconf/mimeview index 9f4f4b65..3146d773 100644 --- a/src/sampleconf/mimeview +++ b/src/sampleconf/mimeview @@ -20,7 +20,7 @@ # the default xallexcepts list xallexcepts = application/pdf application/postscript application/x-dvi \ - text/html|gnuinfo text/html|chm text/html|epub \ + text/html|gnuinfo text/html|chm text/html|epub text/html|rclman \ application/x-fsdirectory|parentopen inode/directory|parentopen @@ -28,6 +28,9 @@ xallexcepts = application/pdf application/postscript application/x-dvi \ # Pseudo entry used if the 'use desktop' preference is set in the GUI. # Note that we use %U to url-encode the parameter application/x-all = xdg-open %U +# But do use the uncoded url for help (F1) because the fragment in there must +# actually be processed. +text/html|rclman = xdg-open %u application/epub+zip = ebook-viewer %f # Open the parent epub document for epub parts instead of opening them as