[gnome-clocks/redesign/stopwatch: 10/10] Fix conflicts

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 51c175ca12e37e6794aeb81926b351b08f5a1d19
Merge: 83d5730 10e77a9
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Mon Dec 9 01:07:53 2019 +0100

    Fix conflicts

 .gitignore                      |   2 +
 data/gnome-clocks.gresource.xml |   1 +
 data/ui/alarm.ui                |   2 +
 data/ui/headerbar.ui            | 281 ++++++++++++++++++++++++++++++++++++++++
 data/ui/window.ui               | 123 ++++++------------
 data/ui/world.ui                |   2 +
 po/POTFILES.in                  |   2 +
 po/POTFILES.skip                |   1 +
 src/alarm.vala                  |  70 +++++-----
 src/clock.vala                  |  51 +++-----
 src/headerbar.vala              | 158 ++++++++++++++++++++++
 src/main.vala                   |   2 +
 src/meson.build                 |   1 +
 src/stopwatch.vala              |  19 ++-
 src/timer.vala                  |  20 +--
 src/utils.vala                  |   4 +
 src/widgets.vala                | 137 ++++----------------
 src/window.vala                 | 222 ++++++++++++++++++++-----------
 src/world.vala                  | 101 ++++++---------
 19 files changed, 773 insertions(+), 426 deletions(-)
---
diff --cc src/stopwatch.vala
index 14b9322,301b3f9..d9d722e
--- a/src/stopwatch.vala
+++ b/src/stopwatch.vala
@@@ -124,13 -111,15 +124,15 @@@ public class Face : Gtk.Box, Clocks.Clo
          SPLIT,
          TOTAL
      }
--
 +    private ListStore laps;
- 
-     public string label { get; construct set; }
-     public string icon_name { get; construct set; }
-     public HeaderBar header_bar { get; construct set; }
      public PanelId panel_id { get; construct set; }
+     public ButtonMode button_mode { get; set; default = NONE; }
+     public ViewMode view_mode { get; set; default = NORMAL; }
+     public bool can_select { get; set; default = false; }
+     public bool n_selected { get; set; }
+     public string title { get; set; default = _("Clocks"); }
+     public string subtitle { get; set; }
+     public string new_label { get; default = null; }
  
      public State state { get; private set; default = State.RESET; }
  
@@@ -159,14 -140,9 +161,11 @@@
      [GtkChild]
      private Gtk.ListBox laps_list;
  
-     public Face (HeaderBar header_bar) {
-         Object (label: _("Stopwatch"),
-                 icon_name: "stopwatch-symbolic",
-                 header_bar: header_bar,
-                 panel_id: PanelId.STOPWATCH);
+     construct {
+         panel_id = STOPWATCH;
  
 +        laps = new GLib.ListStore(typeof(Lap));
 +
          timer = new GLib.Timer ();
          tick_id = 0;