Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp b/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp
index 30bb55d..a96c817 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dialog_tooloptions.cpp
 **     \brief Template File
 **
-**     $Id: dialog_tooloptions.cpp,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
 */
 /* ========================================================================= */
@@ -30,15 +31,17 @@
 
 #include <gtkmm/label.h>
 #include <gtkmm/scrolledwindow.h>
-#include <sinfg/general.h>
+#include <synfig/general.h>
 #include "dialog_tooloptions.h"
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -50,16 +53,16 @@ using namespace studio;
 /* === M E T H O D S ======================================================= */
 
 Dialog_ToolOptions::Dialog_ToolOptions():
-       Dockable("tool_options",_("Tool Options"),Gtk::StockID("sinfg-normal")),
+       Dockable("tool_options",_("Tool Options"),Gtk::StockID("synfig-normal")),
        empty_label(_("This tool has no options"))
 {
        //scrolled_.add(sub_vbox_);
        //scrolled_.set_policy(Gtk::POLICY_AUTOMATIC,Gtk::POLICY_AUTOMATIC);
-       //scrolled_.show();     
+       //scrolled_.show();
        //get_vbox()->pack_start(scrolled_);
 
        add(sub_vbox_);
-       
+
        set_widget(empty_label);
        empty_label.show();
 }
@@ -77,7 +80,7 @@ Dialog_ToolOptions::clear()
        set_widget(empty_label);
        empty_label.show();
 
-       set_stock_id(Gtk::StockID("sinfg-normal"));
+       set_stock_id(Gtk::StockID("synfig-normal"));
 }
 
 void
@@ -92,7 +95,7 @@ Dialog_ToolOptions::set_widget(Gtk::Widget&x)
 }
 
 void
-Dialog_ToolOptions::set_name(const sinfg::String& name)
+Dialog_ToolOptions::set_name(const synfig::String& name)
 {
-       set_stock_id(Gtk::StockID("sinfg-"+name));
+       set_stock_id(Gtk::StockID("synfig-"+name));
 }