Kaydet (Commit) 66da7c57 authored tarafından doko@ubuntu.com's avatar doko@ubuntu.com

- Issue #17536: Add to webbrowser's browser list: xdg-open, gvfs-open,

  www-browser, x-www-browser, chromium browsers, iceweasel, iceape.
üst f794b143
...@@ -304,6 +304,18 @@ class Galeon(UnixBrowser): ...@@ -304,6 +304,18 @@ class Galeon(UnixBrowser):
background = True background = True
class Chrome(UnixBrowser):
"Launcher class for Google Chrome browser."
remote_args = ['%action', '%s']
remote_action = ""
remote_action_newwin = "--new-window"
remote_action_newtab = ""
background = True
Chromium = Chrome
class Opera(UnixBrowser): class Opera(UnixBrowser):
"Launcher class for Opera browser." "Launcher class for Opera browser."
...@@ -441,6 +453,14 @@ class Grail(BaseBrowser): ...@@ -441,6 +453,14 @@ class Grail(BaseBrowser):
def register_X_browsers(): def register_X_browsers():
# use xdg-open if around
if _iscommand("xdg-open"):
register("xdg-open", None, BackgroundBrowser("xdg-open"))
# The default GNOME3 browser
if "GNOME_DESKTOP_SESSION_ID" in os.environ and _iscommand("gvfs-open"):
register("gvfs-open", None, BackgroundBrowser("gvfs-open"))
# The default GNOME browser # The default GNOME browser
if "GNOME_DESKTOP_SESSION_ID" in os.environ and _iscommand("gnome-open"): if "GNOME_DESKTOP_SESSION_ID" in os.environ and _iscommand("gnome-open"):
register("gnome-open", None, BackgroundBrowser("gnome-open")) register("gnome-open", None, BackgroundBrowser("gnome-open"))
...@@ -449,9 +469,13 @@ def register_X_browsers(): ...@@ -449,9 +469,13 @@ def register_X_browsers():
if "KDE_FULL_SESSION" in os.environ and _iscommand("kfmclient"): if "KDE_FULL_SESSION" in os.environ and _iscommand("kfmclient"):
register("kfmclient", Konqueror, Konqueror("kfmclient")) register("kfmclient", Konqueror, Konqueror("kfmclient"))
if _iscommand("x-www-browser"):
register("x-www-browser", None, BackgroundBrowser("x-www-browser"))
# The Mozilla/Netscape browsers # The Mozilla/Netscape browsers
for browser in ("mozilla-firefox", "firefox", for browser in ("mozilla-firefox", "firefox",
"mozilla-firebird", "firebird", "mozilla-firebird", "firebird",
"iceweasel", "iceape",
"seamonkey", "mozilla", "netscape"): "seamonkey", "mozilla", "netscape"):
if _iscommand(browser): if _iscommand(browser):
register(browser, None, Mozilla(browser)) register(browser, None, Mozilla(browser))
...@@ -471,6 +495,11 @@ def register_X_browsers(): ...@@ -471,6 +495,11 @@ def register_X_browsers():
if _iscommand("skipstone"): if _iscommand("skipstone"):
register("skipstone", None, BackgroundBrowser("skipstone")) register("skipstone", None, BackgroundBrowser("skipstone"))
# Google Chrome/Chromium browsers
for browser in ("google-chrome", "chrome", "chromium", "chromium-browser"):
if _iscommand(browser):
register(browser, None, Chrome(browser))
# Opera, quite popular # Opera, quite popular
if _iscommand("opera"): if _iscommand("opera"):
register("opera", None, Opera("opera")) register("opera", None, Opera("opera"))
...@@ -489,6 +518,8 @@ if os.environ.get("DISPLAY"): ...@@ -489,6 +518,8 @@ if os.environ.get("DISPLAY"):
# Also try console browsers # Also try console browsers
if os.environ.get("TERM"): if os.environ.get("TERM"):
if _iscommand("www-browser"):
register("www-browser", None, GenericBrowser("www-browser"))
# The Links/elinks browsers <http://artax.karlin.mff.cuni.cz/~mikulas/links/> # The Links/elinks browsers <http://artax.karlin.mff.cuni.cz/~mikulas/links/>
if _iscommand("links"): if _iscommand("links"):
register("links", None, GenericBrowser("links")) register("links", None, GenericBrowser("links"))
......
...@@ -25,6 +25,9 @@ Core and Builtins ...@@ -25,6 +25,9 @@ Core and Builtins
Library Library
------- -------
- Issue #17536: Add to webbrowser's browser list: xdg-open, gvfs-open,
www-browser, x-www-browser, chromium browsers, iceweasel, iceape.
- Issue #17656: Fix extraction of zip files with unicode member paths. - Issue #17656: Fix extraction of zip files with unicode member paths.
- Issue #13355: Raise ValueError on random.triangular call with invalid params. - Issue #13355: Raise ValueError on random.triangular call with invalid params.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment