Fix the error about being unable to parse the grid_size metadata. It was previously...

[synfig.git] / synfig-studio / trunk / src / gtkmm / dialog_color.h

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_color.h b/synfig-studio/trunk/src/gtkmm/dialog_color.h
index 4795a38..3d0025a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dialog_color.h
+++ b/synfig-studio/trunk/src/gtkmm/dialog_color.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dialog_color.h
 **     \brief Template Header
 **
-**     $Id: dialog_color.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**     $Id$
 **
 **     \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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_STUDIO_DIALOG_COLOR_H
-#define __SINFG_STUDIO_DIALOG_COLOR_H
+#ifndef __SYNFIG_STUDIO_DIALOG_COLOR_H
+#define __SYNFIG_STUDIO_DIALOG_COLOR_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -35,13 +36,13 @@
 #include <gtkmm/optionmenu.h>
 #include <gtkmm/checkbutton.h>
 
-#include <sinfg/gamma.h>
-#include <sinfg/time.h>
+#include <synfig/gamma.h>
+#include <synfig/time.h>
 
 #include "widget_coloredit.h"
 
-#include <sinfgapp/value_desc.h>
-#include <sinfg/time.h>
+#include <synfigapp/value_desc.h>
+#include <synfig/time.h>
 
 #include "dialogsettings.h"
 
@@ -53,20 +54,20 @@
 
 namespace Gtk { class Menu; class SpinButton; class Adjustment; };
 
-namespace sinfgapp {
+namespace synfigapp {
 class CanvasInterface;
 };
 
 namespace studio {
 
 class Widget_Color;
-       
+
 class Dialog_Color : public Gtk::Dialog
 {
        DialogSettings dialog_settings;
-       
-       sigc::signal<void,sinfg::Color> signal_edited_;
-       //sigc::signal<void,sinfg::Color> signal_apply_;
+
+       sigc::signal<void,synfig::Color> signal_edited_;
+       //sigc::signal<void,synfig::Color> signal_apply_;
 
        bool on_close_pressed();
        void on_apply_pressed();
@@ -75,25 +76,25 @@ class Dialog_Color : public Gtk::Dialog
        Widget_ColorEdit* widget_color;
 
        bool busy_;
-       
+
 public:
        bool busy()const { return busy_; }
-       
-       sigc::signal<void,sinfg::Color>& signal_edited() { return signal_edited_; }
-       
-       //sigc::signal<void,sinfg::Color>& signal_apply() { return signal_apply_; }
-       
-       void set_color(const sinfg::Color& x) { widget_color->set_value(x); }
-
-       sinfg::Color get_color()const { return widget_color->get_value(); }
-               
+
+       sigc::signal<void,synfig::Color>& signal_edited() { return signal_edited_; }
+
+       //sigc::signal<void,synfig::Color>& signal_apply() { return signal_apply_; }
+
+       void set_color(const synfig::Color& x) { widget_color->set_value(x); }
+
+       synfig::Color get_color()const { return widget_color->get_value(); }
+
        void reset();
 
-       
+
        Dialog_Color();
        ~Dialog_Color();
 
-//     void edit(const sinfgapp::ValueDesc &x, etl::handle<sinfgapp::CanvasInterface> canvas_interface, sinfg::Time x=0);
+//     void edit(const synfigapp::ValueDesc &x, etl::handle<synfigapp::CanvasInterface> canvas_interface, synfig::Time x=0);
 }; // END of Dialog_Color
 
 }; // END of namespace studio