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 8e82d74..1c3ec5d 100644 (file)
--- 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_)
 {
@@ -93,19 +95,24 @@ synfigapp::Main::Main(const synfig::String &basepath,ProgressCallback *cb):
 
        synfigapp_ref_count_.reset();
        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();
-       
+
        signal_foreground_color_changed_.construct();
        signal_background_color_changed_.construct();
        signal_gradient_changed_.construct();
        signal_opacity_changed_.construct();
        signal_blend_method_changed_.construct();
        signal_interpolation_changed_.construct();
-       
+
        set_foreground_color(Color::black());
        set_background_color(Color::white());
        set_gradient_default_colors();
@@ -120,14 +127,14 @@ synfigapp::Main::~Main()
        if(!synfigapp_ref_count_.unique())
                return;
        synfigapp_ref_count_.detach();
-       
+
        // Add deinitialization after this point
 
-       delete action_main;     
-       
+       delete action_main;
+
        selected_input_device_=0;
        input_devices_.clear();
-       
+
        settings_.destruct();
        signal_foreground_color_changed_.destruct();
        signal_background_color_changed_.destruct();
@@ -298,7 +305,7 @@ synfigapp::Main::set_interpolation(synfig::Waypoint::Interpolation x)
        if(interpolation_!=x)
        {
                interpolation_=x;
-               
+
                signal_interpolation_changed();
        }
 }
@@ -316,10 +323,10 @@ synfigapp::Main::set_bline_width(synfig::Distance x)
        if(x!=bline_width_)
        {
                bline_width_=x;
-               
+
                if(selected_input_device_)
                        selected_input_device_->set_bline_width(x);
-               
+
                signal_bline_width_changed()();
        }
 }
@@ -375,23 +382,24 @@ bool
 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_bline_width(input_device->get_bline_width());
        set_foreground_color(input_device->get_foreground_color());
-       set_opacity(input_device->get_opacity());       
-       set_blend_method(input_device->get_blend_method());     
-       
+       set_background_color(input_device->get_background_color());
+       set_opacity(input_device->get_opacity());
+       set_blend_method(input_device->get_blend_method());
+
        return true;
 }
 
 InputDevice::Handle
 synfigapp::Main::get_selected_input_device()
 {
-       return selected_input_device_;  
+       return selected_input_device_;
 }
 
 void