[gnome-clocks] Remove delete-selected signal
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-clocks] Remove delete-selected signal
- Date: Mon, 8 Feb 2016 11:58:31 +0000 (UTC)
commit 6cf933fa80f839d7a2c9e4f7fc6795a53a7c8ae7
Author: Paolo Borelli <pborelli gnome org>
Date: Mon Feb 8 12:32:59 2016 +0100
Remove delete-selected signal
Handle deletion within the widget and instead the callers can
save the model whenever its items change
data/ui/alarm.ui | 1 -
data/ui/world.ui | 1 -
src/alarm.vala | 10 ++++------
src/widgets.vala | 3 +--
src/world.vala | 11 +++++------
5 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/data/ui/alarm.ui b/data/ui/alarm.ui
index daa553b..4fca290 100644
--- a/data/ui/alarm.ui
+++ b/data/ui/alarm.ui
@@ -49,7 +49,6 @@
<object class="ClocksContentView" id="content_view">
<property name="visible">True</property>
<signal name="item-activated" handler="item_activated" swapped="no"/>
- <signal name="delete-selected" handler="delete_selected" swapped="no"/>
<signal name="notify::empty" handler="empty_changed" swapped="no"/>
</object>
</child>
diff --git a/data/ui/world.ui b/data/ui/world.ui
index d87709d..42b57d1 100644
--- a/data/ui/world.ui
+++ b/data/ui/world.ui
@@ -49,7 +49,6 @@
<object class="ClocksContentView" id="content_view">
<property name="visible">True</property>
<signal name="item-activated" handler="item_activated" swapped="no"/>
- <signal name="delete-selected" handler="delete_selected" swapped="no"/>
<signal name="notify::empty" handler="empty_changed" swapped="no"/>
</object>
</child>
diff --git a/src/alarm.vala b/src/alarm.vala
index 63de629..22573d2 100644
--- a/src/alarm.vala
+++ b/src/alarm.vala
@@ -576,6 +576,10 @@ public class Face : Gtk.Stack, Clocks.Clock {
reset_view ();
show_all ();
+ alarms.items_changed.connect ((position, removed, added) => {
+ save ();
+ });
+
// Start ticking...
Utils.WallClock.get_default ().tick.connect (() => {
alarms.foreach ((i) => {
@@ -605,12 +609,6 @@ public class Face : Gtk.Stack, Clocks.Clock {
}
[GtkCallback]
- private void delete_selected () {
- alarms.delete_selected ();
- save ();
- }
-
- [GtkCallback]
private void empty_changed () {
reset_view ();
}
diff --git a/src/widgets.vala b/src/widgets.vala
index a6c9475..efde590 100644
--- a/src/widgets.vala
+++ b/src/widgets.vala
@@ -550,7 +550,7 @@ public class ContentView : Gtk.Bin {
delete_button.halign = Gtk.Align.END;
delete_button.hexpand = true;
delete_button.clicked.connect (() => {
- delete_selected ();
+ model.delete_selected ();
icon_view.mode = IconView.Mode.NORMAL;
});
@@ -600,7 +600,6 @@ public class ContentView : Gtk.Bin {
}
public signal void item_activated (ContentItem item);
- public signal void delete_selected ();
public void bind_model (ContentStore store) {
model = store;
diff --git a/src/world.vala b/src/world.vala
index e0af119..7bfcccb 100644
--- a/src/world.vala
+++ b/src/world.vala
@@ -304,6 +304,11 @@ public class Face : Gtk.Stack, Clocks.Clock {
}
reset_view ();
+
+ locations.items_changed.connect ((position, removed, added) => {
+ save ();
+ });
+
show_all ();
// Start ticking...
@@ -322,12 +327,6 @@ public class Face : Gtk.Stack, Clocks.Clock {
}
[GtkCallback]
- private void delete_selected () {
- locations.delete_selected ();
- save ();
- }
-
- [GtkCallback]
private void empty_changed () {
reset_view ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]