Merge branch 'nikitakit_master'
[synfig.git] / synfig-studio / src / gui / iconcontroller.cpp
index de86bbb..7022de0 100644 (file)
@@ -153,9 +153,69 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(canvas_pointer,"canvas_pointer_icon."IMAGE_EXT,_("Rename"));
        INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
        INIT_STOCK_ICON(saveall,"saveall_icon."IMAGE_EXT,_("Save All"));
+
+       // Layers
        INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
-       INIT_STOCK_ICON(layer_pastecanvas,"pastecanvas_icon."IMAGE_EXT,_("Paste Canvas"));
+       // Blur Layers
+       INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon."IMAGE_EXT,_("Blur Layer"));
+       INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon."IMAGE_EXT,_("Motion Blur Layer"));
+       INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon."IMAGE_EXT,_("Radial Blur Layer"));
+       // Distortion Layers
+       INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon."IMAGE_EXT,_("Curve Warp Layer"));
+       INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon."IMAGE_EXT,_("Inside Out Layer"));
+       INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon."IMAGE_EXT,_("Noise Distort Layer"));
+       INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon."IMAGE_EXT,_("Spherize Layer"));
+       INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon."IMAGE_EXT,_("Stretch Layer"));
+       INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon."IMAGE_EXT,_("Twirl Layer"));
+       INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon."IMAGE_EXT,_("Warp Layer"));
+       // Example Layers
+       INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon."IMAGE_EXT,_("Filled Rectangle Layer"));
+       INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon."IMAGE_EXT,_("Metallballs Layer"));
+       INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon."IMAGE_EXT,_("Simple Circle Layer"));
+       // Filter Layers
+       INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon."IMAGE_EXT,_("Clamp Layer"));
+       INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon."IMAGE_EXT,_("Color Correct Layer"));
+       INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon."IMAGE_EXT,_("Halftone 2 Layer"));
+       INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon."IMAGE_EXT,_("Halftone 3 Layer"));
+       INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon."IMAGE_EXT,_("Luna Key Layer"));
+       // Fractal Layers
+       INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon."IMAGE_EXT,_("Julia Set Layer"));
+       INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon."IMAGE_EXT,_("Mandelbrot Set Layer"));
+       // Geometry Layers
+       INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon."IMAGE_EXT,_("Checker Board Layer"));
+       INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon."IMAGE_EXT,_("Circle Layer"));
+       INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon."IMAGE_EXT,_("Outline Layer"));
+       INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon."IMAGE_EXT,_("Polygon Layer"));
+       INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon."IMAGE_EXT,_("Rectangle Layer"));
+       INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon."IMAGE_EXT,_("Region Layer"));
+       INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon."IMAGE_EXT,_("Solid Color Layer"));
+       INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon."IMAGE_EXT,_("Star Layer"));
+       // Gradient Layers
+       INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon."IMAGE_EXT,_("Conical Gradient Layer"));
+       INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon."IMAGE_EXT,_("Curve Gradient Layer"));
+       INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon."IMAGE_EXT,_("Noise Gradient Layer"));
+       INIT_STOCK_ICON(layer_gradient_lineal,"layer_gradient_lineal_icon."IMAGE_EXT,_("Linear Gradient Layer"));
+       INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon."IMAGE_EXT,_("Radial Gradient Layer"));
+       INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon."IMAGE_EXT,_("Spiral Gradient Layer"));
+       // Other Layers
+       INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon."IMAGE_EXT,_("Duplicate Layer"));
+       INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon."IMAGE_EXT,_("Import Image Layer"));
+       INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_pastecanvas_icon."IMAGE_EXT,_("Paste Canvas Layer"));
+       INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon."IMAGE_EXT,_("Plant Layer"));
+       INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon."IMAGE_EXT,_("Super Sample Layer"));
+       INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon."IMAGE_EXT,_("Text Layer"));
+       INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon."IMAGE_EXT,_("Time Loop Layer"));
+       INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon."IMAGE_EXT,_("XOR Pattern Layer"));
+       // Stylize Layers
+       INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon."IMAGE_EXT,_("Bevel Layer"));
+       INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon."IMAGE_EXT,_("Shade Layer"));
+       // Transform Layers
+       INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon."IMAGE_EXT,_("Rotate Layer"));
+       INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon."IMAGE_EXT,_("Translate Layer"));
+       INIT_STOCK_ICON(layer_transform_zoom,"layer_transform_zoom_icon."IMAGE_EXT,_("Zoom Layer"));
+
        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"));
