X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroler.cpp;h=3e263b160d4f917381de7f366b63fc75c6771503;hb=000f59bb0af1107031ed5abfcc0ad2ab3b851dc0;hp=280925abcd15a85047f530455829b56ee6126000;hpb=c6af6e1c3816eb3b15c573089b32e6ae65cd2f49;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
index 280925a..3e263b1 100644
--- a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
@@ -2,10 +2,11 @@
 /*!	\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
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -72,7 +73,11 @@ using namespace synfig;
 
 static Glib::RefPtr<Gdk::Pixbuf> _tree_pixbuf_table_value_type[(int)synfig::ValueBase::TYPE_END];
 
+#ifdef WIN32
 IconControler::IconControler(const synfig::String& basepath)
+#else
+IconControler::IconControler(const synfig::String& /*basepath*/)
+#endif
 {
 	Gtk::IconSource icon_source;
 	icon_source.set_direction_wildcarded();
@@ -90,11 +95,11 @@ IconControler::IconControler(const synfig::String& basepath)
 	char* synfig_root=getenv("SYNFIG_ROOT");
 	if(synfig_root) {
 		path_to_icons=synfig_root;
-		path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+		path_to_icons+=ETL_DIRECTORY_SEPARATOR;
 
-		path_to_icons+="share/pixmaps";
+		path_to_icons+="share/pixmaps/synfigstudio";
 	}
-	path_to_icons+=ETL_DIRECTORY_SEPERATOR;
+	path_to_icons+=ETL_DIRECTORY_SEPARATOR;
 
 	try{
 	Gtk::Window::set_default_icon_from_file(path_to_icons+"synfig_icon."+IMAGE_EXT);
@@ -150,7 +155,7 @@ IconControler::IconControler(const synfig::String& basepath)
 	INIT_STOCK_ICON(saveall,"saveall_icon."IMAGE_EXT,_("Save All"));
 	INIT_STOCK_ICON(bool,"bool_icon."IMAGE_EXT,_("Bool"));
 	INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
-	INIT_STOCK_ICON(layer_pastecanvas,"pastecanvas_icon."IMAGE_EXT,_("PasteCanvas"));
+	INIT_STOCK_ICON(layer_pastecanvas,"pastecanvas_icon."IMAGE_EXT,_("Paste Canvas"));
 	INIT_STOCK_ICON(group,"group_icon."IMAGE_EXT,_("Group"));
 	INIT_STOCK_ICON(grid_enable,"grid_enable_icon."IMAGE_EXT,_("Show Grid"));
 	INIT_STOCK_ICON(grid_disable,"grid_disable_icon."IMAGE_EXT,_("Hide Grid"));
@@ -164,6 +169,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"));
@@ -336,25 +342,26 @@ Gtk::StockID
 studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
 {
 	Gtk::StockID stock_id;
-	if(action.task=="raise")			stock_id=Gtk::Stock::GO_UP;
-	else if(action.task=="lower")		stock_id=Gtk::Stock::GO_DOWN;
-	else if(action.task=="add")			stock_id=Gtk::Stock::ADD;
+	if(action.task=="add")				stock_id=Gtk::Stock::ADD;
+	else if(action.task=="connect")		stock_id=Gtk::Stock::CONNECT;
+	else if(action.task=="disconnect")	stock_id=Gtk::Stock::DISCONNECT;
 	else if(action.task=="insert")		stock_id=Gtk::Stock::ADD;
-	else if(action.task=="move_top")	stock_id=Gtk::Stock::GOTO_TOP;
+	else if(action.task=="lower")		stock_id=Gtk::Stock::GO_DOWN;
 	else if(action.task=="move_bottom")	stock_id=Gtk::Stock::GOTO_BOTTOM;
+	else if(action.task=="move_top")	stock_id=Gtk::Stock::GOTO_TOP;
+	else if(action.task=="raise")		stock_id=Gtk::Stock::GO_UP;
 	else if(action.task=="remove")		stock_id=Gtk::Stock::DELETE;
-	else if(action.task=="set_on")		stock_id=Gtk::Stock::YES;
 	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);
-
+	else if(action.task=="set_on")		stock_id=Gtk::Stock::YES;
+	else								stock_id=Gtk::StockID("synfig-"+
+															  action.task);
 	return stock_id;
 }
 
 Gtk::StockID
 studio::layer_icon(const synfig::String &layer)
 {
-	if(layer=="PasteCanvas" || layer=="pastecanvas")
+	if(layer=="PasteCanvas" || layer=="pastecanvas" || layer=="paste_canvas")
 		return Gtk::StockID("synfig-layer_pastecanvas");
 	else if(layer=="rotate")
 		return Gtk::StockID("synfig-rotate");