diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
| commit | 8e1c5a834469d804d28ee8ab2cbe2da8e600a789 (patch) | |
| tree | b9771456583eaead893cfd8f02e680b58a3da970 /src/editing_tools | |
| parent | 80a5f2d8b095e895a5424f90b2ce4684d94c1a32 (diff) | |
| parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) | |
Merge tag 'upstream/0.26.0'
Upstream version 0.26.0
Diffstat (limited to 'src/editing_tools')
| -rw-r--r-- | src/editing_tools/EditingTools.c | 2 | ||||
| -rw-r--r-- | src/editing_tools/EditingTools.vala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c index d1fe68f..b9d37d7 100644 --- a/src/editing_tools/EditingTools.c +++ b/src/editing_tools/EditingTools.c @@ -12676,7 +12676,7 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win #line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" gtk_combo_box_set_active (_tmp12_, 0); #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" - _tmp13_ = (GtkImage*) gtk_image_new_from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png"); + _tmp13_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR); #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" g_object_ref_sink (_tmp13_); #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala" diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala index c3c79f6..d160f23 100644 --- a/src/editing_tools/EditingTools.vala +++ b/src/editing_tools/EditingTools.vala @@ -676,7 +676,7 @@ public class CropTool : EditingTool { constraint_combo.set_row_separator_func(constraint_combo_separator_func); constraint_combo.set_active(0); - var image = new Gtk.Image.from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png"); + var image = new Gtk.Image.from_icon_name("crop-pivot-reticle", Gtk.IconSize.LARGE_TOOLBAR); pivot_reticle_button.set_image (image); pivot_reticle_button.set_tooltip_text(_("Pivot the crop rectangle between portrait and landscape orientations")); |