X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcanvasview.cpp;h=4a631a2ae572739851d25136af841f1473d30e41;hb=321dd0dc08be2ef279c589c1cd2df79dcb6dd682;hp=43d8de9792d5d288ad0e3cba4a0943314cd3c86e;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 43d8de9..4a631a2 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -2,7 +2,7 @@ /*! \file canvasview.cpp ** \brief Template File ** -** $Id: canvasview.cpp,v 1.7 2005/01/16 19:55:57 darco Exp $ +** $Id$ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -44,60 +44,24 @@ #include #include -#include -#include -#include -#include -#include #include -#include -#include #include #include #include #include -//#include -//#include #include #include -//#include #include "canvasview.h" #include "instance.h" #include "app.h" -#include "cellrenderer_value.h" #include "cellrenderer_timetrack.h" -#include "workarea.h" -#include "dialog_color.h" #include "eventkey.h" -#include "state_polygon.h" -#include "state_bline.h" -#include "state_normal.h" -#include "state_eyedrop.h" -#include "state_draw.h" - -#include "ducktransform_scale.h" -#include "ducktransform_translate.h" -#include "ducktransform_rotate.h" - -#include "event_mouse.h" -#include "event_layerclick.h" - -#include "toolbox.h" - -#include "dialog_preview.h" -#include "dialog_soundselect.h" - -#include "preview.h" -#include "audiocontainer.h" #include "widget_timeslider.h" -#include -#include - #endif /* === U S I N G =========================================================== */ @@ -790,7 +754,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handlerend_desc().get_w()+70; int h=get_canvas()->rend_desc().get_h()+70; @@ -946,7 +910,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 +1269,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 +1427,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 +1682,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( @@ -2155,7 +2110,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 +2183,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 +2590,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 +2845,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(); @@ -2933,7 +2870,7 @@ CanvasView::hide_timebar() } void -CanvasView::timebar_set_sensitive(bool sensitive) +CanvasView::set_sensitive_timebar(bool sensitive) { timebar->set_sensitive(sensitive); current_time_widget->set_sensitive(sensitive); @@ -3354,6 +3291,7 @@ CanvasView::on_preview_create(const PreviewInfo &info) Dialog_Preview *pd = preview_dialog.get(); assert(pd); + pd->set_default_size(700,510); pd->set_preview(prev.get()); pd->present(); }