summaryrefslogtreecommitdiff
path: root/src/MediaPage.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
commit2b3f22361da0c1d8e6ce70d71352821758186db7 (patch)
tree5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/MediaPage.vala
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parentdc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/MediaPage.vala')
-rw-r--r--src/MediaPage.vala54
1 files changed, 8 insertions, 46 deletions
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index a2d5185..eeb79e6 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -291,7 +291,6 @@ public abstract class MediaPage : CheckerboardPage {
{ "MoveToTrash", on_move_to_trash },
{ "NewEvent", on_new_event },
{ "AddTags", on_add_tags },
- { "AddTagsContextMenu", on_add_tags },
{ "ModifyTags", on_modify_tags },
{ "IncreaseSize", on_increase_size },
{ "DecreaseSize", on_decrease_size },
@@ -362,7 +361,7 @@ public abstract class MediaPage : CheckerboardPage {
if (DesktopIntegration.is_send_to_installed())
set_action_sensitive("SendTo", selected_count > 0);
else
- set_action_visible("SendTo", false);
+ set_action_sensitive("SendTo", false);
set_action_sensitive("Rate", selected_count > 0);
update_rating_sensitivities();
@@ -556,46 +555,6 @@ public abstract class MediaPage : CheckerboardPage {
activate_action("RateRejected");
break;
- case "exclam":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.ONE_OR_HIGHER);
- break;
-
- case "at":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.TWO_OR_HIGHER);
- break;
-
- case "numbersign":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.THREE_OR_HIGHER);
- break;
-
- case "dollar":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.FOUR_OR_HIGHER);
- break;
-
- case "percent":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.FIVE_OR_HIGHER);
- break;
-
- case "parenright":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.UNRATED_OR_HIGHER);
- break;
-
- case "parenleft":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.REJECTED_OR_HIGHER);
- break;
-
- case "asterisk":
- if (get_ctrl_pressed())
- get_search_view_filter().set_rating_filter(RatingFilter.REJECTED_ONLY);
- break;
-
case "slash":
activate_action("Flag");
break;
@@ -816,14 +775,17 @@ public abstract class MediaPage : CheckerboardPage {
restore_point = get_view().get_next(cursor) as CheckerboardItem;
}
- if (get_view().get_selected_count() > 0) {
- get_command_manager().execute(new TrashUntrashPhotosCommand(
- (Gee.Collection<MediaSource>) get_view().get_selected_sources(), true));
- }
+ var sources = get_view().get_selected_sources();
if ((restore_point != null) && (get_view().contains(restore_point))) {
set_cursor(restore_point);
}
+
+ if (get_view().get_selected_count() > 0) {
+ get_command_manager().execute(new TrashUntrashPhotosCommand(
+ (Gee.Collection<MediaSource>) sources, true));
+ }
+
}
protected virtual void on_edit_title() {