[gnome-clocks/bilelmoussaoui/redesign-timer: 4/4] Rebase



commit 8bae7ea10aeeaba2c7137e2bd09266f4ae9103fb
Merge: 9d19145 4c4bcde
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Tue Jan 28 18:02:22 2020 +0100

    Rebase

 .gitlab-ci.yml           |  10 +
 po/LINGUAS               |   1 +
 po/ms.po                 | 463 +++++++++++++++++++++++++++++++++++++++++++++++
 src/alarm.vala           |   4 +-
 src/application.vala     |  24 +--
 src/geocoding.vala       |   8 +-
 src/headerbar.vala       |   4 +-
 src/search-provider.vala |  14 +-
 src/stopwatch.vala       |   6 +-
 src/timer.vala           |   4 +-
 src/utils.vala           |  32 ++--
 src/window.vala          |  26 +--
 src/world.vala           |   2 +-
 13 files changed, 536 insertions(+), 62 deletions(-)
---
diff --cc src/timer.vala
index 7875839,566eca6..c477c1c
--- a/src/timer.vala
+++ b/src/timer.vala
@@@ -323,19 -250,24 +323,19 @@@ public class Row : Gtk.ListBoxRow 
      }
  
      private void start () {
 -        countdown_frame.get_style_context ().remove_class ("clocks-paused");
 -
 -        if (state == State.STOPPED) {
 -            var h = h_spinbutton.get_value_as_int ();
 -            var m = m_spinbutton.get_value_as_int ();
 -            var s = s_spinbutton.get_value_as_int ();
 +        update_name_label ();
 +        countdown_label.get_style_context ().add_class ("timer-running");
 +        countdown_label.get_style_context ().remove_class ("timer-ringing");
 +        countdown_label.get_style_context ().remove_class ("timer-paused");
  
 -            span = h * 3600 + m * 60 + s;
 -            settings.set_uint ("timer", (uint) span);
 -            countdown_frame.span = span;
 -            visible_child = countdown_frame;
 -
 -            update_countdown_label (h, m, s);
 -        }
 +        reset_stack.visible_child_name = "empty";
 +        delete_stack.visible_child_name = "empty";
  
 +        start_stack.visible_child_name = "pause";
 +        name_stack.visible_child_name = "display";
          state = State.RUNNING;
          timer.start ();
-         timeout_id = GLib.Timeout.add(40, () => {
+         timeout_id = GLib.Timeout.add (40, () => {
              if (state != State.RUNNING) {
                  timeout_id = 0;
                  return false;


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