summaryrefslogtreecommitdiff
path: root/src/CollectionPage.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
committerJörg Frings-Fürst <debian@jff.email>2018-07-09 12:10:38 +0200
commit709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch)
tree496b2f3899e1d5728ee9ae76095cc5056c317447 /src/CollectionPage.vala
parentf1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff)
parent5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff)
Merge branch 'release/0.28.3-1'0.28.3-1
Diffstat (limited to 'src/CollectionPage.vala')
-rw-r--r--src/CollectionPage.vala23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 3434b13..2b308b9 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -132,7 +132,7 @@ public abstract class CollectionPage : MediaPage {
private static InjectionGroup create_photos_menu_date_injectables() {
InjectionGroup group = new InjectionGroup("PhotosExtrasDateTimePlaceholder");
- group.add_menu_item(_("Adjust Date and Time…"), "AdjustDateTime");
+ group.add_menu_item(_("Adjust Date and Time…"), "AdjustDateTime", "F4");
return group;
}
@@ -217,14 +217,10 @@ public abstract class CollectionPage : MediaPage {
protected override void init_actions(int selected_count, int count) {
base.init_actions(selected_count, count);
- set_action_short_label("RotateClockwise", Resources.ROTATE_CW_LABEL);
- set_action_short_label("RotateCounterclockwise", Resources.ROTATE_CCW_LABEL);
- set_action_short_label("Publish", Resources.PUBLISH_LABEL);
-
- set_action_important("RotateClockwise", true);
- set_action_important("RotateCounterclockwise", true);
- set_action_important("Enhance", true);
- set_action_important("Publish", true);
+ set_action_sensitive("RotateClockwise", true);
+ set_action_sensitive("RotateCounterclockwise", true);
+ set_action_sensitive("Enhance", true);
+ set_action_sensitive("Publish", true);
}
protected override void update_actions(int selected_count, int count) {
@@ -249,10 +245,9 @@ public abstract class CollectionPage : MediaPage {
// don't allow duplication of the selection if it contains a video -- videos are huge and
// and they're not editable anyway, so there seems to be no use case for duplicating them
set_action_sensitive("Duplicate", has_selected && (!selection_has_videos));
- set_action_visible("ExternalEdit", (!primary_is_video));
set_action_sensitive("ExternalEdit",
- one_selected && !is_string_empty(Config.Facade.get_instance().get_external_photo_app()));
- set_action_visible("ExternalEditRAW",
+ (!primary_is_video) && one_selected && !is_string_empty(Config.Facade.get_instance().get_external_photo_app()));
+ set_action_sensitive("ExternalEditRAW",
one_selected && (!primary_is_video)
&& ((Photo) get_view().get_selected_at(0).get_source()).get_master_file_format() ==
PhotoFileFormat.RAW
@@ -412,9 +407,9 @@ public abstract class CollectionPage : MediaPage {
string title = null;
if (has_some_videos)
- title = (export_list.size == 1) ? _("Export Photo/Video") : _("Export Photos/Videos");
+ title = ngettext("Export Photo/Video", "Export Photos/Videos", export_list.size);
else
- title = (export_list.size == 1) ? _("Export Photo") : _("Export Photos");
+ title = ngettext("Export Photo", "Export Photos", export_list.size);
ExportDialog export_dialog = new ExportDialog(title);
// Setting up the parameters object requires a bit of thinking about what the user wants.