Since the last change will require a recompilation of pretty much everything, I took...

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

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
index 68a8190..1764ae2 100644 (file)
--- 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
@@ -72,7 +72,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 +94,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+="share/pixmaps";
+               path_to_icons+=ETL_DIRECTORY_SEPARATOR;
+
+               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);
@@ -102,7 +106,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);                        \
@@ -130,7 +134,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"));
@@ -150,7 +154,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 +168,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"));
@@ -198,7 +203,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);
@@ -256,10 +261,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);
 }
@@ -321,7 +326,7 @@ studio::valuenode_icon(etl::handle<synfig::ValueNode> value_node)
        }
        else
        {
-               return Gtk::StockID("synfig-value_node");               
+               return Gtk::StockID("synfig-value_node");
        }
 }
 
@@ -347,14 +352,14 @@ 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;
 }
 
 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");