Fix most of the warnings from doxygen for synfig-studio sources.
[synfig.git] / synfig-studio / trunk / src / gtkmm / canvasview.cpp
index 20534a0..89ce488 100644 (file)
@@ -99,6 +99,8 @@
 #include <synfigapp/main.h>
 #include <synfigapp/inputdevice.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -242,7 +244,7 @@ public:
                view(view)
        {
 
-               view->statusbar->push("Idle");
+               view->statusbar->push(_("Idle"));
        }
 
        ~CanvasViewUIInterface()
@@ -332,7 +334,7 @@ public:
        virtual bool
        error(const std::string &err)
        {
-               view->statusbar->push("ERROR");
+               view->statusbar->push(_("ERROR"));
 
                // If we are in the process of canceling,
                // then just go ahead and return false --
@@ -381,7 +383,7 @@ public:
        void
        not_implemented()
        {
-               error("Feature not yet implemented");
+               error(_("Feature not yet implemented"));
        }
 };
 
@@ -709,9 +711,9 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
 
        //notebook->show();
 
-       //notebook->append_page(*create_layer_tree(),"Layers");
-       //notebook->append_page(*create_children_tree(),"Children");
-       //notebook->append_page(*create_keyframe_tree(),"Keyframes");
+       //notebook->append_page(*create_layer_tree(),_("Layers"));
+       //notebook->append_page(*create_children_tree(),_("Children"));
+       //notebook->append_page(*create_keyframe_tree(),_("Keyframes"));
 
        //synfig::info("Canvasview: Before big chunk of allocation and tabling stuff");
        //create all allocated stuff for this canvas
@@ -947,11 +949,11 @@ CanvasView::create_time_bar()
        //time_scroll->signal_value_changed().connect(sigc::mem_fun(*work_area, &studio::WorkArea::render_preview_hook));
        //time_scroll->set_update_policy(Gtk::UPDATE_DISCONTINUOUS);
 
-       NORMAL_BUTTON(animatebutton,"gtk-yes","Animate");
+       NORMAL_BUTTON(animatebutton,"gtk-yes",_("Animate"));
        animatebutton->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_animate_button_pressed));
        animatebutton->show();
 
-       NORMAL_BUTTON(keyframebutton,"synfig-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();
 
@@ -1006,11 +1008,11 @@ CanvasView::create_status_bar()
        Gtk::Table *statusbartable= manage(new class Gtk::Table(7, 1, false));
 //     statusbar = manage(new class Gtk::Statusbar()); // This is already done at construction
        progressbar =manage(new class Gtk::ProgressBar());
-       SMALL_BUTTON(stopbutton,"gtk-stop","Stop");
-       SMALL_BUTTON(refreshbutton,"gtk-refresh","Refresh");
-       //SMALL_BUTTON(treetogglebutton,"gtk-go-down","Toggle Layer Tree");
-//     NEW_SMALL_BUTTON(raisebutton,"gtk-go-up","Raise Layer");
-//     NEW_SMALL_BUTTON(lowerbutton,"gtk-go-down","Lower Layer");
+       SMALL_BUTTON(stopbutton,"gtk-stop",_("Stop"));
+       SMALL_BUTTON(refreshbutton,"gtk-refresh",_("Refresh"));
+       //SMALL_BUTTON(treetogglebutton,"gtk-go-down",_("Toggle Layer Tree"));
+//     NEW_SMALL_BUTTON(raisebutton,"gtk-go-up",_("Raise Layer"));
+//     NEW_SMALL_BUTTON(lowerbutton,"gtk-go-down",_("Lower Layer"));
        //statusbartable->attach(*treetogglebutton, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 //     statusbartable->attach(*lowerbutton, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 //     statusbartable->attach(*raisebutton, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
@@ -1100,9 +1102,9 @@ CanvasView::create_keyframe_tree()
        Gtk::Image *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,"synfig-duplicate","Duplicate Keyframe");
-       NEW_SMALL_BUTTON(button_delete,"gtk-delete","Delete Keyframe");
+       NEW_SMALL_BUTTON(button_add,"gtk-add",_("New 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()));
        layout_table->attach(*hbox, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK, 0, 0);
@@ -1184,7 +1186,7 @@ CanvasView::init_menus()
        */
        action_group = Gtk::ActionGroup::create();
 
-       //action_group->add( Gtk::Action::create("MenuFile", "_File") );
+       //action_group->add( Gtk::Action::create("MenuFile", _("_File")) );
        action_group->add( Gtk::Action::create("save", Gtk::Stock::SAVE),
                hide_return(sigc::mem_fun(*get_instance().get(), &studio::Instance::save))
        );
@@ -1267,7 +1269,7 @@ CanvasView::init_menus()
                );
                for(i=1;i<=10;i++)
                {
-                       Glib::RefPtr<Gtk::RadioAction> action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i), strprintf("Set Quality to %d",i)));
+                       Glib::RefPtr<Gtk::RadioAction> action(Gtk::RadioAction::create(quality_group,strprintf("quality-%02d",i), strprintf(_("Set Quality to %d"),i)));
                        if(i==10)
                        {
                                action->set_active();
@@ -1355,8 +1357,8 @@ CanvasView::init_menus()
        }
 
 
-#define DUCK_MASK(lower,upper) \
-       duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", _("Show "#lower" ducks")); \
+#define DUCK_MASK(lower,upper,string)  \
+       duck_mask_##lower=Gtk::ToggleAction::create("mask-" #lower "-ducks", string); \
        duck_mask_##lower->set_active((bool)(work_area->get_type_mask()&Duck::TYPE_##upper)); \
        action_group->add( duck_mask_##lower, \
                sigc::bind( \
@@ -1364,12 +1366,12 @@ CanvasView::init_menus()
                        Duck::TYPE_##upper \
                ) \
        )
-       DUCK_MASK(position,POSITION);
-       DUCK_MASK(tangent,TANGENT);
-       DUCK_MASK(vertex,VERTEX);
-       DUCK_MASK(radius,RADIUS);
-       DUCK_MASK(width,WIDTH);
-       DUCK_MASK(angle,ANGLE);
+       DUCK_MASK(position,POSITION,_("Show Position Ducks"));
+       DUCK_MASK(tangent,TANGENT,_("Show Tangent Ducks"));
+       DUCK_MASK(vertex,VERTEX,_("Show Vertex Ducks"));
+       DUCK_MASK(radius,RADIUS,_("Show Radius Ducks"));
+       DUCK_MASK(width,WIDTH,_("Show Width Ducks"));
+       DUCK_MASK(angle,ANGLE,_("Show Angle Ducks"));
 #undef DUCK_MASK
 
        add_accel_group(App::ui_manager()->get_accel_group());
@@ -1491,7 +1493,7 @@ CanvasView::init_menus()
        ));
 
        build_new_layer_menu(newlayermenu);
-       layermenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New",newlayermenu));
+       layermenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New"),newlayermenu));
 
 
        {
@@ -1502,7 +1504,7 @@ CanvasView::init_menus()
        }
 
 
-       //canvasmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Keyframe Dialog",sigc::mem_fun(keyframe_dialog,&studio::Dialog_Keyframe::present)));
+       //canvasmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Keyframe Dialog"),sigc::mem_fun(keyframe_dialog,&studio::Dialog_Keyframe::present)));
 
        // Duck Mask Menu
        if(1)
@@ -1634,22 +1636,24 @@ CanvasView::init_menus()
                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));
-       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_Edit",editmenu));
-       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_View",viewmenu));
-       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_Canvas",canvasmenu));
-       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("_Layer",layermenu));
+       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_File"),filemenu));
+       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Edit"),editmenu));
+       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_View"),viewmenu));
+       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Canvas"),canvasmenu));
+       mainmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("_Layer"),layermenu));
 
        mainmenu.accelerate(*this);
 
+/*
        {
 
-               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Waypoint",NOT_IMPLEMENTED_SLOT));
-               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Delete Waypoint",NOT_IMPLEMENTED_SLOT));
-               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Export",NOT_IMPLEMENTED_SLOT));
+               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Waypoint"),NOT_IMPLEMENTED_SLOT));
+               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Delete Waypoint"),NOT_IMPLEMENTED_SLOT));
+               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Export"),NOT_IMPLEMENTED_SLOT));
                trackmenu.items().push_back(Gtk::Menu_Helpers::SeparatorElem());
-               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Properties",NOT_IMPLEMENTED_SLOT));
+               trackmenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Properties"),NOT_IMPLEMENTED_SLOT));
        }
+*/
        mainmenu.show();
        filemenu.show();
        editmenu.show();
@@ -1986,7 +1990,7 @@ CanvasView::close_instance()
 }
 
 handle<CanvasView>
-CanvasView::create(loose_handle<Instance> instance,handle<Canvas> canvas)
+CanvasView::create(etl::loose_handle<Instance> instance, etl::handle<synfig::Canvas> canvas)
 {
        etl::handle<studio::CanvasView> view(new CanvasView(instance,instance->synfigapp::Instance::find_canvas_interface(canvas)));
        instance->canvas_view_list().push_front(view);
@@ -2200,7 +2204,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
                                // newlayers->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), newlayers));
                                build_new_layer_menu(*newlayers);
 
-                               parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Layer",*newlayers));
+                               parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Layer"),*newlayers));
                                if(!multiple_selected && layer->get_name()=="PasteCanvas")
                                {
                                        parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"),
@@ -2237,10 +2241,10 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
 #warning update me!
 #if 0
                                        parammenu.items().clear();
-                                       parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Connect",
+                                       parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Connect"),
                                                hide_return(sigc::mem_fun(*canvas_interface().get(),&synfigapp::CanvasInterface::connect_selected_layer_params))
                                        ));
-                                       parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("Disconnect",
+                                       parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Disconnect"),
                                                hide_return(sigc::mem_fun(*canvas_interface().get(),&synfigapp::CanvasInterface::disconnect_selected_layer_params))
                                        ));
                                        parammenu.popup(0,0);
@@ -2532,7 +2536,7 @@ CanvasView::on_keyframe_button_pressed()
 }
 
 bool
-CanvasView::duck_change_param(const Point &value,synfig::Layer::Handle layer, synfig::String param_name)
+CanvasView::duck_change_param(const synfig::Point &value,synfig::Layer::Handle layer, synfig::String param_name)
 {
        return canvas_interface()->change_value(synfigapp::ValueDesc(layer,param_name),value);
 }
@@ -2556,8 +2560,16 @@ CanvasView::on_duck_changed(const synfig::Point &value,const synfigapp::ValueDes
        return true;
 }
 
+bool
+CanvasView::on_duck_angle_changed(const synfig::Angle &rotation,const synfigapp::ValueDesc& value_desc)
+{
+       // \todo will this really always be the case?
+       assert(value_desc.get_value_type() == ValueBase::TYPE_ANGLE);
+       return canvas_interface()->change_value(value_desc, value_desc.get_value(get_time()).get(Angle()) + rotation);
+}
+
 void
-CanvasView::selected_layer_color_set(Color color)
+CanvasView::selected_layer_color_set(synfig::Color color)
 {
        synfigapp::SelectionManager::LayerList selected_list(get_selection_manager()->get_selected_layers());
        synfigapp::SelectionManager::LayerList::iterator iter;
@@ -2576,7 +2588,7 @@ CanvasView::selected_layer_color_set(Color color)
 }
 
 void
-CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas::Handle canvas, std::set<synfig::Layer::Handle>& selected_list)
+CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, synfig::Canvas::Handle canvas, std::set<synfig::Layer::Handle>& selected_list)
 {
        int transforms(0);
        String layer_name;
@@ -3111,8 +3123,8 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
                {
                        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.
+                       // For some reason, GTK hands us a list of URLs separated
+                       // by not only Carriage-Returns, but also Line-Feeds.
                        // Line-Feeds will mess us up. Remove all the line-feeds.
                        while(selection_data.find_first_of('\r')!=synfig::String::npos)
                                selection_data.erase(selection_data.begin()+selection_data.find_first_of('\r'));
@@ -3409,7 +3421,7 @@ CanvasView::on_audio_file_change(const std::string &f)
 }
 
 void
-CanvasView::on_audio_offset_change(const Time &t)
+CanvasView::on_audio_offset_change(const synfig::Time &t)
 {
        canvas_interface()->set_meta_data("audiooffset",t.get_string());
 }