@@ -187,6 +247,11 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(seek_prev_frame,"seek_prev_frame."IMAGE_EXT,_("Previous Frame"));
        INIT_STOCK_ICON(seek_next_frame,"seek_next_frame."IMAGE_EXT,_("Next Frame"));
        INIT_STOCK_ICON(seek_end,"seek_end."IMAGE_EXT,_("Seek to End"));
+       INIT_STOCK_ICON(add_to_group,"action_add_to_group_icon."IMAGE_EXT,_("Add Layer to Group"));
+       INIT_STOCK_ICON(remove_from_group,"action_remove_from_group_icon."IMAGE_EXT,_("Remove Layer from Group"));
+       INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon."IMAGE_EXT,_("Set Layer Description"));
+       INIT_STOCK_ICON(export,"action_export_icon."IMAGE_EXT,_("Export Value Node"));
+       INIT_STOCK_ICON(unexport,"action_unexport_icon."IMAGE_EXT,_("Unexport Value Node"));
 
        INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toggle position ducks"));
        INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toggle vertex ducks"));
@@ -212,7 +277,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON_CLONE(cvs_revert,"gtk-revert",_("CVS Revert"));
 
        // Tools
-       INIT_STOCK_ICON(normal,"normal_icon."IMAGE_EXT,_("Normal Tool"));
+       INIT_STOCK_ICON(normal,"normal_icon."IMAGE_EXT,_("Transform Tool"));
        INIT_STOCK_ICON(transform,"transform_icon."IMAGE_EXT,_("Transform Tool"));
        INIT_STOCK_ICON(polygon,"polyline_icon."IMAGE_EXT,_("Polygon Tool"));
        INIT_STOCK_ICON(bline,"bline_icon."IMAGE_EXT,_("BLine Tool"));
@@ -234,7 +299,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
        INIT_STOCK_ICON(star,"star_icon."IMAGE_EXT,_("Star Tool"));
 
 #undef INIT_STOCK_ICON
-#undef INIT_STOCK_ICON
+#undef INIT_STOCK_ICON_CLONE
 
        icon_factory->add_default();
 
