Merge branch 'dev' into newlocallab

This commit is contained in:
Morgan Hardwood
2018-07-19 23:07:59 +02:00
2038 changed files with 40844 additions and 190177 deletions

View File

@@ -1315,7 +1315,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
startupdir = Gtk::manage(new Gtk::Entry());
Gtk::Button* sdselect = Gtk::manage(new Gtk::Button());
sdselect->set_image(*Gtk::manage(new RTImage("gtk-open.png")));
sdselect->set_image (*Gtk::manage (new RTImage ("folder-open.png")));
Gtk::RadioButton::Group opts = sdcurrent->get_group();
sdlast->set_group(opts);
@@ -1417,8 +1417,8 @@ Gtk::Widget* Preferences::getFileBrowserPanel()
delExt->set_tooltip_text(M("PREFERENCES_PARSEDEXTDELHINT"));
moveExtUp->set_tooltip_text(M("PREFERENCES_PARSEDEXTUPHINT"));
moveExtDown->set_tooltip_text(M("PREFERENCES_PARSEDEXTDOWNHINT"));
Gtk::Image* addExtImg = Gtk::manage(new RTImage("list-add-small.png"));
Gtk::Image* delExtImg = Gtk::manage(new RTImage("list-remove-red-small.png"));
Gtk::Image* addExtImg = Gtk::manage ( new RTImage ("add-small.png") );
Gtk::Image* delExtImg = Gtk::manage ( new RTImage ("remove-small.png") );
Gtk::Image* moveExtUpImg = Gtk::manage(new RTImage("arrow-up-small.png"));
Gtk::Image* moveExtDownImg = Gtk::manage(new RTImage("arrow-down-small.png"));
addExt->add(*addExtImg);