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
@@ -200,8 +200,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 +453,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",

src/hamster-service.py

@@ -154,7 +154,7 @@ def AddFact(self, fact_str, start_time, end_time, temporary):
         Returns:
             fact id (int), 0 means failure.
 
-        Note: see datetime.utcfromtimestamp documentation
+        Note: see datetime.fromtimestamp documentation
               for the precise meaning of timestamps.
         """
         fact = Fact.parse(fact_str)
@@ -166,12 +166,12 @@ def AddFact(self, fact_str, start_time, end_time, temporary):
         if start_time == -1:
             fact.start_time = None
         elif start_time != 0:
-            fact.start_time = dt.datetime.utcfromtimestamp(start_time)
+            fact.start_time = dt.datetime.fromtimestamp(start_time, tz=dt.timezone.utc).replace(tzinfo=None)
 
         if end_time == -1:
             fact.end_time = None
         elif end_time != 0:
-            fact.end_time = dt.datetime.utcfromtimestamp(end_time)
+            fact.end_time = dt.datetime.fromtimestamp(end_time, tz=dt.timezone.utc).replace(tzinfo=None)
 
         return self.add_fact(fact)
 
@@ -249,11 +249,11 @@ def GetFactJSON(self, fact_id):
     def UpdateFact(self, fact_id, fact, start_time, end_time, temporary):
         start_time = start_time or None
         if start_time:
-            start_time = dt.datetime.utcfromtimestamp(start_time)
+            start_time = dt.datetime.fromtimestamp(start_time, tz=dt.timezone.utc).replace(tzinfo=None)
 
         end_time = end_time or None
         if end_time:
-            end_time = dt.datetime.utcfromtimestamp(end_time)
+            end_time = dt.datetime.fromtimestamp(end_time, tz=dt.timezone.utc).replace(tzinfo=None)
         return self.update_fact(fact_id, fact, start_time, end_time, temporary)
 
 
@@ -278,7 +278,7 @@ def StopTracking(self, end_time):
         """Stops tracking the current activity"""
         end_time = end_time or None
         if end_time:
-            end_time = dt.datetime.utcfromtimestamp(end_time)
+            end_time = dt.datetime.fromtimestamp(end_time, tz=dt.timezone.utc).replace(tzinfo=None)
         return self.stop_tracking(end_time)
 
 
@@ -310,11 +310,11 @@ def GetFacts(self, start_date, end_date, search_terms):
         #TODO: Assert start > end ?
         start = dt.date.today()
         if start_date:
-            start = dt.datetime.utcfromtimestamp(start_date).date()
+            start = dt.datetime.fromtimestamp(start_date, tz=dt.timezone.utc).date()
 
         end = None
         if end_date:
-            end = dt.datetime.utcfromtimestamp(end_date).date()
+            end = dt.datetime.fromtimestamp(end_date, tz=dt.timezone.utc).date()
 
         return [to_dbus_fact(fact) for fact in self.get_facts(start, end, search_terms)]
 

src/hamster/__init__.py

@@ -1,5 +1,5 @@
 import gi
-gi.require_version('Gtk', '3.0')  # noqa: E402
+gi.require_version('Gtk', '4.0')  # noqa: E402
 gi.require_version('PangoCairo', '1.0')  # noqa: E402
 # for some reason performance is improved by importing Gtk early
 from gi.repository import Gtk as gtk