X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Ficoncontroller.cpp;h=58b8d894507fc609c6d854d3d9cc23dcbaecc583;hb=7c3682a6d1bb940fd74e9e327bbc2dd3a8fdb504;hp=1c1ed5918f4d10bd0611927740a13f072570e74e;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 1c1ed59..58b8d89 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -7,6 +7,7 @@ ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** Copyright (c) 2007, 2008 Chris Moore +** Copyright (c) 2008 Paul Wise ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -83,7 +84,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 +93,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,8 +149,8 @@ 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")); INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode")); INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About")); @@ -156,12 +160,15 @@ 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(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")); INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable Grid Snap")); INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap")); INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate")); + INIT_STOCK_ICON(encapsulate,"encapsulate_icon."IMAGE_EXT,_("Encapsulate")); + INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers")); INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack")); INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack")); @@ -185,7 +192,7 @@ IconController::IconController(const synfig::String& /*basepath*/) // 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")); @@ -200,6 +207,9 @@ 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")); + INIT_STOCK_ICON(star,"star_icon."IMAGE_EXT,_("Star Tool")); icon_factory->add_default(); @@ -332,6 +342,11 @@ studio::get_tree_pixbuf(synfig::ValueBase::Type type) 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) { @@ -352,6 +367,11 @@ studio::get_action_stock_id(const synfigapp::Action::BookEntry& action) return stock_id; } +#ifdef WIN32 +#define DELETE TEMPORARY_DELETE_MACRO +#undef TEMPORARY_DELETE_MACRO +#endif + Gtk::StockID studio::layer_icon(const synfig::String &layer) { @@ -371,6 +391,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