X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftheme_manager.cc;h=923e61fa4cf531ea631ece2ac146e135977c2fac;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=740bf46078e445a5025c17c03af1b7c37a28623a;hpb=09ec34292683c8a4edcc0060b938192ae18225c4;p=ardour.git

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 740bf46078..923e61fa4c 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -48,10 +48,10 @@ sigc::signal<void> ColorsChanged;
 sigc::signal<void,uint32_t> ColorChanged;
 
 ThemeManager::ThemeManager()
-	: ArdourDialog ("ThemeManager"),
-	dark_button ("Dark theme"),
-	light_button ("Light theme"),
-	reset_button ("Restore Defaults")
+	: ArdourDialog (_("Theme Manager")),
+	  dark_button (_("Dark Theme")),
+	  light_button (_("Light Theme")),
+	  reset_button (_("Restore Defaults"))
 {
 	set_title (_("Theme Manager"));
 
@@ -83,16 +83,16 @@ ThemeManager::ThemeManager()
 	get_vbox()->pack_start (reset_button, PACK_SHRINK);
 	get_vbox()->pack_start (scroller);
 
-	color_display.signal_button_press_event().connect (mem_fun (*this, &ThemeManager::button_press_event), false);
+	color_display.signal_button_press_event().connect (sigc::mem_fun (*this, &ThemeManager::button_press_event), false);
 
 	color_dialog.get_colorsel()->set_has_opacity_control (true);
 	color_dialog.get_colorsel()->set_has_palette (true);
 
-	color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT));
-	color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
-	dark_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_dark_theme_button_toggled));
-	light_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_light_theme_button_toggled));
-	reset_button.signal_clicked().connect (mem_fun (*this, &ThemeManager::reset_canvas_colors));
+	color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT));
+	color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
+	dark_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_dark_theme_button_toggled));
+	light_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_light_theme_button_toggled));
+	reset_button.signal_clicked().connect (sigc::mem_fun (*this, &ThemeManager::reset_canvas_colors));
 
 	set_size_request (-1, 400);
 	setup_theme ();
@@ -193,14 +193,13 @@ load_rc_file (const string& filename, bool themechange)
 	spath += system_config_search_path();
 
 	if (!find_file_in_search_path (spath, filename, rc_file_path)) {
-		warning << string_compose(
-				_("Unable to find UI style file %1 in search path %2. Ardour will look strange"),
-				filename, spath.to_string())
+		warning << string_compose (_("Unable to find UI style file %1 in search path %2. %3 will look strange"),
+                                           filename, spath.to_string(), PROGRAM_NAME)
 				<< endmsg;
 		return;
 	}
 
-	cerr << "Loading ui configuration file " << rc_file_path.to_string() << endmsg;
+	info << "Loading ui configuration file " << rc_file_path.to_string() << endmsg;
 
 	Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path.to_string(), themechange);
 }