Picard updates (#4023)

* updated default browser patch
* custom icon
This commit is contained in:
Philipp Wolfer
2019-07-19 16:44:08 +02:00
committed by Sergei Reznikov
parent 18d5066070
commit 416f176447
3 changed files with 86 additions and 60 deletions

View File

@@ -37,17 +37,18 @@ index 117391fc..839a2f20 100644
--
2.21.0
From 75d7a1fea21f169da24e9b1003d6b9f928dcdb71 Mon Sep 17 00:00:00 2001
From 43065c9cfaed92f68d8c80aed220016e5815d260 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <ph.wolfer@gmail.com>
Date: Tue, 29 Jan 2019 11:35:33 +0000
Subject: [PATCH 2/2] Haiku: Use WebPositive as default browser
Subject: [PATCH 2/3] Haiku: open URLs with default browser
Try opening with "open", fall back to WebPositive
---
picard/util/webbrowser2.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
picard/util/webbrowser2.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/picard/util/webbrowser2.py b/picard/util/webbrowser2.py
index 7d003ccf..bacd8a13 100644
index 7d003ccf..3c1c9c2a 100644
--- a/picard/util/webbrowser2.py
+++ b/picard/util/webbrowser2.py
@@ -17,7 +17,7 @@
@@ -59,13 +60,15 @@ index 7d003ccf..bacd8a13 100644
import webbrowser
from PyQt5 import QtWidgets
@@ -32,6 +32,11 @@ in PyQt and also adds a utility function for opening Picard URLS.
@@ -32,6 +32,13 @@ in PyQt and also adds a utility function for opening Picard URLS.
"""
+if platform == "haiku1":
+ haiku_default = webbrowser.GenericBrowser("open")
+ webbrowser.register("haiku-default", None, haiku_default, True)
+ webpositive = webbrowser.GenericBrowser("WebPositive")
+ webbrowser.register("webpositive", None, webpositive, True)
+ webbrowser.register("webpositive", None, webpositive)
+
+
def open(url):