Skip to content

Instantly share code, notes, and snippets.

@tschoonj

tschoonj/synfigstudio.diff

Created September 27, 2015 13:15
Show Gist options
  • Save tschoonj/91fd64c528c7b971f185 to your computer and use it in GitHub Desktop.
Save tschoonj/91fd64c528c7b971f185 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
synfigstudio.diff
diff --git a/src/gui/canvasview.cpp b/src/gui/canvasview.cpp
index 076f704..9cf4504 100644
--- a/src/gui/canvasview.cpp
+++ b/src/gui/canvasview.cpp
@@ -33,7 +33,7 @@
# include <config.h>
#endif
-#include <sigc++/adaptors/hide.h>
+#include <sigc++/sigc++.h>
#include <sstream>
#include <algorithm>
@@ -91,10 +91,6 @@
//#include <synfigapp/action_setwaypoint.h>
//#include <synfigapp/action_deletewaypoint.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/retype.h>
-//#include <sigc++/hide.h>
-
#include "canvasview.h"
#include "instance.h"
#include "app.h"
diff --git a/src/gui/dialogs/about.cpp b/src/gui/dialogs/about.cpp
index 0312f3c..f27bbe1 100644
--- a/src/gui/dialogs/about.cpp
+++ b/src/gui/dialogs/about.cpp
@@ -203,7 +203,7 @@ About::About()
imagepath+=ETL_DIRECTORY_SEPARATOR;
Gtk::Image *Logo = manage(new class Gtk::Image());
- Logo->set(imagepath+"synfig_icon."IMAGE_EXT);
+ Logo->set(imagepath+"synfig_icon." IMAGE_EXT);
set_logo(Logo->get_pixbuf());
#ifdef SHOW_EXTRA_INFO
diff --git a/src/gui/docks/dock_canvasspecific.cpp b/src/gui/docks/dock_canvasspecific.cpp
index 64f81e5..8404499 100644
--- a/src/gui/docks/dock_canvasspecific.cpp
+++ b/src/gui/docks/dock_canvasspecific.cpp
@@ -35,10 +35,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/adaptors/hide.h>
-//#include <sigc++/hide.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "canvasview.h"
#include <ETL/clock>
diff --git a/src/gui/docks/dock_children.cpp b/src/gui/docks/dock_children.cpp
index 3197aed..aaa52e1 100644
--- a/src/gui/docks/dock_children.cpp
+++ b/src/gui/docks/dock_children.cpp
@@ -36,10 +36,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "trees/childrentreestore.h"
#include "trees/childrentree.h"
#include "canvasview.h"
diff --git a/src/gui/docks/dock_curves.cpp b/src/gui/docks/dock_curves.cpp
index cbcf622..c92a48c 100644
--- a/src/gui/docks/dock_curves.cpp
+++ b/src/gui/docks/dock_curves.cpp
@@ -35,9 +35,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "canvasview.h"
#include "trees/layerparamtreestore.h"
#include "workarea.h"
diff --git a/src/gui/docks/dock_history.cpp b/src/gui/docks/dock_history.cpp
index 426279c..fe35bf4 100644
--- a/src/gui/docks/dock_history.cpp
+++ b/src/gui/docks/dock_history.cpp
@@ -38,9 +38,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include <synfigapp/action.h>
#include "trees/historytreestore.h"
diff --git a/src/gui/docks/dock_info.h b/src/gui/docks/dock_info.h
index c954932..ebe84d5 100644
--- a/src/gui/docks/dock_info.h
+++ b/src/gui/docks/dock_info.h
@@ -27,7 +27,7 @@
/* === H E A D E R S ======================================================= */
#include "docks/dock_canvasspecific.h"
-#include "sigc++/signal.h"
+#include "sigc++/sigc++.h"
#include "widgets/widget_distance.h"
diff --git a/src/gui/docks/dock_keyframes.cpp b/src/gui/docks/dock_keyframes.cpp
index 340a8eb..f3fd8aa 100644
--- a/src/gui/docks/dock_keyframes.cpp
+++ b/src/gui/docks/dock_keyframes.cpp
@@ -35,9 +35,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "trees/keyframetreestore.h"
#include "trees/keyframetree.h"
#include "canvasview.h"
diff --git a/src/gui/docks/dock_layergroups.cpp b/src/gui/docks/dock_layergroups.cpp
index 83d7eb3..4e522fd 100644
--- a/src/gui/docks/dock_layergroups.cpp
+++ b/src/gui/docks/dock_layergroups.cpp
@@ -35,10 +35,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "canvasview.h"
#include "trees/layergrouptreestore.h"
diff --git a/src/gui/docks/dock_layers.cpp b/src/gui/docks/dock_layers.cpp
index b99a6ae..17a147a 100644
--- a/src/gui/docks/dock_layers.cpp
+++ b/src/gui/docks/dock_layers.cpp
@@ -38,10 +38,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "trees/layertreestore.h"
#include "trees/layertree.h"
#include "canvasview.h"
diff --git a/src/gui/docks/dock_metadata.cpp b/src/gui/docks/dock_metadata.cpp
index 0d319e0..24c5427 100644
--- a/src/gui/docks/dock_metadata.cpp
+++ b/src/gui/docks/dock_metadata.cpp
@@ -36,9 +36,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "trees/metadatatreestore.h"
#include "trees/metadatatree.h"
#include "canvasview.h"
diff --git a/src/gui/docks/dock_navigator.h b/src/gui/docks/dock_navigator.h
index 40640e2..c990f56 100644
--- a/src/gui/docks/dock_navigator.h
+++ b/src/gui/docks/dock_navigator.h
@@ -26,7 +26,7 @@
#define __SYNFIG_DOCK_NAVIGATOR_H
/* === H E A D E R S ======================================================= */
-#include "sigc++/signal.h"
+#include "sigc++/sigc++.h"
#include <gtkmm/drawingarea.h>
#include <gdkmm/pixbuf.h>
diff --git a/src/gui/docks/dock_params.cpp b/src/gui/docks/dock_params.cpp
index 6628091..36f8f32 100644
--- a/src/gui/docks/dock_params.cpp
+++ b/src/gui/docks/dock_params.cpp
@@ -35,9 +35,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "canvasview.h"
#include "trees/layerparamtreestore.h"
#include "workarea.h"
diff --git a/src/gui/docks/dock_timetrack.cpp b/src/gui/docks/dock_timetrack.cpp
index 5ec7518..43a4ef7 100644
--- a/src/gui/docks/dock_timetrack.cpp
+++ b/src/gui/docks/dock_timetrack.cpp
@@ -37,9 +37,7 @@
#include <gtkmm/scrolledwindow.h>
#include <cassert>
#include "instance.h"
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include "canvasview.h"
#include "trees/layerparamtreestore.h"
#include "workarea.h"
diff --git a/src/gui/docks/dock_toolbox.cpp b/src/gui/docks/dock_toolbox.cpp
index 53c6b89..6b0931c 100644
--- a/src/gui/docks/dock_toolbox.cpp
+++ b/src/gui/docks/dock_toolbox.cpp
@@ -37,11 +37,7 @@
#include <gtk/gtk.h>
#include <gtkmm/accelmap.h>
-#include <sigc++/signal.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/retype.h>
+#include <sigc++/sigc++.h>
#include "general.h"
#include <sstream>
diff --git a/src/gui/docks/dockable.cpp b/src/gui/docks/dockable.cpp
index 722b05c..9b1d532 100644
--- a/src/gui/docks/dockable.cpp
+++ b/src/gui/docks/dockable.cpp
@@ -30,7 +30,7 @@
#endif
#include "app.h"
-#include <sigc++/hide.h>
+#include <sigc++/sigc++.h>
#include "docks/dockable.h"
#include "docks/dockmanager.h"
diff --git a/src/gui/docks/dockdialog.cpp b/src/gui/docks/dockdialog.cpp
index 6fb14df..ea8b078 100644
--- a/src/gui/docks/dockdialog.cpp
+++ b/src/gui/docks/dockdialog.cpp
@@ -42,10 +42,7 @@
#include <synfig/general.h>
#include <synfig/uniqueid.h>
#include <gtkmm/table.h>
-#include <sigc++/hide.h>
-#include <sigc++/slot.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/retype.h>
+#include <sigc++/sigc++.h>
#include "canvasview.h"
#include <gtkmm/paned.h>
#include <gtkmm/box.h>
diff --git a/src/gui/docks/dockmanager.h b/src/gui/docks/dockmanager.h
index 4efc704..2c5da75 100644
--- a/src/gui/docks/dockmanager.h
+++ b/src/gui/docks/dockmanager.h
@@ -31,8 +31,7 @@
#include <list>
#include <map>
#include <synfig/string.h>
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <ETL/smart_ptr>
#include <gtkmm/widget.h>
diff --git a/src/gui/duck.h b/src/gui/duck.h
index edd0e1b..c0825e5 100644
--- a/src/gui/duck.h
+++ b/src/gui/duck.h
@@ -37,8 +37,7 @@
#include <synfig/vector.h>
#include <synfig/string.h>
#include <synfig/real.h>
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <synfig/time.h>
#include <ETL/smart_ptr>
#include <synfigapp/value_desc.h>
diff --git a/src/gui/duckmatic.cpp b/src/gui/duckmatic.cpp
index 361a91a..6d2e4f2 100644
--- a/src/gui/duckmatic.cpp
+++ b/src/gui/duckmatic.cpp
@@ -66,10 +66,7 @@
#include <synfig/context.h>
#include <synfig/layer_pastecanvas.h>
-#include <sigc++/retype_return.h>
-#include <sigc++/retype.h>
-#include <sigc++/hide.h>
-#include <sigc++/bind.h>
+#include <sigc++/sigc++.h>
#include "ducktransform_matrix.h"
#include "ducktransform_rotate.h"
diff --git a/src/gui/duckmatic.h b/src/gui/duckmatic.h
index c3a702f..4ef8757 100644
--- a/src/gui/duckmatic.h
+++ b/src/gui/duckmatic.h
@@ -39,8 +39,7 @@
#include <synfig/vector.h>
#include <synfig/string.h>
#include <synfig/real.h>
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <synfig/time.h>
#include <synfig/color.h>
#include <ETL/smart_ptr>
diff --git a/src/gui/iconcontroller.cpp b/src/gui/iconcontroller.cpp
index 82cf459..a0114bb 100644
--- a/src/gui/iconcontroller.cpp
+++ b/src/gui/iconcontroller.cpp
@@ -134,205 +134,205 @@ IconController::init_icons(const synfig::String& path_to_icons)
Gtk::Stock::add(stock_##name);
// Types
- INIT_STOCK_ICON(type_bool,"type_bool_icon."IMAGE_EXT,_("Bool"));
- INIT_STOCK_ICON(type_integer,"type_integer_icon."IMAGE_EXT,_("Integer"));
- INIT_STOCK_ICON(type_angle,"type_angle_icon."IMAGE_EXT,_("Angle"));
- INIT_STOCK_ICON(type_time,"type_time_icon."IMAGE_EXT,_("Time"));
- INIT_STOCK_ICON(type_real,"type_real_icon."IMAGE_EXT,_("Real"));
- INIT_STOCK_ICON(type_vector,"type_vector_icon."IMAGE_EXT,_("Vector"));
- INIT_STOCK_ICON(type_color,"type_color_icon."IMAGE_EXT,_("Color"));
- INIT_STOCK_ICON(type_segment,"type_segment_icon."IMAGE_EXT,_("Segment"));
- INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon."IMAGE_EXT,_("Spline Point"));
- INIT_STOCK_ICON(type_list,"type_list_icon."IMAGE_EXT,_("List"));
- INIT_STOCK_ICON(type_string,"type_string_icon."IMAGE_EXT,_("String"));
- INIT_STOCK_ICON(type_canvas,"type_canvas_icon."IMAGE_EXT,_("Canvas"));
- INIT_STOCK_ICON(type_gradient,"type_gradient_icon."IMAGE_EXT,_("Gradient"))
+ INIT_STOCK_ICON(type_bool,"type_bool_icon." IMAGE_EXT,_("Bool"));
+ INIT_STOCK_ICON(type_integer,"type_integer_icon." IMAGE_EXT,_("Integer"));
+ INIT_STOCK_ICON(type_angle,"type_angle_icon." IMAGE_EXT,_("Angle"));
+ INIT_STOCK_ICON(type_time,"type_time_icon." IMAGE_EXT,_("Time"));
+ INIT_STOCK_ICON(type_real,"type_real_icon." IMAGE_EXT,_("Real"));
+ INIT_STOCK_ICON(type_vector,"type_vector_icon." IMAGE_EXT,_("Vector"));
+ INIT_STOCK_ICON(type_color,"type_color_icon." IMAGE_EXT,_("Color"));
+ INIT_STOCK_ICON(type_segment,"type_segment_icon." IMAGE_EXT,_("Segment"));
+ INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon." IMAGE_EXT,_("Spline Point"));
+ INIT_STOCK_ICON(type_list,"type_list_icon." IMAGE_EXT,_("List"));
+ INIT_STOCK_ICON(type_string,"type_string_icon." IMAGE_EXT,_("String"));
+ INIT_STOCK_ICON(type_canvas,"type_canvas_icon." IMAGE_EXT,_("Canvas"));
+ INIT_STOCK_ICON(type_gradient,"type_gradient_icon." IMAGE_EXT,_("Gradient"))
// ToolBox Tools
- INIT_STOCK_ICON(normal,"tool_normal_icon."IMAGE_EXT,_("Transform Tool"));
- INIT_STOCK_ICON(polygon,"tool_polyline_icon."IMAGE_EXT,_("Polygon Tool"));
- INIT_STOCK_ICON(bline,"tool_spline_icon."IMAGE_EXT,_("Spline Tool"));
- INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon."IMAGE_EXT,_("Eyedrop Tool"));
- INIT_STOCK_ICON(fill,"tool_fill_icon."IMAGE_EXT,_("Fill Tool"));
- INIT_STOCK_ICON(draw,"tool_draw_icon."IMAGE_EXT,_("Draw Tool"));
- INIT_STOCK_ICON(lasso,"tool_cutout_icon."IMAGE_EXT,_("Cutout Tool"));
- INIT_STOCK_ICON(brush,"tool_brush_icon."IMAGE_EXT,_("Brush Tool"));
- INIT_STOCK_ICON(sketch,"tool_sketch_icon."IMAGE_EXT,_("Sketch Tool"));
- INIT_STOCK_ICON(circle,"tool_circle_icon."IMAGE_EXT,_("Circle Tool"));
- INIT_STOCK_ICON(rectangle,"tool_rectangle_icon."IMAGE_EXT,_("Rectangle Tool"));
- INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon."IMAGE_EXT,_("SmoothMove Tool"));
- INIT_STOCK_ICON(rotate,"tool_rotate_icon."IMAGE_EXT,"Rotate Tool");
- INIT_STOCK_ICON(width,"tool_width_icon."IMAGE_EXT,_("Width Tool"));
- INIT_STOCK_ICON(scale,"tool_scale_icon."IMAGE_EXT,"Scale Tool");
- INIT_STOCK_ICON(zoom,"tool_zoom_icon."IMAGE_EXT,_("Zoom Tool"));
- INIT_STOCK_ICON(mirror,"tool_mirror_icon."IMAGE_EXT,_("Mirror Tool"));
- INIT_STOCK_ICON(text,"tool_text_icon."IMAGE_EXT,"Text Tool");
- INIT_STOCK_ICON(gradient,"tool_gradient_icon."IMAGE_EXT,_("Gradient Tool"));
- INIT_STOCK_ICON(star,"tool_star_icon."IMAGE_EXT,_("Star Tool"));
+ INIT_STOCK_ICON(normal,"tool_normal_icon." IMAGE_EXT,_("Transform Tool"));
+ INIT_STOCK_ICON(polygon,"tool_polyline_icon." IMAGE_EXT,_("Polygon Tool"));
+ INIT_STOCK_ICON(bline,"tool_spline_icon." IMAGE_EXT,_("Spline Tool"));
+ INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon." IMAGE_EXT,_("Eyedrop Tool"));
+ INIT_STOCK_ICON(fill,"tool_fill_icon." IMAGE_EXT,_("Fill Tool"));
+ INIT_STOCK_ICON(draw,"tool_draw_icon." IMAGE_EXT,_("Draw Tool"));
+ INIT_STOCK_ICON(lasso,"tool_cutout_icon." IMAGE_EXT,_("Cutout Tool"));
+ INIT_STOCK_ICON(brush,"tool_brush_icon." IMAGE_EXT,_("Brush Tool"));
+ INIT_STOCK_ICON(sketch,"tool_sketch_icon." IMAGE_EXT,_("Sketch Tool"));
+ INIT_STOCK_ICON(circle,"tool_circle_icon." IMAGE_EXT,_("Circle Tool"));
+ INIT_STOCK_ICON(rectangle,"tool_rectangle_icon." IMAGE_EXT,_("Rectangle Tool"));
+ INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon." IMAGE_EXT,_("SmoothMove Tool"));
+ INIT_STOCK_ICON(rotate,"tool_rotate_icon." IMAGE_EXT,"Rotate Tool");
+ INIT_STOCK_ICON(width,"tool_width_icon." IMAGE_EXT,_("Width Tool"));
+ INIT_STOCK_ICON(scale,"tool_scale_icon." IMAGE_EXT,"Scale Tool");
+ INIT_STOCK_ICON(zoom,"tool_zoom_icon." IMAGE_EXT,_("Zoom Tool"));
+ INIT_STOCK_ICON(mirror,"tool_mirror_icon." IMAGE_EXT,_("Mirror Tool"));
+ INIT_STOCK_ICON(text,"tool_text_icon." IMAGE_EXT,"Text Tool");
+ INIT_STOCK_ICON(gradient,"tool_gradient_icon." IMAGE_EXT,_("Gradient Tool"));
+ INIT_STOCK_ICON(star,"tool_star_icon." IMAGE_EXT,_("Star Tool"));
//ToolBox Others
- 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(valuenode_forbidanimation,"valuenode_forbidanimation_icon."IMAGE_EXT,_("ValueNode Forbid Animation"));
- INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About"));
- INIT_STOCK_ICON(rename,"rename_icon."IMAGE_EXT,_("Rename"));
- INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
- INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
- INIT_STOCK_ICON(saveall,"saveall_icon."IMAGE_EXT,_("Save All"));
+ 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(valuenode_forbidanimation,"valuenode_forbidanimation_icon." IMAGE_EXT,_("ValueNode Forbid Animation"));
+ INIT_STOCK_ICON(about,"about_icon." IMAGE_EXT,_("About"));
+ INIT_STOCK_ICON(rename,"rename_icon." IMAGE_EXT,_("Rename"));
+ INIT_STOCK_ICON(canvas,"canvas_icon." IMAGE_EXT,_("Canvas"));
+ 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,"layer_icon." IMAGE_EXT,_("Layer"));
// 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"));
+ 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"));
+ 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"));
+ 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,_("Luma Key Layer"));
+ 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,_("Luma 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"));
+ 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_advanced_outline,"layer_geometry_advanced_outline_icon."IMAGE_EXT,_("Advanced 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"));
+ 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_advanced_outline,"layer_geometry_advanced_outline_icon." IMAGE_EXT,_("Advanced 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_linear,"layer_gradient_linear_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"));
+ 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_linear,"layer_gradient_linear_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_group_icon."IMAGE_EXT,_("Group Layer"));
- INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon."IMAGE_EXT,_("Plant Layer"));
- INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon."IMAGE_EXT,_("Stroboscope Layer"));
- INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon."IMAGE_EXT,_("Super Sample Layer"));
- INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon."IMAGE_EXT,_("Sound Layer"));
- INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon."IMAGE_EXT,_("Switch Layer"));
- INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon."IMAGE_EXT,_("Skeleton 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"));
+ 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_group_icon." IMAGE_EXT,_("Group Layer"));
+ INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon." IMAGE_EXT,_("Plant Layer"));
+ INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon." IMAGE_EXT,_("Stroboscope Layer"));
+ INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon." IMAGE_EXT,_("Super Sample Layer"));
+ INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon." IMAGE_EXT,_("Sound Layer"));
+ INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon." IMAGE_EXT,_("Switch Layer"));
+ INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon." IMAGE_EXT,_("Skeleton 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"));
+ 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_scale,"layer_transform_scale_icon."IMAGE_EXT,_("Scale Layer"));
-
- INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool"));
- INIT_STOCK_ICON(group,"set_icon."IMAGE_EXT,_("Set"));
-
- 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,"group_icon."IMAGE_EXT,_("Group"));
- 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"));
-
- INIT_STOCK_ICON(children,"library_icon."IMAGE_EXT,_("Library"));
- INIT_STOCK_ICON(curves,"graphs_icon."IMAGE_EXT,_("Graphs"));
- INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes"));
- INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData"));
- INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator"));
- INIT_STOCK_ICON(timetrack,"time_track_icon."IMAGE_EXT,_("Time Track"));
- INIT_STOCK_ICON(history,"history_icon."IMAGE_EXT,_("History"));
- INIT_STOCK_ICON(palette,"palette_icon."IMAGE_EXT,_("Palette"));
- INIT_STOCK_ICON(params,"parameters_icon."IMAGE_EXT,_("Parameters"));
-
- INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon."IMAGE_EXT,_("Past keyframes unlocked"));
- INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon."IMAGE_EXT,_("Past keyframes locked"));
- INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon."IMAGE_EXT,_("Future keyframes unlocked"));
- INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon."IMAGE_EXT,_("Future keyframes locked"));
-
- INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon."IMAGE_EXT,_("Animate Mode Off"));
- INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon."IMAGE_EXT,_("Animate Mode On"));
+ 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_scale,"layer_transform_scale_icon." IMAGE_EXT,_("Scale Layer"));
+
+ INIT_STOCK_ICON(info,"info_icon." IMAGE_EXT,_("Info Tool"));
+ INIT_STOCK_ICON(group,"set_icon." IMAGE_EXT,_("Set"));
+
+ 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,"group_icon." IMAGE_EXT,_("Group"));
+ 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"));
+
+ INIT_STOCK_ICON(children,"library_icon." IMAGE_EXT,_("Library"));
+ INIT_STOCK_ICON(curves,"graphs_icon." IMAGE_EXT,_("Graphs"));
+ INIT_STOCK_ICON(keyframes,"keyframe_icon." IMAGE_EXT,_("Keyframes"));
+ INIT_STOCK_ICON(meta_data,"meta_data_icon." IMAGE_EXT,_("MetaData"));
+ INIT_STOCK_ICON(navigator,"navigator_icon." IMAGE_EXT,_("Navigator"));
+ INIT_STOCK_ICON(timetrack,"time_track_icon." IMAGE_EXT,_("Time Track"));
+ INIT_STOCK_ICON(history,"history_icon." IMAGE_EXT,_("History"));
+ INIT_STOCK_ICON(palette,"palette_icon." IMAGE_EXT,_("Palette"));
+ INIT_STOCK_ICON(params,"parameters_icon." IMAGE_EXT,_("Parameters"));
+
+ INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon." IMAGE_EXT,_("Past keyframes unlocked"));
+ INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon." IMAGE_EXT,_("Past keyframes locked"));
+ INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon." IMAGE_EXT,_("Future keyframes unlocked"));
+ INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon." IMAGE_EXT,_("Future keyframes locked"));
+
+ INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon." IMAGE_EXT,_("Animate Mode Off"));
+ INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon." IMAGE_EXT,_("Animate Mode On"));
- INIT_STOCK_ICON(jack, "jack_icon."IMAGE_EXT, _("JACK"));
-
- INIT_STOCK_ICON(set_outline_color,"set_outline_color."IMAGE_EXT,_("Set as Outline"));
- INIT_STOCK_ICON(set_fill_color,"set_fill_color."IMAGE_EXT,_("Set as Fill"));
-
- INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon."IMAGE_EXT,_("Seek to Begin"));
- INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon."IMAGE_EXT,_("Seek to Previous Keyframe"));
- INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon."IMAGE_EXT,_("Seek to Previous Frame"));
- INIT_STOCK_ICON(animate_play,"animate_play_icon."IMAGE_EXT,_("Play"));
- INIT_STOCK_ICON(animate_stop,"animate_stop_icon."IMAGE_EXT,_("Stop"));
- INIT_STOCK_ICON(animate_pause,"animate_pause_icon."IMAGE_EXT,_("Pause"));
- INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon."IMAGE_EXT,_("Seek to Next frame"));
- INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon."IMAGE_EXT,_("Seek to Next Keyframe"));
- INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to End"));
- INIT_STOCK_ICON(animate_loop,"animate_loop_icon."IMAGE_EXT,_("Animate Loop"));
-
- INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon."IMAGE_EXT,_("Add Layer to Set"));
- INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon."IMAGE_EXT,_("Remove Layer from Set"));
- 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(flat_interpolation,"action_flat_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Flat"));
- INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Interpolate"));
- INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Peak"));
- INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Rounded"));
- INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Squared"));
-
- INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toggle position handles"));
- INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toggle vertex handles"));
- INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toggle tangent handles"));
- INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toggle radius handles"));
- INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toggle width handles"));
- INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toggle angle handles"));
-
- INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon."IMAGE_EXT,_("Toggle show grid"));
- INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon."IMAGE_EXT,_("Toggle snap grid"));
- INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon."IMAGE_EXT,_("Toggle show guide"));
- INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon."IMAGE_EXT,_("Toggle snap guide"));
-
- INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon."IMAGE_EXT,_("Toggle onion skin"));
-
- INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon."IMAGE_EXT,_("Increase resolution"));
- INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon."IMAGE_EXT,_("Decrease resolution"));
-
- INIT_STOCK_ICON(preview_options,"preview_options_icon."IMAGE_EXT,_("Preview Options Dialog"));
- INIT_STOCK_ICON(render_options,"render_options_icon."IMAGE_EXT,_("Render Options Dialog"));
-
- INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon."IMAGE_EXT,_("TCB interpolation"));
- INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon."IMAGE_EXT,_("Ease In/Out interpolation"));
- INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon."IMAGE_EXT,_("Const interpolation"));
- INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon."IMAGE_EXT,_("Linear interpolation"));
- INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon."IMAGE_EXT,_("Clamped interpolation"));
-
- INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon."IMAGE_EXT,_("Linked"));
- INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon."IMAGE_EXT,_("Unlinked"));
- INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon."IMAGE_EXT,"Utils Timetrack align");
+ INIT_STOCK_ICON(jack, "jack_icon." IMAGE_EXT, _("JACK"));
+
+ INIT_STOCK_ICON(set_outline_color,"set_outline_color." IMAGE_EXT,_("Set as Outline"));
+ INIT_STOCK_ICON(set_fill_color,"set_fill_color." IMAGE_EXT,_("Set as Fill"));
+
+ INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon." IMAGE_EXT,_("Seek to Begin"));
+ INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon." IMAGE_EXT,_("Seek to Previous Keyframe"));
+ INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon." IMAGE_EXT,_("Seek to Previous Frame"));
+ INIT_STOCK_ICON(animate_play,"animate_play_icon." IMAGE_EXT,_("Play"));
+ INIT_STOCK_ICON(animate_stop,"animate_stop_icon." IMAGE_EXT,_("Stop"));
+ INIT_STOCK_ICON(animate_pause,"animate_pause_icon." IMAGE_EXT,_("Pause"));
+ INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon." IMAGE_EXT,_("Seek to Next frame"));
+ INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon." IMAGE_EXT,_("Seek to Next Keyframe"));
+ INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon." IMAGE_EXT,_("Seek to End"));
+ INIT_STOCK_ICON(animate_loop,"animate_loop_icon." IMAGE_EXT,_("Animate Loop"));
+
+ INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon." IMAGE_EXT,_("Add Layer to Set"));
+ INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon." IMAGE_EXT,_("Remove Layer from Set"));
+ 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(flat_interpolation,"action_flat_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Flat"));
+ INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Interpolate"));
+ INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Peak"));
+ INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Rounded"));
+ INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Squared"));
+
+ INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon." IMAGE_EXT,_("Toggle position handles"));
+ INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon." IMAGE_EXT,_("Toggle vertex handles"));
+ INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon." IMAGE_EXT,_("Toggle tangent handles"));
+ INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon." IMAGE_EXT,_("Toggle radius handles"));
+ INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon." IMAGE_EXT,_("Toggle width handles"));
+ INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon." IMAGE_EXT,_("Toggle angle handles"));
+
+ INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon." IMAGE_EXT,_("Toggle show grid"));
+ INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon." IMAGE_EXT,_("Toggle snap grid"));
+ INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon." IMAGE_EXT,_("Toggle show guide"));
+ INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon." IMAGE_EXT,_("Toggle snap guide"));
+
+ INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon." IMAGE_EXT,_("Toggle onion skin"));
+
+ INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon." IMAGE_EXT,_("Increase resolution"));
+ INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon." IMAGE_EXT,_("Decrease resolution"));
+
+ INIT_STOCK_ICON(preview_options,"preview_options_icon." IMAGE_EXT,_("Preview Options Dialog"));
+ INIT_STOCK_ICON(render_options,"render_options_icon." IMAGE_EXT,_("Render Options Dialog"));
+
+ INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon." IMAGE_EXT,_("TCB interpolation"));
+ INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon." IMAGE_EXT,_("Ease In/Out interpolation"));
+ INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon." IMAGE_EXT,_("Const interpolation"));
+ INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon." IMAGE_EXT,_("Linear interpolation"));
+ INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon." IMAGE_EXT,_("Clamped interpolation"));
+
+ INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon." IMAGE_EXT,_("Linked"));
+ INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon." IMAGE_EXT,_("Unlinked"));
+ INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon." IMAGE_EXT,"Utils Timetrack align");
INIT_STOCK_ICON_CLONE(cvs_add,"gtk-add",_("CVS Add"));
INIT_STOCK_ICON_CLONE(cvs_update,"gtk-open",_("CVS Update"));
diff --git a/src/gui/instance.cpp b/src/gui/instance.cpp
index d86f3d8..1119771 100644
--- a/src/gui/instance.cpp
+++ b/src/gui/instance.cpp
@@ -46,16 +46,12 @@
#include <iostream>
#include "canvasview.h"
#include "app.h"
-#include <sigc++/signal.h>
-#include <sigc++/adaptors/hide.h>
+#include <sigc++/sigc++.h>
#include "docks/dock_toolbox.h"
#include "onemoment.h"
#include <synfig/savecanvas.h>
#include "autorecover.h"
-#include <sigc++/retype_return.h>
-#include <sigc++/retype.h>
-//#include <sigc++/hide.h>
#include <synfig/valuenode_composite.h>
#include <synfig/valuenode_duplicate.h>
#include "widgets/widget_waypointmodel.h"
diff --git a/src/gui/instance.h b/src/gui/instance.h
index 0369ccf..f73587d 100644
--- a/src/gui/instance.h
+++ b/src/gui/instance.h
@@ -33,7 +33,7 @@
#include <gtkmm/treeview.h>
#include <gtkmm/treestore.h>
#include <synfigapp/instance.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <synfigapp/value_desc.h>
#include "trees/historytreestore.h"
#include <synfig/canvas.h>
diff --git a/src/gui/splash.cpp b/src/gui/splash.cpp
index b7603bd..3ca27ca 100644
--- a/src/gui/splash.cpp
+++ b/src/gui/splash.cpp
@@ -187,7 +187,7 @@ Splash::Splash():
//synfig::info("%s", strprintf("%d",number).c_str());
splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"."IMAGE_EXT);
*/
- splash_image->set(imagepath+"splash_screen."IMAGE_EXT);
+ splash_image->set(imagepath+"splash_screen." IMAGE_EXT);
splash_image->set_alignment(0.5,0.5);
splash_image->set_padding(0,0);
@@ -220,7 +220,7 @@ Splash::Splash():
frame->add(*fixed);
// Set up the parameters for this pop-up window
- set_title("Synfig Studio "VERSION);
+ set_title("Synfig Studio " VERSION);
set_modal(false);
property_window_position().set_value(Gtk::WIN_POS_CENTER);
set_resizable(false);
diff --git a/src/gui/states/state_draw.cpp b/src/gui/states/state_draw.cpp
index 852585a..80c6ef1 100644
--- a/src/gui/states/state_draw.cpp
+++ b/src/gui/states/state_draw.cpp
@@ -60,7 +60,7 @@
#include "app.h"
#include <utility>
-#include <sigc++/connection.h>
+#include <sigc++/sigc++.h>
#include <gtkmm/radiobutton.h>
#include <gtkmm/radiobuttongroup.h>
diff --git a/src/gui/states/state_lasso.cpp b/src/gui/states/state_lasso.cpp
index 040ed04..38363e7 100644
--- a/src/gui/states/state_lasso.cpp
+++ b/src/gui/states/state_lasso.cpp
@@ -62,7 +62,7 @@
#include "synfigapp/actions/layerencapsulate.h"
#include <utility>
-#include <sigc++/connection.h>
+#include <sigc++/sigc++.h>
#include <gtkmm/radiobutton.h>
#include <gtkmm/radiobuttongroup.h>
diff --git a/src/gui/states/state_stroke.h b/src/gui/states/state_stroke.h
index 0beade5..6b723d1 100644
--- a/src/gui/states/state_stroke.h
+++ b/src/gui/states/state_stroke.h
@@ -29,7 +29,7 @@
#include "canvasview.h"
#include "workarea.h"
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include "duckmatic.h"
#include <synfig/blinepoint.h>
#include <list>
diff --git a/src/gui/states/state_zoom.cpp b/src/gui/states/state_zoom.cpp
index c203612..0bd672f 100644
--- a/src/gui/states/state_zoom.cpp
+++ b/src/gui/states/state_zoom.cpp
@@ -30,8 +30,7 @@
# include <config.h>
#endif
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <ETL/handle>
#include <synfig/vector.h>
diff --git a/src/gui/widgets/widget_curves.cpp b/src/gui/widgets/widget_curves.cpp
index eaf5fd3..4c90a81 100644
--- a/src/gui/widgets/widget_curves.cpp
+++ b/src/gui/widgets/widget_curves.cpp
@@ -38,7 +38,7 @@
#include <map>
#include <vector>
#include <ETL/misc>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include "general.h"
diff --git a/src/gui/widgets/widget_distance.h b/src/gui/widgets/widget_distance.h
index 514dbf9..e0e4eaf 100644
--- a/src/gui/widgets/widget_distance.h
+++ b/src/gui/widgets/widget_distance.h
@@ -27,8 +27,7 @@
/* === H E A D E R S ======================================================= */
-#include <sigc++/signal.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include <gtkmm/spinbutton.h>
#include <gtkmm/adjustment.h>
#include <synfig/distance.h>
diff --git a/src/gui/widgets/widget_filename.h b/src/gui/widgets/widget_filename.h
index 844ba19..eff0955 100644
--- a/src/gui/widgets/widget_filename.h
+++ b/src/gui/widgets/widget_filename.h
@@ -27,8 +27,7 @@
/* === H E A D E R S ======================================================= */
-#include <sigc++/signal.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include <gtkmm/grid.h>
#include <gtkmm/entry.h>
#include <gtkmm/button.h>
diff --git a/src/gui/widgets/widget_keyframe_list.h b/src/gui/widgets/widget_keyframe_list.h
index fc17ea2..ebdc568 100644
--- a/src/gui/widgets/widget_keyframe_list.h
+++ b/src/gui/widgets/widget_keyframe_list.h
@@ -33,7 +33,7 @@
#include <gtkmm/tooltip.h>
#include <gtkmm/window.h>
#include <synfig/keyframe.h>
-#include <sigc++/connection.h>
+#include <sigc++/sigc++.h>
#include <synfigapp/canvasinterface.h>
diff --git a/src/gui/widgets/widget_ruler.h b/src/gui/widgets/widget_ruler.h
index 07345fa..a81e90f 100644
--- a/src/gui/widgets/widget_ruler.h
+++ b/src/gui/widgets/widget_ruler.h
@@ -27,8 +27,7 @@
/* === H E A D E R S ======================================================= */
-#include <sigc++/signal.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include <gtkmm/drawingarea.h>
#include <pangomm/layout.h>
diff --git a/src/gui/widgets/widget_time.h b/src/gui/widgets/widget_time.h
index 59ff6c4..d346b62 100644
--- a/src/gui/widgets/widget_time.h
+++ b/src/gui/widgets/widget_time.h
@@ -27,8 +27,7 @@
/* === H E A D E R S ======================================================= */
-#include <sigc++/signal.h>
-#include <sigc++/slot.h>
+#include <sigc++/sigc++.h>
#include <gtkmm/entry.h>
#include <synfig/time.h>
diff --git a/src/gui/workarea.cpp b/src/gui/workarea.cpp
index b260100..95cde48 100644
--- a/src/gui/workarea.cpp
+++ b/src/gui/workarea.cpp
@@ -32,7 +32,7 @@
# include <config.h>
#endif
-#include <sigc++/adaptors/hide.h>
+#include <sigc++/sigc++.h>
#include "workarea.h"
#include "canvasview.h"
@@ -44,9 +44,6 @@
#include <gtkmm/image.h>
#include <gtkmm/scrollbar.h>
#include <cmath>
-#include <sigc++/retype_return.h>
-#include <sigc++/retype.h>
-#include <sigc++/hide.h>
#include <ETL/misc>
#include <synfig/target_scanline.h>
diff --git a/src/gui/workarearenderer/workarearenderer.h b/src/gui/workarearenderer/workarearenderer.h
index c11c3be..0e10db1 100644
--- a/src/gui/workarearenderer/workarearenderer.h
+++ b/src/gui/workarearenderer/workarearenderer.h
@@ -28,8 +28,7 @@
/* === H E A D E R S ======================================================= */
#include <ETL/handle>
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <synfig/vector.h>
#include <gdkmm/window.h>
#include <gdkmm/rectangle.h>
diff --git a/src/synfigapp/action_system.h b/src/synfigapp/action_system.h
index 0e2fc3f..92c2a9a 100644
--- a/src/synfigapp/action_system.h
+++ b/src/synfigapp/action_system.h
@@ -28,8 +28,7 @@
/* === H E A D E R S ======================================================= */
#include "action.h"
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <ETL/handle>
#include <synfig/canvas.h>
#include "uimanager.h"
diff --git a/src/synfigapp/canvasinterface.h b/src/synfigapp/canvasinterface.h
index 799604e..8e03702 100644
--- a/src/synfigapp/canvasinterface.h
+++ b/src/synfigapp/canvasinterface.h
@@ -30,8 +30,7 @@
//#include <synfig/canvas.h>
#include <synfig/value.h>
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include <list>
#include "selectionmanager.h"
#include "uimanager.h"
diff --git a/src/synfigapp/instance.h b/src/synfigapp/instance.h
index 7fe60aa..1adae0c 100644
--- a/src/synfigapp/instance.h
+++ b/src/synfigapp/instance.h
@@ -35,8 +35,7 @@
#include <synfig/filesystemgroup.h>
#include <list>
#include <set>
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include "action_system.h"
#include "selectionmanager.h"
#include "cvs.h"
diff --git a/src/synfigapp/main.h b/src/synfigapp/main.h
index 80455d1..39ceca0 100644
--- a/src/synfigapp/main.h
+++ b/src/synfigapp/main.h
@@ -34,8 +34,7 @@
#include <synfig/distance.h>
#include <synfig/real.h>
#include <synfig/waypoint.h>
-#include <sigc++/signal.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
#include "inputdevice.h"
#include "settings.h"
diff --git a/src/synfigapp/uimanager.h b/src/synfigapp/uimanager.h
index 18c9cdc..984fe2c 100644
--- a/src/synfigapp/uimanager.h
+++ b/src/synfigapp/uimanager.h
@@ -30,7 +30,7 @@
#include <ETL/handle>
#include <synfig/general.h>
#include <synfig/string.h>
-#include <sigc++/object.h>
+#include <sigc++/sigc++.h>
/* === M A C R O S ========================================================= */
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment