X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_sketch.cpp;h=5a8ec1596268620a9334813cd37b2433b80b1b13;hb=1b138b535876987c79453888f370d71910d975ed;hp=6d7121e504ae0668c731c750e3e4ecc302387d28;hpb=11c0abb278300f2c4439b538b300433078a19a78;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
index 6d7121e..5a8ec15 100644
--- a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
@@ -60,6 +60,8 @@
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/actiongroup.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -189,14 +191,14 @@ StateSketch_Context::load_sketch()
 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);
 	}
 }
@@ -204,16 +206,16 @@ StateSketch_Context::clear_sketch()
 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);
 		}
 	}
@@ -222,7 +224,7 @@ StateSketch_Context::undo_stroke()
 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();
 }
 
@@ -313,7 +315,7 @@ StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
 	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));
@@ -486,8 +488,9 @@ 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;
+	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;
@@ -501,7 +504,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_foreground_color());
 
 	return Smach::RESULT_ACCEPT;
 }