Merge branch 'main' into autostart

Author: dar5hak

com.github.elfenware.badger.yml

@@ -11,8 +11,21 @@ finish-args:
   - '--device=dri'
   - '--socket=fallback-x11'
   - '--socket=wayland'
+  # Allow Badger to send reminders
   - '--socket=session-bus'
 
+cleanup:
+  -  '/include'
+  -  '/lib/pkgconfig'
+  -  '/man'
+  -  '/share/doc'
+  -  '/share/gtk-doc'
+  -  '/share/man'
+  -  '/share/pkgconfig'
+  -  '/share/installed-tests'
+  -  '*.la'
+  -  '*.a'
+
 modules:
   - name: badger
     buildsystem: meson

data/com.github.elfenware.badger.gschema.xml

@@ -77,16 +77,6 @@
     path="/com/github/elfenware/badger/state/"
     id="com.github.elfenware.badger.state"
     gettext-domain="com.github.elfenware.badger">
-    <key name="window-width" type="i">
-      <default>180</default>
-      <summary>The saved width of the window.</summary>
-      <description>The saved width of the window.</description>
-    </key>
-    <key name="window-height" type="i">
-      <default>200</default>
-      <summary>The saved height of the window.</summary>
-      <description>The saved height of the window.</description>
-    </key>
     <key name="first-run" type="b">
       <default>true</default>
       <summary>Whether this is the first time that Badger has opened</summary>

po/de.po

@@ -111,7 +111,7 @@ msgstr "Atmen:"
 #: src/MainWindow.vala:43
 #: src/MainWindow.vala:44
 msgid "Badger"
-msgstr "Dachs"
+msgstr "Badger"
 
 #: src/MainGrid.vala:48
 msgid "Reminders"

po/extra/de.po

@@ -15,7 +15,7 @@ msgstr ""
 #: data/com.github.elfenware.badger.desktop.in:4
 #: data/com.github.elfenware.badger.metainfo.xml.in:7
 msgid "Badger"
-msgstr "Dachs"
+msgstr "Badger"
 
 #: data/com.github.elfenware.badger.desktop.in:5
 msgid "Ergonomic Reminder"
@@ -225,93 +225,3 @@ msgstr "Erste Veröffentlichung 🎉️"
 msgid "Elfenware"
 msgstr "Elfenware"
 
-#~ msgid "Blink your eyes"
-#~ msgstr "Blinzeln Sie mit den Augen"
-
-#~ msgid "Look away from the screen and slowly blink your eyes for 10 seconds."
-#~ msgstr "Schauen Sie vom Bildschirm weg und blinzeln Sie langsam 10 Sekunden lang mit den Augen."
-
-#~ msgid "Eyes:"
-#~ msgstr "Die Augen:"
-
-#~ msgid "Stretch your fingers"
-#~ msgstr "Strecken Sie Ihre Finger"
-
-#~ msgid "Spread out your palm wide, then close it into a fist. Repeat 5 times."
-#~ msgstr "Breiten Sie Ihre Handfläche weit aus und schließen Sie sie dann zu einer Faust. Wiederholen Sie dies 5 Mal."
-
-#~ msgid "Fingers:"
-#~ msgstr "Die Finger:"
-
-#~ msgid "Stretch your arms"
-#~ msgstr "Strecken Sie Ihre Arme"
-
-#~ msgid "Stretch your arms, and twist your wrists for 10 seconds."
-#~ msgstr "Strecken Sie die Arme und verdrehen Sie die Handgelenke für 10 Sekunden."
-
-#~ msgid "Arms:"
-#~ msgstr "Die Arme:"
-
-#~ msgid "Stretch your legs"
-#~ msgstr "Die Beine vertreten"
-
-#~ msgid "Stand up, twist each ankle, and bend each knee."
-#~ msgstr "Stehen Sie auf, drehen Sie jedes Fußgelenk und beugen Sie jedes Knie."
-
-#~ msgid "Legs:"
-#~ msgstr "Die Beine:"
-
-#~ msgid "Turn your neck"
-#~ msgstr "Den Hals umdrehen"
-
-#~ msgid "Turn your head in all directions. Repeat 3 times."
-#~ msgstr "Drehen Sie den Kopf in alle Richtungen. Wiederholen Sie dies 3 Mal."
-
-#~ msgid "Neck:"
-#~ msgstr "Hals:"
-
-#~ msgid "Hydrate yourself"
-#~ msgstr "Hydratisieren Sie sich"
-
-#~ msgid "Drink a glass of water."
-#~ msgstr "Trinken Sie ein Glas Wasser."
-
-#~ msgid "Water:"
-#~ msgstr "Wasser:"
-
-#~ msgid "Watch your posture"
-#~ msgstr "Achten Sie auf Ihre Körperhaltung"
-
-#~ msgid "Make sure your back is straight."
-#~ msgstr "Achten Sie darauf, dass Ihr Rücken gerade ist."
-
-#~ msgid "Posture:"
-#~ msgstr "Körperhaltung:"
-
-#~ msgid "Focus on your breath"
-#~ msgstr "Konzentrieren Sie sich auf Ihren Atem"
-
-#~ msgid "Inhale and exhale deeply, thrice."
-#~ msgstr "Atme dreimal tief ein und aus."
-
-#~ msgid "Breath:"
-#~ msgstr "Atmen:"
-
-#~ msgid "Reminders"
-#~ msgstr "Mahnungen"
-
-#~ msgid "Decide how often Badger should remind you to relax these:"
-#~ msgstr "Entscheiden Sie, wie oft Badger Sie daran erinnern soll, diese zu entspannen:"
-
-#, c-format
-#~ msgid "%.0f min"
-#~ msgstr "%.0f min"
-
-#~ msgid "1 min"
-#~ msgstr "1 Minute"
-
-#~ msgid "30 min"
-#~ msgstr "30 min"
-
-#~ msgid "1 hour"
-#~ msgstr "1 Stunde"

