diff --git a/debian/control b/debian/control index f93bc02..208c750 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,8 @@ Depends: ${misc:Depends}, gir1.2-gtk-3.0, gir1.2-glib-2.0, gir1.2-gdkpixbuf-2.0, - gir1.2-webkit-3.0 + gir1.2-webkit2-4.0 + gir1.2-gexiv2-0.10 Description: Ojo Image Viewer A fast and good-looking image viewer, nice as a preliminary stage in a photography workflow diff --git a/ojo/ojo.py b/ojo/ojo.py index a1752a1..77e0560 100644 --- a/ojo/ojo.py +++ b/ojo/ojo.py @@ -20,7 +20,7 @@ gi.require_version("Gtk", "3.0") gi.require_version("Gdk", "3.0") gi.require_version("GdkPixbuf", "2.0") -gi.require_version("WebKit", "3.0") +gi.require_version("WebKit2", "4.0") gi.require_version("GExiv2", "0.10") from gi.repository import Gdk, GdkPixbuf, GObject, Gtk # isort:skip # fmt: on diff --git a/ojo/webview.py b/ojo/webview.py index 88f49bd..e669210 100644 --- a/ojo/webview.py +++ b/ojo/webview.py @@ -1,4 +1,4 @@ -from gi.repository import WebKit, GObject +from gi.repository import WebKit2, GObject import logging from ojo import util @@ -47,9 +47,9 @@ def load(self, html_filename, on_load_fn=None, on_action_fn=None): with open(ojoconfig.get_data_file(html_filename)) as f: html = f.read() - self.web_view = WebKit.WebView() - self.web_view.set_transparent(True) - self.web_view.set_can_focus(True) + self.web_view = WebKit2.WebView() + self.web_view.set_transparent(True) # broken + self.web_view.set_can_focus(True) # broken def nav(wv, command): logging.debug("Received command: " + command) @@ -61,14 +61,14 @@ def nav(wv, command): argument = command[index + 1 :] on_action_fn(action, argument) - self.web_view.connect("status-bar-text-changed", nav) + self.web_view.connect("status-bar-text-changed", nav) # broken def _on_load(*args): self.is_loaded = True if on_load_fn: on_load_fn() - self.web_view.connect("document-load-finished", _on_load) + self.web_view.connect("document-load-finished", _on_load) # broken self.web_view.load_string( html, "text/html", "UTF-8", util.path2url(ojoconfig.get_data_path()) + "/" )