X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroller.cpp;h=5c8bc351872025f488e0e30915fd90c1f0a21c46;hb=58575b7ece3fabec0c0ffa2633590819c8812e7b;hp=2af5543fe7d3cbce2ad7382ef94633b006ee0441;hpb=703137ea9f6084f99c34b9e14c47a5e45b21b4a3;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp
index 2af5543..5c8bc35 100644
--- 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;
 
@@ -145,7 +148,6 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	INIT_STOCK_ICON(list,"list_icon."IMAGE_EXT,_("Rename"));
 	INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
 	INIT_STOCK_ICON(string,"string_icon."IMAGE_EXT,_("Rename"));
-	INIT_STOCK_ICON(gradient,"gradient_icon."IMAGE_EXT,_("Gradient"));
 
 	INIT_STOCK_ICON(reset_colors,"reset_colors_icon."IMAGE_EXT,_("Reset Colors"));
 	INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
@@ -159,7 +161,6 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	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"));
@@ -206,6 +207,8 @@ IconController::IconController(const synfig::String& /*basepath*/)
 	INIT_STOCK_ICON(zoom,"zoom_icon."IMAGE_EXT,_("Zoom Tool"));
 	INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool"));
 	INIT_STOCK_ICON(mirror,"mirror_icon."IMAGE_EXT,_("Mirror Tool"));
+	INIT_STOCK_ICON(text,"text_icon."IMAGE_EXT,"Text Tool");
+	INIT_STOCK_ICON(gradient,"gradient_icon."IMAGE_EXT,_("Gradient Tool"));
 
 	icon_factory->add_default();