#include <gtkmm/checkbutton.h>
#include <gtkmm/actiongroup.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
void
StateSketch_Context::clear_sketch()
{
- get_work_area()->clear_persistant_strokes();
+ 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_persistant_strokes(false);
- get_work_area()->set_show_persistant_strokes(true);
+ 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_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_persistant_strokes(false);
- get_work_area()->set_show_persistant_strokes(true);
+ 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();
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);
// Enable the time bar
//get_canvas_view()->set_sensitive_timebar(true);
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;
}