Skip to content

Partial updates for ubuntu 20.04 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
milesfrain wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Partial updates for ubuntu 20.04 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion ojo/ojo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions ojo/webview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from gi.repository import WebKit, GObject
from gi.repository import WebKit2, GObject

import logging
from ojo import util
Expand Down Expand Up @@ -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)
Expand All @@ -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()) + "/"
)
Expand Down