Merge branch 'master' into gregoa

[gregoa/zavai.git] / src / app_alarm.vala

diff --git a/src/app_alarm.vala b/src/app_alarm.vala
index 8b7cfd2e763aa3e668e05966650968661d2cff0b..8cfff21636033d1935d66c363ed9975556401523 100644 (file)
--- a/src/app_alarm.vala
+++ b/src/app_alarm.vala
@@ -60,31 +60,31 @@ protected class AlarmNotifierDialog : ui.notify.Notifier
         message_button.show();
     }
 
-    protected virtual bool push_aux_state()
+    protected override bool push_aux_state()
     {
-        var state = new zavai.led.LedState(name);
+        var state = new zavai.led.LedState(notifier_name);
         state.set_blink(255);
         zavai.led.aux.push_state(state);
         return true;
     }
 
-    protected virtual bool push_vibrator_state()
+    protected override bool push_vibrator_state()
     {
-        var state = new zavai.led.LedState(name);
+        var state = new zavai.led.LedState(notifier_name);
         state.set_blink(255);
-        zavai.led.aux.push_state(state);
+        zavai.led.vibrator.push_state(state);
         return true;
     }
 
-    protected virtual bool push_ringtone_state()
+    protected override bool push_ringtone_state()
     {
-        var state = new zavai.audio.PlayerState(name, config.ringtone_alarm, true);
+        var state = new zavai.audio.PlayerState(notifier_name, config.ringtone_alarm, true);
         zavai.audio.soundplayer.push_state(state);
         return true;
     }
 }
 
-public class AlarmNotifier : zavai.Resource, ui.notify.Notifier
+public class AlarmNotifier : zavai.Resource, Object
 {
     protected weak clock.AlarmTriggerInfo current = null;
     protected AlarmNotifierDialog dialog = null;
@@ -103,6 +103,9 @@ public class AlarmNotifier : zavai.Resource, ui.notify.Notifier
         current = info;
         dialog = new AlarmNotifierDialog("Alarm", info.label);
 
+        if (zavai.led.auxbutton != null)
+            zavai.led.auxbutton.event += on_auxbutton;
+
         uint cancel_timeout = 0;
         cancel_timeout = Timeout.add(30 * 1000, () => {
             dialog.response(Gtk.ResponseType.CANCEL);
@@ -120,11 +123,22 @@ public class AlarmNotifier : zavai.Resource, ui.notify.Notifier
                 clock.alarm_trigger_queue.cancel(current);
                 break;
         }
+
+        if (zavai.led.auxbutton != null)
+            zavai.led.auxbutton.event -= on_auxbutton;
+
         dialog.destroy();
         dialog = null;
         current = null;
     }
 
+    protected bool on_auxbutton(ulong time, bool pressed)
+    {
+        if (dialog == null) return false;
+        dialog.response(Gtk.ResponseType.OK);
+        return true;
+    }
+
     public void on_done(clock.AlarmTriggerInfo info)
     {
         if (current == null || dialog == null || current != info) return;