X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroler.cpp;h=143d06c1cb406c21d35b3f4f0199ae11bb1e4f2a;hb=040dd7baf4cee0e19161af0f0a33963ddcfae634;hp=7f740a3dd4bc65af4da5485cbc1464cb4f495edf;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
index 7f740a3..143d06c 100644
--- a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file template.cpp
+/*!	\file iconcontroler.cpp
 **	\brief Template File
 **
-**	$Id: iconcontroler.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -86,6 +86,14 @@ IconControler::IconControler(const synfig::String& basepath)
 #else
 	path_to_icons=IMAGE_DIR;
 #endif
+
+	char* synfig_root=getenv("SYNFIG_ROOT");
+	if(synfig_root) {
+		path_to_icons=synfig_root;
+		path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+
+		path_to_icons+="share/pixmaps";
+	}
 	path_to_icons+=ETL_DIRECTORY_SEPERATOR;
 
 	try{
@@ -94,7 +102,7 @@ IconControler::IconControler(const synfig::String& basepath)
 	{
 		synfig::warning("Unable to open "+path_to_icons+"synfig_icon."+IMAGE_EXT);
 	}
-	
+
 /*
 #define INIT_STOCK_ICON(name,iconfile,desc)							\
 	stock_##name=Gtk::StockItem(Gtk::StockID("synfig-" #name),desc);   			\
@@ -122,7 +130,7 @@ IconControler::IconControler(const synfig::String& basepath)
 
 #define INIT_STOCK_ITEM(name,desc)							\
 	stock_##name=Gtk::StockItem(Gtk::StockID("synfig-" #name),desc);   			\
-	Gtk::Stock::add(stock_##name);								
+	Gtk::Stock::add(stock_##name);
 
 	INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
 	INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
@@ -156,6 +164,7 @@ IconControler::IconControler(const synfig::String& basepath)
 	INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
 
 	INIT_STOCK_ICON(children,"children_icon."IMAGE_EXT,_("Children"));
+	INIT_STOCK_ICON(curves,"curves_icon."IMAGE_EXT,_("Curves"));
 	INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes"));
 	INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData"));
 	INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator"));
@@ -190,7 +199,7 @@ IconControler::IconControler(const synfig::String& basepath)
 	INIT_STOCK_ICON(mirror,"mirror_icon."IMAGE_EXT,_("Mirror Tool"));
 
 	icon_factory->add_default();
-	
+
 	Gtk::IconSize::register_new("synfig-small_icon",12,12);
 	for(int i(0);i<(int)ValueBase::TYPE_END;i++)
 		_tree_pixbuf_table_value_type[i]=Gtk::Button().render_icon(value_icon(ValueBase::Type(i)),Gtk::ICON_SIZE_SMALL_TOOLBAR);
@@ -248,10 +257,10 @@ IconControler::get_tool_cursor(const Glib::ustring& name,const Glib::RefPtr<Gdk:
 	);
 */
 	DEBUGPOINT();
-	
+
 	Gdk::Color FG("#000000");
 	Gdk::Color BG("#FF00FF");
-	
+
 	DEBUGPOINT();
   	return Gdk::Cursor(pixmap, pixmap, FG, BG, 0, 0);
 }
@@ -313,7 +322,7 @@ studio::valuenode_icon(etl::handle<synfig::ValueNode> value_node)
 	}
 	else
 	{
-		return Gtk::StockID("synfig-value_node");		
+		return Gtk::StockID("synfig-value_node");
 	}
 }
 
@@ -339,7 +348,7 @@ studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
 	else if(action.task=="set_off")		stock_id=Gtk::Stock::NO;
 	else if(action.task=="remove")		stock_id=Gtk::Stock::DELETE;
 	else								stock_id=Gtk::StockID("synfig-"+action.task);
-	
+
 	return stock_id;
 }