Removed trailing whitespace.

[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 36adb8b..ee131c1 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroler.cpp
@@ -5,16 +5,17 @@
 **     $Id: iconcontroler.cpp,v 1.1.1.1 2005/01/07 03:34:36 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
 */
 /* ========================================================================= */
@@ -85,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{
@@ -93,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);                        \
@@ -121,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"));
@@ -189,7 +198,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);
@@ -247,10 +256,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);
 }
@@ -312,7 +321,7 @@ studio::valuenode_icon(etl::handle<synfig::ValueNode> value_node)
        }
        else
        {
-               return Gtk::StockID("synfig-value_node");               
+               return Gtk::StockID("synfig-value_node");
        }
 }
 
@@ -338,7 +347,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;
 }