Merge pull request #470 from bgamari/gsettings

Port to GSettings

README.md

@@ -53,7 +53,7 @@ pgrep -af hamster
 ###### Ubuntu (tested in 19.04 and 18.04)
 
 ```bash
-sudo apt install gettext intltool gconf2 gir1.2-gconf-2.0 python3-gi-cairo python3-distutils python3-dbus python3-xdg
+sudo apt install gettext intltool python3-gi-cairo python3-distutils python3-dbus python3-xdg
 # and for documentation
 sudo apt install gnome-doc-utils yelp
 ```
@@ -70,7 +70,7 @@ sudo zypper install gnome-doc-utils xml2po yelp
 
 *RPM-based instructions below should be updated for python3 (issue [#369](https://github.com/projecthamster/hamster/issues/369)).*
 
-`yum install gettext intltool gnome-python2-gconf dbus-python`
+`yum install gettext intltool dbus-python`
 
 If the hamster help pages are not accessible ("unable to open `help:hamster-time-tracker`"),
 then a [Mallard](https://en.wikipedia.org/wiki/Mallard_(documentation))-capable help reader is required,

data/hamster.desktop.in.in

@@ -2,7 +2,7 @@
 Version=1.0
 Type=Application
 Terminal=false
-_Name=Hamster Time Tracker
+_Name=Hamster
 _Comment=Your personal time keeping tool
 Icon=hamster
 Exec=@BINDIR@/hamster

data/hamster.metainfo.xml

@@ -3,7 +3,7 @@
   <id>hamster</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+ and CC-BY-SA-3.0</project_license>
-  <name>Hamster Time Tracker</name>
+  <name>Hamster</name>
   <summary>Your personal time keeping tool</summary>
 
   <description>
@@ -39,6 +39,7 @@
       <image>https://github.com/projecthamster/hamster/blob/master/data/screenshots/overview2.png</image>
     </screenshot>
   </screenshots>
+  ​<translation type="gettext">hamster</translation>
   <url type="homepage">https://github.com/projecthamster/hamster/wiki</url>
   <provides>
     <binary>hamster</binary>

data/org.gnome.hamster.gschema.xml

@@ -0,0 +1,22 @@
+<schemalist>
+    <schema path="/org/gnome/hamster/" id="org.gnome.Hamster" gettext-domain="hamster">
+        <key type="s" name="last-report-folder">
+            <default>""</default>
+            <summary>The folder the last report was saved to</summary>
+            <description>
+                The folder the last report was saved to
+            </description>
+        </key>
+
+        <key type="u" name="day-start-minutes">
+            <default>330</default>
+            <summary>At what time does the day start (defaults to 5:30AM)</summary>
+            <description>
+                The hamster day of an activity is the civil date of start time,
+                provided start time is after day-start.
+                On the contrary, if start time is earlier than day-start,
+                then the activity belongs to the previous hamster day.
+            </description>
+        </key>
+    </schema>
+</schemalist>

data/wscript_build

@@ -25,14 +25,6 @@ for filename in ["hamster.desktop"]:
 
 bld.add_group()
 
-# process .in files with intl_tool
-bld(features = 'intltool_in',
-    source   = 'hamster.schemas.in',
-    target = 'hamster.schemas',
-    install_path = bld.env.schemas_destination,
-    podir    = '../po',
-    flags    = ['-s', '-u'])
-
 bld(features = 'intltool_in',
     source   = 'hamster.desktop.in',
     install_path = '${DATADIR}/applications',

po/POTFILES.in

@@ -3,7 +3,7 @@
 [type: gettext/glade]data/date_range.ui
 [type: gettext/glade]data/edit_activity.ui
 data/hamster.desktop.in.in
-data/hamster.schemas.in
+data/org.gnome.hamster.gschema.xml
 [type: gettext/glade]data/preferences.ui
 [type: gettext/python]src/hamster-cli
 src/hamster/about.py

src/hamster/about.py

@@ -28,8 +28,7 @@ def __init__(self, parent = None):
         about = gtk.AboutDialog()
         self.window = about
         infos = {
-            "program-name" : _("Hamster Time Tracker"),
-            "name" : _("Time Tracker"), #this should be deprecated in gtk 2.10
+            "program-name" : "Hamster",
             "version" : runtime.version,
             "comments" : _("Project Hamster — track your time"),
             "copyright" : _("Copyright © 2007–2010 Toms Bauģis and others"),