@@ -407,30 +472,110 @@ studio::get_action_stock_id(const synfigapp::Action::BookEntry& action)
 Gtk::StockID
 studio::layer_icon(const synfig::String &layer)
 {
-       if(layer=="PasteCanvas" || layer=="pastecanvas" || layer=="paste_canvas")
-               return Gtk::StockID("synfig-layer_pastecanvas");
-       else if(layer=="rotate")
-               return Gtk::StockID("synfig-rotate");
-       else if(layer=="zoom")
-               return Gtk::StockID("synfig-zoom");
-       else if(layer=="region")
-               return Gtk::StockID("synfig-bline");
-       else if(layer=="polygon")
-               return Gtk::StockID("synfig-polygon");
-       else if(layer=="outline")
-               return Gtk::StockID("synfig-width");
+       // Blur Layers
+       if(layer=="blur")
+               return Gtk::StockID("synfig-layer_blur_blur");
+       else if(layer=="MotionBlur") // in the future should be "motion_blur"
+               return Gtk::StockID("synfig-layer_blur_motion");
+       else if(layer=="radial_blur")
+               return Gtk::StockID("synfig-layer_blur_radial");
+       // Distortion Layers
+       else if(layer=="curve_warp")
+               return Gtk::StockID("synfig-layer_distortion_curvewarp");
+       else if(layer=="inside_out")
+               return Gtk::StockID("synfig-layer_distortion_insideout");
+       else if(layer=="noise_distort")
+               return Gtk::StockID("synfig-layer_distortion_noise");
+       else if(layer=="spherize")
+               return Gtk::StockID("synfig-layer_distortion_spherize");
+       else if(layer=="stretch")
+               return Gtk::StockID("synfig-layer_distortion_stretch");
+       else if(layer=="twirl")
+               return Gtk::StockID("synfig-layer_distortion_twirl");
+       else if(layer=="warp")
+               return Gtk::StockID("synfig-layer_distortion_warp");
+       // Example Layers
+       else if(layer=="filled_rectangle")
+               return Gtk::StockID("synfig-layer_example_filledrectangle");
+       else if(layer=="metaballs")
+               return Gtk::StockID("synfig-layer_example_metaballs");
+       else if(layer=="simple_circle")
+               return Gtk::StockID("synfig-layer_example_simplecircle");
+       // Filter Layers
+       else if(layer=="clamp")
+               return Gtk::StockID("synfig-layer_filter_clamp");
+       else if(layer=="colorcorrect")
+               return Gtk::StockID("synfig-layer_filter_colorcorrect");
+       else if(layer=="halftone2")
+               return Gtk::StockID("synfig-layer_filter_halftone2");
+       else if(layer=="halftone3")
+               return Gtk::StockID("synfig-layer_filter_halftone3");
+       else if(layer=="lumakey")
+               return Gtk::StockID("synfig-layer_filter_lumakey");
+       // Fractal Layers
+       else if(layer=="mandelbrot")
+               return Gtk::StockID("synfig-layer_fractal_mandelbrot");
+       else if(layer=="julia")
+               return Gtk::StockID("synfig-layer_fractal_julia");
+       // Geometry Layers
+       else if(layer=="checker_board")
+               return Gtk::StockID("synfig-layer_geometry_checkerboard");
        else if(layer=="circle")
-               return Gtk::StockID("synfig-circle");
+               return Gtk::StockID("synfig-layer_geometry_circle");
+       else if(layer=="outline")
+               return Gtk::StockID("synfig-layer_geometry_outline");
+       else if(layer=="polygon")
+               return Gtk::StockID("synfig-layer_geometry_polygon");
        else if(layer=="rectangle")
-               return Gtk::StockID("synfig-rectangle");
+               return Gtk::StockID("synfig-layer_geometry_rectangle");
+       else if(layer=="region")
+               return Gtk::StockID("synfig-layer_geometry_region");
+       else if(layer=="solid_color" || layer=="SolidColor")
+               return Gtk::StockID("synfig-layer_geometry_solidcolor");
        else if(layer=="star")
-               return Gtk::StockID("synfig-star");
+               return Gtk::StockID("synfig-layer_geometry_star");
+       // Gradient Layers
+       else if(layer=="conical_gradient")
+               return Gtk::StockID("synfig-layer_gradient_conical");
+       else if(layer=="curve_gradient")
+               return Gtk::StockID("synfig-layer_gradient_curve");
+       else if(layer=="noise")
+               return Gtk::StockID("synfig-layer_gradient_noise");
+       else if(layer=="linear_gradient")
+               return Gtk::StockID("synfig-layer_gradient_lineal");
+       else if(layer=="radial_gradient")
+               return Gtk::StockID("synfig-layer_gradient_radial");
+       else if(layer=="spiral_gradient")
+               return Gtk::StockID("synfig-layer_gradient_spiral");
+       // Other Layers
+       else if(layer=="duplicate")
+               return Gtk::StockID("synfig-layer_other_duplicate");
+       else if(layer=="importimage" || layer=="import")
+               return Gtk::StockID("synfig-layer_other_importimage");
+       else if(layer=="PasteCanvas" || layer=="pastecanvas" || layer=="paste_canvas")
+               return Gtk::StockID("synfig-layer_other_pastecanvas");
        else if(layer=="plant")
-               return Gtk::StockID("synfig-plant");
+               return Gtk::StockID("synfig-layer_other_plant");
+       else if(layer=="super_sample")
+               return Gtk::StockID("synfig-layer_other_supersample");
        else if(layer=="text")
-               return Gtk::StockID("synfig-text");
-       else if(layer.find("gradient")!=String::npos)
-               return Gtk::StockID("synfig-gradient");
+               return Gtk::StockID("synfig-layer_other_text");
+       else if(layer=="timeloop")
+               return Gtk::StockID("synfig-layer_other_timeloop");
+       else if(layer=="xor_pattern")
+               return Gtk::StockID("synfig-layer_other_xorpattern");
+       // Stylize Layers
+       else if(layer=="bevel")
+               return Gtk::StockID("synfig-layer_stylize_bevel");
+       else if(layer=="shade")
+               return Gtk::StockID("synfig-layer_stylize_shade");
+       // Transform Layers
+       else if(layer=="rotate")
+               return Gtk::StockID("synfig-layer_transform_rotate");
+       else if(layer=="translate")
+               return Gtk::StockID("synfig-layer_transform_translate");
+       else if(layer=="zoom")
+               return Gtk::StockID("synfig-layer_transform_zoom");
        else
                return Gtk::StockID("synfig-layer");
 }