Store the default background color along with the default foreground color.

[synfig.git] / synfig-studio / trunk / src / synfigapp / main.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/main.cpp b/synfig-studio/trunk/src/synfigapp/main.cpp
index ef9df72..1c3ec5d 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/main.cpp
+++ b/synfig-studio/trunk/src/synfigapp/main.cpp
@@ -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();
@@ -382,6 +389,7 @@ synfigapp::Main::select_input_device(InputDevice::Handle 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());