summaryrefslogtreecommitdiff
path: root/src/editing_tools
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-03 13:15:00 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-03 13:15:00 +0200
commitbc53b714952ceb0afd02b591403cb2bc0cb1aab9 (patch)
tree8ff57ed1a1265b2c87f37e3c8fa19876faf80990 /src/editing_tools
parentd4c476947425c12b1984fedea16f8a8c42a07ba3 (diff)
parentc43dfb815a4951b8248f4f0e98babe4f80204f03 (diff)
Merge tag 'upstream/0.22.0'
Upstream version 0.22.0
Diffstat (limited to 'src/editing_tools')
-rw-r--r--src/editing_tools/EditingTools.vala12
-rw-r--r--src/editing_tools/StraightenTool.vala4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index f5fb144..6c91011 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2014 Yorba Foundation
+/* Copyright 2011-2015 Yorba Foundation
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
@@ -647,7 +647,7 @@ public class CropTool : EditingTool {
private const int CONTROL_SPACING = 8;
public Gtk.Button ok_button = new Gtk.Button.with_label(Resources.CROP_LABEL);
- public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+ public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
public Gtk.ComboBox constraint_combo;
public Gtk.Button pivot_reticle_button = new Gtk.Button();
public Gtk.Entry custom_width_entry = new Gtk.Entry();
@@ -1890,9 +1890,9 @@ public class RedeyeTool : EditingTool {
private Gtk.Label slider_label = new Gtk.Label.with_mnemonic(_("Size:"));
public Gtk.Button apply_button =
- new Gtk.Button.from_stock(Gtk.Stock.APPLY);
+ new Gtk.Button.with_mnemonic(Resources.APPLY_LABEL);
public Gtk.Button close_button =
- new Gtk.Button.from_stock(Gtk.Stock.CLOSE);
+ new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
public Gtk.Scale slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL,
RedeyeInstance.MIN_RADIUS, RedeyeInstance.MAX_RADIUS, 1.0);
@@ -2240,9 +2240,9 @@ public class AdjustTool : EditingTool {
HighlightDetailTransformation.MIN_PARAMETER, HighlightDetailTransformation.MAX_PARAMETER,
1.0);
- public Gtk.Button ok_button = new Gtk.Button.from_stock(Gtk.Stock.OK);
+ public Gtk.Button ok_button = new Gtk.Button.with_mnemonic(Resources.OK_LABEL);
public Gtk.Button reset_button = new Gtk.Button.with_mnemonic(_("_Reset"));
- public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+ public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
public RGBHistogramManipulator histogram_manipulator = new RGBHistogramManipulator();
public AdjustToolWindow(Gtk.Window container) {
diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala
index 8a778ec..e2b117e 100644
--- a/src/editing_tools/StraightenTool.vala
+++ b/src/editing_tools/StraightenTool.vala
@@ -1,5 +1,5 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
@@ -98,7 +98,7 @@ public class StraightenTool : EditingTool {
public Gtk.Label angle_label = new Gtk.Label("");
public Gtk.Label description_label = new Gtk.Label(_("Angle:"));
public Gtk.Button ok_button = new Gtk.Button.with_mnemonic(_("_Straighten"));
- public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+ public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
public Gtk.Button reset_button = new Gtk.Button.with_mnemonic(_("_Reset"));
/**