From: dooglus Date: Sun, 1 Apr 2007 19:06:26 +0000 (+0000) Subject: Remove old unused code that used to handle the eyedropper, colour selector, bline... X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=f59b7cc0fa5bcd11c52025fe7b06287cffae4cd5;p=synfig.git Remove old unused code that used to handle the eyedropper, colour selector, bline, polygon and draw tools. git-svn-id: http://svn.voria.com/code@413 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index c5f2126..7ce3871 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -1465,13 +1465,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) )); @@ -2884,30 +2877,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(); diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp index 00da151..7559f32 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp @@ -192,12 +192,6 @@ void _create_stock_dialog2() dock_dialog->present(); } -static void -show_dialog_color() -{ - App::dialog_color->present(); -} - Toolbox::Toolbox(): Gtk::Window(Gtk::WINDOW_TOPLEVEL), dialog_settings(this,"toolbox") @@ -283,14 +277,6 @@ Toolbox::Toolbox(): TOOLBOX_BUTTON(button_undo,"gtk-undo","Undo"); TOOLBOX_BUTTON(button_redo,"gtk-redo","Redo"); ADD_TOOLBOX_BUTTON(button_about,"synfig-about","About Synfig Studio"); - ADD_TOOLBOX_BUTTON(button_color,"synfig-color","Color Dialog"); - - TOOLBOX_BUTTON(button_rotoscope_bline,"synfig-rotoscope_bline",_("Old Rotoscope BLine")); - TOOLBOX_BUTTON(button_rotoscope_polygon,"synfig-rotoscope_polygon",_("Rotoscope Polygon")); - TOOLBOX_BUTTON(button_eyedrop,"synfig-eyedrop",_("Eyedrop Tool")); - TOOLBOX_BUTTON(button_rotoscope,"synfig-rotoscope_bline",_("Rotoscope 2")); - - button_about->signal_clicked().connect(sigc::ptr_fun(studio::App::dialog_about)); button_new->signal_clicked().connect(sigc::ptr_fun(studio::App::new_instance)); @@ -300,7 +286,6 @@ Toolbox::Toolbox(): button_save_all->signal_clicked().connect(sigc::ptr_fun(save_all)); button_undo->signal_clicked().connect(sigc::ptr_fun(studio::App::undo)); button_redo->signal_clicked().connect(sigc::ptr_fun(studio::App::redo)); - button_color->signal_clicked().connect(sigc::ptr_fun(show_dialog_color)); // Create the file button cluster Gtk::Table *file_buttons=manage(new class Gtk::Table(4, 4, false)); @@ -368,11 +353,6 @@ Toolbox::Toolbox(): button_undo->set_sensitive(false); button_redo->set_sensitive(false); - button_rotoscope_bline->set_sensitive(false); - button_rotoscope->set_sensitive(false); - button_rotoscope_polygon->set_sensitive(false); - button_eyedrop->set_sensitive(false); - std::list listTargets; listTargets.push_back( Gtk::TargetEntry("text/plain") ); @@ -510,9 +490,6 @@ Toolbox::add_state(const Smach::state_base *state) icon->show(); button->show(); - - - int row=state_button_map.size()/4; int col=state_button_map.size()%4; @@ -527,7 +504,6 @@ Toolbox::add_state(const Smach::state_base *state) ) ); - refresh(); } @@ -544,7 +520,7 @@ Toolbox::update_undo_redo() // This should probably go elsewhere, but it should // work fine here with no troubles. - // These next several lines just adjust the rotoscope buttons + // These next several lines just adjust the tool buttons // so that they are only clickable when they should be. if(instance && App::get_selected_canvas_view()) { diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.h b/synfig-studio/trunk/src/gtkmm/toolbox.h index 4bad44c..31f159b 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.h +++ b/synfig-studio/trunk/src/gtkmm/toolbox.h @@ -61,11 +61,6 @@ class Toolbox : public Gtk::Window Gtk::Button *button_undo; Gtk::Button *button_redo; - Gtk::Button *button_eyedrop; - Gtk::Button *button_rotoscope; - Gtk::Button *button_rotoscope_bline; - Gtk::Button *button_rotoscope_polygon; - Gtk::Table *tool_table; std::map state_button_map;