X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_sketch.cpp;h=0cac528a0c70099e27aa9b9e9236e935b2258b3a;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=ec6e8406404df09292bc8cbfe4116c495c26058e;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp index ec6e840..0cac528 100644 --- a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -60,6 +61,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -152,7 +155,7 @@ StateSketch_Context::save_sketch() { synfig::String filename(basename(get_canvas()->get_file_name())+".sketch"); - while(App::dialog_save_file(_("Save Sketch"), filename)) + while(App::dialog_save_file(_("Save Sketch"), filename, SKETCH_DIR_PREFERENCE)) { // If the filename still has wildcards, then we should // continue looking for the file we want @@ -171,7 +174,7 @@ StateSketch_Context::load_sketch() { synfig::String filename(basename(get_canvas()->get_file_name())+".sketch"); - while(App::dialog_open_file(_("Load Sketch"), filename)) + while(App::dialog_open_file(_("Load Sketch"), filename, SKETCH_DIR_PREFERENCE)) { // If the filename still has wildcards, then we should // continue looking for the file we want @@ -189,24 +192,40 @@ StateSketch_Context::load_sketch() void StateSketch_Context::clear_sketch() { - get_work_area()->clear_persistant_strokes(); - get_canvas_view()->get_smach().process_event(EVENT_REFRESH); + get_work_area()->clear_persistent_strokes(); + + // if the sketch is currently shown, make sure it is updated + //! \todo is there a better way than this of getting Duckmatic to update its stroke_list_? + if (checkbutton_show_sketch.get_active()) + { + get_work_area()->set_show_persistent_strokes(false); + get_work_area()->set_show_persistent_strokes(true); + get_canvas_view()->get_smach().process_event(EVENT_REFRESH); + } } void StateSketch_Context::undo_stroke() { - if(!get_work_area()->persistant_stroke_list().empty()) + if(!get_work_area()->persistent_stroke_list().empty()) { - get_work_area()->persistant_stroke_list().pop_back(); - get_canvas_view()->get_smach().process_event(EVENT_REFRESH); + get_work_area()->persistent_stroke_list().pop_back(); + + // if the sketch is currently shown, make sure it is updated + //! \todo is there a better way than this of getting Duckmatic to update its stroke_list_? + if (checkbutton_show_sketch.get_active()) + { + get_work_area()->set_show_persistent_strokes(false); + get_work_area()->set_show_persistent_strokes(true); + get_canvas_view()->get_smach().process_event(EVENT_REFRESH); + } } } void StateSketch_Context::toggle_show_sketch() { - get_work_area()->set_show_persistant_strokes(checkbutton_show_sketch.get_active()); + get_work_area()->set_show_persistent_strokes(checkbutton_show_sketch.get_active()); get_work_area()->queue_draw(); } @@ -214,7 +233,7 @@ StateSketch_Context::StateSketch_Context(CanvasView* canvas_view): action_group(Gtk::ActionGroup::create()), canvas_view_(canvas_view), is_working(*canvas_view), - prev_workarea_layer_status_(get_work_area()->allow_layer_clicks), + prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()), button_clear_sketch(_("Clear Sketch")), button_undo_stroke(_("Undo Stroke")), button_save_sketch(_("Save Sketch")), @@ -293,36 +312,34 @@ StateSketch_Context::StateSketch_Context(CanvasView* canvas_view): action_group->add( Gtk::Action::create("toolbar-sketch", "Sketch Toolbar") ); - App::ui_manager()->add_ui_from_string(ui_info); - - checkbutton_show_sketch.set_active(get_work_area()->get_show_persistant_strokes()); + checkbutton_show_sketch.set_active(get_work_area()->get_show_persistent_strokes()); button_clear_sketch.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::clear_sketch)); button_undo_stroke.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::undo_stroke)); button_save_sketch.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::save_sketch)); button_load_sketch.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::load_sketch)); checkbutton_show_sketch.signal_clicked().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::toggle_show_sketch)); - //options_table.attach(*manage(new Gtk::Label(_("Sketch Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.attach(checkbutton_show_sketch, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + + options_table.attach(*manage(new Gtk::Label(_("Sketch Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); + options_table.attach(checkbutton_show_sketch, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); //options_table.attach(button_undo_stroke, 0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); //options_table.attach(button_clear_sketch, 0, 2, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); //options_table.attach(button_save_sketch, 0, 1, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); //options_table.attach(button_load_sketch, 1, 2, 4, 5, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - options_table.show_all(); refresh_tool_options(); App::dialog_tool_options->present(); // Turn off layer clicking - get_work_area()->allow_layer_clicks=false; + get_work_area()->set_allow_layer_clicks(false); get_canvas_view()->work_area->set_cursor(Gdk::PENCIL); // Turn off duck clicking - get_work_area()->allow_duck_clicks=false; + get_work_area()->set_allow_duck_clicks(false); // clear out the ducks //get_work_area()->clear_ducks(); @@ -334,8 +351,8 @@ StateSketch_Context::StateSketch_Context(CanvasView* canvas_view): prev_table_status=get_canvas_view()->tables_are_visible(); //if(prev_table_status)get_canvas_view()->hide_tables(); - // Hide the time bar - //get_canvas_view()->hide_timebar(); + // Disable the time bar + //get_canvas_view()->set_sensitive_timebar(false); // Connect a signal //get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateSketch_Context::on_user_click)); @@ -350,14 +367,13 @@ StateSketch_Context::~StateSketch_Context() App::dialog_tool_options->clear(); // Restore layer clicking - get_work_area()->allow_layer_clicks=prev_workarea_layer_status_; + get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_); // Restore duck clicking - get_work_area()->allow_duck_clicks=true; + get_work_area()->set_allow_duck_clicks(true); - // Show the time bar - if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end()) - get_canvas_view()->show_timebar(); + // Enable the time bar + //get_canvas_view()->set_sensitive_timebar(true); // Bring back the tables if they were out before if(prev_table_status)get_canvas_view()->show_tables(); @@ -433,27 +449,27 @@ StateSketch_Context::refresh_tool_options() } Smach::event_result -StateSketch_Context::event_refresh_tool_options(const Smach::event& x) +StateSketch_Context::event_refresh_tool_options(const Smach::event& /*x*/) { refresh_tool_options(); return Smach::RESULT_ACCEPT; } Smach::event_result -StateSketch_Context::event_yield_tool_options(const Smach::event& x) +StateSketch_Context::event_yield_tool_options(const Smach::event& /*x*/) { yield_tool_options(); return Smach::RESULT_ACCEPT; } Smach::event_result -StateSketch_Context::event_stop_handler(const Smach::event& x) +StateSketch_Context::event_stop_handler(const Smach::event& /*x*/) { throw Smach::egress_exception(); } Smach::event_result -StateSketch_Context::event_refresh_handler(const Smach::event& x) +StateSketch_Context::event_refresh_handler(const Smach::event& /*x*/) { return Smach::RESULT_ACCEPT; } @@ -471,9 +487,6 @@ StateSketch_Context::event_mouse_down_handler(const Smach::event& x) return Smach::RESULT_ACCEPT; } - case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu - return Smach::RESULT_ACCEPT; - default: return Smach::RESULT_OK; } @@ -486,7 +499,7 @@ StateSketch_Context::event_stroke(const Smach::event& x) assert(event.stroke_data); - get_work_area()->add_persistant_stroke(event.stroke_data,synfigapp::Main::get_foreground_color()); + get_work_area()->add_persistent_stroke(event.stroke_data,synfigapp::Main::get_outline_color()); return Smach::RESULT_ACCEPT; }