[gnome-clocks/bilelmoussaoui/redesign-timer: 9/9] Merge branch 'master' of gitlab.gnome.org:GNOME/gnome-clocks into bilelmoussaoui/redesign-timer



commit 8a0e6d4ab545791678478f206e743e99d7f54732
Merge: b767b28 f28f9ed
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Wed Feb 5 18:22:43 2020 +0100

    Merge branch 'master' of gitlab.gnome.org:GNOME/gnome-clocks into bilelmoussaoui/redesign-timer

 data/gtk/help-overlay.ui |  29 +++++-
 meson.build              |   2 +-
 po/es.po                 | 109 +++++++++++++-------
 po/hr.po                 | 261 +++++++++++++++++++++++++++++------------------
 po/id.po                 | 101 ++++++++++++------
 po/sk.po                 | 103 +++++++++++++------
 po/sv.po                 | 101 ++++++++++++------
 src/application.vala     |   2 +-
 src/window.vala          |   5 +
 9 files changed, 482 insertions(+), 231 deletions(-)
---
diff --cc src/window.vala
index 4a528e4,de99937..820e73f
--- a/src/window.vala
+++ b/src/window.vala
@@@ -106,11 -106,15 +106,16 @@@ public class Window : Gtk.ApplicationWi
              stack.visible_child = w;
          });
  
 -        timer.notify["state"].connect ((w) => {
 -            stack.child_set_property (timer, "needs-attention", timer.state == Timer.Face.State.RUNNING);
 +
 +        timer.notify["is-running"].connect ((w) => {
 +            stack.child_set_property (timer, "needs-attention", timer.is_running);
          });
  
+         // We need to set this manually, otherwise it fails in the devel version
+         var builder = new Gtk.Builder.from_resource ("/org/gnome/clocks/gtk/help-overlay.ui");
+         var dialog = (Gtk.ShortcutsWindow)builder.get_object ("help_overlay");
+         set_help_overlay (dialog);
+ 
          unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class (get_class ());
  
          // plain ctrl+page_up/down is easten by the scrolled window...


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]