Added my "Copyright (c) 2007" notices, for files I edited in 2007.

[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 ad6985c..67895d7 100644 (file)
--- 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 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
@@ -189,14 +192,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 +207,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 +225,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();
 }
 
@@ -230,7 +233,7 @@ StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
        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")),
@@ -313,7 +316,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));
@@ -333,12 +336,12 @@ StateSketch_Context::StateSketch_Context(CanvasView* canvas_view):
        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();
@@ -366,10 +369,10 @@ StateSketch_Context::~StateSketch_Context()
        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);
@@ -448,27 +451,27 @@ StateSketch_Context::refresh_tool_options()
 }
 
 Smach::event_result
-StateSketch_Context::event_refresh_tool_options(const Smach::event& x)
+StateSketch_Context::event_refresh_tool_options(const Smach::event& /*x*/)
 {
        refresh_tool_options();
        return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateSketch_Context::event_yield_tool_options(const Smach::event& x)
+StateSketch_Context::event_yield_tool_options(const Smach::event& /*x*/)
 {
        yield_tool_options();
        return Smach::RESULT_ACCEPT;
 }
 
 Smach::event_result
-StateSketch_Context::event_stop_handler(const Smach::event& x)
+StateSketch_Context::event_stop_handler(const Smach::event& /*x*/)
 {
        throw Smach::egress_exception();
 }
 
 Smach::event_result
-StateSketch_Context::event_refresh_handler(const Smach::event& x)
+StateSketch_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
        return Smach::RESULT_ACCEPT;
 }
@@ -486,8 +489,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 +505,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;
 }