src/MainGrid.vala

@@ -20,6 +20,7 @@
 
 public class Badger.MainGrid : Gtk.Box {
     delegate void SetInterval (uint interval);
+    public Gtk.Revealer revealer;
 
     public MainGrid (Reminder[] reminders) {
         var settings = new GLib.Settings ("com.github.elfenware.badger.timers");
@@ -41,6 +42,7 @@ public class Badger.MainGrid : Gtk.Box {
                     halign = Gtk.Align.END,
                     hexpand = true,
                     valign = Gtk.Align.CENTER,
+                    margin_bottom = 18
         };
         settings.bind ("all", global_switch, "active", SettingsBindFlags.DEFAULT);
         var heading = new Granite.HeaderLabel (_ ("Reminders")) {
@@ -52,23 +54,28 @@ public class Badger.MainGrid : Gtk.Box {
         global_box.append (global_switch);
         append (global_box);
 
+        // This is everything below the switch.
+        var scale_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+        scale_box.vexpand = true;
+
+
 
         /************************************************/
         /*               Label to explain               */
         /************************************************/
 
         var subheading = new Gtk.Label (_ ("Decide how often Badger should remind you to relax these:")) {
             halign = Gtk.Align.START,
-            margin_top = 18,
-            margin_bottom = 6
+            margin_top = 12,
+            margin_bottom = 0
         };
         subheading.add_css_class (Granite.STYLE_CLASS_H4_LABEL);
         subheading.add_css_class ("title-4");
 
-        append (subheading);
+        scale_box.append (subheading);
 
         var marks = new Marks ();
-        append (marks);
+        scale_box.append (marks);
 
         HashTable<string, Gtk.Scale> scales = new HashTable<string, Gtk.Scale> (str_hash, str_equal);
 
@@ -97,9 +104,6 @@ public class Badger.MainGrid : Gtk.Box {
         /*               All the scales                 */
         /************************************************/
 
-        var scale_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        scale_box.vexpand = true;
-
         for (int index = 0; index < reminders.length; index++) {
             Reminder reminder = reminders[index];
 
@@ -161,9 +165,6 @@ public class Badger.MainGrid : Gtk.Box {
 
         }
 
-        append (scale_box);
-
-
         /********************************************/
         /*               DnD Label                  */
         /********************************************/
@@ -174,6 +175,16 @@ public class Badger.MainGrid : Gtk.Box {
             margin_bottom = 6
         };
         hey.add_css_class ("accent");
-        append (hey);
+        scale_box.append (hey);
+
+        /**************************************************/
+        /*               Scales revealer                  */
+        /**************************************************/
+
+        // If the "all" flag is false, the switch is off, hide the scales 
+        this.revealer = new Gtk.Revealer ();
+        revealer.set_transition_type (Gtk.RevealerTransitionType.SLIDE_DOWN);
+        revealer.set_child (scale_box);
+        append (revealer);
     }
 }

src/MainWindow.vala

@@ -32,16 +32,16 @@ public class Badger.MainWindow : Gtk.Window {
     }
 
     construct {
-            Intl.setlocale ();
-        settings = new GLib.Settings ("com.github.elfenware.badger.state");
+        Intl.setlocale ();
+        settings = new GLib.Settings ("com.github.elfenware.badger.timers");
+
+        // We cannot resize window if it is allowed to change
+        set_size_request (12, 12);
+        set_resizable (false);
 
-        set_default_size (
-            settings.get_int ("window-width"),
-            settings.get_int ("window-height")
-        );
 
-        set_title (_("Badger"));
-        Gtk.Label title_widget = new Gtk.Label (_("Badger"));
+        set_title ("Badger");
+        Gtk.Label title_widget = new Gtk.Label (this.get_title ());
         title_widget.add_css_class (Granite.STYLE_CLASS_TITLE_LABEL);
 
         this.headerbar = new Gtk.HeaderBar ();
@@ -59,22 +59,31 @@ public class Badger.MainWindow : Gtk.Window {
 
         set_child (handle);
 
-        // save state
+        // Avoid showing the window without content despite toggle off.
+        main.revealer.reveal_child = settings.get_boolean ("all");
+
+        // Resize window accordingly to state of global switch
+        settings.changed["all"].connect ( on_toggle_changed);
+
+        // Avoid a bug whence reopened windows cannot be closed
         close_request.connect (e => {
             return before_destroy ();
         });
     }
 
+    private void on_toggle_changed () {
+        debug ("\nToggle changed!");
+        main.revealer.reveal_child = settings.get_boolean ("all");
 
-    // save state
-    private bool before_destroy () {
-        int width, height;
-
-        get_default_size (out width, out height);
-
-        settings.set_int ("window-width", width);
-        settings.set_int ("window-height", height);
+        if (!settings.get_boolean ("all")) {
+            debug ("\nToggle is off! Resizing window");
+            set_size_request (12, 12);
+            queue_resize ();
+        }
+    }
 
+    // Avoid a bug whence reopened windows cannot be closed
+    private bool before_destroy () {
         hide ();
         return true;
     }