summaryrefslogtreecommitdiff
path: root/src/PhotoPage.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
committerJörg Frings-Fürst <debian@jff.email>2023-06-14 20:36:37 +0200
commitbb80d3feebdc9acc52e3f4ad24084d8425f043a2 (patch)
tree2084a84c39f159c6aea254775dc0880d52579d45 /src/PhotoPage.vala
parentb26ff0798252a1a8072dd2c7a67f6205de9fde11 (diff)
parent31804433d72460cbe0a39f9f8ea5e76058d84cda (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/PhotoPage.vala')
-rw-r--r--src/PhotoPage.vala19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index fd513b2..10ebb10 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -759,7 +759,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
return false;
zoom_about_event_cursor_point(event, ZOOM_INCREMENT_SIZE);
- return false;
+ return true;
}
protected override bool on_mousewheel_down(Gdk.EventScroll event) {
@@ -767,7 +767,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
return false;
zoom_about_event_cursor_point(event, -ZOOM_INCREMENT_SIZE);
- return false;
+ return true;
}
protected override void restore_zoom_state() {
@@ -1466,8 +1466,9 @@ public abstract class EditingHostPage : SinglePhotoPage {
return;
}
- if (unscaled != null)
+ if (unscaled != null) {
set_pixbuf(unscaled, max_dim);
+ }
// create the PhotoCanvas object for a two-way interface to the tool
EditingTools.PhotoCanvas photo_canvas = new EditingHostCanvas(this);
@@ -1528,8 +1529,9 @@ public abstract class EditingHostPage : SinglePhotoPage {
needs_improvement = true;
}
- if (replacement != null)
+ if (replacement != null) {
set_pixbuf(replacement, new_max_dim);
+ }
cancel_editing_pixbuf = null;
// if this is a rough pixbuf, schedule an improvement
@@ -2458,7 +2460,7 @@ public class LibraryPhotoPage : EditingHostPage {
base.add_actions (map);
map.add_action_entries (entries, this);
- (get_action ("ViewRatings") as GLib.SimpleAction).change_state (Config.Facade.get_instance ().get_display_photo_ratings ());
+ ((GLib.SimpleAction) get_action ("ViewRatings")).change_state (Config.Facade.get_instance ().get_display_photo_ratings ());
var d = Config.Facade.get_instance().get_default_raw_developer();
var action = new GLib.SimpleAction.stateful("RawDeveloper",
GLib.VariantType.STRING, d == RawDeveloper.SHOTWELL ? "Shotwell" : "Camera");
@@ -2888,7 +2890,8 @@ public class LibraryPhotoPage : EditingHostPage {
Gee.Collection<LibraryPhoto> photos = new Gee.ArrayList<LibraryPhoto>();
photos.add(photo);
- remove_from_app(photos, _("Remove From Library"), _("Removing Photo From Library"));
+ remove_from_app(photos, GLib.dpgettext2(null, "Dialog Title", "Remove From Library"),
+ GLib.dpgettext2(null, "Dialog Title", "Removing Photo From Library"));
}
private void on_move_to_trash() {
@@ -3012,7 +3015,7 @@ public class LibraryPhotoPage : EditingHostPage {
if (!has_photo())
return;
- ExportDialog export_dialog = new ExportDialog(_("Export Photo"));
+ ExportDialog export_dialog = new ExportDialog(GLib.dpgettext2(null, "Dialog Title", "Export Photo"));
int scale;
ScaleConstraint constraint;
@@ -3171,7 +3174,7 @@ public class LibraryPhotoPage : EditingHostPage {
}
protected override void insert_faces_button(Gtk.Toolbar toolbar) {
- faces_button = new Gtk.ToggleToolButton.from_stock(Resources.FACES_TOOL);
+ faces_button = new Gtk.ToggleToolButton();
faces_button.set_icon_name(Resources.ICON_FACES);
faces_button.set_label(Resources.FACES_LABEL);
faces_button.set_tooltip_text(Resources.FACES_TOOLTIP);