X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_sketch.cpp;h=fce5564281a2e1c0a3267ac9baa700802fec7279;hb=d2f7311f97711e59bd3f9c6ed956d007492b2ab9;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..fce5564 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 <gtkmm/checkbutton.h>
 #include <gtkmm/actiongroup.h>
 
+#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
@@ -487,7 +490,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;