X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockable.cpp;h=5ba33bd7d76edcbdaa5f265cb912e7f4c2f3c3fc;hb=1a07b28bd8ed77176bd97068c4911cff2fee6c5f;hp=b3fb489219c1a4badb2a8d179c8a5b00fbc7130f;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockable.cpp b/synfig-studio/trunk/src/gtkmm/dockable.cpp
index b3fb489..5ba33bd 100644
--- a/synfig-studio/trunk/src/gtkmm/dockable.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dockable.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file dockable.cpp
 **	\brief Template File
 **
 **	$Id: dockable.cpp,v 1.2 2005/01/12 07:24:45 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
 */
 /* ========================================================================= */
@@ -35,7 +36,7 @@
 #include "dockmanager.h"
 #include "dockbook.h"
 #include "dockdialog.h"
-#include <sinfg/general.h>
+#include <synfig/general.h>
 #include <gtkmm/table.h>
 #include <gtk/gtk.h>
 
@@ -45,7 +46,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -71,7 +72,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-Dockable::Dockable(const sinfg::String& name,const sinfg::String& local_name,Gtk::StockID stock_id_):
+Dockable::Dockable(const synfig::String& name,const synfig::String& local_name,Gtk::StockID stock_id_):
 //	Gtk::Window(Gtk::WINDOW_TOPLEVEL),
 	name_(name),
 	local_name_(local_name),
@@ -225,7 +226,7 @@ Dockable::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::Selection
 }
 
 void
-Dockable::set_local_name(const sinfg::String& local_name)
+Dockable::set_local_name(const synfig::String& local_name)
 {
 	//set_title(local_name);
 	title_label_.set_text(local_name);
@@ -311,13 +312,13 @@ Dockable::add(Gtk::Widget& x)
 }
 
 Gtk::ToolButton*
-Dockable::add_button(const Gtk::StockID& stock_id, const sinfg::String& tooltip)
+Dockable::add_button(const Gtk::StockID& stock_id, const synfig::String& tooltip)
 {
 	if(!toolbar_)
 		set_toolbar(*manage(new Gtk::Toolbar));
 
 	//Gtk::IconSize iconsize(4);
-	//Gtk::IconSize iconsize(Gtk::IconSize::from_name("sinfg-small_icon"));
+	//Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon"));
 
 	Gtk::ToolButton* ret(manage(new Gtk::ToolButton(stock_id)));
 	//Gtk::Image* icon(manage(new Gtk::Image(stock_id,iconsize)));