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
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;
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"));
INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode"));
INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About"));
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(plant,"plant_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"));
// Tools
INIT_STOCK_ICON(normal,"normal_icon."IMAGE_EXT,_("Normal Tool"));
- INIT_STOCK_ICON(polygon,"polygon_icon."IMAGE_EXT,_("Polygon Tool"));
+ INIT_STOCK_ICON(polygon,"polyline_icon."IMAGE_EXT,_("Polygon Tool"));
INIT_STOCK_ICON(bline,"bline_icon."IMAGE_EXT,_("BLine Tool"));
INIT_STOCK_ICON(eyedrop,"eyedrop_icon."IMAGE_EXT,_("Eyedrop Tool"));
INIT_STOCK_ICON(fill,"fill_icon."IMAGE_EXT,_("Fill Tool"));
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"));
+ INIT_STOCK_ICON(star,"star_icon."IMAGE_EXT,_("Star Tool"));
icon_factory->add_default();
//return Gtk::Button().render_icon(value_icon(type),Gtk::ICON_SIZE_SMALL_TOOLBAR);
return _tree_pixbuf_table_value_type[int(type)];
}
+
+#ifdef WIN32
#define TEMPORARY_DELETE_MACRO DELETE
#undef DELETE
+#endif
+
Gtk::StockID
studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
{
action.task);
return stock_id;
}
+
+#ifdef WIN32
#define DELETE TEMPORARY_DELETE_MACRO
#undef TEMPORARY_DELETE_MACRO
+#endif
Gtk::StockID
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