Migrate from GTK3 to GTK4

README.md

@@ -115,7 +115,7 @@ commands). Older versions are not supported.
 ###### Ubuntu (tested in 19.04 and 18.04)
 
 ```bash
-sudo apt install gettext intltool python3-gi python3-cairo python3-gi-cairo python3-distutils python3-dbus libglib2.0-dev libglib2.0-bin gir1.2-gtk-3.0 gtk-update-icon-cache
+sudo apt install gettext intltool python3-gi python3-cairo python3-gi-cairo python3-distutils python3-dbus libglib2.0-dev libglib2.0-bin gir1.2-gtk-4.0 gtk-update-icon-cache
 # and for documentation
 sudo apt install itstool yelp
 ```
@@ -307,7 +307,7 @@ for some time now. Hopefully the effort will be renewed in the future.
 In the meantime, this sub-project aims to pursue development of the "legacy" Hamster
 code base, maintaining database compatibility with the widely installed
 [v1.04](https://github.com/projecthamster/hamster/releases/tag/hamster-time-tracker-1.04),
-but migrating to `Gtk3` and `python3`.  
+but migrating to `Gtk4` and `python3`.  
 This will allow package maintainers to provide
 new packages for recent releases of mainstream Linux distributions for which the old
 1.04-based versions are no longer provided.

data/org.gnome.Hamster.flatpak.yml

@@ -1,7 +1,7 @@
 ---
 app-id: org.gnome.Hamster
 runtime: org.gnome.Platform
-runtime-version: '45'
+runtime-version: '47'
 sdk: org.gnome.Sdk
 command: hamster
 modules:

po/wscript

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # encoding: utf-8
 # Thomas Nagy, 2006-2009 (ita)
 

src/hamster-cli.py

@@ -27,8 +27,8 @@
 import re
 
 import gi
-gi.require_version('Gdk', '3.0')  # noqa: E402
-gi.require_version('Gtk', '3.0')  # noqa: E402
+gi.require_version('Gdk', '4.0')  # noqa: E402
+gi.require_version('Gtk', '4.0')  # noqa: E402
 from gi.repository import GLib as glib
 from gi.repository import Gdk as gdk
 from gi.repository import Gtk as gtk
@@ -170,9 +170,7 @@ def _open_window(self, name, data=None):
                 logger.debug("new About")
             controller = self.about_controller
         elif name in ("add", "clone", "edit"):
-            if self.fact_controller:
-                # Something is already going on, with other arguments, present it.
-                # Or should we just discard the forgotten one ?
+            if self.fact_controller and self.fact_controller.window:
                 logger.warning("Fact controller already active. Please close first.")
             else:
                 fact_id = data.get_int32() if data else None
@@ -200,8 +198,6 @@ def _open_window(self, name, data=None):
         # https://specifications.freedesktop.org/wm-spec/wm-spec-1.3.html
         if name != "overview" and self.overview_controller:
             window.set_transient_for(self.overview_controller.window)
-            # so the dialog appears on top of the transient-for:
-            window.set_type_hint(gdk.WindowTypeHint.DIALOG)
         else:
             # toplevel
             window.set_transient_for(None)
@@ -455,7 +451,7 @@ def version(self):
     logger.debug("app instanciated")
 
     import signal
-    signal.signal(signal.SIGINT, signal.SIG_DFL) # gtk3 screws up ctrl+c
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
 
     parser = argparse.ArgumentParser(
         description="Time tracking utility",