X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=cbaed033d8631b5eb5f920de8faabf3590f38941;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=82b6f09f48a91d8525eebb9cc96d4f861535676d;hpb=3f7b0cb177d3f3c6cf926add2bf807811f743f72;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 82b6f09..cbaed03 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -553,13 +553,13 @@ public: } //! Sets which value_nodes should be selected - virtual void set_selected_children(const ChildrenList &children_list) + virtual void set_selected_children(const ChildrenList &/*children_list*/) { return; } //! Sets which value_node should be selected. Empty handle if none. - virtual void set_selected_child(const ChildrenList::value_type &child) + virtual void set_selected_child(const ChildrenList::value_type &/*child*/) { return; } @@ -610,12 +610,12 @@ public: return get_selected_layer_parameters().front(); } - void set_selected_layer_parameters(const LayerParamList &layer_param_list) + void set_selected_layer_parameters(const LayerParamList &/*layer_param_list*/) { return; } - void set_selected_layer_param(const LayerParam &layer_param) + void set_selected_layer_param(const LayerParam &/*layer_param*/) { return; } @@ -790,7 +790,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handlerend_desc().get_w()+70; int h=get_canvas()->rend_desc().get_h()+70; @@ -946,7 +946,7 @@ CanvasView::create_time_bar() Gtk::Table *table= manage(new class Gtk::Table(2, 3, false)); //setup the audio display - disp_audio->set_size_request(-1,32); //disp_audio.show(); + disp_audio->set_size_request(-1,32); //disp_audio->show(); disp_audio->set_time_adjustment(&time_adjustment()); disp_audio->signal_start_scrubbing().connect( sigc::mem_fun(*audio,&AudioContainer::start_scrubbing) @@ -1305,16 +1305,14 @@ CanvasView::init_menus() 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(), &synfigapp::CanvasInterface::seek_frame),-1)); - action=Gtk::Action::create("seek-next-second", Gtk::Stock::GO_FORWARD,_("Seek Foward"),_("Seek Foward")); + action=Gtk::Action::create("seek-next-second", Gtk::Stock::GO_FORWARD,_("Seek Forward"),_("Seek Forward")); 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(), &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(), &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(), &synfigapp::CanvasInterface::seek_time),Time::begin())); @@ -1465,13 +1463,6 @@ 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("synfig-rotoscope_bline"), - sigc::mem_fun(*this, &studio::CanvasView::do_rotoscope_bline))); - 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("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"), sigc::mem_fun(canvas_properties,&studio::CanvasProperties::present) )); @@ -1727,7 +1718,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer) //parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("New Layer"),*newlayers)); - if(layer->get_name()=="PasteCanvas") + if(layer->get_name()=="paste_canvas") { menu->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"), sigc::bind( @@ -1746,7 +1737,7 @@ CanvasView::popup_layer_menu(synfig::Layer::Handle layer) } void -CanvasView::register_layer_type(synfig::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; @@ -1766,7 +1757,7 @@ CanvasView::register_layer_type(synfig::Layer::Book::value_type &lyr,std::map category_map; @@ -2088,7 +2079,7 @@ CanvasView::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamL } bool -CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnID column_id) +CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::ColumnID /*column_id*/) { switch(button) { @@ -2155,7 +2146,7 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow row, LayerTree::ColumnI build_new_layer_menu(*newlayers); parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Layer",*newlayers)); - if(!multiple_selected && layer->get_name()=="PasteCanvas") + if(!multiple_selected && layer->get_name()=="paste_canvas") { parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem(_("Select All Children"), sigc::bind( @@ -2228,6 +2219,12 @@ CanvasView::on_children_user_click(int button, Gtk::TreeRow row, ChildrenTree::C if(!(bool)row[children_tree_model.is_canvas]) { synfigapp::ValueDesc value_desc=row[children_tree_model.value_desc]; + if (!value_desc) + { + //! \todo fix properly -- what is the child dialog for? + synfig::info("preventing child dialog right-click crash"); + return true; + } assert(value_desc); popup_param_menu(value_desc); return true; @@ -2629,7 +2626,7 @@ CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas // If this is a paste canvas layer, then we need to // descend into it - if(layer_name=="PasteCanvas") + if(layer_name=="paste_canvas") { Vector scale; scale[0]=scale[1]=exp(layer->get_param("zoom").get(Real())); @@ -2884,30 +2881,6 @@ CanvasView::toggle_tables() } void -CanvasView::do_rotoscope_bline() -{ - smach_.enter(&state_bline); -} - -void -CanvasView::do_rotoscope() -{ - smach_.enter(&state_draw); -} - -void -CanvasView::do_rotoscope_poly() -{ - smach_.enter(&state_polygon); -} - -void -CanvasView::do_eyedrop() -{ - smach_.enter(&state_eyedrop); -} - -void CanvasView::show_timebar() { timebar->show(); @@ -3036,7 +3009,7 @@ CanvasView::on_waypoint_delete() } void -CanvasView::on_drop_drag_data_received(const Glib::RefPtr& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time) +CanvasView::on_drop_drag_data_received(const Glib::RefPtr& context, int /*x*/, int /*y*/, const Gtk::SelectionData& selection_data_, guint /*info*/, guint time) { // We will make this true once we have a solid drop bool success(false);