[pitivi] utils: Fix opening directly a specific help section
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] utils: Fix opening directly a specific help section
- Date: Thu, 26 Sep 2019 19:45:45 +0000 (UTC)
commit 86c689f0bde4e3254d75d4a187323ed5384afa53
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Fri Sep 13 22:49:03 2019 +0200
utils: Fix opening directly a specific help section
pitivi/utils/misc.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/utils/misc.py b/pitivi/utils/misc.py
index e943a16c..d4940e2f 100644
--- a/pitivi/utils/misc.py
+++ b/pitivi/utils/misc.py
@@ -254,15 +254,21 @@ def show_user_manual(page=None):
for contextual help.
"""
def get_page_uri(uri, page):
- if page is not None:
- return uri + "#" + page
+ if page:
+ if uri.startswith("http://"):
+ return "%s/%s.html" % (uri, page)
+ if uri.startswith("ghelp://"):
+ return "%s/%s" % (uri, page)
+ if uri.startswith("help:"):
+ return "%s/%s" % (uri, page)
return uri
time_now = int(time.time())
uris = (APPMANUALURL_OFFLINE, APPMANUALURL_ONLINE)
for uri in uris:
+ page_uri = get_page_uri(uri, page)
try:
- Gtk.show_uri(None, get_page_uri(uri, page), time_now)
+ Gtk.show_uri(None, page_uri, time_now)
return
except Exception as e:
log.info("utils", "Failed loading URI %s: %s", uri, e)
@@ -271,10 +277,10 @@ def show_user_manual(page=None):
try:
# Last try calling yelp directly (used in flatpak while we do
# not have a portal to access system wild apps)
- subprocess.Popen(["yelp",
- get_page_uri(APPMANUALURL_OFFLINE, page)])
- except FileNotFoundError:
- log.warning("utils", "Failed loading URIs")
+ page_uri = get_page_uri(APPMANUALURL_OFFLINE, page)
+ subprocess.Popen(["yelp", page_uri])
+ except FileNotFoundError as e:
+ log.warning("utils", "Failed loading %s: %s", page_uri, e)
dialog = Gtk.MessageDialog(modal=True,
message_type=Gtk.MessageType.ERROR,
buttons=Gtk.ButtonsType.OK,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]