Merge master into gtk3

This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
259 changed files with 5061 additions and 3654 deletions

View File

@@ -26,7 +26,7 @@ using namespace rtengine::procparams;
Distortion::Distortion (): FoldableToolPanel(this, "distortion", M("TP_DISTORTION_LABEL"))
{
rlistener = NULL;
rlistener = nullptr;
autoDistor = Gtk::manage (new Gtk::Button ()); // M("TP_DISTORTION_AUTO")
autoDistor->set_image (*Gtk::manage (new RTImage ("distortion-auto.png")));
autoDistor->set_tooltip_text (M("TP_DISTORTION_AUTO_TIP"));