Solve the gamma problem (corrected locale when loading/saving settings file)

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_zoom.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp
index 35ee61e..e5a0e9b 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file state_zoom.cpp
 **     \brief Zoom Toole Implementation File
 **
 **     $Id: state_zoom.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -32,7 +33,7 @@
 #include <sigc++/object.h>
 
 #include <ETL/handle>
-#include <sinfg/vector.h>
+#include <synfig/vector.h>
 
 
 #include "state_zoom.h"
@@ -42,7 +43,7 @@
 #include "app.h"
 #include "dialog_tooloptions.h"
 #include "toolbox.h"
-#include <sinfgapp/main.h>
+#include <synfigapp/main.h>
 
 #endif
 
@@ -50,7 +51,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -72,7 +73,7 @@ class studio::StateZoom_Context : public sigc::trackable
        bool prev_workarea_layer_status_;
                
        //Toolbox settings
-       sinfgapp::Settings& settings;
+       synfigapp::Settings& settings;
        
        //Toolbox display
        Gtk::Table options_table;
@@ -93,8 +94,8 @@ public:
 
        //Canvas interaction
        const etl::handle<CanvasView>& get_canvas_view()const{return canvas_view_;}
-       etl::handle<sinfgapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
-       sinfg::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();}
+       etl::handle<synfigapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
+       synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();}
        WorkArea * get_work_area()const{return canvas_view_->get_work_area();}
        
        //Modifying settings etc.
@@ -153,7 +154,7 @@ StateZoom_Context::StateZoom_Context(CanvasView* canvas_view):
        canvas_view_(canvas_view),
        is_working(*canvas_view),
        prev_workarea_layer_status_(get_work_area()->allow_layer_clicks),
-       settings(sinfgapp::Main::get_selected_input_device()->settings())
+       settings(synfigapp::Main::get_selected_input_device()->settings())
 {
        // Set up the tool options dialog
        //options_table.attach(*manage(new Gtk::Label(_("Zoom Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);