projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remember separate default directories for opening and writing each of animations...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_sketch.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp
index
cb4fd6e
..
2effb73
100644
(file)
--- 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 <gtkmm/checkbutton.h>
#include <gtkmm/actiongroup.h>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-152,7
+154,7
@@
StateSketch_Context::save_sketch()
{
synfig::String filename(basename(get_canvas()->get_file_name())+".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
{
// 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");
{
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
{
// 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
}
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;
default:
return Smach::RESULT_OK;