**
** \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
#include <gtkmm/checkbutton.h>
#include <gtkmm/actiongroup.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
{
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
{
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
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();
}
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")),
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));
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();
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));
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();
}
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;
}
return Smach::RESULT_ACCEPT;
}
- case BUTTON_RIGHT: // Intercept the right-button click to short-circut the pop-up menu
- return Smach::RESULT_ACCEPT;
+ case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
+ if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
+ return Smach::RESULT_ACCEPT;
default:
return Smach::RESULT_OK;
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_foreground_color());
return Smach::RESULT_ACCEPT;
}
projects / synfig.git / blobdiff