Use ETL directory separator instead of forward slashes.

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

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
index 225c89a..448a8c6 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
+++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
@@ -83,7 +83,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
 
        std::string path_to_icons;
 #ifdef WIN32
-       path_to_icons=basepath+"/../"+IMAGE_DIR;
+       path_to_icons=basepath+ETL_DIRECTORY_SEPARATOR+".."+ETL_DIRECTORY_SEPARATOR+IMAGE_DIR;
 #else
        path_to_icons=IMAGE_DIR;
 #endif
@@ -92,8 +92,11 @@ IconController::IconController(const synfig::String& /*basepath*/)
        if(synfig_root) {
                path_to_icons=synfig_root;
                path_to_icons+=ETL_DIRECTORY_SEPARATOR;
-
-               path_to_icons+="share/pixmaps/synfigstudio";
+               path_to_icons+="share";
+               path_to_icons+=ETL_DIRECTORY_SEPARATOR;
+               path_to_icons+="pixmaps";
+               path_to_icons+=ETL_DIRECTORY_SEPARATOR;
+               path_to_icons+="synfigstudio";
        }
        path_to_icons+=ETL_DIRECTORY_SEPARATOR;
 
@@ -157,6 +160,9 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(saveall,"saveall_icon."IMAGE_EXT,_("Save All"));
        INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
        INIT_STOCK_ICON(layer_pastecanvas,"pastecanvas_icon."IMAGE_EXT,_("Paste Canvas"));
+       INIT_STOCK_ICON(star,"star_icon."IMAGE_EXT,"");
+       INIT_STOCK_ICON(plant,"plant_icon."IMAGE_EXT,"");
+       INIT_STOCK_ICON(text,"text_icon."IMAGE_EXT,"");
        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"));
@@ -384,6 +390,12 @@ studio::layer_icon(const synfig::String &layer)
                return Gtk::StockID("synfig-circle");
        else if(layer=="rectangle")
                return Gtk::StockID("synfig-rectangle");
+       else if(layer=="star")
+               return Gtk::StockID("synfig-star");
+       else if(layer=="plant")
+               return Gtk::StockID("synfig-plant");
+       else if(layer=="text")
+               return Gtk::StockID("synfig-text");
        else if(layer.find("gradient")!=String::npos)
                return Gtk::StockID("synfig-gradient");
        else