From 02252941b29de64037116f4d37991a38d9ff0d94 Mon Sep 17 00:00:00 2001 From: darco Date: Fri, 8 Jul 2005 10:55:57 +0000 Subject: [PATCH] my log git-svn-id: http://svn.voria.com/code@26 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/Makefile.am | 10 +- synfig-studio/trunk/config/configure.ac | 18 +- synfig-studio/trunk/config/sinfg.m4 | 51 -- synfig-studio/trunk/config/synfig.m4 | 51 ++ synfig-studio/trunk/fixer | 21 +- synfig-studio/trunk/images/Makefile.am | 34 +- synfig-studio/trunk/images/about_dialog.sif | 8 +- synfig-studio/trunk/images/sinfg_icon.sif | 65 -- synfig-studio/trunk/images/synfig_icon.sif | 65 ++ synfig-studio/trunk/sinfgstudio.desktop.in | 11 - synfig-studio/trunk/sinfgstudio.keys.in | 23 - synfig-studio/trunk/sinfgstudio.mime.in | 7 - synfig-studio/trunk/src/Makefile.am | 12 +- synfig-studio/trunk/src/gtkmm/Makefile.am | 10 +- synfig-studio/trunk/src/gtkmm/about.cpp | 18 +- synfig-studio/trunk/src/gtkmm/about.h | 10 +- synfig-studio/trunk/src/gtkmm/adjust_window.cpp | 6 +- synfig-studio/trunk/src/gtkmm/adjust_window.h | 6 +- synfig-studio/trunk/src/gtkmm/app.cpp | 206 ++--- synfig-studio/trunk/src/gtkmm/app.h | 38 +- synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp | 34 +- synfig-studio/trunk/src/gtkmm/asyncrenderer.h | 22 +- synfig-studio/trunk/src/gtkmm/audiocontainer.cpp | 114 +-- synfig-studio/trunk/src/gtkmm/audiocontainer.h | 8 +- synfig-studio/trunk/src/gtkmm/autorecover.cpp | 32 +- synfig-studio/trunk/src/gtkmm/autorecover.h | 16 +- synfig-studio/trunk/src/gtkmm/canvasoptions.cpp | 4 +- synfig-studio/trunk/src/gtkmm/canvasoptions.h | 6 +- synfig-studio/trunk/src/gtkmm/canvasproperties.cpp | 10 +- synfig-studio/trunk/src/gtkmm/canvasproperties.h | 12 +- synfig-studio/trunk/src/gtkmm/canvastreestore.cpp | 58 +- synfig-studio/trunk/src/gtkmm/canvastreestore.h | 40 +- synfig-studio/trunk/src/gtkmm/canvasview.cpp | 408 +++++----- synfig-studio/trunk/src/gtkmm/canvasview.h | 124 +-- .../trunk/src/gtkmm/cellrenderer_gradient.cpp | 6 +- .../trunk/src/gtkmm/cellrenderer_gradient.h | 16 +- .../trunk/src/gtkmm/cellrenderer_time.cpp | 8 +- synfig-studio/trunk/src/gtkmm/cellrenderer_time.h | 20 +- .../trunk/src/gtkmm/cellrenderer_timetrack.cpp | 124 +-- .../trunk/src/gtkmm/cellrenderer_timetrack.h | 64 +- .../trunk/src/gtkmm/cellrenderer_value.cpp | 50 +- synfig-studio/trunk/src/gtkmm/cellrenderer_value.h | 36 +- synfig-studio/trunk/src/gtkmm/childrentree.cpp | 20 +- synfig-studio/trunk/src/gtkmm/childrentree.h | 26 +- .../trunk/src/gtkmm/childrentreestore.cpp | 22 +- synfig-studio/trunk/src/gtkmm/childrentreestore.h | 32 +- synfig-studio/trunk/src/gtkmm/compview.cpp | 30 +- synfig-studio/trunk/src/gtkmm/compview.h | 10 +- synfig-studio/trunk/src/gtkmm/devicetracker.cpp | 14 +- synfig-studio/trunk/src/gtkmm/devicetracker.h | 6 +- synfig-studio/trunk/src/gtkmm/dialog_color.cpp | 12 +- synfig-studio/trunk/src/gtkmm/dialog_color.h | 30 +- synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp | 24 +- synfig-studio/trunk/src/gtkmm/dialog_gradient.h | 28 +- synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp | 16 +- synfig-studio/trunk/src/gtkmm/dialog_keyframe.h | 18 +- synfig-studio/trunk/src/gtkmm/dialog_preview.cpp | 4 +- synfig-studio/trunk/src/gtkmm/dialog_preview.h | 16 +- synfig-studio/trunk/src/gtkmm/dialog_setup.cpp | 6 +- synfig-studio/trunk/src/gtkmm/dialog_setup.h | 16 +- .../trunk/src/gtkmm/dialog_soundselect.cpp | 6 +- synfig-studio/trunk/src/gtkmm/dialog_soundselect.h | 22 +- .../trunk/src/gtkmm/dialog_tooloptions.cpp | 14 +- synfig-studio/trunk/src/gtkmm/dialog_tooloptions.h | 8 +- synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp | 12 +- synfig-studio/trunk/src/gtkmm/dialog_waypoint.h | 32 +- synfig-studio/trunk/src/gtkmm/dialogsettings.cpp | 24 +- synfig-studio/trunk/src/gtkmm/dialogsettings.h | 18 +- synfig-studio/trunk/src/gtkmm/dock_canvases.cpp | 18 +- synfig-studio/trunk/src/gtkmm/dock_canvases.h | 8 +- .../trunk/src/gtkmm/dock_canvasspecific.cpp | 18 +- .../trunk/src/gtkmm/dock_canvasspecific.h | 10 +- synfig-studio/trunk/src/gtkmm/dock_children.cpp | 8 +- synfig-studio/trunk/src/gtkmm/dock_children.h | 6 +- synfig-studio/trunk/src/gtkmm/dock_curves.cpp | 10 +- synfig-studio/trunk/src/gtkmm/dock_curves.h | 6 +- synfig-studio/trunk/src/gtkmm/dock_history.cpp | 20 +- synfig-studio/trunk/src/gtkmm/dock_history.h | 6 +- synfig-studio/trunk/src/gtkmm/dock_info.cpp | 10 +- synfig-studio/trunk/src/gtkmm/dock_info.h | 8 +- synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp | 8 +- synfig-studio/trunk/src/gtkmm/dock_keyframes.h | 6 +- synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp | 6 +- synfig-studio/trunk/src/gtkmm/dock_layergroups.h | 6 +- synfig-studio/trunk/src/gtkmm/dock_layers.cpp | 38 +- synfig-studio/trunk/src/gtkmm/dock_layers.h | 8 +- synfig-studio/trunk/src/gtkmm/dock_metadata.cpp | 8 +- synfig-studio/trunk/src/gtkmm/dock_metadata.h | 6 +- synfig-studio/trunk/src/gtkmm/dock_navigator.cpp | 64 +- synfig-studio/trunk/src/gtkmm/dock_navigator.h | 10 +- synfig-studio/trunk/src/gtkmm/dock_params.cpp | 8 +- synfig-studio/trunk/src/gtkmm/dock_params.h | 6 +- synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp | 28 +- synfig-studio/trunk/src/gtkmm/dock_timetrack.h | 6 +- synfig-studio/trunk/src/gtkmm/dockable.cpp | 14 +- synfig-studio/trunk/src/gtkmm/dockable.h | 22 +- synfig-studio/trunk/src/gtkmm/dockbook.cpp | 20 +- synfig-studio/trunk/src/gtkmm/dockbook.h | 14 +- synfig-studio/trunk/src/gtkmm/dockdialog.cpp | 38 +- synfig-studio/trunk/src/gtkmm/dockdialog.h | 12 +- synfig-studio/trunk/src/gtkmm/dockmanager.cpp | 48 +- synfig-studio/trunk/src/gtkmm/dockmanager.h | 12 +- synfig-studio/trunk/src/gtkmm/duck.cpp | 30 +- synfig-studio/trunk/src/gtkmm/duck.h | 96 +-- synfig-studio/trunk/src/gtkmm/duckmatic.cpp | 242 +++--- synfig-studio/trunk/src/gtkmm/duckmatic.h | 110 +-- .../trunk/src/gtkmm/ducktransform_rotate.h | 36 +- .../trunk/src/gtkmm/ducktransform_scale.h | 18 +- .../trunk/src/gtkmm/ducktransform_translate.h | 20 +- synfig-studio/trunk/src/gtkmm/event_layerclick.h | 16 +- synfig-studio/trunk/src/gtkmm/event_mouse.h | 20 +- synfig-studio/trunk/src/gtkmm/eventkey.h | 6 +- .../trunk/src/gtkmm/groupactionmanager.cpp | 24 +- synfig-studio/trunk/src/gtkmm/groupactionmanager.h | 14 +- synfig-studio/trunk/src/gtkmm/historytreestore.cpp | 34 +- synfig-studio/trunk/src/gtkmm/historytreestore.h | 20 +- synfig-studio/trunk/src/gtkmm/iconcontroler.cpp | 90 +-- synfig-studio/trunk/src/gtkmm/iconcontroler.h | 26 +- synfig-studio/trunk/src/gtkmm/instance.cpp | 168 ++-- synfig-studio/trunk/src/gtkmm/instance.h | 52 +- synfig-studio/trunk/src/gtkmm/ipc.cpp | 46 +- synfig-studio/trunk/src/gtkmm/ipc.h | 18 +- .../trunk/src/gtkmm/keyframeactionmanager.cpp | 16 +- .../trunk/src/gtkmm/keyframeactionmanager.h | 14 +- synfig-studio/trunk/src/gtkmm/keyframetree.cpp | 16 +- synfig-studio/trunk/src/gtkmm/keyframetree.h | 28 +- .../trunk/src/gtkmm/keyframetreestore.cpp | 82 +- synfig-studio/trunk/src/gtkmm/keyframetreestore.h | 42 +- synfig-studio/trunk/src/gtkmm/keymapsettings.cpp | 4 +- synfig-studio/trunk/src/gtkmm/keymapsettings.h | 6 +- .../trunk/src/gtkmm/layeractionmanager.cpp | 54 +- synfig-studio/trunk/src/gtkmm/layeractionmanager.h | 18 +- synfig-studio/trunk/src/gtkmm/layergrouptree.cpp | 26 +- synfig-studio/trunk/src/gtkmm/layergrouptree.h | 20 +- .../trunk/src/gtkmm/layergrouptreestore.cpp | 140 ++-- .../trunk/src/gtkmm/layergrouptreestore.h | 56 +- .../trunk/src/gtkmm/layerparamtreestore.cpp | 52 +- .../trunk/src/gtkmm/layerparamtreestore.h | 38 +- synfig-studio/trunk/src/gtkmm/layertree.cpp | 96 +-- synfig-studio/trunk/src/gtkmm/layertree.h | 44 +- synfig-studio/trunk/src/gtkmm/layertreestore.cpp | 154 ++-- synfig-studio/trunk/src/gtkmm/layertreestore.h | 72 +- synfig-studio/trunk/src/gtkmm/main.cpp | 8 +- .../trunk/src/gtkmm/metadatatreestore.cpp | 20 +- synfig-studio/trunk/src/gtkmm/metadatatreestore.h | 28 +- .../trunk/src/gtkmm/mod_mirror/mod_mirror.cpp | 4 +- .../trunk/src/gtkmm/mod_mirror/mod_mirror.h | 6 +- .../trunk/src/gtkmm/mod_mirror/state_mirror.cpp | 32 +- .../trunk/src/gtkmm/mod_mirror/state_mirror.h | 6 +- .../trunk/src/gtkmm/mod_palette/dock_palbrowse.cpp | 4 +- .../trunk/src/gtkmm/mod_palette/dock_palbrowse.h | 10 +- .../trunk/src/gtkmm/mod_palette/dock_paledit.cpp | 34 +- .../trunk/src/gtkmm/mod_palette/dock_paledit.h | 30 +- .../trunk/src/gtkmm/mod_palette/mod_palette.cpp | 4 +- .../trunk/src/gtkmm/mod_palette/mod_palette.h | 6 +- synfig-studio/trunk/src/gtkmm/module.cpp | 4 +- synfig-studio/trunk/src/gtkmm/module.h | 6 +- synfig-studio/trunk/src/gtkmm/onemoment.cpp | 6 +- synfig-studio/trunk/src/gtkmm/onemoment.h | 8 +- synfig-studio/trunk/src/gtkmm/preview.cpp | 96 +-- synfig-studio/trunk/src/gtkmm/preview.h | 22 +- synfig-studio/trunk/src/gtkmm/renddesc.cpp | 24 +- synfig-studio/trunk/src/gtkmm/renddesc.h | 16 +- synfig-studio/trunk/src/gtkmm/render.cpp | 18 +- synfig-studio/trunk/src/gtkmm/render.h | 18 +- synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp | 34 +- synfig-studio/trunk/src/gtkmm/renderer_bbox.h | 14 +- synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp | 18 +- synfig-studio/trunk/src/gtkmm/renderer_canvas.h | 6 +- synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp | 36 +- synfig-studio/trunk/src/gtkmm/renderer_dragbox.h | 12 +- synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp | 20 +- synfig-studio/trunk/src/gtkmm/renderer_ducks.h | 6 +- synfig-studio/trunk/src/gtkmm/renderer_grid.cpp | 32 +- synfig-studio/trunk/src/gtkmm/renderer_grid.h | 8 +- synfig-studio/trunk/src/gtkmm/renderer_guides.cpp | 38 +- synfig-studio/trunk/src/gtkmm/renderer_guides.h | 6 +- .../trunk/src/gtkmm/renderer_timecode.cpp | 36 +- synfig-studio/trunk/src/gtkmm/renderer_timecode.h | 8 +- synfig-studio/trunk/src/gtkmm/smach.h | 6 +- synfig-studio/trunk/src/gtkmm/state_bline.cpp | 126 +-- synfig-studio/trunk/src/gtkmm/state_bline.h | 6 +- synfig-studio/trunk/src/gtkmm/state_circle.cpp | 30 +- synfig-studio/trunk/src/gtkmm/state_circle.h | 6 +- synfig-studio/trunk/src/gtkmm/state_draw.cpp | 222 +++--- synfig-studio/trunk/src/gtkmm/state_draw.h | 6 +- synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp | 20 +- synfig-studio/trunk/src/gtkmm/state_eyedrop.h | 6 +- synfig-studio/trunk/src/gtkmm/state_fill.cpp | 34 +- synfig-studio/trunk/src/gtkmm/state_fill.h | 6 +- synfig-studio/trunk/src/gtkmm/state_gradient.cpp | 32 +- synfig-studio/trunk/src/gtkmm/state_gradient.h | 6 +- synfig-studio/trunk/src/gtkmm/state_normal.cpp | 62 +- synfig-studio/trunk/src/gtkmm/state_normal.h | 6 +- synfig-studio/trunk/src/gtkmm/state_polygon.cpp | 50 +- synfig-studio/trunk/src/gtkmm/state_polygon.h | 6 +- synfig-studio/trunk/src/gtkmm/state_rectangle.cpp | 30 +- synfig-studio/trunk/src/gtkmm/state_rectangle.h | 6 +- synfig-studio/trunk/src/gtkmm/state_rotate.cpp | 50 +- synfig-studio/trunk/src/gtkmm/state_rotate.h | 6 +- synfig-studio/trunk/src/gtkmm/state_scale.cpp | 40 +- synfig-studio/trunk/src/gtkmm/state_scale.h | 6 +- synfig-studio/trunk/src/gtkmm/state_sketch.cpp | 24 +- synfig-studio/trunk/src/gtkmm/state_sketch.h | 6 +- synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp | 42 +- synfig-studio/trunk/src/gtkmm/state_smoothmove.h | 6 +- synfig-studio/trunk/src/gtkmm/state_stroke.cpp | 24 +- synfig-studio/trunk/src/gtkmm/state_stroke.h | 16 +- synfig-studio/trunk/src/gtkmm/state_width.cpp | 28 +- synfig-studio/trunk/src/gtkmm/state_width.h | 6 +- synfig-studio/trunk/src/gtkmm/state_zoom.cpp | 16 +- synfig-studio/trunk/src/gtkmm/state_zoom.h | 6 +- synfig-studio/trunk/src/gtkmm/statemanager.cpp | 8 +- synfig-studio/trunk/src/gtkmm/statemanager.h | 6 +- synfig-studio/trunk/src/gtkmm/toolbox.cpp | 56 +- synfig-studio/trunk/src/gtkmm/toolbox.h | 14 +- synfig-studio/trunk/src/gtkmm/valuelink.cpp | 4 +- synfig-studio/trunk/src/gtkmm/valuelink.h | 28 +- .../trunk/src/gtkmm/widget_canvaschooser.cpp | 16 +- .../trunk/src/gtkmm/widget_canvaschooser.h | 20 +- synfig-studio/trunk/src/gtkmm/widget_color.cpp | 20 +- synfig-studio/trunk/src/gtkmm/widget_color.h | 18 +- synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp | 10 +- synfig-studio/trunk/src/gtkmm/widget_coloredit.h | 46 +- .../trunk/src/gtkmm/widget_compselect.cpp | 10 +- synfig-studio/trunk/src/gtkmm/widget_compselect.h | 6 +- synfig-studio/trunk/src/gtkmm/widget_curves.cpp | 32 +- synfig-studio/trunk/src/gtkmm/widget_curves.h | 12 +- synfig-studio/trunk/src/gtkmm/widget_defaults.cpp | 142 ++-- synfig-studio/trunk/src/gtkmm/widget_defaults.h | 8 +- synfig-studio/trunk/src/gtkmm/widget_distance.cpp | 12 +- synfig-studio/trunk/src/gtkmm/widget_distance.h | 14 +- synfig-studio/trunk/src/gtkmm/widget_enum.cpp | 12 +- synfig-studio/trunk/src/gtkmm/widget_enum.h | 14 +- synfig-studio/trunk/src/gtkmm/widget_filename.cpp | 4 +- synfig-studio/trunk/src/gtkmm/widget_filename.h | 6 +- synfig-studio/trunk/src/gtkmm/widget_gradient.cpp | 16 +- synfig-studio/trunk/src/gtkmm/widget_gradient.h | 28 +- synfig-studio/trunk/src/gtkmm/widget_sound.cpp | 14 +- synfig-studio/trunk/src/gtkmm/widget_sound.h | 6 +- synfig-studio/trunk/src/gtkmm/widget_time.cpp | 8 +- synfig-studio/trunk/src/gtkmm/widget_time.h | 14 +- .../trunk/src/gtkmm/widget_timeslider.cpp | 26 +- synfig-studio/trunk/src/gtkmm/widget_timeslider.h | 10 +- synfig-studio/trunk/src/gtkmm/widget_value.cpp | 18 +- synfig-studio/trunk/src/gtkmm/widget_value.h | 30 +- synfig-studio/trunk/src/gtkmm/widget_vector.cpp | 12 +- synfig-studio/trunk/src/gtkmm/widget_vector.h | 24 +- synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp | 18 +- synfig-studio/trunk/src/gtkmm/widget_waypoint.h | 28 +- .../trunk/src/gtkmm/widget_waypointmodel.cpp | 6 +- .../trunk/src/gtkmm/widget_waypointmodel.h | 18 +- synfig-studio/trunk/src/gtkmm/workarea.cpp | 192 ++--- synfig-studio/trunk/src/gtkmm/workarea.h | 98 +-- synfig-studio/trunk/src/gtkmm/workarearenderer.cpp | 12 +- synfig-studio/trunk/src/gtkmm/workarearenderer.h | 12 +- synfig-studio/trunk/src/gtkmm/zoomdial.cpp | 2 +- synfig-studio/trunk/src/gtkmm/zoomdial.h | 6 +- synfig-studio/trunk/src/sinfgapp/Makefile.am | 50 -- synfig-studio/trunk/src/sinfgapp/action.cpp | 449 ----------- synfig-studio/trunk/src/sinfgapp/action.h | 387 ---------- synfig-studio/trunk/src/sinfgapp/action_param.cpp | 515 ------------- synfig-studio/trunk/src/sinfgapp/action_param.h | 236 ------ synfig-studio/trunk/src/sinfgapp/action_system.cpp | 711 ----------------- synfig-studio/trunk/src/sinfgapp/action_system.h | 249 ------ .../trunk/src/sinfgapp/actions/activepointadd.cpp | 204 ----- .../trunk/src/sinfgapp/actions/activepointadd.h | 80 -- .../src/sinfgapp/actions/activepointremove.cpp | 176 ----- .../trunk/src/sinfgapp/actions/activepointremove.h | 76 -- .../trunk/src/sinfgapp/actions/activepointset.cpp | 289 ------- .../trunk/src/sinfgapp/actions/activepointset.h | 80 -- .../src/sinfgapp/actions/activepointsetoff.cpp | 212 ----- .../trunk/src/sinfgapp/actions/activepointsetoff.h | 79 -- .../src/sinfgapp/actions/activepointseton.cpp | 212 ----- .../trunk/src/sinfgapp/actions/activepointseton.h | 79 -- .../src/sinfgapp/actions/activepointsetsmart.cpp | 364 --------- .../src/sinfgapp/actions/activepointsetsmart.h | 82 -- .../src/sinfgapp/actions/activepointsimpleadd.cpp | 182 ----- .../src/sinfgapp/actions/activepointsimpleadd.h | 80 -- .../sinfgapp/actions/blinepointtangentmerge.cpp | 179 ----- .../src/sinfgapp/actions/blinepointtangentmerge.h | 72 -- .../sinfgapp/actions/blinepointtangentsplit.cpp | 179 ----- .../src/sinfgapp/actions/blinepointtangentsplit.h | 72 -- .../trunk/src/sinfgapp/actions/canvasadd.cpp | 150 ---- .../trunk/src/sinfgapp/actions/canvasadd.h | 76 -- .../trunk/src/sinfgapp/actions/canvasremove.cpp | 133 ---- .../trunk/src/sinfgapp/actions/canvasremove.h | 72 -- .../src/sinfgapp/actions/canvasrenddescset.cpp | 125 --- .../trunk/src/sinfgapp/actions/canvasrenddescset.h | 74 -- .../trunk/src/sinfgapp/actions/colorset.cpp | 145 ---- .../trunk/src/sinfgapp/actions/colorset.h | 72 -- .../trunk/src/sinfgapp/actions/editmodeset.cpp | 128 --- .../trunk/src/sinfgapp/actions/editmodeset.h | 71 -- .../trunk/src/sinfgapp/actions/gradientset.cpp | 145 ---- .../trunk/src/sinfgapp/actions/gradientset.h | 73 -- .../trunk/src/sinfgapp/actions/groupaddlayers.cpp | 144 ---- .../trunk/src/sinfgapp/actions/groupaddlayers.h | 78 -- .../trunk/src/sinfgapp/actions/groupremove.cpp | 133 ---- .../trunk/src/sinfgapp/actions/groupremove.h | 78 -- .../src/sinfgapp/actions/groupremovelayers.cpp | 142 ---- .../trunk/src/sinfgapp/actions/groupremovelayers.h | 78 -- .../trunk/src/sinfgapp/actions/grouprename.cpp | 129 ---- .../trunk/src/sinfgapp/actions/grouprename.h | 80 -- .../trunk/src/sinfgapp/actions/keyframeadd.cpp | 136 ---- .../trunk/src/sinfgapp/actions/keyframeadd.h | 73 -- .../src/sinfgapp/actions/keyframeduplicate.cpp | 243 ------ .../trunk/src/sinfgapp/actions/keyframeduplicate.h | 76 -- .../trunk/src/sinfgapp/actions/keyframeremove.cpp | 231 ------ .../trunk/src/sinfgapp/actions/keyframeremove.h | 75 -- .../trunk/src/sinfgapp/actions/keyframeset.cpp | 429 ----------- .../trunk/src/sinfgapp/actions/keyframeset.h | 88 --- .../src/sinfgapp/actions/keyframesetdelta.cpp | 259 ------- .../trunk/src/sinfgapp/actions/keyframesetdelta.h | 83 -- .../src/sinfgapp/actions/keyframewaypointset.cpp | 176 ----- .../src/sinfgapp/actions/keyframewaypointset.h | 76 -- .../trunk/src/sinfgapp/actions/layeractivate.cpp | 198 ----- .../trunk/src/sinfgapp/actions/layeractivate.h | 75 -- .../trunk/src/sinfgapp/actions/layeradd.cpp | 145 ---- .../trunk/src/sinfgapp/actions/layeradd.h | 73 -- .../trunk/src/sinfgapp/actions/layerduplicate.cpp | 154 ---- .../trunk/src/sinfgapp/actions/layerduplicate.h | 72 -- .../src/sinfgapp/actions/layerencapsulate.cpp | 216 ------ .../trunk/src/sinfgapp/actions/layerencapsulate.h | 73 -- .../trunk/src/sinfgapp/actions/layerlower.cpp | 155 ---- .../trunk/src/sinfgapp/actions/layerlower.h | 70 -- .../trunk/src/sinfgapp/actions/layermove.cpp | 260 ------- .../trunk/src/sinfgapp/actions/layermove.h | 78 -- .../src/sinfgapp/actions/layerparamconnect.cpp | 187 ----- .../trunk/src/sinfgapp/actions/layerparamconnect.h | 78 -- .../src/sinfgapp/actions/layerparamdisconnect.cpp | 176 ----- .../src/sinfgapp/actions/layerparamdisconnect.h | 77 -- .../trunk/src/sinfgapp/actions/layerparamset.cpp | 170 ---- .../trunk/src/sinfgapp/actions/layerparamset.h | 77 -- .../trunk/src/sinfgapp/actions/layerraise.cpp | 151 ---- .../trunk/src/sinfgapp/actions/layerraise.h | 70 -- .../trunk/src/sinfgapp/actions/layerremove.cpp | 180 ----- .../trunk/src/sinfgapp/actions/layerremove.h | 77 -- .../trunk/src/sinfgapp/actions/layersetdesc.cpp | 141 ---- .../trunk/src/sinfgapp/actions/layersetdesc.h | 75 -- .../trunk/src/sinfgapp/actions/timepointscopy.cpp | 322 -------- .../trunk/src/sinfgapp/actions/timepointscopy.h | 81 -- .../src/sinfgapp/actions/timepointsdelete.cpp | 285 ------- .../trunk/src/sinfgapp/actions/timepointsdelete.h | 79 -- .../trunk/src/sinfgapp/actions/timepointsmove.cpp | 327 -------- .../trunk/src/sinfgapp/actions/timepointsmove.h | 84 -- .../src/sinfgapp/actions/valuedescconnect.cpp | 216 ------ .../trunk/src/sinfgapp/actions/valuedescconnect.h | 72 -- .../src/sinfgapp/actions/valuedescconvert.cpp | 224 ------ .../trunk/src/sinfgapp/actions/valuedescconvert.h | 71 -- .../src/sinfgapp/actions/valuedescdisconnect.cpp | 193 ----- .../src/sinfgapp/actions/valuedescdisconnect.h | 71 -- .../trunk/src/sinfgapp/actions/valuedescexport.cpp | 199 ----- .../trunk/src/sinfgapp/actions/valuedescexport.h | 71 -- .../trunk/src/sinfgapp/actions/valuedesclink.cpp | 244 ------ .../trunk/src/sinfgapp/actions/valuedesclink.h | 72 -- .../trunk/src/sinfgapp/actions/valuedescset.cpp | 532 ------------- .../trunk/src/sinfgapp/actions/valuedescset.h | 74 -- .../trunk/src/sinfgapp/actions/valuenodeadd.cpp | 162 ---- .../trunk/src/sinfgapp/actions/valuenodeadd.h | 74 -- .../src/sinfgapp/actions/valuenodeconstset.cpp | 147 ---- .../trunk/src/sinfgapp/actions/valuenodeconstset.h | 76 -- .../actions/valuenodedynamiclistinsert.cpp | 196 ----- .../sinfgapp/actions/valuenodedynamiclistinsert.h | 82 -- .../actions/valuenodedynamiclistinsertsmart.cpp | 269 ------- .../actions/valuenodedynamiclistinsertsmart.h | 77 -- .../sinfgapp/actions/valuenodedynamiclistloop.cpp | 152 ---- .../sinfgapp/actions/valuenodedynamiclistloop.h | 77 -- .../actions/valuenodedynamiclistremove.cpp | 152 ---- .../sinfgapp/actions/valuenodedynamiclistremove.h | 77 -- .../actions/valuenodedynamiclistremovesmart.cpp | 187 ----- .../actions/valuenodedynamiclistremovesmart.h | 77 -- .../actions/valuenodedynamiclistrotateorder.cpp | 163 ---- .../actions/valuenodedynamiclistrotateorder.h | 75 -- .../actions/valuenodedynamiclistunloop.cpp | 154 ---- .../sinfgapp/actions/valuenodedynamiclistunloop.h | 77 -- .../src/sinfgapp/actions/valuenodelinkconnect.cpp | 159 ---- .../src/sinfgapp/actions/valuenodelinkconnect.h | 77 -- .../sinfgapp/actions/valuenodelinkdisconnect.cpp | 170 ---- .../src/sinfgapp/actions/valuenodelinkdisconnect.h | 76 -- .../trunk/src/sinfgapp/actions/valuenoderemove.cpp | 176 ----- .../trunk/src/sinfgapp/actions/valuenoderemove.h | 77 -- .../trunk/src/sinfgapp/actions/valuenoderename.cpp | 164 ---- .../trunk/src/sinfgapp/actions/valuenoderename.h | 76 -- .../src/sinfgapp/actions/valuenodereplace.cpp | 222 ------ .../trunk/src/sinfgapp/actions/valuenodereplace.h | 75 -- .../trunk/src/sinfgapp/actions/waypointadd.cpp | 213 ----- .../trunk/src/sinfgapp/actions/waypointadd.h | 82 -- .../trunk/src/sinfgapp/actions/waypointremove.cpp | 188 ----- .../trunk/src/sinfgapp/actions/waypointremove.h | 77 -- .../trunk/src/sinfgapp/actions/waypointset.cpp | 266 ------- .../trunk/src/sinfgapp/actions/waypointset.h | 79 -- .../src/sinfgapp/actions/waypointsetsmart.cpp | 467 ----------- .../trunk/src/sinfgapp/actions/waypointsetsmart.h | 81 -- .../src/sinfgapp/actions/waypointsimpleadd.cpp | 156 ---- .../trunk/src/sinfgapp/actions/waypointsimpleadd.h | 79 -- synfig-studio/trunk/src/sinfgapp/blineconvert.cpp | 835 -------------------- synfig-studio/trunk/src/sinfgapp/blineconvert.h | 115 --- .../trunk/src/sinfgapp/canvasinterface.cpp | 857 --------------------- synfig-studio/trunk/src/sinfgapp/canvasinterface.h | 308 -------- synfig-studio/trunk/src/sinfgapp/cvs.cpp | 375 --------- synfig-studio/trunk/src/sinfgapp/cvs.h | 103 --- synfig-studio/trunk/src/sinfgapp/editmode.h | 83 -- synfig-studio/trunk/src/sinfgapp/inputdevice.cpp | 195 ----- synfig-studio/trunk/src/sinfgapp/inputdevice.h | 101 --- synfig-studio/trunk/src/sinfgapp/instance.cpp | 186 ----- synfig-studio/trunk/src/sinfgapp/instance.h | 140 ---- synfig-studio/trunk/src/sinfgapp/main.cpp | 401 ---------- synfig-studio/trunk/src/sinfgapp/main.h | 112 --- .../trunk/src/sinfgapp/selectionmanager.h | 146 ---- synfig-studio/trunk/src/sinfgapp/settings.cpp | 237 ------ synfig-studio/trunk/src/sinfgapp/settings.h | 78 -- synfig-studio/trunk/src/sinfgapp/timegather.cpp | 311 -------- synfig-studio/trunk/src/sinfgapp/timegather.h | 135 ---- synfig-studio/trunk/src/sinfgapp/uimanager.cpp | 157 ---- synfig-studio/trunk/src/sinfgapp/uimanager.h | 115 --- synfig-studio/trunk/src/sinfgapp/value_desc.h | 182 ----- synfig-studio/trunk/src/synfigapp/Makefile.am | 50 ++ synfig-studio/trunk/src/synfigapp/action.cpp | 449 +++++++++++ synfig-studio/trunk/src/synfigapp/action.h | 387 ++++++++++ synfig-studio/trunk/src/synfigapp/action_param.cpp | 515 +++++++++++++ synfig-studio/trunk/src/synfigapp/action_param.h | 236 ++++++ .../trunk/src/synfigapp/action_system.cpp | 711 +++++++++++++++++ synfig-studio/trunk/src/synfigapp/action_system.h | 249 ++++++ .../trunk/src/synfigapp/actions/activepointadd.cpp | 204 +++++ .../trunk/src/synfigapp/actions/activepointadd.h | 80 ++ .../src/synfigapp/actions/activepointremove.cpp | 176 +++++ .../src/synfigapp/actions/activepointremove.h | 76 ++ .../trunk/src/synfigapp/actions/activepointset.cpp | 289 +++++++ .../trunk/src/synfigapp/actions/activepointset.h | 80 ++ .../src/synfigapp/actions/activepointsetoff.cpp | 212 +++++ .../src/synfigapp/actions/activepointsetoff.h | 79 ++ .../src/synfigapp/actions/activepointseton.cpp | 212 +++++ .../trunk/src/synfigapp/actions/activepointseton.h | 79 ++ .../src/synfigapp/actions/activepointsetsmart.cpp | 364 +++++++++ .../src/synfigapp/actions/activepointsetsmart.h | 82 ++ .../src/synfigapp/actions/activepointsimpleadd.cpp | 182 +++++ .../src/synfigapp/actions/activepointsimpleadd.h | 80 ++ .../synfigapp/actions/blinepointtangentmerge.cpp | 179 +++++ .../src/synfigapp/actions/blinepointtangentmerge.h | 72 ++ .../synfigapp/actions/blinepointtangentsplit.cpp | 179 +++++ .../src/synfigapp/actions/blinepointtangentsplit.h | 72 ++ .../trunk/src/synfigapp/actions/canvasadd.cpp | 150 ++++ .../trunk/src/synfigapp/actions/canvasadd.h | 76 ++ .../trunk/src/synfigapp/actions/canvasremove.cpp | 133 ++++ .../trunk/src/synfigapp/actions/canvasremove.h | 72 ++ .../src/synfigapp/actions/canvasrenddescset.cpp | 125 +++ .../src/synfigapp/actions/canvasrenddescset.h | 74 ++ .../trunk/src/synfigapp/actions/colorset.cpp | 145 ++++ .../trunk/src/synfigapp/actions/colorset.h | 72 ++ .../trunk/src/synfigapp/actions/editmodeset.cpp | 128 +++ .../trunk/src/synfigapp/actions/editmodeset.h | 71 ++ .../trunk/src/synfigapp/actions/gradientset.cpp | 145 ++++ .../trunk/src/synfigapp/actions/gradientset.h | 73 ++ .../trunk/src/synfigapp/actions/groupaddlayers.cpp | 144 ++++ .../trunk/src/synfigapp/actions/groupaddlayers.h | 78 ++ .../trunk/src/synfigapp/actions/groupremove.cpp | 133 ++++ .../trunk/src/synfigapp/actions/groupremove.h | 78 ++ .../src/synfigapp/actions/groupremovelayers.cpp | 142 ++++ .../src/synfigapp/actions/groupremovelayers.h | 78 ++ .../trunk/src/synfigapp/actions/grouprename.cpp | 129 ++++ .../trunk/src/synfigapp/actions/grouprename.h | 80 ++ .../trunk/src/synfigapp/actions/keyframeadd.cpp | 136 ++++ .../trunk/src/synfigapp/actions/keyframeadd.h | 73 ++ .../src/synfigapp/actions/keyframeduplicate.cpp | 243 ++++++ .../src/synfigapp/actions/keyframeduplicate.h | 76 ++ .../trunk/src/synfigapp/actions/keyframeremove.cpp | 231 ++++++ .../trunk/src/synfigapp/actions/keyframeremove.h | 75 ++ .../trunk/src/synfigapp/actions/keyframeset.cpp | 429 +++++++++++ .../trunk/src/synfigapp/actions/keyframeset.h | 88 +++ .../src/synfigapp/actions/keyframesetdelta.cpp | 259 +++++++ .../trunk/src/synfigapp/actions/keyframesetdelta.h | 83 ++ .../src/synfigapp/actions/keyframewaypointset.cpp | 176 +++++ .../src/synfigapp/actions/keyframewaypointset.h | 76 ++ .../trunk/src/synfigapp/actions/layeractivate.cpp | 198 +++++ .../trunk/src/synfigapp/actions/layeractivate.h | 75 ++ .../trunk/src/synfigapp/actions/layeradd.cpp | 145 ++++ .../trunk/src/synfigapp/actions/layeradd.h | 73 ++ .../trunk/src/synfigapp/actions/layerduplicate.cpp | 154 ++++ .../trunk/src/synfigapp/actions/layerduplicate.h | 72 ++ .../src/synfigapp/actions/layerencapsulate.cpp | 216 ++++++ .../trunk/src/synfigapp/actions/layerencapsulate.h | 73 ++ .../trunk/src/synfigapp/actions/layerlower.cpp | 155 ++++ .../trunk/src/synfigapp/actions/layerlower.h | 70 ++ .../trunk/src/synfigapp/actions/layermove.cpp | 260 +++++++ .../trunk/src/synfigapp/actions/layermove.h | 78 ++ .../src/synfigapp/actions/layerparamconnect.cpp | 187 +++++ .../src/synfigapp/actions/layerparamconnect.h | 78 ++ .../src/synfigapp/actions/layerparamdisconnect.cpp | 176 +++++ .../src/synfigapp/actions/layerparamdisconnect.h | 77 ++ .../trunk/src/synfigapp/actions/layerparamset.cpp | 170 ++++ .../trunk/src/synfigapp/actions/layerparamset.h | 77 ++ .../trunk/src/synfigapp/actions/layerraise.cpp | 151 ++++ .../trunk/src/synfigapp/actions/layerraise.h | 70 ++ .../trunk/src/synfigapp/actions/layerremove.cpp | 180 +++++ .../trunk/src/synfigapp/actions/layerremove.h | 77 ++ .../trunk/src/synfigapp/actions/layersetdesc.cpp | 141 ++++ .../trunk/src/synfigapp/actions/layersetdesc.h | 75 ++ .../trunk/src/synfigapp/actions/timepointscopy.cpp | 322 ++++++++ .../trunk/src/synfigapp/actions/timepointscopy.h | 81 ++ .../src/synfigapp/actions/timepointsdelete.cpp | 285 +++++++ .../trunk/src/synfigapp/actions/timepointsdelete.h | 79 ++ .../trunk/src/synfigapp/actions/timepointsmove.cpp | 327 ++++++++ .../trunk/src/synfigapp/actions/timepointsmove.h | 84 ++ .../src/synfigapp/actions/valuedescconnect.cpp | 216 ++++++ .../trunk/src/synfigapp/actions/valuedescconnect.h | 72 ++ .../src/synfigapp/actions/valuedescconvert.cpp | 224 ++++++ .../trunk/src/synfigapp/actions/valuedescconvert.h | 71 ++ .../src/synfigapp/actions/valuedescdisconnect.cpp | 193 +++++ .../src/synfigapp/actions/valuedescdisconnect.h | 71 ++ .../src/synfigapp/actions/valuedescexport.cpp | 199 +++++ .../trunk/src/synfigapp/actions/valuedescexport.h | 71 ++ .../trunk/src/synfigapp/actions/valuedesclink.cpp | 244 ++++++ .../trunk/src/synfigapp/actions/valuedesclink.h | 72 ++ .../trunk/src/synfigapp/actions/valuedescset.cpp | 532 +++++++++++++ .../trunk/src/synfigapp/actions/valuedescset.h | 74 ++ .../trunk/src/synfigapp/actions/valuenodeadd.cpp | 162 ++++ .../trunk/src/synfigapp/actions/valuenodeadd.h | 74 ++ .../src/synfigapp/actions/valuenodeconstset.cpp | 147 ++++ .../src/synfigapp/actions/valuenodeconstset.h | 76 ++ .../actions/valuenodedynamiclistinsert.cpp | 196 +++++ .../synfigapp/actions/valuenodedynamiclistinsert.h | 82 ++ .../actions/valuenodedynamiclistinsertsmart.cpp | 269 +++++++ .../actions/valuenodedynamiclistinsertsmart.h | 77 ++ .../synfigapp/actions/valuenodedynamiclistloop.cpp | 152 ++++ .../synfigapp/actions/valuenodedynamiclistloop.h | 77 ++ .../actions/valuenodedynamiclistremove.cpp | 152 ++++ .../synfigapp/actions/valuenodedynamiclistremove.h | 77 ++ .../actions/valuenodedynamiclistremovesmart.cpp | 187 +++++ .../actions/valuenodedynamiclistremovesmart.h | 77 ++ .../actions/valuenodedynamiclistrotateorder.cpp | 163 ++++ .../actions/valuenodedynamiclistrotateorder.h | 75 ++ .../actions/valuenodedynamiclistunloop.cpp | 154 ++++ .../synfigapp/actions/valuenodedynamiclistunloop.h | 77 ++ .../src/synfigapp/actions/valuenodelinkconnect.cpp | 159 ++++ .../src/synfigapp/actions/valuenodelinkconnect.h | 77 ++ .../synfigapp/actions/valuenodelinkdisconnect.cpp | 170 ++++ .../synfigapp/actions/valuenodelinkdisconnect.h | 76 ++ .../src/synfigapp/actions/valuenoderemove.cpp | 176 +++++ .../trunk/src/synfigapp/actions/valuenoderemove.h | 77 ++ .../src/synfigapp/actions/valuenoderename.cpp | 164 ++++ .../trunk/src/synfigapp/actions/valuenoderename.h | 76 ++ .../src/synfigapp/actions/valuenodereplace.cpp | 222 ++++++ .../trunk/src/synfigapp/actions/valuenodereplace.h | 75 ++ .../trunk/src/synfigapp/actions/waypointadd.cpp | 213 +++++ .../trunk/src/synfigapp/actions/waypointadd.h | 82 ++ .../trunk/src/synfigapp/actions/waypointremove.cpp | 188 +++++ .../trunk/src/synfigapp/actions/waypointremove.h | 77 ++ .../trunk/src/synfigapp/actions/waypointset.cpp | 266 +++++++ .../trunk/src/synfigapp/actions/waypointset.h | 79 ++ .../src/synfigapp/actions/waypointsetsmart.cpp | 467 +++++++++++ .../trunk/src/synfigapp/actions/waypointsetsmart.h | 81 ++ .../src/synfigapp/actions/waypointsimpleadd.cpp | 156 ++++ .../src/synfigapp/actions/waypointsimpleadd.h | 79 ++ synfig-studio/trunk/src/synfigapp/blineconvert.cpp | 835 ++++++++++++++++++++ synfig-studio/trunk/src/synfigapp/blineconvert.h | 115 +++ .../trunk/src/synfigapp/canvasinterface.cpp | 857 +++++++++++++++++++++ .../trunk/src/synfigapp/canvasinterface.h | 308 ++++++++ synfig-studio/trunk/src/synfigapp/cvs.cpp | 375 +++++++++ synfig-studio/trunk/src/synfigapp/cvs.h | 103 +++ synfig-studio/trunk/src/synfigapp/editmode.h | 83 ++ synfig-studio/trunk/src/synfigapp/inputdevice.cpp | 195 +++++ synfig-studio/trunk/src/synfigapp/inputdevice.h | 101 +++ synfig-studio/trunk/src/synfigapp/instance.cpp | 186 +++++ synfig-studio/trunk/src/synfigapp/instance.h | 140 ++++ synfig-studio/trunk/src/synfigapp/main.cpp | 401 ++++++++++ synfig-studio/trunk/src/synfigapp/main.h | 112 +++ .../trunk/src/synfigapp/selectionmanager.h | 146 ++++ synfig-studio/trunk/src/synfigapp/settings.cpp | 237 ++++++ synfig-studio/trunk/src/synfigapp/settings.h | 78 ++ synfig-studio/trunk/src/synfigapp/timegather.cpp | 311 ++++++++ synfig-studio/trunk/src/synfigapp/timegather.h | 135 ++++ synfig-studio/trunk/src/synfigapp/uimanager.cpp | 157 ++++ synfig-studio/trunk/src/synfigapp/uimanager.h | 115 +++ synfig-studio/trunk/src/synfigapp/value_desc.h | 182 +++++ synfig-studio/trunk/src/template.cpp | 4 +- synfig-studio/trunk/src/template.h | 6 +- synfig-studio/trunk/synfigstudio.desktop.in | 11 + synfig-studio/trunk/synfigstudio.keys.in | 23 + synfig-studio/trunk/synfigstudio.mime.in | 7 + synfig-studio/trunk/win32inst.nsi.in | 14 +- 580 files changed, 29892 insertions(+), 29875 deletions(-) delete mode 100755 synfig-studio/trunk/config/sinfg.m4 create mode 100755 synfig-studio/trunk/config/synfig.m4 delete mode 100644 synfig-studio/trunk/images/sinfg_icon.sif create mode 100644 synfig-studio/trunk/images/synfig_icon.sif delete mode 100644 synfig-studio/trunk/sinfgstudio.desktop.in delete mode 100644 synfig-studio/trunk/sinfgstudio.keys.in delete mode 100644 synfig-studio/trunk/sinfgstudio.mime.in delete mode 100644 synfig-studio/trunk/src/sinfgapp/Makefile.am delete mode 100644 synfig-studio/trunk/src/sinfgapp/action.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/action.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/action_param.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/action_param.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/action_system.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/action_system.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointadd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointadd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointremove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointremove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointsetoff.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointsetoff.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointseton.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointseton.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointsetsmart.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointsetsmart.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointsimpleadd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/activepointsimpleadd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/blinepointtangentmerge.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/blinepointtangentmerge.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/blinepointtangentsplit.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/blinepointtangentsplit.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/canvasadd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/canvasadd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/canvasremove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/canvasremove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/canvasrenddescset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/canvasrenddescset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/colorset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/colorset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/editmodeset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/editmodeset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/gradientset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/gradientset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/groupaddlayers.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/groupaddlayers.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/groupremove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/groupremove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/groupremovelayers.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/groupremovelayers.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/grouprename.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/grouprename.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeadd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeadd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeduplicate.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeduplicate.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeremove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeremove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframeset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframesetdelta.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframesetdelta.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframewaypointset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/keyframewaypointset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layeractivate.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layeractivate.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layeradd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layeradd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerduplicate.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerduplicate.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerencapsulate.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerencapsulate.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerlower.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerlower.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layermove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layermove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerparamconnect.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerparamconnect.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerparamdisconnect.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerparamdisconnect.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerparamset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerparamset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerraise.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerraise.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerremove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layerremove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layersetdesc.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/layersetdesc.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/timepointscopy.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/timepointscopy.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/timepointsdelete.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/timepointsdelete.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/timepointsmove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/timepointsmove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescconnect.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescconnect.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescconvert.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescconvert.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescdisconnect.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescdisconnect.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescexport.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescexport.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedesclink.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedesclink.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuedescset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodeadd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodeadd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodeconstset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodeconstset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistinsert.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistinsert.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistinsertsmart.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistinsertsmart.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistloop.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistloop.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistremove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistremove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistremovesmart.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistremovesmart.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistrotateorder.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistrotateorder.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistunloop.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodedynamiclistunloop.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodelinkconnect.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodelinkconnect.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodelinkdisconnect.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodelinkdisconnect.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenoderemove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenoderemove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenoderename.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenoderename.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodereplace.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/valuenodereplace.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointadd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointadd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointremove.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointremove.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointset.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointset.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointsetsmart.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointsetsmart.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointsimpleadd.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/actions/waypointsimpleadd.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/blineconvert.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/blineconvert.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/canvasinterface.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/canvasinterface.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/cvs.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/cvs.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/editmode.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/inputdevice.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/inputdevice.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/instance.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/instance.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/main.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/main.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/selectionmanager.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/settings.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/settings.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/timegather.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/timegather.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/uimanager.cpp delete mode 100644 synfig-studio/trunk/src/sinfgapp/uimanager.h delete mode 100644 synfig-studio/trunk/src/sinfgapp/value_desc.h create mode 100644 synfig-studio/trunk/src/synfigapp/Makefile.am create mode 100644 synfig-studio/trunk/src/synfigapp/action.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/action.h create mode 100644 synfig-studio/trunk/src/synfigapp/action_param.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/action_param.h create mode 100644 synfig-studio/trunk/src/synfigapp/action_system.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/action_system.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointadd.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointremove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointseton.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/canvasadd.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/canvasremove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/colorset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/colorset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/editmodeset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/gradientset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/groupremove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/grouprename.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeadd.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeremove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframeset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layeractivate.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layeradd.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerduplicate.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerlower.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layermove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layermove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerparamset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerraise.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layerremove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/layersetdesc.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/timepointscopy.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/timepointsmove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescexport.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedesclink.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuedescset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenoderename.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointadd.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointremove.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointset.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.h create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.h create mode 100644 synfig-studio/trunk/src/synfigapp/blineconvert.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/blineconvert.h create mode 100644 synfig-studio/trunk/src/synfigapp/canvasinterface.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/canvasinterface.h create mode 100644 synfig-studio/trunk/src/synfigapp/cvs.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/cvs.h create mode 100644 synfig-studio/trunk/src/synfigapp/editmode.h create mode 100644 synfig-studio/trunk/src/synfigapp/inputdevice.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/inputdevice.h create mode 100644 synfig-studio/trunk/src/synfigapp/instance.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/instance.h create mode 100644 synfig-studio/trunk/src/synfigapp/main.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/main.h create mode 100644 synfig-studio/trunk/src/synfigapp/selectionmanager.h create mode 100644 synfig-studio/trunk/src/synfigapp/settings.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/settings.h create mode 100644 synfig-studio/trunk/src/synfigapp/timegather.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/timegather.h create mode 100644 synfig-studio/trunk/src/synfigapp/uimanager.cpp create mode 100644 synfig-studio/trunk/src/synfigapp/uimanager.h create mode 100644 synfig-studio/trunk/src/synfigapp/value_desc.h create mode 100644 synfig-studio/trunk/synfigstudio.desktop.in create mode 100644 synfig-studio/trunk/synfigstudio.keys.in create mode 100644 synfig-studio/trunk/synfigstudio.mime.in diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am index a3ce6b2..4b8d0e8 100644 --- a/synfig-studio/trunk/Makefile.am +++ b/synfig-studio/trunk/Makefile.am @@ -6,23 +6,23 @@ MAINTAINERCLEANFILES=config/package config/ltmain.sh config/config.guess config/ SUBDIRS=images src -EXTRA_DIST=bootstrap config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg sinfg.kdevprj config/ETL.m4 +EXTRA_DIST=bootstrap config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg synfig.kdevprj config/ETL.m4 # Desktop entry #desktopdir = $(datadir)/gnome/apps/Graphics desktopdir = $(prefix)/share/applications -desktop_DATA = sinfgstudio.desktop -#desktop_in_files = sinfgstudio.desktop.in +desktop_DATA = synfigstudio.desktop +#desktop_in_files = synfigstudio.desktop.in #desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) # @INTLTOOL_DESKTOP_RULE@ mimedir = $(prefix)/share/mime-info -mime_DATA = sinfgstudio.keys sinfgstudio.mime +mime_DATA = synfigstudio.keys synfigstudio.mime # Icon icondir = $(datadir)/pixmaps -icon_DATA = images/sinfg_icon.png images/sif_icon.png +icon_DATA = images/synfig_icon.png images/sif_icon.png CVS=cvs diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac index 0357c90..1193af3 100755 --- a/synfig-studio/trunk/config/configure.ac +++ b/synfig-studio/trunk/config/configure.ac @@ -69,11 +69,11 @@ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gthread-2.0,[],[ AC_SUBST(GTKMM_CFLAGS) AC_SUBST(GTKMM_LIBS) -PKG_CHECK_MODULES(SINFG, synfig ETL sigc++-2.0,,[ +PKG_CHECK_MODULES(SYNFIG, synfig ETL sigc++-2.0,,[ AC_MSG_ERROR([ ** Unable to set up dependent libraries]) ]) -AC_SUBST(SINFG_CFLAGS) -AC_SUBST(SINFG_LIBS) +AC_SUBST(SYNFIG_CFLAGS) +AC_SUBST(SYNFIG_LIBS) windowsys="gtkmm" AC_DEFINE(STUDIO_WINSYS_H,"gtkmm/winsys.h",[blah]) @@ -149,12 +149,12 @@ AC_DEFINE_UNQUOTED(IMAGE_DIR,"`echo echo $imagedir | sh`", [ Describes where the AC_OUTPUT( Makefile -sinfgstudio.desktop -sinfgstudio.mime -sinfgstudio.keys +synfigstudio.desktop +synfigstudio.mime +synfigstudio.keys src/Makefile src/gtkmm/Makefile -src/sinfgapp/Makefile +src/synfigapp/Makefile images/Makefile win32inst.nsi pkg-info/macosx/synfig-studio.info @@ -180,8 +180,8 @@ FMOD Enabled ---------------------> $with_libfmod "'$'"CXX ------------------------------> '$CXX' "'$'"CXXFLAGS -------------------------> '$CXXFLAGS' "'$'"LDFLAGS --------------------------> '$LDFLAGS' -"'$'"SINFG_CFLAGS ---------------------> '$SINFG_CFLAGS' -"'$'"SINFG_LIBS -----------------------> '$SINFG_LIBS' +"'$'"SYNFIG_CFLAGS ---------------------> '$SYNFIG_CFLAGS' +"'$'"SYNFIG_LIBS -----------------------> '$SYNFIG_LIBS' "'$'"GTKMM_CFLAGS ---------------------> '$GTKMM_CFLAGS' "'$'"GTKMM_LIBS -----------------------> '$GTKMM_LIBS' " diff --git a/synfig-studio/trunk/config/sinfg.m4 b/synfig-studio/trunk/config/sinfg.m4 deleted file mode 100755 index b4df86f..0000000 --- a/synfig-studio/trunk/config/sinfg.m4 +++ /dev/null @@ -1,51 +0,0 @@ -# SINFG M4 Macro -# For GNU Autotools -# $Id: sinfg.m4,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $ -# -# By Robert B. Quattlebaum Jr. -# - -AC_DEFUN([SINFG_DEPS], -[ - USING_ETL(,$2) - AM_PATH_XML2(,,$2) - AC_CHECK_FUNCS([floor pow sqrt],,$2) - $1 -]) - -AC_DEFUN([USING_SINFG], -[ - AC_ARG_WITH(sinfg-includes, - [ --with-sinfg-includes Specify location of sinfg headers],[ - CXXFLAGS="$CXXFLAGS -I$withval" - ]) - - AC_PATH_PROG(SINFG_CONFIG,sinfg-config,no) - - if test "$SINFG_CONFIG" = "no"; then - no_SINFG_config="yes" - $2 - else - AC_MSG_CHECKING([if $SINFG_CONFIG works]) - if $SINFG_CONFIG --libs >/dev/null 2>&1; then - SINFG_VERSION="`$SINFG_CONFIG --version`" - AC_MSG_RESULT([yes, $SINFG_VERSION]) - SINFG_CXXFLAGS="`$SINFG_CONFIG --cxxflags`" - SINFG_CFLAGS="`$SINFG_CONFIG --cflags`" - SINFG_LIBS="`$SINFG_CONFIG --libs`" - CXXFLAGS="$CXXFLAGS $SINFG_CXXFLAGS" - AC_SUBST(SINFG_CXXFLAGS) - AC_SUBST(SINFG_LIBS) - AC_SUBST(SINFG_CFLAGS) - $1 - else - AC_MSG_RESULT(no) - no_SINFG_config="yes" - $2 - fi - fi - - SINFG_DEPS($1,$2) -]) - - diff --git a/synfig-studio/trunk/config/synfig.m4 b/synfig-studio/trunk/config/synfig.m4 new file mode 100755 index 0000000..b4df86f --- /dev/null +++ b/synfig-studio/trunk/config/synfig.m4 @@ -0,0 +1,51 @@ +# SINFG M4 Macro +# For GNU Autotools +# $Id: sinfg.m4,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $ +# +# By Robert B. Quattlebaum Jr. +# + +AC_DEFUN([SINFG_DEPS], +[ + USING_ETL(,$2) + AM_PATH_XML2(,,$2) + AC_CHECK_FUNCS([floor pow sqrt],,$2) + $1 +]) + +AC_DEFUN([USING_SINFG], +[ + AC_ARG_WITH(sinfg-includes, + [ --with-sinfg-includes Specify location of sinfg headers],[ + CXXFLAGS="$CXXFLAGS -I$withval" + ]) + + AC_PATH_PROG(SINFG_CONFIG,sinfg-config,no) + + if test "$SINFG_CONFIG" = "no"; then + no_SINFG_config="yes" + $2 + else + AC_MSG_CHECKING([if $SINFG_CONFIG works]) + if $SINFG_CONFIG --libs >/dev/null 2>&1; then + SINFG_VERSION="`$SINFG_CONFIG --version`" + AC_MSG_RESULT([yes, $SINFG_VERSION]) + SINFG_CXXFLAGS="`$SINFG_CONFIG --cxxflags`" + SINFG_CFLAGS="`$SINFG_CONFIG --cflags`" + SINFG_LIBS="`$SINFG_CONFIG --libs`" + CXXFLAGS="$CXXFLAGS $SINFG_CXXFLAGS" + AC_SUBST(SINFG_CXXFLAGS) + AC_SUBST(SINFG_LIBS) + AC_SUBST(SINFG_CFLAGS) + $1 + else + AC_MSG_RESULT(no) + no_SINFG_config="yes" + $2 + fi + fi + + SINFG_DEPS($1,$2) +]) + + diff --git a/synfig-studio/trunk/fixer b/synfig-studio/trunk/fixer index 4bb7098..b189f6d 100755 --- a/synfig-studio/trunk/fixer +++ b/synfig-studio/trunk/fixer @@ -2,9 +2,22 @@ TEMPFILENAME=~/deleteme.tmp -for filename in `find . -name '*.[ch]*'` ; do { - sed ' -s/SigC::Signal./sigc::signal/g; +SEDSCRIPT=' +s/sinfg/synfig/g; +s/SINFG/SYNFIG/g; +s/= S I N F G ===/= S Y N F I G =/g; +s/Sinfg/Synfig/g; +'; -' < $filename > $TEMPFILENAME && ( diff -q $TEMPFILENAME $filename || cp $TEMPFILENAME $filename ) +for filename in `find . -name "*sinfg*" -a ! -name '*svn*'` ; do { + newfilename=`echo $filename | sed "$SEDSCRIPT"`; + echo $filename '=>' $newfilename; + svn rename $filename $newfilename || exit 2; +} ; done + + +#exit 0; + +for filename in `find . -name '*.[ch]*' -o -name '*.am' -o -name '*.px' -o -name '*.ac' -o -name '*.nsh' -o -name '*.in' | grep -v .svn` ; do { + sed "$SEDSCRIPT" < $filename > $TEMPFILENAME && ( diff -q $TEMPFILENAME $filename || cp $TEMPFILENAME $filename ) } ; done diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index ccffef1..e9e0d53 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -1,9 +1,9 @@ -SINFG=sinfg +SYNFIG=synfig EXT=@imageext@ EXTRA_DIST=studio_about.sif -IMAGES=mirror_icon.$(EXT) time_track_icon.$(EXT) pastecanvas_icon.$(EXT) group_icon.$(EXT) clear_redo_icon.$(EXT) clear_undo_icon.$(EXT) navigator_icon.$(EXT) info_icon.$(EXT) zoom_icon.$(EXT) meta_data_icon.$(EXT) children_icon.$(EXT) keyframe_icon.$(EXT) swap_colors_icon.$(EXT) rotate_icon.$(EXT) scale_icon.$(EXT) smooth_move_icon.$(EXT) width_icon.$(EXT) rectangle_icon.$(EXT) circle_icon.$(EXT) draw_icon.$(EXT) sketch_icon.$(EXT) fill_icon.$(EXT) normal_icon.$(EXT) sif_icon.$(EXT) sinfg_icon.$(EXT) saveall_icon.$(EXT) bool_icon.$(EXT) integer_icon.$(EXT) angle_icon.$(EXT) segment_icon.$(EXT) blinepoint_icon.$(EXT) list_icon.$(EXT) canvas_pointer_icon.$(EXT) string_icon.$(EXT) eyedrop_icon.$(EXT) about_icon.$(EXT) about_dialog.$(EXT) canvas_icon.$(EXT) vector_icon.$(EXT) real_icon.$(EXT) color_icon.$(EXT) valuenode_icon.$(EXT) polygon_icon.$(EXT) bline_icon.$(EXT) layer_icon.$(EXT) duplicate_icon.$(EXT) gradient_icon.$(EXT) keyframe_lock_all.$(EXT) keyframe_lock_past.$(EXT) keyframe_lock_future.$(EXT) keyframe_lock_none.$(EXT) +IMAGES=mirror_icon.$(EXT) time_track_icon.$(EXT) pastecanvas_icon.$(EXT) group_icon.$(EXT) clear_redo_icon.$(EXT) clear_undo_icon.$(EXT) navigator_icon.$(EXT) info_icon.$(EXT) zoom_icon.$(EXT) meta_data_icon.$(EXT) children_icon.$(EXT) keyframe_icon.$(EXT) swap_colors_icon.$(EXT) rotate_icon.$(EXT) scale_icon.$(EXT) smooth_move_icon.$(EXT) width_icon.$(EXT) rectangle_icon.$(EXT) circle_icon.$(EXT) draw_icon.$(EXT) sketch_icon.$(EXT) fill_icon.$(EXT) normal_icon.$(EXT) sif_icon.$(EXT) synfig_icon.$(EXT) saveall_icon.$(EXT) bool_icon.$(EXT) integer_icon.$(EXT) angle_icon.$(EXT) segment_icon.$(EXT) blinepoint_icon.$(EXT) list_icon.$(EXT) canvas_pointer_icon.$(EXT) string_icon.$(EXT) eyedrop_icon.$(EXT) about_icon.$(EXT) about_dialog.$(EXT) canvas_icon.$(EXT) vector_icon.$(EXT) real_icon.$(EXT) color_icon.$(EXT) valuenode_icon.$(EXT) polygon_icon.$(EXT) bline_icon.$(EXT) layer_icon.$(EXT) duplicate_icon.$(EXT) gradient_icon.$(EXT) keyframe_lock_all.$(EXT) keyframe_lock_past.$(EXT) keyframe_lock_future.$(EXT) keyframe_lock_none.$(EXT) CLEANFILES=$(IMAGES) @@ -22,7 +22,7 @@ PNGTOICO=pngtoico CONVERT=convert sif_icon.ico: $(srcdir)/sif_icon.sif - $(SINFG) $< -w 16 -h 16 -o sif_icon_16.gif sif_icon.sif -w 32 -h 32 -o sif_icon_32.gif sif_icon.sif -w 64 -h 64 -o sif_icon_64.gif + $(SYNFIG) $< -w 16 -h 16 -o sif_icon_16.gif sif_icon.sif -w 32 -h 32 -o sif_icon_32.gif sif_icon.sif -w 64 -h 64 -o sif_icon_64.gif $(CONVERT) sif_icon_16.gif sif_icon_16.png $(CONVERT) sif_icon_32.gif sif_icon_32.png $(CONVERT) sif_icon_64.gif sif_icon_64.png @@ -33,43 +33,43 @@ clean: $(RM) $(CLEANFILES) .sif.bmp: - $(SINFG) -q $< -o $@ --time 0 + $(SYNFIG) -q $< -o $@ --time 0 .sif.$(EXT): - $(SINFG) -q $< -o $@ --time 0 + $(SYNFIG) -q $< -o $@ --time 0 keyframe_lock_all.$(EXT): $(srcdir)/keyframe_lock_icon.sif - $(SINFG) -q $< -o $@ --time 0 + $(SYNFIG) -q $< -o $@ --time 0 keyframe_lock_past.$(EXT): $(srcdir)/keyframe_lock_icon.sif - $(SINFG) -q $< -o $@ --time 0 -c PastOnly + $(SYNFIG) -q $< -o $@ --time 0 -c PastOnly keyframe_lock_future.$(EXT): $(srcdir)/keyframe_lock_icon.sif - $(SINFG) -q $< -o $@ --time 0 -c FutureOnly + $(SYNFIG) -q $< -o $@ --time 0 -c FutureOnly keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif - $(SINFG) -q $< -o $@ --time 0 -c Disabled + $(SYNFIG) -q $< -o $@ --time 0 -c Disabled #.sif.png: -# $(SINFG) -q $< -o $@ --time 0 +# $(SYNFIG) -q $< -o $@ --time 0 #datanode_icon.$(EXT): datanode_icon.sif -# $(SINFG) -q datanode_icon.sif -o datanode_icon.$(EXT) -w 128 -h 128 --time 0 +# $(SYNFIG) -q datanode_icon.sif -o datanode_icon.$(EXT) -w 128 -h 128 --time 0 #color_icon.$(EXT): color_icon.sif -# $(SINFG) -q color_icon.sif -o color_icon.$(EXT) -w 128 -h 128 --time 0 +# $(SYNFIG) -q color_icon.sif -o color_icon.$(EXT) -w 128 -h 128 --time 0 #real_icon.$(EXT): real_icon.sif -# $(SINFG) -q real_icon.sif -o real_icon.$(EXT) -w 128 -h 128 --time 0 +# $(SYNFIG) -q real_icon.sif -o real_icon.$(EXT) -w 128 -h 128 --time 0 #vector_icon.$(EXT): vector_icon.sif -# $(SINFG) -q vector_icon.sif -o vector_icon.$(EXT) -w 128 -h 128 --time 0 +# $(SYNFIG) -q vector_icon.sif -o vector_icon.$(EXT) -w 128 -h 128 --time 0 #about_dialog.$(EXT): about_dialog.sif -# $(SINFG) -q about_dialog.sif -o about_dialog.$(EXT) --time 0 +# $(SYNFIG) -q about_dialog.sif -o about_dialog.$(EXT) --time 0 #about_icon.$(EXT): about_icon.sif -# $(SINFG) -q about_icon.sif -o about_icon.$(EXT) -w 128 -h 128 --time 0 +# $(SYNFIG) -q about_icon.sif -o about_icon.$(EXT) -w 128 -h 128 --time 0 #canvas_icon.$(EXT): canvas_icon.sif -# $(SINFG) -q canvas_icon.sif -o canvas_icon.$(EXT) -w 128 -h 128 --time 0 +# $(SYNFIG) -q canvas_icon.sif -o canvas_icon.$(EXT) -w 128 -h 128 --time 0 diff --git a/synfig-studio/trunk/images/about_dialog.sif b/synfig-studio/trunk/images/about_dialog.sif index b6add27..0dc9f0d 100644 --- a/synfig-studio/trunk/images/about_dialog.sif +++ b/synfig-studio/trunk/images/about_dialog.sif @@ -1096,7 +1096,7 @@ 1.2500000000 - + @@ -1255,7 +1255,7 @@ - times + Times New Roman @@ -1397,7 +1397,7 @@ - times + Times New Roman @@ -1498,7 +1498,7 @@ - arialbd + Arial diff --git a/synfig-studio/trunk/images/sinfg_icon.sif b/synfig-studio/trunk/images/sinfg_icon.sif deleted file mode 100644 index aff3ee3..0000000 --- a/synfig-studio/trunk/images/sinfg_icon.sif +++ /dev/null @@ -1,65 +0,0 @@ - - - Untitled0 - - - - - - - - - - - - - 0.0000000000 - 0.0500000007 - - - - - - - - - - - - - - - - - - - - - 0.000000 - 0.000000 - 0.000000 - 1.000000 - - - - - 0.1000000015 - -0.1000000015 - - - - - 0.2000000030 - 0.2000000030 - - - - - - - - - - diff --git a/synfig-studio/trunk/images/synfig_icon.sif b/synfig-studio/trunk/images/synfig_icon.sif new file mode 100644 index 0000000..aff3ee3 --- /dev/null +++ b/synfig-studio/trunk/images/synfig_icon.sif @@ -0,0 +1,65 @@ + + + Untitled0 + + + + + + + + + + + + + 0.0000000000 + 0.0500000007 + + + + + + + + + + + + + + + + + + + + + 0.000000 + 0.000000 + 0.000000 + 1.000000 + + + + + 0.1000000015 + -0.1000000015 + + + + + 0.2000000030 + 0.2000000030 + + + + + + + + + + diff --git a/synfig-studio/trunk/sinfgstudio.desktop.in b/synfig-studio/trunk/sinfgstudio.desktop.in deleted file mode 100644 index 5fdeb2e..0000000 --- a/synfig-studio/trunk/sinfgstudio.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=@PACKAGE_NAME@ -Comment=A Powerful 2D Animation and Composition Package -Exec=@prefix@/bin/sinfgstudio -Terminal=1 -Type=Application -Icon=@prefix@/share/pixmaps/sinfg_icon.@imageext@ -Categories=Application;Graphics; -StartupNotify=true -Encoding=UTF-8 -MimeType=image/sif diff --git a/synfig-studio/trunk/sinfgstudio.keys.in b/synfig-studio/trunk/sinfgstudio.keys.in deleted file mode 100644 index 4d4c1c8..0000000 --- a/synfig-studio/trunk/sinfgstudio.keys.in +++ /dev/null @@ -1,23 +0,0 @@ - -image/sif: - open=@prefix@/bin/sinfgstudio %f - view=@prefix@/bin/sinfgstudio %f - icon-filename=@prefix@/share/pixmaps/sif_icon.@imageext@ - description=SINFG Composition - default_action_type=application - short_list_application_ids_for_novice_user_level=sinfgstudio - short_list_application_ids_for_intermediate_user_level=sinfgstudio - short_list_application_ids_for_advanced_user_level=sinfgstudio -# category=Images - - -image/sifz: - open=@prefix@/bin/sinfgstudio %f - view=@prefix@/bin/sinfgstudio %f - icon-filename=@prefix@/share/pixmaps/sif_icon.@imageext@ - description=Compressed SINFG Composition - default_action_type=application - short_list_application_ids_for_novice_user_level=sinfgstudio - short_list_application_ids_for_intermediate_user_level=sinfgstudio - short_list_application_ids_for_advanced_user_level=sinfgstudio -# category=Images diff --git a/synfig-studio/trunk/sinfgstudio.mime.in b/synfig-studio/trunk/sinfgstudio.mime.in deleted file mode 100644 index 1b95060..0000000 --- a/synfig-studio/trunk/sinfgstudio.mime.in +++ /dev/null @@ -1,7 +0,0 @@ -# mime types for sinfg studio - -image/sif - ext: sif SIF - -image/sifz - ext: sifZ SIFZ sif.gz SIF.GZ SIF.gz diff --git a/synfig-studio/trunk/src/Makefile.am b/synfig-studio/trunk/src/Makefile.am index bd320f4..e82e505 100644 --- a/synfig-studio/trunk/src/Makefile.am +++ b/synfig-studio/trunk/src/Makefile.am @@ -3,18 +3,18 @@ MAINTAINERCLEANFILES=Makefile.in EXTRA_DIST=template.cpp template.h -SUBDIRS=sinfgapp gtkmm +SUBDIRS=synfigapp gtkmm #if WINDOWSYS_GTKMM #WINDOWSYS_LIBS=$(top_builddir)/src/gtkmm/libwindowsys.a @GTKMM_LIBS@ -#SUBDIRS=sinfgapp gtkmm +#SUBDIRS=synfigapp gtkmm #else #WINDOWSYS_LIBS=$(top_builddir)/src/win32/libwindowsys.a @WIN32_LIBS@ #SUBDIRS=win32 #endif -#bin_PROGRAMS = sinfgstudio -#sinfgstudio_SOURCES = main.cpp app.cpp app.h instance.cpp instance.h actions.cpp actions.h toolbox.cpp toolbox.h compview.cpp compview.h canvasview.cpp canvasview.h workarea.cpp workarea.h canvasproperties.cpp canvasproperties.h +#bin_PROGRAMS = synfigstudio +#synfigstudio_SOURCES = main.cpp app.cpp app.h instance.cpp instance.h actions.cpp actions.h toolbox.cpp toolbox.h compview.cpp compview.h canvasview.cpp canvasview.h workarea.cpp workarea.h canvasproperties.cpp canvasproperties.h # view.h view.cpp workarea.cpp workarea.h toolbox.cpp toolbox.h trackview.cpp trackview.h actions.cpp actions.h compview.cpp compview.h -#sinfgstudio_LDADD = @SINFG_LIBS@ $(WINDOWSYS_LIBS) -#sinfgstudio_LDFLAGS=-dlopen self +#synfigstudio_LDADD = @SYNFIG_LIBS@ $(WINDOWSYS_LIBS) +#synfigstudio_LDFLAGS=-dlopen self diff --git a/synfig-studio/trunk/src/gtkmm/Makefile.am b/synfig-studio/trunk/src/gtkmm/Makefile.am index c88314f..ac1d071 100644 --- a/synfig-studio/trunk/src/gtkmm/Makefile.am +++ b/synfig-studio/trunk/src/gtkmm/Makefile.am @@ -46,8 +46,8 @@ OTHER_CC=statemanager.cpp module.cpp ipc.cpp asyncrenderer.cpp duckmatic.cpp mai INCLUDES=-I$(top_srcdir)/src -bin_PROGRAMS = sinfgstudio -sinfgstudio_SOURCES = $(MOD_MIRROR_CC) $(MOD_MIRROR_HH) $(PALETTE_CC) $(PALETTE_HH) $(WORKAREARENDERER_CC) $(WORKAREARENDERER_HH) $(ACTION_MANAGERS_HH) $(ACTION_MANAGERS_CC) $(DOCK_HH) $(DOCK_CC) $(OTHER_HH) $(OTHER_CC) $(EVENTS_HH) $(EVENTS_CC) $(DUCKTRANSFORM_HH) $(DUCKTRANSFORM_CC) $(TREEVIEW_HH) $(TREEVIEW_CC) $(TREESTORE_HH) $(TREESTORE_CC) $(STATE_CC) $(STATE_HH) $(WIDGET_CC) $(WIDGET_HH) $(DIALOG_HH) $(DIALOG_CC) $(CELLRENDERER_HH) $(CELLRENDERER_CC) -sinfgstudio_LDADD = -L../sinfgapp -lsinfgapp @SINFG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@ -sinfgstudio_LDFLAGS=-dlopen self -sinfgstudio_CXXFLAGS=@SINFG_CFLAGS@ @GTKMM_CFLAGS@ +bin_PROGRAMS = synfigstudio +synfigstudio_SOURCES = $(MOD_MIRROR_CC) $(MOD_MIRROR_HH) $(PALETTE_CC) $(PALETTE_HH) $(WORKAREARENDERER_CC) $(WORKAREARENDERER_HH) $(ACTION_MANAGERS_HH) $(ACTION_MANAGERS_CC) $(DOCK_HH) $(DOCK_CC) $(OTHER_HH) $(OTHER_CC) $(EVENTS_HH) $(EVENTS_CC) $(DUCKTRANSFORM_HH) $(DUCKTRANSFORM_CC) $(TREEVIEW_HH) $(TREEVIEW_CC) $(TREESTORE_HH) $(TREESTORE_CC) $(STATE_CC) $(STATE_HH) $(WIDGET_CC) $(WIDGET_HH) $(DIALOG_HH) $(DIALOG_CC) $(CELLRENDERER_HH) $(CELLRENDERER_CC) +synfigstudio_LDADD = -L../synfigapp -lsynfigapp @SYNFIG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@ +synfigstudio_LDFLAGS=-dlopen self +synfigstudio_CXXFLAGS=@SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp index 819ed63..ebf7916 100644 --- a/synfig-studio/trunk/src/gtkmm/about.cpp +++ b/synfig-studio/trunk/src/gtkmm/about.cpp @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template File ** $Id: about.cpp,v 1.2 2005/01/13 21:11:16 darco Exp $ ** @@ -38,7 +38,7 @@ #include #include -#include +#include #include "about.h" #include "app.h" @@ -53,7 +53,7 @@ using namespace studio; #ifndef VERSION #define VERSION "unknown" -#define PACKAGE "sinfgstudio" +#define PACKAGE "synfigstudio" #endif #ifdef WIN32 @@ -80,7 +80,7 @@ extern const guint gtk_interface_age; /* === P R O C E D U R E S ================================================= */ -class studio::AboutProgress : public sinfg::ProgressCallback +class studio::AboutProgress : public synfig::ProgressCallback { About &about; @@ -176,7 +176,7 @@ About::About(): Logo->set_padding(0,0); // Create the Copyright Label - Gtk::Label *CopyrightLabel = manage(new class Gtk::Label(SINFG_COPYRIGHT)); + Gtk::Label *CopyrightLabel = manage(new class Gtk::Label(SYNFIG_COPYRIGHT)); CopyrightLabel->set_size_request(image_w,24); CopyrightLabel->set_alignment(0.5,0.5); CopyrightLabel->set_padding(0,0); @@ -195,8 +195,8 @@ About::About(): // Set the version label to contain the correct information string ver; ver+="Version "VERSION" ("__DATE__" "__TIME__")\n"; - ver+="Using SINFG "; - ver+=sinfg::get_version(); + ver+="Using SYNFIG "; + ver+=synfig::get_version(); #ifdef __GNUC__ ver+=strprintf(" and GNU G++ %d.%d.%d",__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__); #endif @@ -240,7 +240,7 @@ About::About(): fixed1->put(*tasklabel, 0, image_h); // Set up the parameters for this pop-up window - set_title("Sinfg Studio "VERSION); + set_title("Synfig Studio "VERSION); set_modal(false); property_window_position().set_value(Gtk::WIN_POS_CENTER); set_resizable(false); @@ -282,7 +282,7 @@ About::set_can_self_destruct(bool x) CloseButton->hide(); } -sinfg::ProgressCallback * +synfig::ProgressCallback * About::get_callback() { return cb; diff --git a/synfig-studio/trunk/src/gtkmm/about.h b/synfig-studio/trunk/src/gtkmm/about.h index 1766bfd..b543ee5 100644 --- a/synfig-studio/trunk/src/gtkmm/about.h +++ b/synfig-studio/trunk/src/gtkmm/about.h @@ -1,5 +1,5 @@ /*! ======================================================================== -** Sinfg +** Synfig ** Template Header File ** $Id: about.h,v 1.1.1.1 2005/01/07 03:34:35 darco Exp $ ** @@ -20,8 +20,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GTKMM_ABOUT_H -#define __SINFG_GTKMM_ABOUT_H +#ifndef __SYNFIG_GTKMM_ABOUT_H +#define __SYNFIG_GTKMM_ABOUT_H /* === H E A D E R S ======================================================= */ @@ -38,7 +38,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ -namespace sinfg { class ProgressCallback; }; +namespace synfig { class ProgressCallback; }; namespace studio { @@ -62,7 +62,7 @@ class About : public Gtk::Window public: - sinfg::ProgressCallback *get_callback(); + synfig::ProgressCallback *get_callback(); void set_can_self_destruct(bool x); diff --git a/synfig-studio/trunk/src/gtkmm/adjust_window.cpp b/synfig-studio/trunk/src/gtkmm/adjust_window.cpp index 90ca220..105b72b 100644 --- a/synfig-studio/trunk/src/gtkmm/adjust_window.cpp +++ b/synfig-studio/trunk/src/gtkmm/adjust_window.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file adjust_window.cpp ** \brief Adjustment Window Implementation File ** @@ -37,7 +37,7 @@ using namespace std; //using namespace etl; -//using namespace sinfg; +//using namespace synfig; using studio::Adjust_Window; @@ -83,7 +83,7 @@ void Adjust_Window::set_child_adjustment(Gtk::Adjustment *child) adj_child = child; - sinfg::info("Adjust: connecting to child signals"); + synfig::info("Adjust: connecting to child signals"); if(child) { childchanged = child->signal_changed().connect(sigc::mem_fun(*this,&Adjust_Window::update_fromchild)); diff --git a/synfig-studio/trunk/src/gtkmm/adjust_window.h b/synfig-studio/trunk/src/gtkmm/adjust_window.h index 5cbf4a4..a638560 100644 --- a/synfig-studio/trunk/src/gtkmm/adjust_window.h +++ b/synfig-studio/trunk/src/gtkmm/adjust_window.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file adjust_window.h ** \brief Adjustment Window Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_TEMPLATE_H -#define __SINFG_TEMPLATE_H +#ifndef __SYNFIG_TEMPLATE_H +#define __SYNFIG_TEMPLATE_H /* === H E A D E R S ======================================================= */ #include diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index 49cce74..7295b3e 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file app.cpp ** \brief writeme ** @@ -43,7 +43,7 @@ #include -#include +#include #include "app.h" #include "about.h" @@ -79,7 +79,7 @@ #include "autorecover.h" -#include +#include #include "dock_history.h" #include "dock_canvases.h" #include "dock_keyframes.h" @@ -119,7 +119,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -144,7 +144,7 @@ using namespace studio; # define IMAGE_EXT "tif" #endif -#include +#include /* === S I G N A L S ======================================================= */ @@ -180,11 +180,11 @@ const std::list& App::get_recent_files() { return recent_files; } int App::Busy::count; bool App::shutdown_in_progress; -sinfg::Gamma App::gamma; +synfig::Gamma App::gamma; Glib::RefPtr App::ui_manager_; -sinfg::Distance::System App::distance_system; +synfig::Distance::System App::distance_system; studio::Dialog_Setup* App::dialog_setup; @@ -193,8 +193,8 @@ etl::handle< studio::ModPalette > mod_palette_; std::list > App::instance_list; -static etl::handle ui_interface_; -const etl::handle& App::get_ui_interface() { return ui_interface_; } +static etl::handle ui_interface_; +const etl::handle& App::get_ui_interface() { return ui_interface_; } etl::handle App::selected_instance; etl::handle App::selected_canvas_view; @@ -238,7 +238,7 @@ static int max_recent_files_=25; int studio::App::get_max_recent_files() { return max_recent_files_; } void studio::App::set_max_recent_files(int x) { max_recent_files_=x; } -static sinfg::String app_base_path_; +static synfig::String app_base_path_; namespace studio { }; // END of namespace studio @@ -247,7 +247,7 @@ studio::StateManager* state_manager; -class GlobalUIInterface : public sinfgapp::UIInterface +class GlobalUIInterface : public synfigapp::UIInterface { public: @@ -484,9 +484,9 @@ int check_license(String basedir) fclose(file); } else - sinfg::error("Unable to save license key!"); + synfig::error("Unable to save license key!"); } - sinfg::info("License Authenticated -- Serial #%05d",serial); + synfig::info("License Authenticated -- Serial #%05d",serial); return serial; } @@ -509,7 +509,7 @@ studio::UIManager::remove_action_group (const Glib::RefPtr& ac Gtk::UIManager::remove_action_group(action_group); return; } - sinfg::error("Unable to find action group"); + synfig::error("Unable to find action group"); } void @@ -527,7 +527,7 @@ studio::add_action_group_to_top(Glib::RefPtr ui_manager, Glib DEBUGPOINT(); if(*iter && (*iter)->get_name()!="menus") { - sinfg::info("Removing action group "+(*iter)->get_name()); + synfig::info("Removing action group "+(*iter)->get_name()); ui_manager->remove_action_group(*iter); } } @@ -543,10 +543,10 @@ studio::add_action_group_to_top(Glib::RefPtr ui_manager, Glib DEBUGPOINT(); } */ -class Preferences : public sinfgapp::Settings +class Preferences : public synfigapp::Settings { public: - virtual bool get_value(const sinfg::String& key, sinfg::String& value)const + virtual bool get_value(const synfig::String& key, synfig::String& value)const { if(key=="gamma") { @@ -584,10 +584,10 @@ public: return true; } - return sinfgapp::Settings::get_value(key,value); + return synfigapp::Settings::get_value(key,value); } - virtual bool set_value(const sinfg::String& key,const sinfg::String& value) + virtual bool set_value(const synfig::String& key,const synfig::String& value) { if(key=="gamma") { @@ -607,7 +607,7 @@ public: if(key=="time_format") { int i(atoi(value.c_str())); - App::set_time_format(static_cast(i)); + App::set_time_format(static_cast(i)); return true; } if(key=="auto_recover_backup_interval") @@ -634,12 +634,12 @@ public: return true; } - return sinfgapp::Settings::set_value(key,value); + return synfigapp::Settings::set_value(key,value); } virtual KeyList get_key_list()const { - KeyList ret(sinfgapp::Settings::get_key_list()); + KeyList ret(synfigapp::Settings::get_key_list()); ret.push_back("gamma"); ret.push_back("time_format"); ret.push_back("distance_system"); @@ -674,9 +674,9 @@ init_ui_manager() menus_action_group->add( Gtk::Action::create("menu-state", "State") ); menus_action_group->add( Gtk::Action::create("menu-toolbox", "Toolbox") ); - // Add the sinfgapp actions... - sinfgapp::Action::Book::iterator iter; - for(iter=sinfgapp::Action::book().begin();iter!=sinfgapp::Action::book().end();++iter) + // Add the synfigapp actions... + synfigapp::Action::Book::iterator iter; + for(iter=synfigapp::Action::book().begin();iter!=synfigapp::Action::book().end();++iter) { actions_action_group->add(Gtk::Action::create( "action-"+iter->second.name, @@ -690,15 +690,15 @@ init_ui_manager() #define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ group->add(action,sig); } DEFINE_ACTION2("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties")); - DEFINE_ACTION("about", Gtk::StockID("sinfg-about")); + DEFINE_ACTION("about", Gtk::StockID("synfig-about")); DEFINE_ACTION("open", Gtk::Stock::OPEN); DEFINE_ACTION("save", Gtk::Stock::SAVE); DEFINE_ACTION("save-as", Gtk::Stock::SAVE_AS); DEFINE_ACTION("revert", Gtk::Stock::REVERT_TO_SAVED); - DEFINE_ACTION("cvs-add", Gtk::StockID("sinfg-cvs_add")); - DEFINE_ACTION("cvs-update", Gtk::StockID("sinfg-cvs_update")); - DEFINE_ACTION("cvs-commit", Gtk::StockID("sinfg-cvs_commit")); - DEFINE_ACTION("cvs-revert", Gtk::StockID("sinfg-cvs_revert")); + DEFINE_ACTION("cvs-add", Gtk::StockID("synfig-cvs_add")); + DEFINE_ACTION("cvs-update", Gtk::StockID("synfig-cvs_update")); + DEFINE_ACTION("cvs-commit", Gtk::StockID("synfig-cvs_commit")); + DEFINE_ACTION("cvs-revert", Gtk::StockID("synfig-cvs_revert")); DEFINE_ACTION("import", _("Import")); DEFINE_ACTION("render", _("Render")); DEFINE_ACTION("preview", _("Preview")); @@ -767,15 +767,15 @@ init_ui_manager() #undef DEFINE_ACTION -// Set up sinfgapp actions +// Set up synfigapp actions /*{ - sinfgapp::Action::Book::iterator iter; + synfigapp::Action::Book::iterator iter; - for(iter=sinfgapp::Action::book().begin();iter!=sinfgapp::Action::book().end();++iter) + for(iter=synfigapp::Action::book().begin();iter!=synfigapp::Action::book().end();++iter) { Gtk::StockID stock_id; - if(!(iter->second.category&sinfgapp::Action::CATEGORY_HIDDEN)) + if(!(iter->second.category&synfigapp::Action::CATEGORY_HIDDEN)) { //Gtk::Image* image(manage(new Gtk::Image())); if(iter->second.task=="raise") stock_id=Gtk::Stock::GO_UP; @@ -787,7 +787,7 @@ init_ui_manager() else if(iter->second.task=="set_off") stock_id=Gtk::Stock::NO; //else if(iter->second.task=="duplicate") stock_id=Gtk::Stock::COPY; else if(iter->second.task=="remove") stock_id=Gtk::Stock::DELETE; - else stock_id=Gtk::StockID("sinfg-"+iter->second.task); + else stock_id=Gtk::StockID("synfig-"+iter->second.task); actions_action_group->add(Gtk::Action::create( "action-"+iter->second.name, @@ -946,7 +946,7 @@ init_ui_manager() } catch(const Glib::Error& ex) { - sinfg::error("building menus and toolbars failed: " + ex.what()); + synfig::error("building menus and toolbars failed: " + ex.what()); } // Add default keyboard accelerators @@ -1051,11 +1051,11 @@ App::App(int *argc, char ***argv): if(mkdir(get_user_app_directory().c_str(),ACCESSPERMS)<0) { if(errno!=EEXIST) - sinfg::error("UNABLE TO CREATE \"%s\"",get_user_app_directory().c_str()); + synfig::error("UNABLE TO CREATE \"%s\"",get_user_app_directory().c_str()); } else { - sinfg::info("Created directory \"%s\"",get_user_app_directory().c_str()); + synfig::info("Created directory \"%s\"",get_user_app_directory().c_str()); } @@ -1063,50 +1063,50 @@ App::App(int *argc, char ***argv): try { - if(!SINFG_CHECK_VERSION()) + if(!SYNFIG_CHECK_VERSION()) { - cerr<<"FATAL: Sinfg Version Mismatch"<(new sinfgapp::Main(etl::dirname((*argv)[0]),&sinfg_init_cb)); } + // Initialize the Synfig library + try { synfigapp_main=etl::smart_ptr(new synfigapp::Main(etl::dirname((*argv)[0]),&synfig_init_cb)); } catch(...) { - get_ui_interface()->error("Failed to initialize sinfg!"); + get_ui_interface()->error("Failed to initialize synfig!"); throw; } // add the preferences to the settings - sinfgapp::Main::settings().add_domain(&_preferences,"pref"); + synfigapp::Main::settings().add_domain(&_preferences,"pref"); try { @@ -1236,11 +1236,11 @@ App::App(int *argc, char ***argv): if( get_ui_interface()->yes_no( "Auto Recovery", - "SINFG Studio seems to have crashed\n" + "SYNFIG Studio seems to have crashed\n" "before you could save all your files.\n" "Would you like to re-open those files\n" "and recover your unsaved changes?" - )==sinfgapp::UIInterface::RESPONSE_YES + )==synfigapp::UIInterface::RESPONSE_YES ) { if(!auto_recover->recover()) @@ -1249,7 +1249,7 @@ App::App(int *argc, char ***argv): } else get_ui_interface()->error( - _("SINFG Studio has attempted to recover\n" + _("SYNFIG Studio has attempted to recover\n" "from a previous crash. The files that it has\n" "recovered are NOT YET SAVED. It would be a good\n" "idea to review them and save them now.") @@ -1288,7 +1288,7 @@ App::~App() save_settings(); - sinfgapp::Main::settings().remove_domain("pref"); + synfigapp::Main::settings().remove_domain("pref"); selected_instance=0; @@ -1329,11 +1329,15 @@ App::~App() String App::get_user_app_directory() { - return Glib::build_filename(Glib::get_home_dir(),"sinfg"); +#ifdef __APPLE__ + return Glib::build_filename(Glib::get_home_dir(),"Library/Synfig"); +#else + return Glib::build_filename(Glib::get_home_dir(),"Synfig"); +#endif } -sinfg::String -App::get_config_file(const sinfg::String& file) +synfig::String +App::get_config_file(const synfig::String& file) { return Glib::build_filename(get_user_app_directory(),file); } @@ -1388,7 +1392,7 @@ App::get_time_format() } void -App::set_time_format(sinfg::Time::Format x) +App::set_time_format(synfig::Time::Format x) { _App_time_format=x; } @@ -1410,7 +1414,7 @@ App::save_settings() if(!file) { - sinfg::warning("Unable to save %s",filename.c_str()); + synfig::warning("Unable to save %s",filename.c_str()); break; } @@ -1421,11 +1425,11 @@ App::save_settings() }while(0); std::string filename=get_config_file("settings"); - sinfgapp::Main::settings().save_to_file(filename); + synfigapp::Main::settings().save_to_file(filename); } catch(...) { - sinfg::warning("Caught exception when attempting to save settings."); + synfig::warning("Caught exception when attempting to save settings."); } } @@ -1452,32 +1456,32 @@ App::load_settings() } } std::string filename=get_config_file("settings"); - if(!sinfgapp::Main::settings().load_from_file(filename)) + if(!synfigapp::Main::settings().load_from_file(filename)) { - //std::string filename=Glib::build_filename(Glib::get_home_dir(),".sinfgrc"); - //if(!sinfgapp::Main::settings().load_from_file(filename)) + //std::string filename=Glib::build_filename(Glib::get_home_dir(),".synfigrc"); + //if(!synfigapp::Main::settings().load_from_file(filename)) { gamma.set_gamma(1.0/2.2); - sinfgapp::Main::settings().set_value("dock.dialog.1.comp_selector","1"); - sinfgapp::Main::settings().set_value("dock.dialog.1.contents","navigator - info pal_edit pal_browse - tool_options history canvases - layers groups"); - sinfgapp::Main::settings().set_value("dock.dialog.1.contents_size","225 167 207"); - sinfgapp::Main::settings().set_value("dock.dialog.1.pos","1057 32"); - sinfgapp::Main::settings().set_value("dock.dialog.1.size","208 1174"); - sinfgapp::Main::settings().set_value("dock.dialog.2.comp_selector","0"); - sinfgapp::Main::settings().set_value("dock.dialog.2.contents","params children keyframes | timetrack curves meta_data"); - sinfgapp::Main::settings().set_value("dock.dialog.2.contents_size","263"); - sinfgapp::Main::settings().set_value("dock.dialog.2.pos","0 973"); - sinfgapp::Main::settings().set_value("dock.dialog.2.size","1045 235"); - sinfgapp::Main::settings().set_value("pref.distance_system","pt"); - sinfgapp::Main::settings().set_value("pref.use_colorspace_gamma","1"); - sinfgapp::Main::settings().set_value("window.toolbox.pos","4 4"); + synfigapp::Main::settings().set_value("dock.dialog.1.comp_selector","1"); + synfigapp::Main::settings().set_value("dock.dialog.1.contents","navigator - info pal_edit pal_browse - tool_options history canvases - layers groups"); + synfigapp::Main::settings().set_value("dock.dialog.1.contents_size","225 167 207"); + synfigapp::Main::settings().set_value("dock.dialog.1.pos","1057 32"); + synfigapp::Main::settings().set_value("dock.dialog.1.size","208 1174"); + synfigapp::Main::settings().set_value("dock.dialog.2.comp_selector","0"); + synfigapp::Main::settings().set_value("dock.dialog.2.contents","params children keyframes | timetrack curves meta_data"); + synfigapp::Main::settings().set_value("dock.dialog.2.contents_size","263"); + synfigapp::Main::settings().set_value("dock.dialog.2.pos","0 973"); + synfigapp::Main::settings().set_value("dock.dialog.2.size","1045 235"); + synfigapp::Main::settings().set_value("pref.distance_system","pt"); + synfigapp::Main::settings().set_value("pref.use_colorspace_gamma","1"); + synfigapp::Main::settings().set_value("window.toolbox.pos","4 4"); } } } catch(...) { - sinfg::warning("Caught exception when attempting to load settings."); + synfig::warning("Caught exception when attempting to load settings."); } } @@ -1509,20 +1513,20 @@ App::quit() return; /* - if((*iter)->sinfgapp::Instance::get_action_count()) + if((*iter)->synfigapp::Instance::get_action_count()) { - handle uim; + handle uim; uim=(*iter)->find_canvas_view((*iter)->get_canvas())->get_ui_interface(); assert(uim); string str=strprintf(_("Would you like to save your changes to %s?"),(*iter)->get_file_name().c_str() ); - switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,sinfgapp::UIInterface::RESPONSE_YES)) + switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES)) { - case sinfgapp::UIInterface::RESPONSE_NO: + case synfigapp::UIInterface::RESPONSE_NO: break; - case sinfgapp::UIInterface::RESPONSE_YES: + case synfigapp::UIInterface::RESPONSE_YES: (*iter)->save(); break; - case sinfgapp::UIInterface::RESPONSE_CANCEL: + case synfigapp::UIInterface::RESPONSE_CANCEL: return; default: assert(0); @@ -1531,20 +1535,20 @@ App::quit() } - if((*iter)->sinfgapp::Instance::is_modified()) + if((*iter)->synfigapp::Instance::is_modified()) { - handle uim; + handle uim; uim=(*iter)->find_canvas_view((*iter)->get_canvas())->get_ui_interface(); assert(uim); string str=strprintf(_("%s has changes not yet on the CVS repository.\nWould you like to commit these changes?"),(*iter)->get_file_name().c_str() ); - switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,sinfgapp::UIInterface::RESPONSE_YES)) + switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES)) { - case sinfgapp::UIInterface::RESPONSE_NO: + case synfigapp::UIInterface::RESPONSE_NO: break; - case sinfgapp::UIInterface::RESPONSE_YES: + case synfigapp::UIInterface::RESPONSE_YES: (*iter)->dialog_cvs_commit(); break; - case sinfgapp::UIInterface::RESPONSE_CANCEL: + case synfigapp::UIInterface::RESPONSE_CANCEL: return; default: assert(0); @@ -1637,7 +1641,7 @@ App::dialog_open_file(const std::string &title, std::string &filename) return false; #else - sinfg::String prev_path; + synfig::String prev_path; if(!_preferences.get_value("curr_path",prev_path)) prev_path="."; @@ -1919,7 +1923,7 @@ App::open_as(std::string filename,std::string as) { OneMoment one_moment; - etl::handle canvas(open_canvas_as(filename,as)); + etl::handle canvas(open_canvas_as(filename,as)); if(canvas && get_instance(canvas)) { get_instance(canvas)->find_canvas_view(canvas)->present(); @@ -1960,7 +1964,7 @@ App::open_as(std::string filename,std::string as) void App::new_instance() { - handle canvas=sinfg::Canvas::create(); + handle canvas=synfig::Canvas::create(); canvas->set_name(strprintf("Untitled%d",Instance::get_count())); String file_name(strprintf("untitled%d.sif",Instance::get_count())); @@ -2084,7 +2088,7 @@ studio::App::redo() selected_instance->redo(); } -sinfg::String +synfig::String studio::App::get_base_path() { return app_base_path_; diff --git a/synfig-studio/trunk/src/gtkmm/app.h b/synfig-studio/trunk/src/gtkmm/app.h index decaaf8..0359794 100644 --- a/synfig-studio/trunk/src/gtkmm/app.h +++ b/synfig-studio/trunk/src/gtkmm/app.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file app.h ** \brief writeme ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STUDIO_APP_H -#define __SINFG_STUDIO_APP_H +#ifndef __SYNFIG_STUDIO_APP_H +#define __SYNFIG_STUDIO_APP_H /* === H E A D E R S ======================================================= */ @@ -35,13 +35,13 @@ #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include "iconcontroler.h" /* === M A C R O S ========================================================= */ @@ -57,7 +57,7 @@ namespace Gtk class ActionGroup; }; -namespace sinfgapp +namespace synfigapp { class UIInterface; class Main; @@ -123,7 +123,7 @@ public: */ private: - //static etl::handle ui_interface_; + //static etl::handle ui_interface_; //static int max_recent_files; /* @@ -141,7 +141,7 @@ private: static IPC *ipc; */ - etl::smart_ptr sinfgapp_main; + etl::smart_ptr synfigapp_main; static etl::handle selected_instance; @@ -170,9 +170,9 @@ public: // static Dialog_Palette* dialog_palette; static Dialog_ToolOptions *dialog_tool_options; - static sinfg::Distance::System distance_system; + static synfig::Distance::System distance_system; - static sinfg::Gamma gamma; + static synfig::Gamma gamma; static Toolbox *toolbox; @@ -258,19 +258,19 @@ public: static void add_recent_file(const std::string &filename); - static sinfg::String get_base_path(); + static synfig::String get_base_path(); static void save_settings(); static void load_settings(); static const std::list& get_recent_files(); - static const etl::handle& get_ui_interface(); + static const etl::handle& get_ui_interface(); static void set_selected_instance(etl::loose_handle instance); static void set_selected_canvas_view(etl::loose_handle); - static etl::loose_handle get_instance(etl::handle canvas); + static etl::loose_handle get_instance(etl::handle canvas); static etl::loose_handle get_selected_instance() { return selected_instance; } static etl::loose_handle get_selected_canvas_view() { return selected_canvas_view; } @@ -296,8 +296,8 @@ public: static void set_max_recent_files(int x); - static sinfg::Time::Format get_time_format(); - static void set_time_format(sinfg::Time::Format x); + static synfig::Time::Format get_time_format(); + static void set_time_format(synfig::Time::Format x); static bool shutdown_request(GdkEventAny*bleh=NULL); @@ -319,8 +319,8 @@ public: static void dialog_not_implemented(); - static sinfg::String get_user_app_directory(); - static sinfg::String get_config_file(const sinfg::String& file); + static synfig::String get_user_app_directory(); + static synfig::String get_config_file(const synfig::String& file); }; // END of class App }; // END namespace studio diff --git a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp index 9c41444..900f24d 100644 --- a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp +++ b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file asyncrenderer.cpp ** \brief Template File ** @@ -48,7 +48,7 @@ #include #endif -#include +#include #include #endif @@ -57,7 +57,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; #define BOREDOM_TIMEOUT 50 @@ -70,10 +70,10 @@ using namespace studio; /* === C L A S S E S ======================================================= */ -class AsyncTarget_Tile : public sinfg::Target_Tile +class AsyncTarget_Tile : public synfig::Target_Tile { public: - etl::handle warm_target; + etl::handle warm_target; struct tile_t { @@ -97,7 +97,7 @@ public: sigc::connection ready_connection; public: - AsyncTarget_Tile(etl::handle warm_target): + AsyncTarget_Tile(etl::handle warm_target): warm_target(warm_target) { set_avoid_time_sync(warm_target->get_avoid_time_sync()); @@ -145,14 +145,14 @@ public: return warm_target->next_frame(time); } - virtual bool start_frame(sinfg::ProgressCallback *cb=0) + virtual bool start_frame(synfig::ProgressCallback *cb=0) { if(!alive_flag) return false; return warm_target->start_frame(cb); } - virtual bool add_tile(const sinfg::Surface &surface, int gx, int gy) + virtual bool add_tile(const synfig::Surface &surface, int gx, int gy) { assert(surface); if(!alive_flag) @@ -219,10 +219,10 @@ public: -class AsyncTarget_Scanline : public sinfg::Target_Scanline +class AsyncTarget_Scanline : public synfig::Target_Scanline { public: - etl::handle warm_target; + etl::handle warm_target; int scanline_; Surface surface; @@ -239,7 +239,7 @@ public: public: - AsyncTarget_Scanline(etl::handle warm_target): + AsyncTarget_Scanline(etl::handle warm_target): warm_target(warm_target) { set_avoid_time_sync(warm_target->get_avoid_time_sync()); @@ -274,7 +274,7 @@ public: alive_flag=false; } - virtual bool start_frame(sinfg::ProgressCallback *cb=0) + virtual bool start_frame(synfig::ProgressCallback *cb=0) { return alive_flag; } @@ -338,27 +338,27 @@ public: /* === M E T H O D S ======================================================= */ -AsyncRenderer::AsyncRenderer(etl::handle target_,sinfg::ProgressCallback *cb): +AsyncRenderer::AsyncRenderer(etl::handle target_,synfig::ProgressCallback *cb): error(false), success(false), cb(cb) { render_thread=0; - if(etl::handle::cast_dynamic(target_)) + if(etl::handle::cast_dynamic(target_)) { etl::handle wrap_target( - new AsyncTarget_Tile(etl::handle::cast_dynamic(target_)) + new AsyncTarget_Tile(etl::handle::cast_dynamic(target_)) ); signal_stop_.connect(sigc::mem_fun(*wrap_target,&AsyncTarget_Tile::set_dead)); target=wrap_target; } - else if(etl::handle::cast_dynamic(target_)) + else if(etl::handle::cast_dynamic(target_)) { etl::handle wrap_target( new AsyncTarget_Scanline( - etl::handle::cast_dynamic(target_) + etl::handle::cast_dynamic(target_) ) ); diff --git a/synfig-studio/trunk/src/gtkmm/asyncrenderer.h b/synfig-studio/trunk/src/gtkmm/asyncrenderer.h index f9721c9..028fa1e 100644 --- a/synfig-studio/trunk/src/gtkmm/asyncrenderer.h +++ b/synfig-studio/trunk/src/gtkmm/asyncrenderer.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file asyncrenderer.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_ASYNCRENDERER_H -#define __SINFG_ASYNCRENDERER_H +#ifndef __SYNFIG_ASYNCRENDERER_H +#define __SYNFIG_ASYNCRENDERER_H /* === H E A D E R S ======================================================= */ @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -54,14 +54,14 @@ class AsyncRenderer : public etl::shared_object, public sigc::trackable std::list activity_connection_list; - //etl::handle target_scanline; - //etl::handle target_tile; - etl::handle target; + //etl::handle target_scanline; + //etl::handle target_tile; + etl::handle target; bool error; bool success; - sinfg::ProgressCallback *cb; + synfig::ProgressCallback *cb; sigc::signal signal_stop_; @@ -75,7 +75,7 @@ class AsyncRenderer : public etl::shared_object, public sigc::trackable */ public: - AsyncRenderer(etl::handle target,sinfg::ProgressCallback *cb=0); + AsyncRenderer(etl::handle target,synfig::ProgressCallback *cb=0); virtual ~AsyncRenderer(); void start(); diff --git a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp index dd3b295..5beeb32 100644 --- a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp +++ b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file audiocontainer.cpp ** \brief Audio Container implementation File ** @@ -36,7 +36,7 @@ //#include #include -#include +#include #include @@ -59,7 +59,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; /* === M A C R O S ========================================================= */ #ifdef __WIN32 @@ -89,7 +89,7 @@ bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector //trivial rejection... if(!sample || sps < 1) { - sinfg::warning("build_profile: Sample rate was too low or sample was invalid"); + synfig::warning("build_profile: Sample rate was too low or sample was invalid"); return false; } @@ -116,7 +116,7 @@ bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector if(sizeall <= 0) { - sinfg::warning("ProfileAudio: Sample buffer cannot be size smaller than 1 (%X)",FSOUND_GetError()); + synfig::warning("ProfileAudio: Sample buffer cannot be size smaller than 1 (%X)",FSOUND_GetError()); return false; } @@ -126,7 +126,7 @@ bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector float stride = allsamplerate/(float)sps; //down sampling to 8 bit min/max values - sinfg::warning("About to downsample from %d Hz to %.1f Hz, sample stride: %f", allsamplerate, sps, stride); + synfig::warning("About to downsample from %d Hz to %.1f Hz, sample stride: %f", allsamplerate, sps, stride); char *sampledata=0,*useless = 0; unsigned int len1,len2; @@ -134,10 +134,10 @@ bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector { if(!FSOUND_Sample_Lock(sample,0,sizeall,(void**)&sampledata,(void**)&useless,&len1,&len2)) { - sinfg::warning("ProfileAudio: Unable to lock the sound buffer... (%X)",FSOUND_GetError()); + synfig::warning("ProfileAudio: Unable to lock the sound buffer... (%X)",FSOUND_GetError()); return false; } - sinfg::warning("Locked: %X: %d bytes, %X: %d bytes",sampledata,len1,useless,len2); + synfig::warning("Locked: %X: %d bytes, %X: %d bytes",sampledata,len1,useless,len2); if(channelsize == 1) { @@ -154,7 +154,7 @@ bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector int i = 0; //HACK - to prevent if statement inside inner loop - //sinfg::warning("wo baby wo baby, inc: %d, stride: %f, size: %d", inc, stride, sizeall); + //synfig::warning("wo baby wo baby, inc: %d, stride: %f, size: %d", inc, stride, sizeall); while(iter < end) { int maxs = 0, mins = 0; @@ -189,7 +189,7 @@ bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector int i = 0; //HACK - to prevent if statement inside inner loop - //sinfg::warning("wo baby wo baby, inc: %d, stride: %f, size: %d", inc, stride, sizeall); + //synfig::warning("wo baby wo baby, inc: %d, stride: %f, size: %d", inc, stride, sizeall); while(iter < end) { int maxs = 0, mins = 0; @@ -212,12 +212,12 @@ bool build_profile(FSOUND_SAMPLE *sample, double &samplerate, std::vector } } - sinfg::warning("Stats: %f seconds with %d bytes now %d bytes", (samples.size()/2)/sps, sizeall, samples.size()); - sinfg::warning(" %f seconds before", numsamples/(float)allsamplerate); + synfig::warning("Stats: %f seconds with %d bytes now %d bytes", (samples.size()/2)/sps, sizeall, samples.size()); + synfig::warning(" %f seconds before", numsamples/(float)allsamplerate); //we're done yay!, unlock FSOUND_Sample_Unlock(sample,sampledata,useless,len1,len2); - sinfg::info("Unlocked"); + synfig::info("Unlocked"); //FSOUND_PlaySound(FSOUND_FREE,sound); //test @@ -433,7 +433,7 @@ struct scrubinfo FSOUND_SetPaused(channel,true); }else { - //sinfg::info("DSP f = %d Hz", freq); + //synfig::info("DSP f = %d Hz", freq); FSOUND_SetPaused(channel,false); if(!FSOUND_SetFrequency(channel,freq)) { @@ -515,7 +515,7 @@ void * scrubdspwrap(void *originalbuffer, void *newbuffer, int length, void *use } } - //sinfg::info(dsp); + //synfig::info(dsp); return newbuffer; } @@ -539,21 +539,21 @@ public: if(!loaded) { #ifdef WITH_FMOD - sinfg::info("Initializing FMOD on demand..."); + synfig::info("Initializing FMOD on demand..."); { FSOUND_SetOutput(AUDIO_OUTPUT); /*int numdrivers = FSOUND_GetNumDrivers(); - sinfg::info("Num FMOD drivers = %d",numdrivers); - sinfg::info("Current Driver is #%d", FSOUND_GetDriver()); + synfig::info("Num FMOD drivers = %d",numdrivers); + synfig::info("Current Driver is #%d", FSOUND_GetDriver()); for(int i = 0; i < numdrivers; ++i) { unsigned int caps = 0; FSOUND_GetDriverCaps(i,&caps); - sinfg::info(" Caps for driver %d (%s) = %x",i,FSOUND_GetDriverName(i),caps); + synfig::info(" Caps for driver %d (%s) = %x",i,FSOUND_GetDriverName(i),caps); } FSOUND_SetDriver(0);*/ @@ -563,7 +563,7 @@ public: if(!FSOUND_Init(44100, 32, 0)) { - sinfg::warning("Unable to load FMOD"); + synfig::warning("Unable to load FMOD"); }else { loaded = true; @@ -580,18 +580,18 @@ public: //add to the refcount ++refcount; - //sinfg::info("Audio: increment fmod refcount %d", refcount); + //synfig::info("Audio: increment fmod refcount %d", refcount); } void decref() { if(refcount <= 0) { - sinfg::warning("FMOD refcount is already 0..."); + synfig::warning("FMOD refcount is already 0..."); }else { --refcount; - //sinfg::info("Audio: decrement fmod refcount %d", refcount); + //synfig::info("Audio: decrement fmod refcount %d", refcount); //NOTE: UNCOMMENT THIS IF YOU WANT FMOD TO UNLOAD ITSELF WHEN IT ISN'T NEEDED ANYMORE... flush(); @@ -611,7 +611,7 @@ public: if(loaded && refcount <= 0) { #ifdef WITH_FMOD - sinfg::info("Unloading FMOD"); + synfig::info("Unloading FMOD"); if(scrubdspunit) FSOUND_DSP_Free(scrubdspunit); FSOUND_Close(); #endif @@ -706,7 +706,7 @@ struct studio::AudioContainer::AudioImp channel = FSOUND_PlaySoundEx(FSOUND_FREE,sample,0,true); if(channel < 0 || FSOUND_GetError() != FMOD_ERR_NONE) { - sinfg::warning("Could not play the sample..."); + synfig::warning("Could not play the sample..."); return false; } } @@ -856,11 +856,11 @@ handle studio::AudioContainer::get_profile(float samplerat //if we already have done our work, then we're good if(profilevalid && prof) { - //sinfg::info("Using already built profile"); + //synfig::info("Using already built profile"); return prof; } - //sinfg::info("Before profile"); + //synfig::info("Before profile"); //make a new profile at current sample rate //NOTE: We might want to reuse the structure already there... @@ -869,18 +869,18 @@ handle studio::AudioContainer::get_profile(float samplerat if(!prof) { - sinfg::warning("Couldn't allocate audioprofile..."); + synfig::warning("Couldn't allocate audioprofile..."); return handle(); } //setting the info for the sample rate - //sinfg::info("Setting info..."); + //synfig::info("Setting info..."); - sinfg::info("Building Profile..."); + synfig::info("Building Profile..."); prof->samplerate = samplerate; if(build_profile(imp->sample,prof->samplerate,prof->samples)) { - sinfg::info(" Success!"); + synfig::info(" Success!"); profilevalid = true; return prof; }else @@ -1001,22 +1001,22 @@ bool studio::AudioContainer::AudioImp::load(const std::string &filename, if(!is_absolute_path(file)) { file=filedirectory+filename; - sinfg::warning("Not absolute hoooray"); + synfig::warning("Not absolute hoooray"); } - sinfg::info("Loading Audio file: %s", file.c_str()); + synfig::info("Loading Audio file: %s", file.c_str()); //check to see if file exists { struct stat s; if(stat(file.c_str(),&s) == -1 && errno == ENOENT) { - sinfg::info("There was no audio file..."); + synfig::info("There was no audio file..."); return false; } } //load fmod if we can... - //sinfg::warning("I'm compiled with FMOD!"); + //synfig::warning("I'm compiled with FMOD!"); fmodinit.addref(); //load the stream @@ -1025,15 +1025,15 @@ bool studio::AudioContainer::AudioImp::load(const std::string &filename, if(!sm) { - sinfg::warning("Could not open the audio file as a sample: %s",file.c_str()); + synfig::warning("Could not open the audio file as a sample: %s",file.c_str()); goto error; } - //sinfg::warning("Opened a file as a sample! :)"); + //synfig::warning("Opened a file as a sample! :)"); /*{ int bufferlen = FSOUND_DSP_GetBufferLength(); - sinfg::info("Buffer length = %d samples, %.3lf s",bufferlen, bufferlen / (double)FSOUND_GetOutputRate()); + synfig::info("Buffer length = %d samples, %.3lf s",bufferlen, bufferlen / (double)FSOUND_GetOutputRate()); }*/ //set all the variables since everything has worked out... @@ -1045,12 +1045,12 @@ bool studio::AudioContainer::AudioImp::load(const std::string &filename, FSOUND_Sample_GetDefaults(sm,&sfreq,&volume,0,0); //double len = length / (double)sfreq; - //sinfg::info("Sound info: %.2lf s long, %d Hz, %d Vol",(double)length,sfreq,volume); + //synfig::info("Sound info: %.2lf s long, %d Hz, %d Vol",(double)length,sfreq,volume); } - //sinfg::warning("Got all info, and setting up everything, %.2f sec.", length); - //sinfg::warning(" BigSample: composed of %d samples", FSOUND_Sample_GetLength(sm)); - sinfg::info("Successfully opened %s as a sample and initialized it.",file.c_str()); + //synfig::warning("Got all info, and setting up everything, %.2f sec.", length); + //synfig::warning(" BigSample: composed of %d samples", FSOUND_Sample_GetLength(sm)); + synfig::info("Successfully opened %s as a sample and initialized it.",file.c_str()); //set up the playable info sample = sm; @@ -1088,7 +1088,7 @@ void studio::AudioContainer::AudioImp::play(double t) if(t < 0) { unsigned int timeout = (int)floor(-t * 1000 + 0.5); - //sinfg::info("Playing audio delayed by %d ms",timeout); + //synfig::info("Playing audio delayed by %d ms",timeout); //delay for t seconds... delaycon = Glib::signal_timeout().connect( sigc::mem_fun(*this,&studio::AudioContainer::AudioImp::start_playing_now),timeout); @@ -1103,7 +1103,7 @@ void studio::AudioContainer::AudioImp::play(double t) if(position >= FSOUND_Sample_GetLength(sample)) { - sinfg::warning("Can't play audio when past length..."); + synfig::warning("Can't play audio when past length..."); return; } @@ -1112,7 +1112,7 @@ void studio::AudioContainer::AudioImp::play(double t) FSOUND_SetCurrentPosition(channel,position); FSOUND_SetPaused(channel,false); - //sinfg::info("Playing audio with position %d samples",position); + //synfig::info("Playing audio with position %d samples",position); #endif } @@ -1162,7 +1162,7 @@ void studio::AudioContainer::AudioImp::clear() void AudioContainer::AudioImp::start_scrubbing(double t) { - //sinfg::info("Start scrubbing: %lf", t); + //synfig::info("Start scrubbing: %lf", t); if(playing) stop(); set_scrubbing(true); @@ -1199,21 +1199,21 @@ void AudioContainer::AudioImp::start_scrubbing(double t) scrinfo.pos = curscrubpos; scrinfo.delaystart = delay_factor*buffer_length_sec; - //sinfg::info("\tStarting at %d samps, with %d p %.3f delay", + //synfig::info("\tStarting at %d samps, with %d p %.3f delay", // FSOUND_GetCurrentPosition(channel), (int)scrinfo.pos, scrinfo.delaystart); } //enable the dsp... - //sinfg::info("\tActivating DSP"); + //synfig::info("\tActivating DSP"); FSOUND_DSP_SetActive(scrubdspunit,true); #endif } void AudioContainer::AudioImp::stop_scrubbing() { - //sinfg::info("Stop scrubbing"); + //synfig::info("Stop scrubbing"); if(is_scrubbing()) { @@ -1223,7 +1223,7 @@ void AudioContainer::AudioImp::stop_scrubbing() g_scrubdata.scrub = 0; //stop the dsp... - //sinfg::info("\tDeactivating DSP"); + //synfig::info("\tDeactivating DSP"); FSOUND_DSP_SetActive(scrubdspunit,false); if(FSOUND_IsPlaying(channel)) FSOUND_SetPaused(channel,true); #endif @@ -1235,7 +1235,7 @@ void AudioContainer::AudioImp::stop_scrubbing() void AudioContainer::AudioImp::scrub(double t) { #ifdef WITH_FMOD - //sinfg::info("Scrub to %lf",t); + //synfig::info("Scrub to %lf",t); if(is_scrubbing()) { //What should we do? @@ -1256,7 +1256,7 @@ void AudioContainer::AudioImp::scrub(double t) //Outside so completely stopped... if(newpos < 0 || oldpos >= length) { - //sinfg::info("\tOut +"); + //synfig::info("\tOut +"); if(FSOUND_IsPlaying(channel)) { FSOUND_SetPaused(channel,true); @@ -1278,7 +1278,7 @@ void AudioContainer::AudioImp::scrub(double t) init_play(); FSOUND_SetCurrentPosition(channel,0); - sinfg::info("\tIn + %d", FSOUND_GetCurrentPosition(channel)); + synfig::info("\tIn + %d", FSOUND_GetCurrentPosition(channel)); scrinfo.Lock(); scrinfo.pos = 0; @@ -1297,7 +1297,7 @@ void AudioContainer::AudioImp::scrub(double t) //should we restart the delay cycle... (is it done?) if(!isRunning() || (scrinfo.delaystart <= 0 && scrinfo.deltatime <= 0 && isPaused())) { - //sinfg::info("Starting + at %d",(int)newpos); + //synfig::info("Starting + at %d",(int)newpos); scrinfo.deltatime = 0; scrinfo.delaystart = delay_factor*buffer_length_sec; scrinfo.Unlock(); @@ -1326,7 +1326,7 @@ void AudioContainer::AudioImp::scrub(double t) //completely stopped... if(newpos >= length || oldpos < 0) { - //sinfg::info("Out -"); + //synfig::info("Out -"); if(FSOUND_IsPlaying(channel)) { FSOUND_SetPaused(channel,true); @@ -1342,7 +1342,7 @@ void AudioContainer::AudioImp::scrub(double t) //going in? - start going backwards at the end... /*else if(oldpos >= length) { - sinfg::info("In -"); + synfig::info("In -"); //Set up the sound to be playing paused at the start... init_play(); FSOUND_SetCurrentPosition(channel,length-1); @@ -1364,7 +1364,7 @@ void AudioContainer::AudioImp::scrub(double t) //should we restart the delay cycle... (is it done?) if(!isRunning() ||(scrinfo.delaystart <= 0 && scrinfo.deltatime <= 0 && isPaused())) { - //sinfg::info("Starting - at %d",(int)newpos); + //synfig::info("Starting - at %d",(int)newpos); scrinfo.deltatime = 0; scrinfo.delaystart = delay_factor*buffer_length_sec; scrinfo.Unlock(); diff --git a/synfig-studio/trunk/src/gtkmm/audiocontainer.h b/synfig-studio/trunk/src/gtkmm/audiocontainer.h index cc449e8..39b165f 100644 --- a/synfig-studio/trunk/src/gtkmm/audiocontainer.h +++ b/synfig-studio/trunk/src/gtkmm/audiocontainer.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file audiocontainer.h ** \brief Sound info header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_AUDIOCONTAINER_H -#define __SINFG_AUDIOCONTAINER_H +#ifndef __SYNFIG_AUDIOCONTAINER_H +#define __SYNFIG_AUDIOCONTAINER_H /* === H E A D E R S ======================================================= */ #include @@ -32,7 +32,7 @@ #include #include -#include +#include /* === M A C R O S ========================================================= */ const float DEF_DISPLAYSAMPLERATE = 400; diff --git a/synfig-studio/trunk/src/gtkmm/autorecover.cpp b/synfig-studio/trunk/src/gtkmm/autorecover.cpp index 06c1db3..f1e8567 100644 --- a/synfig-studio/trunk/src/gtkmm/autorecover.cpp +++ b/synfig-studio/trunk/src/gtkmm/autorecover.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file autorecover.cpp ** \brief Template File ** @@ -32,8 +32,8 @@ //#include #include "app.h" -#include -#include +#include +#include #include #include #include "instance.h" @@ -64,7 +64,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -87,11 +87,11 @@ AutoRecover::AutoRecover() if(mkdir(get_shadow_directory().c_str(),ACCESSPERMS)<0) { if(errno!=EEXIST) - sinfg::error("UNABLE TO CREATE \"%s\"",get_shadow_directory().c_str()); + synfig::error("UNABLE TO CREATE \"%s\"",get_shadow_directory().c_str()); } else { - sinfg::info("Created directory \"%s\"",get_shadow_directory().c_str()); + synfig::info("Created directory \"%s\"",get_shadow_directory().c_str()); } } @@ -99,7 +99,7 @@ AutoRecover::~AutoRecover() { } -sinfg::String +synfig::String AutoRecover::get_shadow_directory() { return Glib::build_filename(App::get_user_app_directory(),"tmp"); @@ -122,8 +122,8 @@ AutoRecover::set_timeout(int milliseconds) // auto_backup_connect=App::main.get_context()->signal_timeout().connect(sigc::mem_fun(&AutoRecover::auto_backup),timeout); } -sinfg::String -AutoRecover::get_shadow_file_name(const sinfg::String& filename) +synfig::String +AutoRecover::get_shadow_file_name(const synfig::String& filename) { unsigned int hash1(0xdeadbeef); unsigned int hash2(0x83502529); @@ -165,15 +165,15 @@ AutoRecover::cleanup_pid(int pid) int status=0; if(waitpid(pid,&status,WNOHANG)==-1) { - sinfg::info("PID %d isn't a zombie yet",pid); + synfig::info("PID %d isn't a zombie yet",pid); return true; } if(WEXITSTATUS(status)!=0) { - sinfg::error("Autobackup seems to have failed! (PID=%d)",pid); + synfig::error("Autobackup seems to have failed! (PID=%d)",pid); } else - sinfg::info("PID=%d has been cleaned up",pid); + synfig::info("PID=%d has been cleaned up",pid); #endif return false; } @@ -219,12 +219,12 @@ AutoRecover::auto_backup() } if(savecount) - sinfg::info("AutoRecover::auto_backup(): %d Files backed up.",savecount); + synfig::info("AutoRecover::auto_backup(): %d Files backed up.",savecount); } catch(...) { - sinfg::error("AutoRecover::auto_backup(): UNKNOWN EXCEPTION THROWN."); - sinfg::error("AutoRecover::auto_backup(): FILES NOT BACKED UP."); + synfig::error("AutoRecover::auto_backup(): UNKNOWN EXCEPTION THROWN."); + synfig::error("AutoRecover::auto_backup(): FILES NOT BACKED UP."); } #ifdef HAVE_FORK @@ -313,7 +313,7 @@ AutoRecover::normal_shutdown() } void -AutoRecover::clear_backup(sinfg::Canvas::Handle canvas) +AutoRecover::clear_backup(synfig::Canvas::Handle canvas) { if(canvas) remove(get_shadow_file_name(canvas->get_file_name()).c_str()); diff --git a/synfig-studio/trunk/src/gtkmm/autorecover.h b/synfig-studio/trunk/src/gtkmm/autorecover.h index c6a4ed0..4b018ef 100644 --- a/synfig-studio/trunk/src/gtkmm/autorecover.h +++ b/synfig-studio/trunk/src/gtkmm/autorecover.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file autorecover.h ** \brief Template Header ** @@ -21,13 +21,13 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_AUTORECOVER_H -#define __SINFG_AUTORECOVER_H +#ifndef __SYNFIG_AUTORECOVER_H +#define __SYNFIG_AUTORECOVER_H /* === H E A D E R S ======================================================= */ -#include -#include +#include +#include #include /* === M A C R O S ========================================================= */ @@ -47,7 +47,7 @@ public: ~AutoRecover(); static int pid(); - static sinfg::String get_shadow_file_name(const sinfg::String& filename); + static synfig::String get_shadow_file_name(const synfig::String& filename); static bool auto_backup(); @@ -56,14 +56,14 @@ public: void set_timeout(int milliseconds); int get_timeout()const { return timeout; } - static sinfg::String get_shadow_directory(); + static synfig::String get_shadow_directory(); bool recovery_needed()const; bool recover(); void normal_shutdown(); - void clear_backup(sinfg::Canvas::Handle canvas); + void clear_backup(synfig::Canvas::Handle canvas); }; // END of class AutoRecover }; // END of namespace studio diff --git a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp index 44d47a7..4b5b1ee 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvasoptions.cpp ** \brief Template File ** @@ -42,7 +42,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/canvasoptions.h b/synfig-studio/trunk/src/gtkmm/canvasoptions.h index c34847b..4ce2950 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasoptions.h +++ b/synfig-studio/trunk/src/gtkmm/canvasoptions.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvasoptions.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GTKMM_CANVASOPTIONS_H -#define __SINFG_GTKMM_CANVASOPTIONS_H +#ifndef __SYNFIG_GTKMM_CANVASOPTIONS_H +#define __SYNFIG_GTKMM_CANVASOPTIONS_H /* === H E A D E R S ======================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp index 46ecc17..ca4990d 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvasproperties.cpp ** \brief Template File ** @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "metadatatreestore.h" #include #include @@ -45,7 +45,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -56,7 +56,7 @@ using namespace studio; /* === M E T H O D S ======================================================= */ -CanvasProperties::CanvasProperties(Gtk::Window& parent,handle canvas_interface): +CanvasProperties::CanvasProperties(Gtk::Window& parent,handle canvas_interface): Gtk::Dialog(_("Canvas Properties"),parent,false,true), canvas_interface_(canvas_interface) { @@ -157,7 +157,7 @@ CanvasProperties::create_meta_data_view() void CanvasProperties::on_button_meta_data_add() { - sinfg::String key; + synfig::String key; if(App::dialog_entry("New MetaData Entry", "Please enter the name of the key",key) && !key.empty()) { canvas_interface_->set_meta_data(key," "); diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.h b/synfig-studio/trunk/src/gtkmm/canvasproperties.h index 057ddf1..c360e06 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasproperties.h +++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvasproperties.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_GTKMM_CANVASPROPERTIES_H -#define __SINFG_GTKMM_CANVASPROPERTIES_H +#ifndef __SYNFIG_GTKMM_CANVASPROPERTIES_H +#define __SYNFIG_GTKMM_CANVASPROPERTIES_H /* === H E A D E R S ======================================================= */ @@ -43,7 +43,7 @@ /* === C L A S S E S & S T R U C T S ======================================= */ namespace Gtk { class TreeView; }; -namespace sinfgapp { class CanvasInterface; }; +namespace synfigapp { class CanvasInterface; }; namespace studio { @@ -51,7 +51,7 @@ class CanvasProperties : public Gtk::Dialog { Gtk::Tooltips tooltips; - etl::handle canvas_interface_; + etl::handle canvas_interface_; Widget_RendDesc widget_rend_desc; Gtk::Entry entry_id; Gtk::Entry entry_name; @@ -64,7 +64,7 @@ class CanvasProperties : public Gtk::Dialog void on_button_meta_data_delete(); public: - CanvasProperties(Gtk::Window& parent,etl::handle canvas_interface); + CanvasProperties(Gtk::Window& parent,etl::handle canvas_interface); ~CanvasProperties(); void refresh(); diff --git a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp index 4a4ea6f..470da31 100644 --- a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvastreestore.cpp ** \brief Template File ** @@ -29,12 +29,12 @@ #endif #include "canvastreestore.h" -#include +#include #include "iconcontroler.h" -#include -#include +#include +#include #include -#include +#include #include "cellrenderer_value.h" #include "cellrenderer_timetrack.h" #include @@ -45,7 +45,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -63,7 +63,7 @@ static CanvasTreeStore::Model& ModelHack() return *model; } -CanvasTreeStore::CanvasTreeStore(etl::loose_handle canvas_interface_): +CanvasTreeStore::CanvasTreeStore(etl::loose_handle canvas_interface_): Gtk::TreeStore(ModelHack()), canvas_interface_ (canvas_interface_) { @@ -78,9 +78,9 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu { if(column==model.value.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); - Glib::Value x; + Glib::Value x; g_value_init(x.gobj(),x.value_type()); if(!value_desc) @@ -95,7 +95,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu x.set((*value_desc.get_value_node())(canvas_interface()->get_time())); else { - sinfg::error(__FILE__":%d: Unable to figure out value",__LINE__); + synfig::error(__FILE__":%d: Unable to figure out value",__LINE__); return; } @@ -105,7 +105,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_value_node.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -118,7 +118,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_shared.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -131,7 +131,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_exported.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -144,7 +144,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_canvas.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -157,7 +157,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.id.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -175,12 +175,12 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.is_editable.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); - x.set(!value_desc.is_value_node() || sinfgapp::is_editable(value_desc.get_value_node())); + x.set(!value_desc.is_value_node() || synfigapp::is_editable(value_desc.get_value_node())); g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); @@ -188,7 +188,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.type.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -217,7 +217,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.label.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); Glib::Value x; g_value_init(x.gobj(),x.value_type()); @@ -258,7 +258,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu else if(column==model.icon.index()) { - sinfgapp::ValueDesc value_desc((*iter)[model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[model.value_desc]); if(!value_desc) return Gtk::TreeStore::get_value_vfunc(iter,column,value); @@ -275,7 +275,7 @@ CanvasTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int colu } bool -CanvasTreeStore::find_first_value_desc(const sinfgapp::ValueDesc& value_desc, Gtk::TreeIter& iter) +CanvasTreeStore::find_first_value_desc(const synfigapp::ValueDesc& value_desc, Gtk::TreeIter& iter) { iter=children().begin(); while(iter && value_desc!=(*iter)[model.value_desc]) @@ -299,7 +299,7 @@ CanvasTreeStore::find_first_value_desc(const sinfgapp::ValueDesc& value_desc, Gt } bool -CanvasTreeStore::find_next_value_desc(const sinfgapp::ValueDesc& value_desc, Gtk::TreeIter& iter) +CanvasTreeStore::find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gtk::TreeIter& iter) { if(!iter) return find_first_value_desc(value_desc,iter); @@ -382,7 +382,7 @@ CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk:: } void -CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool do_children) +CanvasTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc, bool do_children) { Gtk::TreeModel::Children children = row.children(); while(!children.empty() && erase(children.begin())); @@ -401,7 +401,7 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d row[model.value_node] = value_node; //row[model.is_canvas] = false; //row[model.is_value_node] = true; - //row[model.is_editable] = sinfgapp::is_editable(value_node); + //row[model.is_editable] = synfigapp::is_editable(value_node); //row[model.id]=value_node->get_id(); // Set the canvas @@ -422,7 +422,7 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d child_row[model.link_id] = i; child_row[model.canvas] = static_cast(row[model.canvas]); child_row[model.name] = linkable->link_local_name(i); - set_row(child_row,sinfgapp::ValueDesc(linkable,i)); + set_row(child_row,synfigapp::ValueDesc(linkable,i)); } } return; @@ -435,9 +435,9 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d return; } } - catch(sinfg::Exception::IDNotFound x) + catch(synfig::Exception::IDNotFound x) { - sinfg::error(__FILE__":%d: IDNotFound thrown",__LINE__); + synfig::error(__FILE__":%d: IDNotFound thrown",__LINE__); erase(row); return; } @@ -449,7 +449,7 @@ CanvasTreeStore::set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool d void CanvasTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children) { - sinfgapp::ValueDesc value_desc=row[model.value_desc]; + synfigapp::ValueDesc value_desc=row[model.value_desc]; if(value_desc) { @@ -517,7 +517,7 @@ CanvasTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool do_children) void CanvasTreeStore::rebuild_row(Gtk::TreeModel::Row &row, bool do_children) { - sinfgapp::ValueDesc value_desc=(sinfgapp::ValueDesc)row[model.value_desc]; + synfigapp::ValueDesc value_desc=(synfigapp::ValueDesc)row[model.value_desc]; if(value_desc && value_desc.get_value_node()) { diff --git a/synfig-studio/trunk/src/gtkmm/canvastreestore.h b/synfig-studio/trunk/src/gtkmm/canvastreestore.h index b011fbb..252f319 100644 --- a/synfig-studio/trunk/src/gtkmm/canvastreestore.h +++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvastreestore.h ** \brief Template Header ** @@ -21,15 +21,15 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STUDIO_CANVASTREESTORE_H -#define __SINFG_STUDIO_CANVASTREESTORE_H +#ifndef __SYNFIG_STUDIO_CANVASTREESTORE_H +#define __SYNFIG_STUDIO_CANVASTREESTORE_H /* === H E A D E R S ======================================================= */ #include -#include +#include #include -#include +#include #include /* === M A C R O S ========================================================= */ @@ -70,12 +70,12 @@ public: Gtk::TreeModelColumn name; Gtk::TreeModelColumn id; - Gtk::TreeModelColumn canvas; + Gtk::TreeModelColumn canvas; Gtk::TreeModelColumn is_canvas; - Gtk::TreeModelColumn value_node; + Gtk::TreeModelColumn value_node; Gtk::TreeModelColumn is_value_node; - Gtk::TreeModelColumn value; + Gtk::TreeModelColumn value; Gtk::TreeModelColumn type; Gtk::TreeModelColumn link_id; Gtk::TreeModelColumn link_count; @@ -85,7 +85,7 @@ public: Gtk::TreeModelColumn is_shared; Gtk::TreeModelColumn is_exported; - Gtk::TreeModelColumn value_desc; + Gtk::TreeModelColumn value_desc; Gtk::TreeModelColumn tooltip; @@ -129,7 +129,7 @@ public: private: - etl::loose_handle canvas_interface_; + etl::loose_handle canvas_interface_; /* -- ** -- P R I V A T E M E T H O D S --------------------------------------- @@ -152,32 +152,32 @@ private: public: - CanvasTreeStore(etl::loose_handle canvas_interface_); + CanvasTreeStore(etl::loose_handle canvas_interface_); ~CanvasTreeStore(); - etl::loose_handle canvas_interface() { return canvas_interface_; } - etl::loose_handle canvas_interface()const { return canvas_interface_; } + etl::loose_handle canvas_interface() { return canvas_interface_; } + etl::loose_handle canvas_interface()const { return canvas_interface_; } virtual void rebuild_row(Gtk::TreeModel::Row &row, bool do_children=true); virtual void refresh_row(Gtk::TreeModel::Row &row, bool do_children=true); - virtual void set_row(Gtk::TreeRow row,sinfgapp::ValueDesc value_desc, bool do_children=true); + virtual void set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc, bool do_children=true); - bool find_first_value_desc(const sinfgapp::ValueDesc& value_desc, Gtk::TreeIter& iter); - bool find_next_value_desc(const sinfgapp::ValueDesc& value_desc, Gtk::TreeIter& iter); + bool find_first_value_desc(const synfigapp::ValueDesc& value_desc, Gtk::TreeIter& iter); + bool find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gtk::TreeIter& iter); - bool find_first_value_node(const sinfg::ValueNode::Handle& value_node, Gtk::TreeIter& iter); - bool find_next_value_node(const sinfg::ValueNode::Handle& value_node, Gtk::TreeIter& iter); + bool find_first_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter); + bool find_next_value_node(const synfig::ValueNode::Handle& value_node, Gtk::TreeIter& iter); static CellRenderer_ValueBase* add_cell_renderer_value(Gtk::TreeView::Column* column); static CellRenderer_TimeTrack* add_cell_renderer_value_node(Gtk::TreeView::Column* column); - etl::loose_handle get_canvas_interface()const { return canvas_interface_; } + etl::loose_handle get_canvas_interface()const { return canvas_interface_; } - virtual void on_value_node_changed(sinfg::ValueNode::Handle value_node)=0; + virtual void on_value_node_changed(synfig::ValueNode::Handle value_node)=0; /* -- ** -- P R O T E C T E D M E T H O D S ----------------------------------- diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 5d4c96b..1911347 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvasview.cpp ** \brief Template File ** @@ -42,21 +42,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -//#include -//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +//#include +//#include #include #include @@ -93,8 +93,8 @@ #include "audiocontainer.h" #include "widget_timeslider.h" -#include -#include +#include +#include #endif @@ -102,7 +102,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; using namespace SigC; @@ -110,7 +110,7 @@ using namespace SigC; #define GRAB_HINT_DATA(y) { \ String x; \ - if(sinfgapp::Main::settings().get_value(String("pref.")+y+"_hints",x)) \ + if(synfigapp::Main::settings().get_value(String("pref.")+y+"_hints",x)) \ { \ set_type_hint((Gdk::WindowTypeHint)atoi(x.c_str())); \ } \ @@ -229,7 +229,7 @@ public: }; -class studio::CanvasViewUIInterface : public sinfgapp::UIInterface +class studio::CanvasViewUIInterface : public synfigapp::UIInterface { CanvasView *view; @@ -393,7 +393,7 @@ public: } }; -class studio::CanvasViewSelectionManager : public sinfgapp::SelectionManager +class studio::CanvasViewSelectionManager : public synfigapp::SelectionManager { CanvasView *view; CanvasView::LayerTreeModel layer_tree_model; @@ -407,7 +407,7 @@ public: private: - void _set_selected_layer(const sinfg::Layer::Handle &layer) + void _set_selected_layer(const synfig::Layer::Handle &layer) { view->layer_tree->select_layer(layer); /* @@ -422,7 +422,7 @@ private: const Gtk::TreeRow row = *(view->layer_tree->get_selection()->get_selected()); // Don't do anything if that layer is already selected - if(layer == static_cast(row[layer_tree_model.layer])) + if(layer == static_cast(row[layer_tree_model.layer])) return; } Gtk::TreeModel::Children::iterator iter; @@ -455,16 +455,16 @@ public: { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); sinfg::error("canvas_view.layer_tree not defined!?"); return LayerList(); } + if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return LayerList(); } return view->layer_tree->get_selected_layers(); } //! Returns the first layer selected or an empty handle if none are selected. - virtual sinfg::Layer::Handle get_selected_layer()const + virtual synfig::Layer::Handle get_selected_layer()const { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); sinfg::error("canvas_view.layer_tree not defined!?"); return 0; } + if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return 0; } return view->layer_tree->get_selected_layer(); } @@ -473,7 +473,7 @@ public: { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); sinfg::error("canvas_view.layer_tree not defined!?"); return; } + if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return; } view->layer_tree->select_layers(layer_list); //view->get_smach().process_event(EVENT_REFRESH_DUCKS); @@ -481,11 +481,11 @@ public: } //! Sets which layer should be selected. - virtual void set_selected_layer(const sinfg::Layer::Handle &layer) + virtual void set_selected_layer(const synfig::Layer::Handle &layer) { // assert(view->layer_tree); - if(!view->layer_tree) { DEBUGPOINT(); sinfg::error("canvas_view.layer_tree not defined!?"); return; } + if(!view->layer_tree) { DEBUGPOINT(); synfig::error("canvas_view.layer_tree not defined!?"); return; } view->layer_tree->select_layer(layer); //view->queue_rebuild_ducks(); } @@ -508,7 +508,7 @@ public: static inline void __child_grabber(const Gtk::TreeModel::iterator& iter, ChildrenList* ret) { const CanvasView::ChildrenTreeModel children_tree_model; - sinfgapp::ValueDesc value_desc((*iter)[children_tree_model.value_desc]); + synfigapp::ValueDesc value_desc((*iter)[children_tree_model.value_desc]); if(value_desc) ret->push_back(value_desc); } @@ -542,7 +542,7 @@ public: { Gtk::TreeModel::Row row = *iter; if(selection->is_selected(row)) - ret.push_back((sinfgapp::ValueDesc)row[children_tree_model.value_desc]); + ret.push_back((synfigapp::ValueDesc)row[children_tree_model.value_desc]); } */ return ret; @@ -662,7 +662,7 @@ CanvasView::IsWorking::operator bool()const /* === M E T H O D S ======================================================= */ -CanvasView::CanvasView(etl::loose_handle instance,etl::handle canvas_interface_): +CanvasView::CanvasView(etl::loose_handle instance,etl::handle canvas_interface_): smach_ (this), instance_ (instance), canvas_interface_ (canvas_interface_), @@ -698,7 +698,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handleset_time(0); //layer_tree_store_->rebuild(); @@ -721,7 +721,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handleappend_page(*create_children_tree(),"Children"); //notebook->append_page(*create_keyframe_tree(),"Keyframes"); - //sinfg::info("Canvasview: Before big chunk of allocation and tabling stuff"); + //synfig::info("Canvasview: Before big chunk of allocation and tabling stuff"); //create all allocated stuff for this canvas audio = new AudioContainer(); @@ -742,7 +742,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handle instance,etl::handle instance,etl::handle(new UniversalScrubber(this)); } - //sinfg::info("Canvasview: Before Final time set up"); + //synfig::info("Canvasview: Before Final time set up"); //MORE TIME STUFF time_window_adjustment().set_value(get_canvas()->rend_desc().get_time_start()); time_window_adjustment().value_changed(); @@ -884,7 +884,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handlesignal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_animate_button_pressed)); animatebutton->show(); - NORMAL_BUTTON(keyframebutton,"sinfg-keyframe_lock_all","All Keyframes Locked"); + NORMAL_BUTTON(keyframebutton,"synfig-keyframe_lock_all","All Keyframes Locked"); keyframebutton->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_keyframe_button_pressed)); keyframebutton->show(); @@ -996,7 +996,7 @@ Gtk::Widget* CanvasView::create_status_bar() { Gtk::Image *icon; - Gtk::IconSize iconsize=Gtk::IconSize::from_name("sinfg-small_icon"); + Gtk::IconSize iconsize=Gtk::IconSize::from_name("synfig-small_icon"); cancel=false; // Create the status bar at the bottom of the window @@ -1079,7 +1079,7 @@ CanvasView::create_keyframe_tree() //keyframe_tree->show(); //keyframe_tree->set_model(keyframe_tree_store()); keyframe_tree->set_editable(true); - //keyframe_tree->signal_edited().connect(sigc::hide_return(sigc::mem_fun(*canvas_interface(), &sinfgapp::CanvasInterface::update_keyframe))); + //keyframe_tree->signal_edited().connect(sigc::hide_return(sigc::mem_fun(*canvas_interface(), &synfigapp::CanvasInterface::update_keyframe))); keyframe_tree->signal_event().connect(sigc::mem_fun(*this, &studio::CanvasView::on_keyframe_tree_event)); @@ -1095,10 +1095,10 @@ CanvasView::create_keyframe_tree() layout_table->attach(*scroll_layer_tree, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); Gtk::Image *icon; - Gtk::IconSize iconsize(Gtk::IconSize::from_name("sinfg-small_icon")); + Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon")); NEW_SMALL_BUTTON(button_add,"gtk-add","New Keyframe"); - NEW_SMALL_BUTTON(button_duplicate,"sinfg-duplicate","Duplicate Keyframe"); + NEW_SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate Keyframe"); NEW_SMALL_BUTTON(button_delete,"gtk-delete","Delete Keyframe"); Gtk::HBox *hbox(manage(new Gtk::HBox())); @@ -1191,16 +1191,16 @@ CanvasView::init_menus() action_group->add( Gtk::Action::create("revert", Gtk::Stock::REVERT_TO_SAVED), sigc::hide_return(sigc::mem_fun(*get_instance().get(), &studio::Instance::safe_revert)) ); - action_group->add( Gtk::Action::create("cvs-add", Gtk::StockID("sinfg-cvs_add")), + action_group->add( Gtk::Action::create("cvs-add", Gtk::StockID("synfig-cvs_add")), sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_add)) ); - action_group->add( Gtk::Action::create("cvs-update", Gtk::StockID("sinfg-cvs_update")), + action_group->add( Gtk::Action::create("cvs-update", Gtk::StockID("synfig-cvs_update")), sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_update)) ); - action_group->add( Gtk::Action::create("cvs-revert", Gtk::StockID("sinfg-cvs_revert")), + action_group->add( Gtk::Action::create("cvs-revert", Gtk::StockID("synfig-cvs_revert")), sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_revert)) ); - action_group->add( Gtk::Action::create("cvs-commit", Gtk::StockID("sinfg-cvs_commit")), + action_group->add( Gtk::Action::create("cvs-commit", Gtk::StockID("synfig-cvs_commit")), sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_commit)) ); action_group->add( Gtk::Action::create("import", _("Import")), @@ -1273,7 +1273,7 @@ CanvasView::init_menus() } } - action_group->add( Gtk::Action::create("play", Gtk::StockID("sinfg-play")), + action_group->add( Gtk::Action::create("play", Gtk::StockID("synfig-play")), sigc::mem_fun(*this, &studio::CanvasView::play) ); @@ -1310,28 +1310,28 @@ CanvasView::init_menus() Glib::RefPtr action; action=Gtk::Action::create("seek-next-frame", Gtk::Stock::GO_FORWARD,_("Next Frame"),_("Next Frame")); - action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek_frame),1)); + action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_frame),1)); action=Gtk::Action::create("seek-prev-frame", Gtk::Stock::GO_BACK,_("Prev Frame"),_("Prev Frame")); - action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek_frame),-1)); + action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_frame),-1)); action=Gtk::Action::create("seek-next-second", Gtk::Stock::GO_FORWARD,_("Seek Foward"),_("Seek Foward")); - action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek_time),Time(1))); + action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time(1))); action=Gtk::Action::create("seek-prev-second", Gtk::Stock::GO_BACK,_("Seek Backward"),_("Seek Backward")); - action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek_time),Time(-1))); + action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time(-1))); // Broken...!? /* action=Gtk::Action::create("seek-end", Gtk::Stock::GOTO_LAST,_("Seek to End"),_("Seek to End")); - action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek_time),Time::end())); + action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time::end())); */ action=Gtk::Action::create("seek-begin", Gtk::Stock::GOTO_FIRST,_("Seek to Begin"),_("Seek to Begin")); - action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek_time),Time::begin())); + action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek_time),Time::begin())); action=Gtk::Action::create("jump-next-keyframe", Gtk::Stock::GO_FORWARD,_("Jump to Next Keyframe"),_("Jump to Next Keyframe")); - action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::jump_to_next_keyframe)); + action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::jump_to_next_keyframe)); action=Gtk::Action::create("jump-prev-keyframe", Gtk::Stock::GO_BACK,_("Jump to Prev Keyframe"),_("Jump to Prev Keyframe")); - action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::jump_to_prev_keyframe)); + action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::jump_to_prev_keyframe)); action=Gtk::Action::create("canvas-zoom-in", Gtk::Stock::ZOOM_IN); action_group->add( action,sigc::mem_fun(*work_area, &studio::WorkArea::zoom_in)); @@ -1374,16 +1374,16 @@ CanvasView::init_menus() Glib::RefPtr action; action=Gtk::Action::create("seek-next-frame", Gtk::StockID("gtk-forward"),_("Next Frame"),_("Next Frame")); - accel_action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek),1)); + accel_action_group->add(action,sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek),1)); action=Gtk::Action::create("seek-prev-frame", Gtk::StockID("gtk-forward"),_("Prev Frame"),_("Prev Frame")); - accel_action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::seek),-1)); + accel_action_group->add( action, sigc::bind(sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::seek),-1)); action=Gtk::Action::create("jump-next-keyframe", Gtk::StockID("gtk-forward"),_("Jump to Next Keyframe"),_("Jump to Next Keyframe")); - accel_action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::jump_to_next_keyframe)); + accel_action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::jump_to_next_keyframe)); action=Gtk::Action::create("jump-prev-keyframe", Gtk::StockID("gtk-back"),_("Jump to Prev Keyframe"),_("Jump to Prev Keyframe")); - accel_action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::jump_to_prev_keyframe)); + accel_action_group->add( action,sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::jump_to_prev_keyframe)); action=Gtk::Action::create("canvas-zoom-in", Gtk::StockID("gtk-zoom-in")); accel_action_group->add( action,sigc::mem_fun(*work_area, &studio::WorkArea::zoom_in)); @@ -1434,9 +1434,9 @@ CanvasView::init_menus() filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-revert-to-saved"),hide_return(sigc::mem_fun(*get_instance().get(), &studio::Instance::safe_revert)))); filemenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem()); - filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-cvs_add"),sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_add)))); - filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-cvs_update"),sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_update)))); - filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-cvs_commit"),sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_commit)))); + filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-cvs_add"),sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_add)))); + filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-cvs_update"),sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_update)))); + filemenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-cvs_commit"),sigc::hide_return(sigc::mem_fun(*get_instance(), &studio::Instance::dialog_cvs_commit)))); filemenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem()); filemenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Import..."),Gtk::AccelKey('I',Gdk::CONTROL_MASK),sigc::hide_return(sigc::mem_fun(*this, &studio::CanvasView::image_import)))); @@ -1474,11 +1474,11 @@ CanvasView::init_menus() editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-stop"),Gtk::AccelKey(GDK_Escape,static_cast(0)),SLOT_EVENT(EVENT_STOP))); editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-refresh"),Gtk::AccelKey('k',Gdk::CONTROL_MASK),SLOT_EVENT(EVENT_REFRESH))); editmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem()); - editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-rotoscope_bline"), + editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-rotoscope_bline"), sigc::mem_fun(*this, &studio::CanvasView::do_rotoscope_bline))); - editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-rotoscope_polygon"), + editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-rotoscope_polygon"), sigc::mem_fun(*this, &studio::CanvasView::do_rotoscope_poly))); - editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-eyedrop"), + editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-eyedrop"), sigc::mem_fun(*this, &studio::CanvasView::do_eyedrop))); editmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem()); editmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-properties"),Gtk::AccelKey("F8"), @@ -1490,10 +1490,10 @@ CanvasView::init_menus() { - sinfgapp::Action::ParamList param_list; + synfigapp::Action::ParamList param_list; param_list.add("canvas",Canvas::Handle(get_canvas())); param_list.add("canvas_interface",canvas_interface()); - add_actions_to_menu(&canvasmenu, param_list,sinfgapp::Action::CATEGORY_CANVAS); + add_actions_to_menu(&canvasmenu, param_list,synfigapp::Action::CATEGORY_CANVAS); } @@ -1590,7 +1590,7 @@ CanvasView::init_menus() viewmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Preview Quality"),qualitymenu)); } - viewmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-play"), + viewmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-play"), sigc::mem_fun(*this, &studio::CanvasView::play))); viewmenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("Flipbook Dialog"), sigc::mem_fun(*preview_dialog, &studio::Dialog_Preview::present))); @@ -1624,9 +1624,9 @@ CanvasView::init_menus() sigc::mem_fun(*this, &studio::CanvasView::time_zoom_out))); viewmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Jump to Next Keyframe"),Gtk::AccelKey(']',static_cast(0)), - sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::jump_to_next_keyframe))); + sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::jump_to_next_keyframe))); viewmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Jump to Prev Keyframe"),Gtk::AccelKey('[',static_cast(0)), - sigc::mem_fun(*canvas_interface().get(), &sinfgapp::CanvasInterface::jump_to_prev_keyframe))); + sigc::mem_fun(*canvas_interface().get(), &synfigapp::CanvasInterface::jump_to_prev_keyframe))); mainmenu.items().push_back(Gtk::Menu_Helpers::TearoffMenuElem()); mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_File",filemenu)); @@ -1662,7 +1662,7 @@ CanvasView::init_menus() filemenu.set_accel_path("/File"); editmenu.set_accel_path("/Edit"); layermenu.set_accel_path("/Layer"); - //mainmenu.set_accel_path(""); + //mainmenu.set_accel_path(""); canvasmenu.set_accel_path("/Canvas"); viewmenu.set_accel_path("/View"); duckmaskmenu.set_accel_path("/DuckMask"); @@ -1691,11 +1691,11 @@ CanvasView::show_keyframe_dialog() } void -CanvasView::add_layer(sinfg::String x) +CanvasView::add_layer(synfig::String x) { Canvas::Handle canvas; - sinfgapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers()); + synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers()); int target_depth(0); @@ -1719,13 +1719,13 @@ CanvasView::add_layer(sinfg::String x) } void -CanvasView::popup_layer_menu(sinfg::Layer::Handle layer) +CanvasView::popup_layer_menu(synfig::Layer::Handle layer) { //Gtk::Menu* menu(manage(new Gtk::Menu)); Gtk::Menu* menu(¶mmenu); menu->items().clear(); - sinfgapp::Action::ParamList param_list; + synfigapp::Action::ParamList param_list; param_list.add("time",canvas_interface()->get_time()); param_list.add("canvas",Canvas::Handle(layer->get_canvas())); param_list.add("canvas_interface",canvas_interface()); @@ -1749,13 +1749,13 @@ CanvasView::popup_layer_menu(sinfg::Layer::Handle layer) )); } - add_actions_to_menu(menu, param_list,sinfgapp::Action::CATEGORY_LAYER); + add_actions_to_menu(menu, param_list,synfigapp::Action::CATEGORY_LAYER); menu->popup(3,gtk_get_current_event_time()); } void -CanvasView::register_layer_type(sinfg::Layer::Book::value_type &lyr,std::map* category_map) +CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map* category_map) { /* if(lyr.second.category==_("Do Not Use")) return; @@ -1778,11 +1778,11 @@ void CanvasView::build_new_layer_menu(Gtk::Menu &menu) { /* - std::map category_map; + std::map category_map; std::for_each( - sinfg::Layer::book().begin(), - sinfg::Layer::book().end(), + synfig::Layer::book().begin(), + synfig::Layer::book().end(), sigc::bind( sigc::mem_fun( *this, @@ -1795,7 +1795,7 @@ CanvasView::build_new_layer_menu(Gtk::Menu &menu) menu.items().clear(); menu.items().push_back(Gtk::Menu_Helpers::TearoffMenuElem()); - std::map::iterator iter; + std::map::iterator iter; for(iter=category_map.begin();iter!=category_map.end();++iter) menu.items().push_back(Gtk::Menu_Helpers::MenuElem(iter->first,*iter->second)); @@ -1825,7 +1825,7 @@ CanvasView::on_refresh_pressed() } void -CanvasView::workarea_layer_selected(sinfg::Layer::Handle layer) +CanvasView::workarea_layer_selected(synfig::Layer::Handle layer) { get_selection_manager()->clear_selected_layers(); if(layer) @@ -1840,7 +1840,7 @@ CanvasView::refresh_rend_desc() //???? - //sinfg::info("Canvasview: Refreshing render desc info"); + //synfig::info("Canvasview: Refreshing render desc info"); if(!get_time().is_equal(time_adjustment().get_value())) { time_adjustment().set_value(get_time()); @@ -1869,7 +1869,7 @@ CanvasView::refresh_rend_desc() // Setup the time_window adjustment time_window_adjustment().set_lower(begin_time); time_window_adjustment().set_upper(end_time); - time_window_adjustment().set_step_increment(sinfg::Time(1.0/get_canvas()->rend_desc().get_frame_rate())); + time_window_adjustment().set_step_increment(synfig::Time(1.0/get_canvas()->rend_desc().get_frame_rate())); //Time length(get_canvas()->rend_desc().get_time_end()-get_canvas()->rend_desc().get_time_start()); if(length < time_window_adjustment().get_page_size()) @@ -1878,7 +1878,7 @@ CanvasView::refresh_rend_desc() time_window_adjustment().set_page_size(length); } - /*sinfg::info("w: %p - [%.3f,%.3f] (%.3f,%.3f) child: %p\n", + /*synfig::info("w: %p - [%.3f,%.3f] (%.3f,%.3f) child: %p\n", &time_window_adjustment_, time_window_adjustment_.get_lower(), time_window_adjustment_.get_upper(),time_window_adjustment_.get_value(), time_window_adjustment_.get_page_size(),time_window_adjustment_.get_child_adjustment() @@ -1894,13 +1894,13 @@ CanvasView::refresh_rend_desc() // time_adjustment().set_lower(get_canvas()->rend_desc().get_time_start()); // time_adjustment().set_upper(get_canvas()->rend_desc().get_time_end()); - time_adjustment().set_step_increment(sinfg::Time(1.0/get_canvas()->rend_desc().get_frame_rate())); - time_adjustment().set_page_increment(sinfg::Time(1.0)); + time_adjustment().set_step_increment(synfig::Time(1.0/get_canvas()->rend_desc().get_frame_rate())); + time_adjustment().set_page_increment(synfig::Time(1.0)); time_adjustment().set_page_size(0); time_adjustment().changed(); - /*sinfg::info("w: %p - [%.3f,%.3f] (%.3f,%.3f) child: %p\n", + /*synfig::info("w: %p - [%.3f,%.3f] (%.3f,%.3f) child: %p\n", &time_window_adjustment_, time_window_adjustment_.get_lower(), time_window_adjustment_.get_upper(),time_window_adjustment_.get_value(), time_window_adjustment_.get_page_size(),time_window_adjustment_.get_child_adjustment() @@ -1928,7 +1928,7 @@ CanvasView::refresh_rend_desc() time_adjustment().value_changed(); } - /*sinfg::info("Time stats: \n" + /*synfig::info("Time stats: \n" "w: %p - [%.3f,%.3f] (%.3f,%.3f) child: %p\n" "t: %p - [%.3f,%.3f] %.3f", &time_window_adjustment_, time_window_adjustment_.get_lower(), @@ -1954,7 +1954,7 @@ CanvasView::close() handle CanvasView::create(loose_handle instance,handle canvas) { - etl::handle view(new CanvasView(instance,instance->sinfgapp::Instance::find_canvas_interface(canvas))); + etl::handle view(new CanvasView(instance,instance->synfigapp::Instance::find_canvas_interface(canvas))); instance->canvas_view_list().push_front(view); instance->signal_canvas_view_created()(view.get()); return view; @@ -1972,15 +1972,15 @@ CanvasView::update_title() else title+='"'+get_canvas()->get_name()+'"'; - if(get_instance()->sinfgapp::Instance::get_action_count()) + if(get_instance()->synfigapp::Instance::get_action_count()) title+=_(" (Unsaved)"); - if(get_instance()->sinfgapp::Instance::in_repository()) + if(get_instance()->synfigapp::Instance::in_repository()) { title+=" (CVS"; - if(get_instance()->sinfgapp::Instance::is_modified()) + if(get_instance()->synfigapp::Instance::is_modified()) title+=_("-MODIFIED"); - if(get_instance()->sinfgapp::Instance::is_updated()) + if(get_instance()->synfigapp::Instance::is_updated()) title+=_("-UPDATED"); title+=')'; } @@ -2061,9 +2061,9 @@ CanvasView::build_tables() } void -CanvasView::on_layer_toggle(sinfg::Layer::Handle layer) +CanvasView::on_layer_toggle(synfig::Layer::Handle layer) { - sinfgapp::Action::Handle action(sinfgapp::Action::create("layer_activate")); + synfigapp::Action::Handle action(synfigapp::Action::create("layer_activate")); assert(action); if(!action) @@ -2072,7 +2072,7 @@ CanvasView::on_layer_toggle(sinfg::Layer::Handle layer) action->set_param("canvas",Canvas::Handle(layer->get_canvas())); if(!action->set_param("canvas_interface",canvas_interface())) // if(!action->set_param("canvas_interface",get_instance()->find_canvas_interface(layer->get_canvas()))) - sinfg::error("LayerActivate didn't like CanvasInterface...?"); + synfig::error("LayerActivate didn't like CanvasInterface...?"); action->set_param("time",get_time()); action->set_param("layer",layer); action->set_param("new_status",!layer->active()); @@ -2084,7 +2084,7 @@ CanvasView::on_layer_toggle(sinfg::Layer::Handle layer) void -CanvasView::popup_param_menu(sinfgapp::ValueDesc value_desc, float location) +CanvasView::popup_param_menu(synfigapp::ValueDesc value_desc, float location) { parammenu.items().clear(); get_instance()->make_param_menu(¶mmenu,get_canvas(),value_desc,location); @@ -2093,7 +2093,7 @@ CanvasView::popup_param_menu(sinfgapp::ValueDesc value_desc, float location) } void -CanvasView::add_actions_to_menu(Gtk::Menu *menu, const sinfgapp::Action::ParamList ¶m_list,sinfgapp::Action::Category category)const +CanvasView::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamList ¶m_list,synfigapp::Action::Category category)const { get_instance()->add_actions_to_menu(menu, param_list, category); } @@ -2133,7 +2133,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnI if(column_id==COLUMNID_TIME_TRACK) return false; - //sinfgapp::ValueDesc value_desc(row[layer_param_tree_model.value_desc]); + //synfigapp::ValueDesc value_desc(row[layer_param_tree_model.value_desc]); //ValueNode::Handle value_node(row[layer_param_tree_model.value_node]); //ValueNode::Handle parent_value_node; //ValueBase value=row[layer_param_tree_model.value]; @@ -2145,7 +2145,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnI { Layer::Handle layer(row[layer_tree_model.layer]); - sinfgapp::Action::ParamList param_list; + synfigapp::Action::ParamList param_list; param_list.add("time",canvas_interface()->get_time()); param_list.add("canvas",Canvas::Handle(row[layer_tree_model.canvas])); param_list.add("canvas_interface",canvas_interface()); @@ -2153,8 +2153,8 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnI param_list.add("layer",layer); else { - sinfgapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers()); - sinfgapp::SelectionManager::LayerList::iterator iter; + synfigapp::SelectionManager::LayerList layer_list(get_selection_manager()->get_selected_layers()); + synfigapp::SelectionManager::LayerList::iterator iter; for(iter=layer_list.begin();iter!=layer_list.end();++iter) param_list.add("layer",Layer::Handle(*iter)); @@ -2179,12 +2179,12 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnI )); } - add_actions_to_menu(¶mmenu, param_list,sinfgapp::Action::CATEGORY_LAYER); + add_actions_to_menu(¶mmenu, param_list,synfigapp::Action::CATEGORY_LAYER); parammenu.popup(button,gtk_get_current_event_time()); return true; } /* - else if(column_id==LayerTree::COLUMNID_TIME_TRACK && value_node && handle::cast_dynamic(value_node)) + else if(column_id==LayerTree::COLUMNID_TIME_TRACK && value_node && handle::cast_dynamic(value_node)) { // Right-click on time track with animated // trackmenu.popup(0,0); @@ -2203,10 +2203,10 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnI #if 0 parammenu.items().clear(); parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Connect", - hide_return(sigc::mem_fun(*canvas_interface().get(),&sinfgapp::CanvasInterface::connect_selected_layer_params)) + hide_return(sigc::mem_fun(*canvas_interface().get(),&synfigapp::CanvasInterface::connect_selected_layer_params)) )); parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Disconnect", - hide_return(sigc::mem_fun(*canvas_interface().get(),&sinfgapp::CanvasInterface::disconnect_selected_layer_params)) + hide_return(sigc::mem_fun(*canvas_interface().get(),&synfigapp::CanvasInterface::disconnect_selected_layer_params)) )); parammenu.popup(0,0); #endif @@ -2238,7 +2238,7 @@ CanvasView::on_children_user_click(int button, Gtk::TreeRow row, ChildrenTree::C return false; if(!(bool)row[children_tree_model.is_canvas]) { - sinfgapp::ValueDesc value_desc=row[children_tree_model.value_desc]; + synfigapp::ValueDesc value_desc=row[children_tree_model.value_desc]; assert(value_desc); popup_param_menu(value_desc); return true; @@ -2355,19 +2355,19 @@ CanvasView::time_zoom_out() void CanvasView::time_was_changed() { - sinfg::Time time((sinfg::Time)(double)time_adjustment().get_value()); + synfig::Time time((synfig::Time)(double)time_adjustment().get_value()); set_time(time); } void -CanvasView::on_edited_value(sinfgapp::ValueDesc value_desc,sinfg::ValueBase new_value) +CanvasView::on_edited_value(synfigapp::ValueDesc value_desc,synfig::ValueBase new_value) { canvas_interface()->change_value(value_desc,new_value); } /* void -CanvasView::on_children_edited_value(const Glib::ustring&path_string,sinfg::ValueBase value) +CanvasView::on_children_edited_value(const Glib::ustring&path_string,synfig::ValueBase value) { Gtk::TreePath path(path_string); @@ -2375,7 +2375,7 @@ CanvasView::on_children_edited_value(const Glib::ustring&path_string,sinfg::Valu assert((bool)row[children_tree_model.is_value_node]); - sinfgapp::ValueDesc value_desc=row[children_tree_model.value_desc]; + synfigapp::ValueDesc value_desc=row[children_tree_model.value_desc]; assert(value_desc); on_edited_value(value_desc,value); @@ -2390,10 +2390,10 @@ CanvasView::on_id_changed() void -CanvasView::on_mode_changed(sinfgapp::CanvasInterface::Mode mode) +CanvasView::on_mode_changed(synfigapp::CanvasInterface::Mode mode) { // If the aninimate flag was set in mode... - if(mode&sinfgapp::MODE_ANIMATE) + if(mode&synfigapp::MODE_ANIMATE) { Gtk::Image *icon; icon=manage(new Gtk::Image(Gtk::StockID("gtk-no"),Gtk::ICON_SIZE_BUTTON)); @@ -2414,40 +2414,40 @@ CanvasView::on_mode_changed(sinfgapp::CanvasInterface::Mode mode) icon->show(); } - if((mode&sinfgapp::MODE_ANIMATE_FUTURE) && (mode&sinfgapp::MODE_ANIMATE_PAST)) + if((mode&synfigapp::MODE_ANIMATE_FUTURE) && (mode&synfigapp::MODE_ANIMATE_PAST)) { Gtk::Image *icon; - icon=manage(new Gtk::Image(Gtk::StockID("sinfg-keyframe_lock_all"),Gtk::ICON_SIZE_BUTTON)); + icon=manage(new Gtk::Image(Gtk::StockID("synfig-keyframe_lock_all"),Gtk::ICON_SIZE_BUTTON)); keyframebutton->remove(); keyframebutton->add(*icon); tooltips.set_tip(*keyframebutton,_("All Keyframes Locked")); icon->set_padding(0,0); icon->show(); } - else if((mode&sinfgapp::MODE_ANIMATE_FUTURE) && !(mode&sinfgapp::MODE_ANIMATE_PAST)) + else if((mode&synfigapp::MODE_ANIMATE_FUTURE) && !(mode&synfigapp::MODE_ANIMATE_PAST)) { Gtk::Image *icon; - icon=manage(new Gtk::Image(Gtk::StockID("sinfg-keyframe_lock_future"),Gtk::ICON_SIZE_BUTTON)); + icon=manage(new Gtk::Image(Gtk::StockID("synfig-keyframe_lock_future"),Gtk::ICON_SIZE_BUTTON)); keyframebutton->remove(); keyframebutton->add(*icon); tooltips.set_tip(*keyframebutton,_("Future Keyframes Locked")); icon->set_padding(0,0); icon->show(); } - else if(!(mode&sinfgapp::MODE_ANIMATE_FUTURE) && (mode&sinfgapp::MODE_ANIMATE_PAST)) + else if(!(mode&synfigapp::MODE_ANIMATE_FUTURE) && (mode&synfigapp::MODE_ANIMATE_PAST)) { Gtk::Image *icon; - icon=manage(new Gtk::Image(Gtk::StockID("sinfg-keyframe_lock_past"),Gtk::ICON_SIZE_BUTTON)); + icon=manage(new Gtk::Image(Gtk::StockID("synfig-keyframe_lock_past"),Gtk::ICON_SIZE_BUTTON)); keyframebutton->remove(); keyframebutton->add(*icon); tooltips.set_tip(*keyframebutton,_("Past Keyframes Locked")); icon->set_padding(0,0); icon->show(); } - else if(!(mode&sinfgapp::MODE_ANIMATE_FUTURE) && !(mode&sinfgapp::MODE_ANIMATE_PAST)) + else if(!(mode&synfigapp::MODE_ANIMATE_FUTURE) && !(mode&synfigapp::MODE_ANIMATE_PAST)) { Gtk::Image *icon; - icon=manage(new Gtk::Image(Gtk::StockID("sinfg-keyframe_lock_none"),Gtk::ICON_SIZE_BUTTON)); + icon=manage(new Gtk::Image(Gtk::StockID("synfig-keyframe_lock_none"),Gtk::ICON_SIZE_BUTTON)); keyframebutton->remove(); keyframebutton->add(*icon); tooltips.set_tip(*keyframebutton,_("No Keyframes Locked")); @@ -2461,43 +2461,43 @@ CanvasView::on_mode_changed(sinfgapp::CanvasInterface::Mode mode) void CanvasView::on_animate_button_pressed() { - if(get_mode()&sinfgapp::MODE_ANIMATE) - set_mode(get_mode()-sinfgapp::MODE_ANIMATE); + if(get_mode()&synfigapp::MODE_ANIMATE) + set_mode(get_mode()-synfigapp::MODE_ANIMATE); else - set_mode(get_mode()|sinfgapp::MODE_ANIMATE); + set_mode(get_mode()|synfigapp::MODE_ANIMATE); } void CanvasView::on_keyframe_button_pressed() { - sinfgapp::CanvasInterface::Mode mode(get_mode()); + synfigapp::CanvasInterface::Mode mode(get_mode()); - if((mode&sinfgapp::MODE_ANIMATE_FUTURE) && (mode&sinfgapp::MODE_ANIMATE_PAST)) + if((mode&synfigapp::MODE_ANIMATE_FUTURE) && (mode&synfigapp::MODE_ANIMATE_PAST)) { - set_mode(get_mode()-sinfgapp::MODE_ANIMATE_FUTURE); + set_mode(get_mode()-synfigapp::MODE_ANIMATE_FUTURE); } - else if(!(mode&sinfgapp::MODE_ANIMATE_FUTURE) && (mode&sinfgapp::MODE_ANIMATE_PAST)) + else if(!(mode&synfigapp::MODE_ANIMATE_FUTURE) && (mode&synfigapp::MODE_ANIMATE_PAST)) { - set_mode(get_mode()-sinfgapp::MODE_ANIMATE_PAST|sinfgapp::MODE_ANIMATE_FUTURE); + set_mode(get_mode()-synfigapp::MODE_ANIMATE_PAST|synfigapp::MODE_ANIMATE_FUTURE); } - else if((mode&sinfgapp::MODE_ANIMATE_FUTURE) && !(mode&sinfgapp::MODE_ANIMATE_PAST)) + else if((mode&synfigapp::MODE_ANIMATE_FUTURE) && !(mode&synfigapp::MODE_ANIMATE_PAST)) { - set_mode(get_mode()-sinfgapp::MODE_ANIMATE_FUTURE); + set_mode(get_mode()-synfigapp::MODE_ANIMATE_FUTURE); } - else if(!(mode&sinfgapp::MODE_ANIMATE_FUTURE) && !(mode&sinfgapp::MODE_ANIMATE_PAST)) + else if(!(mode&synfigapp::MODE_ANIMATE_FUTURE) && !(mode&synfigapp::MODE_ANIMATE_PAST)) { - set_mode(get_mode()|sinfgapp::MODE_ANIMATE_FUTURE|sinfgapp::MODE_ANIMATE_PAST); + set_mode(get_mode()|synfigapp::MODE_ANIMATE_FUTURE|synfigapp::MODE_ANIMATE_PAST); } } bool -CanvasView::duck_change_param(const Point &value,sinfg::Layer::Handle layer, sinfg::String param_name) +CanvasView::duck_change_param(const Point &value,synfig::Layer::Handle layer, synfig::String param_name) { - return canvas_interface()->change_value(sinfgapp::ValueDesc(layer,param_name),value); + return canvas_interface()->change_value(synfigapp::ValueDesc(layer,param_name),value); } bool -CanvasView::on_duck_changed(const sinfg::Point &value,const sinfgapp::ValueDesc& value_desc) +CanvasView::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc) { switch(value_desc.get_value_type()) { @@ -2518,11 +2518,11 @@ CanvasView::on_duck_changed(const sinfg::Point &value,const sinfgapp::ValueDesc& void CanvasView::selected_layer_color_set(Color color) { - sinfgapp::SelectionManager::LayerList selected_list(get_selection_manager()->get_selected_layers()); - sinfgapp::SelectionManager::LayerList::iterator iter; + synfigapp::SelectionManager::LayerList selected_list(get_selection_manager()->get_selected_layers()); + synfigapp::SelectionManager::LayerList::iterator iter; // Create the action group - //sinfgapp::PassiveGrouper group(canvas_interface()->get_instance(),_("Set Colors")); + //synfigapp::PassiveGrouper group(canvas_interface()->get_instance(),_("Set Colors")); Layer::Handle layer; for(iter=selected_list.begin();iter!=selected_list.end();++iter) @@ -2530,12 +2530,12 @@ CanvasView::selected_layer_color_set(Color color) if(*iter==layer) continue; layer=*iter; - on_edited_value(sinfgapp::ValueDesc(layer,"color"),color); + on_edited_value(synfigapp::ValueDesc(layer,"color"),color); } } void -CanvasView::rebuild_ducks_layer_(sinfg::TransformStack& transform_stack, Canvas::Handle canvas, std::set& selected_list) +CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas::Handle canvas, std::set& selected_list) { int transforms(0); String layer_name; @@ -2544,7 +2544,7 @@ CanvasView::rebuild_ducks_layer_(sinfg::TransformStack& transform_stack, Canvas: if(!canvas) { - sinfg::warning("CanvasView::rebuild_ducks_layer_(): Layer doesn't have canvas set"); + synfig::warning("CanvasView::rebuild_ducks_layer_(): Layer doesn't have canvas set"); return; } for(Canvas::iterator iter(canvas->begin());iter!=canvas->end();++iter) @@ -2576,7 +2576,7 @@ CanvasView::rebuild_ducks_layer_(sinfg::TransformStack& transform_stack, Canvas: { if(!iter->get_hidden() && !iter->get_invisible_duck()) { - sinfgapp::ValueDesc value_desc(layer,iter->get_name()); + synfigapp::ValueDesc value_desc(layer,iter->get_name()); work_area->add_to_ducks(value_desc,this,transform_stack,&*iter); if(value_desc.is_value_node()) duck_changed_connections.push_back(value_desc.get_value_node()->signal_changed().connect(QUEUE_REBUILD_DUCKS)); @@ -2614,25 +2614,25 @@ CanvasView::rebuild_ducks_layer_(sinfg::TransformStack& transform_stack, Canvas: /* // Add transforms onto the stack if(layer_name=="Translate") { - transform_stack.push(sinfg::Transform_Translate(layer->get_param("origin").get(Vector()))); + transform_stack.push(synfig::Transform_Translate(layer->get_param("origin").get(Vector()))); transforms++; }else if(layer_name=="Zoom") { Vector scale; scale[0]=scale[1]=exp(layer->get_param("amount").get(Real())); - transform_stack.push(sinfg::Transform_Scale(scale,layer->get_param("center").get(Vector()))); + transform_stack.push(synfig::Transform_Scale(scale,layer->get_param("center").get(Vector()))); transforms++; }else if(layer_name=="stretch") { Vector scale(layer->get_param("amount").get(Vector())); - transform_stack.push(sinfg::Transform_Scale(scale,layer->get_param("center").get(Vector()))); + transform_stack.push(synfig::Transform_Scale(scale,layer->get_param("center").get(Vector()))); transforms++; }else if(layer_name=="Rotate") { - transform_stack.push(sinfg::Transform_Rotate(layer->get_param("amount").get(Angle()),layer->get_param("origin").get(Vector()))); + transform_stack.push(synfig::Transform_Rotate(layer->get_param("amount").get(Angle()),layer->get_param("origin").get(Vector()))); transforms++; } */ @@ -2695,7 +2695,7 @@ CanvasView::rebuild_ducks() /*static int i=0; i++; if(i>30) - sinfg::info("%d",i/(i-i)); + synfig::info("%d",i/(i-i)); */ rebuild_ducks_queued=false; @@ -2729,13 +2729,13 @@ CanvasView::rebuild_ducks() // First do the layers... do{ - sinfgapp::SelectionManager::LayerList selected_list(get_selection_manager()->get_selected_layers()); - std::set layer_set(selected_list.begin(),selected_list.end()); + synfigapp::SelectionManager::LayerList selected_list(get_selection_manager()->get_selected_layers()); + std::set layer_set(selected_list.begin(),selected_list.end()); if(!layer_set.empty()) not_empty=true; - sinfg::TransformStack transform_stack; + synfig::TransformStack transform_stack; rebuild_ducks_layer_(transform_stack, get_canvas(), layer_set); @@ -2743,9 +2743,9 @@ CanvasView::rebuild_ducks() // Now do the children do{ - sinfgapp::SelectionManager::ChildrenList selected_list(get_selection_manager()->get_selected_children()); - sinfgapp::SelectionManager::ChildrenList::iterator iter; - sinfg::TransformStack transform_stack; + synfigapp::SelectionManager::ChildrenList selected_list(get_selection_manager()->get_selected_children()); + synfigapp::SelectionManager::ChildrenList::iterator iter; + synfig::TransformStack transform_stack; if(selected_list.empty()) { @@ -2853,7 +2853,7 @@ CanvasView::show_tables() Smach::event_result x(process_event_key(EVENT_TABLES_SHOW)); if(x==Smach::RESULT_OK || x==Smach::RESULT_ACCEPT) { - Gtk::IconSize iconsize=Gtk::IconSize::from_name("sinfg-small_icon"); + Gtk::IconSize iconsize=Gtk::IconSize::from_name("synfig-small_icon"); treetogglebutton->remove(); treetogglebutton->add(*manage(new Gtk::Image(Gtk::StockID("gtk-go-down"),iconsize))); treetogglebutton->show_all(); @@ -2869,7 +2869,7 @@ CanvasView::hide_tables() Smach::event_result x(process_event_key(EVENT_TABLES_HIDE)); if(x==Smach::RESULT_OK || x==Smach::RESULT_ACCEPT) { - Gtk::IconSize iconsize=Gtk::IconSize::from_name("sinfg-small_icon"); + Gtk::IconSize iconsize=Gtk::IconSize::from_name("synfig-small_icon"); treetogglebutton->remove(); treetogglebutton->add(*manage(new Gtk::Image(Gtk::StockID("gtk-go-up"),iconsize))); treetogglebutton->show_all(); @@ -2946,7 +2946,7 @@ CanvasView::hide_timebar() void -CanvasView::on_waypoint_clicked(sinfgapp::ValueDesc value_desc,sinfg::Waypoint waypoint,int button) +CanvasView::on_waypoint_clicked(synfigapp::ValueDesc value_desc,synfig::Waypoint waypoint,int button) { waypoint_dialog.set_value_desc(value_desc); waypoint_dialog.set_waypoint(waypoint); @@ -2964,7 +2964,7 @@ CanvasView::on_waypoint_clicked(sinfgapp::ValueDesc value_desc,sinfg::Waypoint w sigc::bind( sigc::mem_fun( *canvas_interface(), - &sinfgapp::CanvasInterface::set_time + &synfigapp::CanvasInterface::set_time ), waypoint.get_time() ) @@ -2977,12 +2977,12 @@ CanvasView::on_waypoint_clicked(sinfgapp::ValueDesc value_desc,sinfg::Waypoint w ) )); - waypoint_menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("sinfg-duplicate"), + waypoint_menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-duplicate"), sigc::bind( sigc::bind( sigc::mem_fun( *canvas_interface(), - &sinfgapp::CanvasInterface::waypoint_duplicate + &synfigapp::CanvasInterface::waypoint_duplicate ), waypoint ), @@ -2994,7 +2994,7 @@ CanvasView::on_waypoint_clicked(sinfgapp::ValueDesc value_desc,sinfg::Waypoint w sigc::bind( sigc::mem_fun( *canvas_interface(), - &sinfgapp::CanvasInterface::waypoint_remove + &synfigapp::CanvasInterface::waypoint_remove ), waypoint ), @@ -3012,7 +3012,7 @@ CanvasView::on_waypoint_clicked(sinfgapp::ValueDesc value_desc,sinfg::Waypoint w void CanvasView::on_waypoint_changed() { - sinfgapp::Action::ParamList param_list; + synfigapp::Action::ParamList param_list; param_list.add("canvas",get_canvas()); param_list.add("canvas_interface",canvas_interface()); param_list.add("value_node",waypoint_dialog.get_value_desc().get_value_node()); @@ -3025,7 +3025,7 @@ CanvasView::on_waypoint_changed() void CanvasView::on_waypoint_delete() { - sinfgapp::Action::ParamList param_list; + synfigapp::Action::ParamList param_list; param_list.add("canvas",get_canvas()); param_list.add("canvas_interface",canvas_interface()); param_list.add("value_node",waypoint_dialog.get_value_desc().get_value_node()); @@ -3040,23 +3040,23 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr& con { // We will make this true once we have a solid drop bool success(false); - //sinfg::info("Droped data of type \"%s\"",selection_data.get_data_type()); - //sinfg::info("Droped data of target \"%s\"",gdk_atom_name(selection_data->target)); - //sinfg::info("selection=\"%s\"",gdk_atom_name(selection_data->selection)); + //synfig::info("Droped data of type \"%s\"",selection_data.get_data_type()); + //synfig::info("Droped data of target \"%s\"",gdk_atom_name(selection_data->target)); + //synfig::info("selection=\"%s\"",gdk_atom_name(selection_data->selection)); if ((selection_data_.get_length() >= 0) && (selection_data_.get_format() == 8)) { - if(sinfg::String(selection_data_.get_data_type())=="STRING")do + if(synfig::String(selection_data_.get_data_type())=="STRING")do { - sinfg::String selection_data((gchar *)(selection_data_.get_data())); + synfig::String selection_data((gchar *)(selection_data_.get_data())); - Layer::Handle layer(sinfg::Layer::create("Text")); + Layer::Handle layer(synfig::Layer::create("Text")); if(!layer) break; if(!layer->set_param("text",ValueBase(selection_data))) break; - sinfgapp::Action::Handle action(sinfgapp::Action::create("layer_add")); + synfigapp::Action::Handle action(synfigapp::Action::create("layer_add")); assert(action); if(!action) @@ -3073,22 +3073,22 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr& con success=true; } while(0); // END of "STRING" - if(sinfg::String(selection_data_.get_data_type())=="text/plain") + if(synfig::String(selection_data_.get_data_type())=="text/plain") { - sinfg::String selection_data((gchar *)(selection_data_.get_data())); + synfig::String selection_data((gchar *)(selection_data_.get_data())); // For some reason, GTK hands us a list of URL's seperated // by not only Carrage-Returns, but also Line-Feeds. // Line-Feeds will mess us up. Remove all the line-feeds. - while(selection_data.find_first_of('\r')!=sinfg::String::npos) + while(selection_data.find_first_of('\r')!=synfig::String::npos) selection_data.erase(selection_data.begin()+selection_data.find_first_of('\r')); std::stringstream stream(selection_data); - //sinfgapp::PassiveGrouper group(canvas_interface()->get_instance(),_("Insert Image")); + //synfigapp::PassiveGrouper group(canvas_interface()->get_instance(),_("Insert Image")); while(stream) { - sinfg::String filename,URI; + synfig::String filename,URI; getline(stream,filename); // If we don't have a filename, move on. @@ -3099,12 +3099,12 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr& con URI=String(filename.begin(),filename.begin()+sizeof("file://")-1); if(URI!="file://") { - sinfg::warning("Unknown URI (%s) in \"%s\"",URI.c_str(),filename.c_str()); + synfig::warning("Unknown URI (%s) in \"%s\"",URI.c_str(),filename.c_str()); continue; } // Strip the "file://" part from the filename - filename=sinfg::String(filename.begin()+sizeof("file://")-1,filename.end()); + filename=synfig::String(filename.begin()+sizeof("file://")-1,filename.end()); String ext; try{ext=(String(filename.begin()+filename.find_last_of('.')+1,filename.end()));}catch(...){continue;} @@ -3138,7 +3138,7 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr& con void CanvasView::on_keyframe_add_pressed() { - sinfgapp::Action::Handle action(sinfgapp::Action::create("keyframe_add")); + synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_add")); if(!action) { @@ -3166,7 +3166,7 @@ CanvasView::on_keyframe_duplicate_pressed() } keyframe=row[model.keyframe]; - sinfgapp::Action::Handle action(sinfgapp::Action::create("keyframe_duplicate")); + synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_duplicate")); if(!action) { @@ -3195,7 +3195,7 @@ CanvasView::on_keyframe_remove_pressed() } keyframe=row[model.keyframe]; - sinfgapp::Action::Handle action(sinfgapp::Action::create("keyframe_remove")); + synfigapp::Action::Handle action(synfigapp::Action::create("keyframe_remove")); if(!action) { @@ -3249,7 +3249,7 @@ CanvasView::toggle_duck_mask(Duckmatic::Type type) break; default: - sinfg::warning("CanvasView::toggle_duck_mask():Unknown duck type!"); + synfig::warning("CanvasView::toggle_duck_mask():Unknown duck type!"); break; } @@ -3285,8 +3285,8 @@ CanvasView::on_input_device_changed(GdkDevice* device) } assert(device); - sinfgapp::InputDevice::Handle input_device; - input_device=sinfgapp::Main::select_input_device(device->name); + synfigapp::InputDevice::Handle input_device; + input_device=synfigapp::Main::select_input_device(device->name); App::toolbox->change_state(input_device->get_state()); process_event_key(EVENT_INPUT_DEVICE_CHANGED); } @@ -3361,7 +3361,7 @@ CanvasView::on_preview_create(const PreviewInfo &info) void CanvasView::on_audio_option() { - sinfg::warning("Launching Audio Options"); + synfig::warning("Launching Audio Options"); sound_dialog->set_global_fps(get_canvas()->rend_desc().get_frame_rate()); sound_dialog->present(); } @@ -3387,14 +3387,14 @@ CanvasView::on_audio_file_notify() if(!audio->load(file,dirname(get_canvas()->get_file_name())+string("/"))) { - if(file != "") sinfg::warning("Could not load the file: %s", file.c_str()); + if(file != "") synfig::warning("Could not load the file: %s", file.c_str()); get_canvas()->erase_meta_data("audiofile"); disp_audio->hide(); disp_audio->set_profile(etl::handle()); }else { //save in canvasview - sinfg::warning("Getting the profile of the music stuff"); + synfig::warning("Getting the profile of the music stuff"); //profile specific stuff for the preview widget //similar for other attachments @@ -3405,14 +3405,14 @@ CanvasView::on_audio_file_notify() if(!prof) { - sinfg::warning("Agh, I couldn't build the profile captain!"); + synfig::warning("Agh, I couldn't build the profile captain!"); } pd->get_widget().set_audioprofile(prof); disp_audio->set_profile(audio->get_profile()); disp_audio->show(); - sinfg::warning("successfully set the profiles and stuff"); + synfig::warning("successfully set the profiles and stuff"); } disp_audio->queue_draw(); } @@ -3425,7 +3425,7 @@ CanvasView::on_audio_offset_notify() sound_dialog->set_offset(t); disp_audio->queue_draw(); - sinfg::info("CanvasView::on_audio_offset_notify(): offset time set to %s",t.get_string(get_canvas()->rend_desc().get_frame_rate()).c_str()); + synfig::info("CanvasView::on_audio_offset_notify(): offset time set to %s",t.get_string(get_canvas()->rend_desc().get_frame_rate()).c_str()); } void @@ -3433,7 +3433,7 @@ CanvasView::play_audio(float t) { if(audio.get()) { - sinfg::info("Playing audio at %f s",t); + synfig::info("Playing audio at %f s",t); audio->play(t); } } @@ -3457,49 +3457,49 @@ CanvasView::on_audio_scrub() Glib::RefPtr -CanvasView::get_ref_obj(const sinfg::String& x) +CanvasView::get_ref_obj(const synfig::String& x) { return ref_obj_book_[x]; } Glib::RefPtr -CanvasView::get_ref_obj(const sinfg::String& x)const +CanvasView::get_ref_obj(const synfig::String& x)const { return ref_obj_book_.find(x)->second; } void -CanvasView::set_ref_obj(const sinfg::String& x, Glib::RefPtr y) +CanvasView::set_ref_obj(const synfig::String& x, Glib::RefPtr y) { ref_obj_book_[x]=y; } Glib::RefPtr -CanvasView::get_tree_model(const sinfg::String& x) +CanvasView::get_tree_model(const synfig::String& x) { return Glib::RefPtr::cast_dynamic(ref_obj_book_["_tree_model_"+x]); } Glib::RefPtr -CanvasView::get_tree_model(const sinfg::String& x)const +CanvasView::get_tree_model(const synfig::String& x)const { return Glib::RefPtr::cast_dynamic(ref_obj_book_.find("_tree_model_"+x)->second); } void -CanvasView::set_tree_model(const sinfg::String& x, Glib::RefPtr y) +CanvasView::set_tree_model(const synfig::String& x, Glib::RefPtr y) { ref_obj_book_["_tree_model_"+x]=Glib::RefPtr::cast_static(y); } Gtk::Widget* -CanvasView::get_ext_widget(const sinfg::String& x) +CanvasView::get_ext_widget(const synfig::String& x) { return ext_widget_book_[x]; } void -CanvasView::set_ext_widget(const sinfg::String& x, Gtk::Widget* y) +CanvasView::set_ext_widget(const synfig::String& x, Gtk::Widget* y) { ext_widget_book_[x]=y; if(x=="layers_cmp") @@ -3527,7 +3527,7 @@ static bool _close_instance(etl::handle instance) { etl::handle argh(instance); instance->safe_close(); - sinfg::info("closed"); + synfig::info("closed"); return false; } diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h index 887e622..aea06f3 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.h +++ b/synfig-studio/trunk/src/gtkmm/canvasview.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file canvasview.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STUDIO_GTKMM_CANVASVIEW_H -#define __SINFG_STUDIO_GTKMM_CANVASVIEW_H +#ifndef __SYNFIG_STUDIO_GTKMM_CANVASVIEW_H +#define __SYNFIG_STUDIO_GTKMM_CANVASVIEW_H /* === H E A D E R S ======================================================= */ @@ -40,12 +40,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include "instance.h" #include "canvasproperties.h" @@ -76,11 +76,11 @@ #include #include #include -#include +#include #include "adjust_window.h" -#include +#include /* === M A C R O S ========================================================= */ @@ -119,7 +119,7 @@ class Widget_Time; class Dialog_SoundSelect; class Dialog_Preview; -class sinfg::TransformStack; +class synfig::TransformStack; class Dock_Layers; class Dock_Children; class Dock_Keyframes; @@ -166,7 +166,7 @@ public: }; friend class IsWorking; - typedef sinfgapp::CanvasInterface::Mode Mode; + typedef synfigapp::CanvasInterface::Mode Mode; /* -- ** -- P R I V A T E D A T A --------------------------------------------- @@ -178,10 +178,10 @@ public: WorkArea* get_work_area() { return work_area.get(); } private: - sinfg::TransformStack curr_transform_stack; + synfig::TransformStack curr_transform_stack; bool curr_transform_stack_set; - sinfg::Rect bbox; + synfig::Rect bbox; DEBUGPOINT_CLASS(1); @@ -191,7 +191,7 @@ private: DEBUGPOINT_CLASS(2); etl::loose_handle instance_; - etl::handle canvas_interface_; + etl::handle canvas_interface_; DEBUGPOINT_CLASS(3); @@ -223,9 +223,9 @@ private: DEBUGPOINT_CLASS(5); - //std::map > tree_model_book_; - std::map > ref_obj_book_; - std::map ext_widget_book_; + //std::map > tree_model_book_; + std::map > ref_obj_book_; + std::map ext_widget_book_; //! The time adjustment's scope is defined by the time_window adjustment @@ -319,8 +319,8 @@ private: Glib::RefPtr action_group; - etl::handle ui_interface_; - etl::handle selection_manager_; + etl::handle ui_interface_; + etl::handle selection_manager_; bool is_playing_; @@ -371,7 +371,7 @@ public: private: // Constructor is private to force the use of the "create()" constructor - CanvasView(etl::loose_handle instance,etl::handle canvas_interface); + CanvasView(etl::loose_handle instance,etl::handle canvas_interface); //! Constructor Helper Gtk::Widget* create_layer_tree(); @@ -388,7 +388,7 @@ private: //! Constructor Helper - Initializes all of the menus void init_menus(); - bool duck_change_param(const sinfg::Point &value,sinfg::Layer::Handle layer, sinfg::String param_name); + bool duck_change_param(const synfig::Point &value,synfig::Layer::Handle layer, synfig::String param_name); void refresh_time_window(); @@ -404,47 +404,47 @@ private: - void popup_param_menu_bezier(float location, sinfgapp::ValueDesc value_desc) + void popup_param_menu_bezier(float location, synfigapp::ValueDesc value_desc) { popup_param_menu(value_desc,location); } - void popup_param_menu(sinfgapp::ValueDesc value_desc, float location=0); + void popup_param_menu(synfigapp::ValueDesc value_desc, float location=0); - void workarea_layer_selected(sinfg::Layer::Handle layer); + void workarea_layer_selected(synfig::Layer::Handle layer); - void selected_layer_color_set(sinfg::Color color); + void selected_layer_color_set(synfig::Color color); - void register_layer_type(sinfg::Layer::Book::value_type &lyr,std::map*); + void register_layer_type(synfig::Layer::Book::value_type &lyr,std::map*); //! Rebuilds the "new layer" menu void build_new_layer_menu(Gtk::Menu &menu); - void rebuild_ducks_layer_(sinfg::TransformStack& transform_stack, sinfg::Canvas::Handle canvas, std::set& selected_list); + void rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig::Canvas::Handle canvas, std::set& selected_list); /* -- ** -- P U B L I C M E T H O D S ----------------------------------------- */ public: - const sinfg::TransformStack& get_curr_transform_stack()const { return curr_transform_stack; } + const synfig::TransformStack& get_curr_transform_stack()const { return curr_transform_stack; } - const sinfg::Rect& get_bbox()const { return bbox; } + const synfig::Rect& get_bbox()const { return bbox; } - Glib::RefPtr get_ref_obj(const sinfg::String& x); - Glib::RefPtr get_ref_obj(const sinfg::String& x)const; - void set_ref_obj(const sinfg::String& x, Glib::RefPtr y); + Glib::RefPtr get_ref_obj(const synfig::String& x); + Glib::RefPtr get_ref_obj(const synfig::String& x)const; + void set_ref_obj(const synfig::String& x, Glib::RefPtr y); - Glib::RefPtr get_tree_model(const sinfg::String& x); - Glib::RefPtr get_tree_model(const sinfg::String& x)const; - void set_tree_model(const sinfg::String& x, Glib::RefPtr y); + Glib::RefPtr get_tree_model(const synfig::String& x); + Glib::RefPtr get_tree_model(const synfig::String& x)const; + void set_tree_model(const synfig::String& x, Glib::RefPtr y); - Gtk::Widget* get_ext_widget(const sinfg::String& x); - void set_ext_widget(const sinfg::String& x, Gtk::Widget* y); + Gtk::Widget* get_ext_widget(const synfig::String& x); + void set_ext_widget(const synfig::String& x, Gtk::Widget* y); - //std::map& tree_view_book() { return tree_view_book_; } - //std::map& ext_widget_book() { return tree_view_book_; } + //std::map& tree_view_book() { return tree_view_book_; } + //std::map& ext_widget_book() { return tree_view_book_; } void popup_main_menu(); @@ -454,7 +454,7 @@ public: Smach::event_result process_event_key(EventKey x); - void popup_layer_menu(sinfg::Layer::Handle layer); + void popup_layer_menu(synfig::Layer::Handle layer); virtual ~CanvasView(); @@ -470,9 +470,9 @@ public: const studio::Adjust_Window &time_window_adjustment()const { return time_window_adjustment_; } - etl::handle get_ui_interface() { return ui_interface_;} + etl::handle get_ui_interface() { return ui_interface_;} - etl::handle get_selection_manager() { return selection_manager_; } + etl::handle get_selection_manager() { return selection_manager_; } Glib::RefPtr layer_tree_store() { return get_tree_model("layers"); } @@ -486,19 +486,19 @@ public: Glib::RefPtr keyframe_tree_store()const { return get_tree_model("keyframes"); } - void set_time(sinfg::Time t) { canvas_interface_->set_time(t); } + void set_time(synfig::Time t) { canvas_interface_->set_time(t); } - sinfg::Time get_time() { return canvas_interface_->get_time(); } + synfig::Time get_time() { return canvas_interface_->get_time(); } - etl::handle get_canvas()const { return canvas_interface_->get_canvas(); } + etl::handle get_canvas()const { return canvas_interface_->get_canvas(); } etl::handle get_instance()const { return instance_; } - etl::handle canvas_interface() { return canvas_interface_; } + etl::handle canvas_interface() { return canvas_interface_; } - etl::handle canvas_interface()const { return canvas_interface_; } + etl::handle canvas_interface()const { return canvas_interface_; } - void add_actions_to_menu(Gtk::Menu *menu, const sinfgapp::Action::ParamList ¶m_list, sinfgapp::Action::Category category=sinfgapp::Action::CATEGORY_ALL)const; + void add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamList ¶m_list, synfigapp::Action::Category category=synfigapp::Action::CATEGORY_ALL)const; //! Updates the title of the window void update_title(); @@ -544,7 +544,7 @@ public: //! \writeme void rebuild_ducks(); - //bool add_to_ducks(sinfgapp::ValueDesc value_desc, sinfg::ParamDesc *param_desc=NULL); + //bool add_to_ducks(synfigapp::ValueDesc value_desc, synfig::ParamDesc *param_desc=NULL); //! Starts "playing" the animation in real-time void play(); @@ -578,7 +578,7 @@ public: void time_zoom_in(); void time_zoom_out(); - void add_layer(sinfg::String x); + void add_layer(synfig::String x); void show_keyframe_dialog(); @@ -587,7 +587,7 @@ public: void image_import(); - void on_waypoint_clicked(sinfgapp::ValueDesc,sinfg::Waypoint, int button); + void on_waypoint_clicked(synfigapp::ValueDesc,synfig::Waypoint, int button); void preview_option() {on_preview_option();} @@ -612,7 +612,7 @@ private: bool on_keyframe_tree_event(GdkEvent *event); - //void on_children_edited_value(const Glib::ustring&path_string,sinfg::ValueBase value); + //void on_children_edited_value(const Glib::ustring&path_string,synfig::ValueBase value); void on_dirty_preview(); @@ -622,11 +622,11 @@ private: // void on_layer_toggle(const Glib::ustring& path_string, Gtk::TreeModelColumn column); - void on_mode_changed(sinfgapp::CanvasInterface::Mode mode); + void on_mode_changed(synfigapp::CanvasInterface::Mode mode); -// void on_layer_waypoint_clicked(const Glib::ustring &, sinfg::ValueNode_Animated::WaypointList::iterator); +// void on_layer_waypoint_clicked(const Glib::ustring &, synfig::ValueNode_Animated::WaypointList::iterator); - //void on_children_waypoint_clicked(const Glib::ustring &, sinfg::ValueNode_Animated::WaypointList::iterator); + //void on_children_waypoint_clicked(const Glib::ustring &, synfig::ValueNode_Animated::WaypointList::iterator); void on_waypoint_changed(); @@ -660,18 +660,18 @@ private: void on_audio_option(); void on_audio_file_change(const std::string &f); - void on_audio_offset_change(const sinfg::Time &t); + void on_audio_offset_change(const synfig::Time &t); void on_audio_file_notify(); void on_audio_offset_notify(); - bool on_duck_changed(const sinfg::Point &value,const sinfgapp::ValueDesc& value_desc); + bool on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc); - void on_layer_toggle(sinfg::Layer::Handle); + void on_layer_toggle(synfig::Layer::Handle); - void on_edited_value(sinfgapp::ValueDesc,sinfg::ValueBase); + void on_edited_value(synfigapp::ValueDesc,synfig::ValueBase); - //void on_waypoint_clicked(sinfgapp::ValueDesc,sinfg::ValueNode_Animated::WaypointList::iterator, int button); + //void on_waypoint_clicked(synfigapp::ValueDesc,synfig::ValueNode_Animated::WaypointList::iterator, int button); void on_drop_drag_data_received(const Glib::RefPtr& context, int x, int y, const Gtk::SelectionData& selection_data, guint info, guint time); @@ -687,7 +687,7 @@ protected: public: - static etl::handle create(etl::loose_handle instance,etl::handle canvas); + static etl::handle create(etl::loose_handle instance,etl::handle canvas); }; // END of class CanvasView }; // END of namespace studio diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp index 07d81f1..e39ce8c 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file cellrenderer_gradient.cpp ** \brief Template File ** @@ -40,7 +40,7 @@ using namespace std; //using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -58,7 +58,7 @@ using namespace studio; CellRenderer_Gradient::CellRenderer_Gradient(): Glib::ObjectBase (typeid(CellRenderer_Gradient)), Gtk::CellRendererText (), - property_gradient_(*this,"gradient",sinfg::Gradient()) + property_gradient_(*this,"gradient",synfig::Gradient()) { //CellRendererText::signal_edited().connect(sigc::mem_fun(*this,&studio::CellRenderer_Gradient::string_edited_)); } diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.h b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.h index 99ecfce..84a9ee1 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.h +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file cellrenderer_gradient.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STUDIO_CELLRENDERER_GRADIENT_H -#define __SINFG_STUDIO_CELLRENDERER_GRADIENT_H +#ifndef __SYNFIG_STUDIO_CELLRENDERER_GRADIENT_H +#define __SYNFIG_STUDIO_CELLRENDERER_GRADIENT_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ #include #include -#include +#include /* === M A C R O S ========================================================= */ @@ -47,15 +47,15 @@ namespace studio { class CellRenderer_Gradient : public Gtk::CellRendererText { sigc::signal signal_secondary_click_; - sigc::signal signal_edited_; + sigc::signal signal_edited_; - Glib::Property property_gradient_; + Glib::Property property_gradient_; public: - sigc::signal &signal_edited() + sigc::signal &signal_edited() {return signal_edited_; } - Glib::PropertyProxy property_gradient() { return property_gradient_.get_proxy();} + Glib::PropertyProxy property_gradient() { return property_gradient_.get_proxy();} CellRenderer_Gradient(); ~CellRenderer_Gradient(); diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp index e7fe1fa..78560c4 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file cellrenderer_time.cpp ** \brief Template File ** @@ -40,7 +40,7 @@ using namespace std; //using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -58,7 +58,7 @@ using namespace studio; CellRenderer_Time::CellRenderer_Time(): Glib::ObjectBase (typeid(CellRenderer_Time)), Gtk::CellRendererText (), - property_time_(*this,"time",sinfg::Time(0)), + property_time_(*this,"time",synfig::Time(0)), property_fps_(*this,"fps", float(0)) { CellRendererText::signal_edited().connect(sigc::mem_fun(*this,&studio::CellRenderer_Time::string_edited_)); @@ -66,7 +66,7 @@ CellRenderer_Time::CellRenderer_Time(): CellRenderer_Time::~CellRenderer_Time() { - sinfg::info("CellRenderer_Time::~CellRenderer_Time(): deleted"); + synfig::info("CellRenderer_Time::~CellRenderer_Time(): deleted"); } void diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.h b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.h index c024723..f672719 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.h +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.h @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file cellrenderer_time.h ** \brief Template Header ** @@ -21,8 +21,8 @@ /* === S T A R T =========================================================== */ -#ifndef __SINFG_STUDIO_CELLRENDERER_TIME_H -#define __SINFG_STUDIO_CELLRENDERER_TIME_H +#ifndef __SYNFIG_STUDIO_CELLRENDERER_TIME_H +#define __SYNFIG_STUDIO_CELLRENDERER_TIME_H /* === H E A D E R S ======================================================= */ @@ -32,7 +32,7 @@ #include #include -#include +#include /* === M A C R O S ========================================================= */ @@ -47,21 +47,21 @@ namespace studio { class CellRenderer_Time : public Gtk::CellRendererText { sigc::signal signal_secondary_click_; - sigc::signal signal_edited_; + sigc::signal signal_edited_; - Glib::Property property_time_; - Glib::Property property_fps_; + Glib::Property property_time_; + Glib::Property property_fps_; void string_edited_(const Glib::ustring&,const Glib::ustring&); void on_value_editing_done(); public: - sigc::signal &signal_edited() + sigc::signal &signal_edited() {return signal_edited_; } - Glib::PropertyProxy property_time() { return property_time_.get_proxy();} - Glib::PropertyProxy property_fps() { return property_fps_.get_proxy();} + Glib::PropertyProxy property_time() { return property_time_.get_proxy();} + Glib::PropertyProxy property_fps() { return property_fps_.get_proxy();} CellRenderer_Time(); ~CellRenderer_Time(); diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp index b3c9a66..947952d 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp @@ -1,4 +1,4 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file cellrenderer_timetrack.cpp ** \brief Template Header ** @@ -41,14 +41,14 @@ #include "widget_time.h" #include "widget_timeslider.h" -#include +#include #include "instance.h" -#include +#include #endif -using namespace sinfg; +using namespace synfig; using namespace std; using namespace etl; using namespace studio; @@ -77,8 +77,8 @@ CellRenderer_TimeTrack::CellRenderer_TimeTrack(): Gtk::CellRenderer (), adjustment_ (10,10,20,0,0,0), - property_valuedesc_ (*this,"value_desc",sinfgapp::ValueDesc()), - property_canvas_ (*this,"canvas",sinfg::Canvas::Handle()), + property_valuedesc_ (*this,"value_desc",synfigapp::ValueDesc()), + property_canvas_ (*this,"canvas",synfig::Canvas::Handle()), property_adjustment_(*this,"adjustment",&adjustment_), property_enable_timing_info_(*this,"enable-timing-info", false) { @@ -88,7 +88,7 @@ CellRenderer_TimeTrack::CellRenderer_TimeTrack(): CellRenderer_TimeTrack::~CellRenderer_TimeTrack() { - sinfg::info("CellRenderer_TimeTrack::~CellRenderer_TimeTrack(): deleted"); + synfig::info("CellRenderer_TimeTrack::~CellRenderer_TimeTrack(): deleted"); } void @@ -98,7 +98,7 @@ CellRenderer_TimeTrack::set_adjustment(Gtk::Adjustment &x) // x.signal_value_changed().connect(sigc::mem_fun(*this,&Gtk::Widget::queue_draw)); } -sinfg::Canvas::Handle +synfig::Canvas::Handle CellRenderer_TimeTrack::get_canvas()const { return const_cast(this)->property_canvas().get_value(); @@ -123,11 +123,11 @@ CellRenderer_TimeTrack::is_selected(const Waypoint& waypoint)const } //kind of a hack... pointer is ugly -const sinfg::Node::time_set *get_times_from_vdesc(const sinfgapp::ValueDesc &v) +const synfig::Node::time_set *get_times_from_vdesc(const synfigapp::ValueDesc &v) { - if(v.get_value_type() == sinfg::ValueBase::TYPE_CANVAS) + if(v.get_value_type() == synfig::ValueBase::TYPE_CANVAS) { - sinfg::Canvas::Handle canvasparam = v.get_value().get(Canvas::Handle()); + synfig::Canvas::Handle canvasparam = v.get_value().get(Canvas::Handle()); if(canvasparam) { @@ -153,7 +153,7 @@ const sinfg::Node::time_set *get_times_from_vdesc(const sinfgapp::ValueDesc &v) return 0; } -bool get_closest_time(const sinfg::Node::time_set &tset, const Time &t, const Time &range, Time &out) +bool get_closest_time(const synfig::Node::time_set &tset, const Time &t, const Time &range, Time &out) { Node::time_set::const_iterator i,j,end = tset.end(); @@ -217,21 +217,21 @@ CellRenderer_TimeTrack::render_vfunc( inactive_gc->set_stipple(Gdk::Bitmap::create(stipple_xpm,2,2)); inactive_gc->set_fill(Gdk::STIPPLED); - sinfg::Canvas::Handle canvas(property_canvas().get_value()); + synfig::Canvas::Handle canvas(property_canvas().get_value()); - sinfgapp::ValueDesc value_desc = property_value_desc().get_value(); - sinfg::ValueNode *base_value = value_desc.get_value_node().get(); - sinfg::ValueNode_Animated *value_node=dynamic_cast(base_value); + synfigapp::ValueDesc value_desc = property_value_desc().get_value(); + synfig::ValueNode *base_value = value_desc.get_value_node().get(); + synfig::ValueNode_Animated *value_node=dynamic_cast(base_value); - sinfg::ValueNode_DynamicList *parent_value_node(0); + synfig::ValueNode_DynamicList *parent_value_node(0); if(property_value_desc().get_value().parent_is_value_node()) - parent_value_node=dynamic_cast(property_value_desc().get_value().get_parent_value_node().get()); + parent_value_node=dynamic_cast(property_value_desc().get_value().get_parent_value_node().get()); // If the canvas is defined, then load up the keyframes if(canvas) { - const sinfg::KeyframeList& keyframe_list(canvas->keyframe_list()); - sinfg::KeyframeList::const_iterator iter; + const synfig::KeyframeList& keyframe_list(canvas->keyframe_list()); + synfig::KeyframeList::const_iterator iter; for(iter=keyframe_list.begin();iter!=keyframe_list.end();++iter) { @@ -249,11 +249,11 @@ CellRenderer_TimeTrack::render_vfunc( //render all the time points that exist { - const sinfg::Node::time_set *tset = get_times_from_vdesc(value_desc); + const synfig::Node::time_set *tset = get_times_from_vdesc(value_desc); if(tset) { - sinfg::Node::time_set::const_iterator i = tset->begin(), end = tset->end(); + synfig::Node::time_set::const_iterator i = tset->begin(), end = tset->end(); float lower = adjustment->get_lower(), upper = adjustment->get_upper(); @@ -314,7 +314,7 @@ CellRenderer_TimeTrack::render_vfunc( gc->set_rgb_fg_color(Gdk::Color("#00EEEE")); } - //sinfg::info("Displaying time: %.3f s",(float)t); + //synfig::info("Displaying time: %.3f s",(float)t); const int x = (int)((t-lower)*area.get_width()/(upper-lower)); //should draw me a grey filled circle... @@ -349,7 +349,7 @@ CellRenderer_TimeTrack::render_vfunc( if(!t.is_valid()) continue; - //sinfg::info("Displaying time: %.3f s",(float)t); + //synfig::info("Displaying time: %.3f s",(float)t); const int x = (int)((t-lower)*area.get_width()/(upper-lower)); //should draw me a grey filled circle... @@ -383,7 +383,7 @@ CellRenderer_TimeTrack::render_vfunc( if(value_node) { //now render the actual waypoints - sinfg::ValueNode_Animated::WaypointList::iterator iter; + synfig::ValueNode_Animated::WaypointList::iterator iter; for( iter=value_node->waypoint_list().begin(); iter!=value_node->waypoint_list().end(); @@ -435,9 +435,9 @@ CellRenderer_TimeTrack::render_vfunc( if(parent_value_node) { const int index(property_value_desc().get_value().get_index()); - const sinfg::ValueNode_DynamicList::ListEntry& list_entry(parent_value_node->list[index]); - const sinfg::ValueNode_DynamicList::ListEntry::ActivepointList& activepoint_list(list_entry.timing_info); - sinfg::ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator iter,next; + const synfig::ValueNode_DynamicList::ListEntry& list_entry(parent_value_node->list[index]); + const synfig::ValueNode_DynamicList::ListEntry::ActivepointList& activepoint_list(list_entry.timing_info); + synfig::ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator iter,next; bool is_off(false); if(!activepoint_list.empty()) @@ -519,14 +519,14 @@ CellRenderer_TimeTrack::render_vfunc( } } -sinfg::ValueNode_Animated::WaypointList::iterator -CellRenderer_TimeTrack::find_waypoint(const sinfg::Time& t,const sinfg::Time& scope) +synfig::ValueNode_Animated::WaypointList::iterator +CellRenderer_TimeTrack::find_waypoint(const synfig::Time& t,const synfig::Time& scope) { - sinfg::ValueNode_Animated *value_node=dynamic_cast(property_value_desc().get_value().get_value_node().get()); + synfig::ValueNode_Animated *value_node=dynamic_cast(property_value_desc().get_value().get_value_node().get()); Time nearest(Time::end()); - sinfg::ValueNode_Animated::WaypointList::iterator iter,ret; + synfig::ValueNode_Animated::WaypointList::iterator iter,ret; if(value_node) { @@ -562,17 +562,17 @@ CellRenderer_TimeTrack::activate_vfunc( Gtk::CellRendererState flags) { path=treepath; - sinfg::ValueNode_Animated::WaypointList::iterator iter; + synfig::ValueNode_Animated::WaypointList::iterator iter; Time nearest=1000000000; Gtk::Adjustment *adjustment=get_adjustment(); - sinfg::ValueNode_Animated *value_node=dynamic_cast(property_value_desc().get_value().get_value_node().get()); + synfig::ValueNode_Animated *value_node=dynamic_cast(property_value_desc().get_value().get_value_node().get()); - sinfg::Canvas::Handle canvas(get_canvas()); + synfig::Canvas::Handle canvas(get_canvas()); - sinfg::ValueNode_DynamicList *parent_value_node(0); + synfig::ValueNode_DynamicList *parent_value_node(0); if(property_value_desc().get_value().parent_is_value_node()) - parent_value_node=dynamic_cast(property_value_desc().get_value().get_parent_value_node().get()); + parent_value_node=dynamic_cast(property_value_desc().get_value().get_parent_value_node().get()); Time deltatime = 0; Time curr_time; @@ -629,7 +629,7 @@ CellRenderer_TimeTrack::activate_vfunc( will remove it from the the set if it is included. */ - sinfgapp::ValueDesc valdesc = property_value_desc().get_value(); + synfigapp::ValueDesc valdesc = property_value_desc().get_value(); const Node::time_set *tset = get_times_from_vdesc(valdesc); bool clickfound = tset && get_closest_time(*tset,actual_time,pixel_width*cell_area.get_height(),stime); @@ -676,7 +676,7 @@ CellRenderer_TimeTrack::activate_vfunc( catch(int) { selection=false; - selected=sinfg::UniqueID::nil(); + selected=synfig::UniqueID::nil(); } if((!sel_times.empty() || selection) && event->button.button==1) @@ -692,8 +692,8 @@ CellRenderer_TimeTrack::activate_vfunc( if(parent_value_node) { const int index(property_value_desc().get_value().get_index()); - const sinfg::ValueNode_DynamicList::ListEntry::ActivepointList& activepoint_list(parent_value_node->list[index].timing_info); - sinfg::ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator iter; + const synfig::ValueNode_DynamicList::ListEntry::ActivepointList& activepoint_list(parent_value_node->list[index].timing_info); + synfig::ValueNode_DynamicList::ListEntry::ActivepointList::const_iterator iter; for(iter=activepoint_list.begin();iter!=activepoint_list.end();++iter) { @@ -711,12 +711,12 @@ CellRenderer_TimeTrack::activate_vfunc( if(event->button.button==3) { Time stime; - sinfgapp::ValueDesc valdesc = property_value_desc().get_value(); + synfigapp::ValueDesc valdesc = property_value_desc().get_value(); const Node::time_set *tset = get_times_from_vdesc(valdesc); bool clickfound = tset && get_closest_time(*tset,actual_time,pixel_width*cell_area.get_height(),stime); - etl::handle node; + etl::handle node; if(valdesc.get_value(stime).get_type()==ValueBase::TYPE_CANVAS) { node=Canvas::Handle(valdesc.get_value(stime).get(Canvas::Handle())); @@ -761,11 +761,11 @@ CellRenderer_TimeTrack::activate_vfunc( deltatime = actual_time - actual_dragtime; if(sel_times.size() != 0 && (delmode || !deltatime.is_equal(Time(0)))) { - sinfgapp::Action::ParamList param_list; + synfigapp::Action::ParamList param_list; param_list.add("canvas",canvas_interface()->get_canvas()); param_list.add("canvas_interface",canvas_interface()); - if(sel_value.get_value_type() == sinfg::ValueBase::TYPE_CANVAS) + if(sel_value.get_value_type() == synfig::ValueBase::TYPE_CANVAS) { param_list.add("addcanvas",sel_value.get_value().get(Canvas::Handle())); }else @@ -774,7 +774,7 @@ CellRenderer_TimeTrack::activate_vfunc( } set