[gnome-clocks/zbrown/world-clocks] alarms: Wire up edit button

[Zander <zbrown src gnome org>]

commit 25b9c44403d229c2fff597527e8bba97b868f17c
Author: Zander Brown <zbrown gnome org>
Date:   Mon Aug 5 23:49:49 2019 +0100

    alarms: Wire up edit button

 data/css/gnome-clocks.css              |  5 +++++
 data/css/gnome-clocks.highcontrast.css |  5 +++++
 data/ui/alarm.ui                       |  1 -
 data/ui/alarmtile.ui                   |  1 +
 src/alarm.vala                         | 24 ++++++++++--------------
 5 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index 13b2f9b..7c1424b 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -10,6 +10,11 @@ window > stack:backdrop {
 
 /* alarms */
 
+row.snoozing {
+    background: transparent -gtk-icontheme("alarm-symbolic") 65% 400%/48px 48px no-repeat;
+    font-weight: bold;
+}
+
 .alarm-tile,
 .alarm-tile:backdrop {
     color: shade(@insensitive_fg_color,0.9);
diff --git a/data/css/gnome-clocks.highcontrast.css b/data/css/gnome-clocks.highcontrast.css
index a2fccd3..565a874 100644
--- a/data/css/gnome-clocks.highcontrast.css
+++ b/data/css/gnome-clocks.highcontrast.css
@@ -11,6 +11,11 @@ window > stack:backdrop {
 
 /* alarms */
 
+row.snoozing {
+    background: transparent -gtk-icontheme("alarm-symbolic") 65% 400%/48px 48px no-repeat;
+    font-weight: bold;
+}
+
 .alarm-tile,
 .alarm-tile:backdrop,
 .tile.prelight .alarm-tile,
diff --git a/data/ui/alarm.ui b/data/ui/alarm.ui
index 6c90e88..b947f1c 100644
--- a/data/ui/alarm.ui
+++ b/data/ui/alarm.ui
@@ -56,7 +56,6 @@
                 <property name="selection-mode">none</property>
                 <property name="valign">start</property>
                 <property name="margin">24</property>
-                <!--<signal name="row-activated" handler="item_activated" swapped="no"/>-->
                 <style>
                   <class name="frame"/>
                 </style>
diff --git a/data/ui/alarmtile.ui b/data/ui/alarmtile.ui
index 15d1730..9e6578a 100644
--- a/data/ui/alarmtile.ui
+++ b/data/ui/alarmtile.ui
@@ -9,6 +9,7 @@
         <property name="visible">True</property>
         <property name="valign">center</property>
         <property name="halign">center</property>
+        <signal name="clicked" handler="edit" swapped="no" object="ClocksAlarmRow"/>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
diff --git a/src/alarm.vala b/src/alarm.vala
index 35b5272..4f21ce1 100644
--- a/src/alarm.vala
+++ b/src/alarm.vala
@@ -277,9 +277,10 @@ private class Item : Object, ContentItem {
 [GtkTemplate (ui = "/org/gnome/clocks/ui/alarmtile.ui")]
 private class Row : Hdy.ActionRow {
     public Item alarm { get; construct set; }
+    public Face face { get; construct set; }
 
-    public Row (Item alarm) {
-        Object (alarm: alarm);
+    public Row (Item alarm, Face face) {
+        Object (alarm: alarm, face: face);
 
         alarm.bind_property ("name", this, "subtitle", BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE);
 
@@ -316,6 +317,11 @@ private class Row : Hdy.ActionRow {
             title = text;
         }
     }
+
+    [GtkCallback]
+    private void edit () requires (face != null && alarm != null) {
+        face.edit(alarm);
+    }
 }
 
 [GtkTemplate (ui = "/org/gnome/clocks/ui/alarmsetupdialog.ui")]
@@ -629,7 +635,7 @@ public class Face : Gtk.Stack, Clocks.Clock {
 
         listbox.set_header_func((Gtk.ListBoxUpdateHeaderFunc) Hdy.list_box_separator_header);
         listbox.bind_model (alarms, (item) => {
-            return new Row ((Item)item);
+            return new Row ((Item) item, this);
         });
 
         load ();
@@ -660,16 +666,6 @@ public class Face : Gtk.Stack, Clocks.Clock {
 
     public signal void ring ();
 
-    //[GtkCallback]
-    private void item_activated (ContentItem item) {
-        Item alarm = (Item) item;
-        if (alarm.state == Item.State.SNOOZING) {
-            show_ringing_panel (alarm);
-        } else {
-            edit (alarm);
-        }
-    }
-
     [GtkCallback]
     private void dismiss_ringing_panel () {
        reset_view ();
@@ -694,7 +690,7 @@ public class Face : Gtk.Stack, Clocks.Clock {
         settings.set_value ("alarms", alarms.serialize ());
     }
 
-    private void edit (Item alarm) {
+    internal void edit (Item alarm) {
         var dialog = new SetupDialog ((Gtk.Window) get_toplevel (), alarm, alarms);
 
         // Disable alarm while editing it and remember the original active state.