X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_sketch.cpp;h=2effb73c7f6c1ef93eb673c5f44bf8dd5cb06002;hb=c50c9ca115419aeb0c0c6e3dad2215765ae66efe;hp=cb4fd6ea151c080bf1b641cc4b31351b5ae8e623;hpb=37864763edb5eb5303f2ce69dfaee72f8d5bd00b;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
index cb4fd6e..2effb73 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 =========================================================== */
@@ -152,7 +154,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 +173,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
@@ -487,7 +489,8 @@ StateSketch_Context::event_mouse_down_handler(const Smach::event& x)
 		}
 
 	case BUTTON_RIGHT: // Intercept the right-button click to short-circuit the pop-up menu
-		return Smach::RESULT_ACCEPT;
+		if (!getenv("SYNFIG_ENABLE_POPUP_MENU_IN_ALL_TOOLS"))
+			return Smach::RESULT_ACCEPT;
 
 	default:
 		return Smach::RESULT_OK;