X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fmain.cpp;h=1c3ec5df2c14b6d147e0e6d8c8c7fe53a1637221;hb=76a7c3b0f43528c603c597cb733f704cba4f83c1;hp=7decee54065e2bc8bc987f43aefef5bebdb79e94;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/main.cpp b/synfig-studio/trunk/src/synfigapp/main.cpp
index 7decee5..1c3ec5d 100644
--- a/synfig-studio/trunk/src/synfigapp/main.cpp
+++ b/synfig-studio/trunk/src/synfigapp/main.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file main.cpp
+/*!	\file synfigapp/main.cpp
 **	\brief Template File
 **
-**	$Id: main.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -39,6 +39,8 @@
 
 #include <list>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -84,7 +86,7 @@ static synfig::Waypoint::Interpolation interpolation_;
 
 /* === M E T H O D S ======================================================= */
 
-synfigapp::Main::Main(const synfig::String &basepath,ProgressCallback *cb):
+synfigapp::Main::Main(const synfig::String &basepath, synfig::ProgressCallback *cb):
 	synfig::Main(basepath,cb),
 	ref_count_(synfigapp_ref_count_)
 {
@@ -95,6 +97,11 @@ synfigapp::Main::Main(const synfig::String &basepath,ProgressCallback *cb):
 	ref_count_=synfigapp_ref_count_;
 
 	// Add initialization after this point
+
+#ifdef ENABLE_NLS
+	bindtextdomain("synfigstudio", LOCALEDIR);
+#endif
+
 	action_main=new synfigapp::Action::Main();
 
 	settings_.construct();
@@ -376,12 +383,13 @@ synfigapp::Main::select_input_device(InputDevice::Handle input_device)
 {
 	assert(input_device);
 
-	synfig::info("Input device changed to \"%s\"",input_device->get_id().c_str());
+	// synfig::info("Input device changed to \"%s\"",input_device->get_id().c_str());
 
 	selected_input_device_=input_device;
 
 	set_bline_width(input_device->get_bline_width());
 	set_foreground_color(input_device->get_foreground_color());
+	set_background_color(input_device->get_background_color());
 	set_opacity(input_device->get_opacity());
 	set_blend_method(input_device->get_blend_method());