From 15c5453884efa3a5b16299a0ebdc6bb3def0000c Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Fri, 6 Jan 2017 21:46:40 +0100
Subject: [PATCH] Added labels and icons to wide buttons, #3594

---
 rtgui/crop.cc       | 3 +--
 rtgui/distortion.cc | 1 +
 rtgui/icmpanel.cc   | 1 +
 rtgui/lensgeom.cc   | 3 +--
 rtgui/rotate.cc     | 6 ++----
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/rtgui/crop.cc b/rtgui/crop.cc
index 2222e175c..b18b31ea2 100644
--- a/rtgui/crop.cc
+++ b/rtgui/crop.cc
@@ -71,8 +71,7 @@ Crop::Crop (): FoldableToolPanel(this, "crop", M("TP_CROP_LABEL"), false, true)
 
     pack_start (*hb2, Gtk::PACK_SHRINK, 4);
 
-    selectCrop = Gtk::manage (new Gtk::Button ());
-    selectCrop->set_tooltip_text(M("TP_CROP_SELECTCROP"));
+    selectCrop = Gtk::manage (new Gtk::Button (M("TP_CROP_SELECTCROP")));
     selectCrop->set_image (*Gtk::manage (new RTImage ("crop.png")));
 
     pack_start (*selectCrop, Gtk::PACK_SHRINK, 2);
diff --git a/rtgui/distortion.cc b/rtgui/distortion.cc
index 1760d4b69..1fadec9d9 100644
--- a/rtgui/distortion.cc
+++ b/rtgui/distortion.cc
@@ -28,6 +28,7 @@ Distortion::Distortion (): FoldableToolPanel(this, "distortion", M("TP_DISTORTIO
 
     rlistener = nullptr;
     autoDistor = Gtk::manage (new Gtk::Button (M("GENERAL_AUTO")));
+    autoDistor->set_image (*Gtk::manage (new RTImage ("distortion-auto.png")));
     autoDistor->set_alignment(0.5f, 0.5f);
     autoDistor->set_tooltip_text (M("TP_DISTORTION_AUTO_TIP"));
     idConn = autoDistor->signal_pressed().connect( sigc::mem_fun(*this, &Distortion::idPressed) );
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index 926eaad01..f53b57712 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -146,6 +146,7 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     //iVBox->pack_start (*ckbBlendCMSMatrix, Gtk::PACK_SHRINK, 2);
 
     saveRef = Gtk::manage (new Gtk::Button (M("TP_ICM_SAVEREFERENCE")));
+    saveRef->set_image (*Gtk::manage (new RTImage ("gtk-save-large.png")));
     saveRef->set_alignment (0.5f, 0.5f);
     saveRef->set_tooltip_markup (M("TP_ICM_SAVEREFERENCE_TOOLTIP"));
     iVBox->pack_start (*saveRef, Gtk::PACK_SHRINK);
diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc
index f1e14931d..423a7a3ec 100644
--- a/rtgui/lensgeom.cc
+++ b/rtgui/lensgeom.cc
@@ -29,8 +29,7 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
     fill = Gtk::manage (new Gtk::CheckButton (M("TP_LENSGEOM_FILL")));
     pack_start (*fill);
 
-    autoCrop = Gtk::manage (new Gtk::Button ());
-    autoCrop->set_tooltip_text(M("TP_LENSGEOM_AUTOCROP"));
+    autoCrop = Gtk::manage (new Gtk::Button (M("TP_LENSGEOM_AUTOCROP")));
     autoCrop->set_image (*Gtk::manage (new RTImage ("crop-auto.png")));
     pack_start (*autoCrop, Gtk::PACK_SHRINK, 2);
 
diff --git a/rtgui/rotate.cc b/rtgui/rotate.cc
index 90e63ba79..e8ea6c48e 100644
--- a/rtgui/rotate.cc
+++ b/rtgui/rotate.cc
@@ -37,10 +37,8 @@ Rotate::Rotate () : FoldableToolPanel(this, "rotate", M("TP_ROTATE_LABEL"))
     degree->setAdjusterListener (this);
     pack_start (*degree);
 
-    selectStraight = Gtk::manage (new Gtk::Button ());
-    selectStraight->set_tooltip_text(M("TP_ROTATE_SELECTLINE"));
-    Gtk::Image* selimg = Gtk::manage (new RTImage ("straighten-small.png"));
-    selectStraight->set_image (*selimg);
+    selectStraight = Gtk::manage (new Gtk::Button (M("TP_ROTATE_SELECTLINE")));
+    selectStraight->set_image (*Gtk::manage (new RTImage ("straighten-small.png")));
     pack_start (*selectStraight, Gtk::PACK_SHRINK, 2);
 
     selectStraight->signal_pressed().connect( sigc::mem_fun(*this, &Rotate::selectStraightPressed) );