summaryrefslogtreecommitdiff
path: root/src/CollectionPage.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-21 19:19:04 +0100
commitf39ea21098340bd99c48669f152c9068046c2c99 (patch)
treed1166fce1a4a8c470dfaf364816f767678c4729e /src/CollectionPage.vala
parentbc48a4cff815ed156b603c92e684779c317417ba (diff)
parenta7ff7c49085c320c1e0a2ffb66cc6d283c5acb8e (diff)
Merge tag 'upstream/0.25.3'
Upstream version 0.25.3
Diffstat (limited to 'src/CollectionPage.vala')
-rw-r--r--src/CollectionPage.vala15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index c43c0c8..df39f64 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -170,10 +170,17 @@ public abstract class CollectionPage : MediaPage {
{ "Slideshow", on_slideshow }
};
- protected override void add_actions () {
- base.add_actions ();
+ protected override void add_actions (GLib.ActionMap map) {
+ base.add_actions (map);
- AppWindow.get_instance ().add_action_entries (entries, this);
+ map.add_action_entries (entries, this);
+ }
+
+ protected override void remove_actions(GLib.ActionMap map) {
+ base.remove_actions(map);
+ foreach (var entry in entries) {
+ map.remove_action(entry.name);
+ }
}
protected override InjectionGroup[] init_collect_injection_groups() {
@@ -312,7 +319,7 @@ public abstract class CollectionPage : MediaPage {
}
// see #2020
- // double clcik = switch to photo page
+ // double click = switch to photo page
// Super + double click = open in external editor
// Enter = switch to PhotoPage
// Ctrl + Enter = open in external editor (handled with accelerators)