From: dooglus Date: Tue, 30 Oct 2007 12:45:49 +0000 (+0000) Subject: Typo: 'persistant' -> 'persistent'. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=aa759125fb923ee26c866453aada53db7e053e6a;p=synfig.git Typo: 'persistant' -> 'persistent'. git-svn-id: http://svn.voria.com/code@1016 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index 61ecef4..62e70fc 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -87,7 +87,7 @@ Duckmatic::Duckmatic(): grid_snap(false), guide_snap(false), grid_size(1.0/4.0,1.0/4.0), - show_persistant_strokes(true) + show_persistent_strokes(true) { axis_lock=false; drag_offset_=Point(0,0); @@ -110,8 +110,8 @@ Duckmatic::clear_ducks() bezier_list_.clear(); stroke_list_.clear(); - if(show_persistant_strokes) - stroke_list_=persistant_stroke_list_; + if(show_persistent_strokes) + stroke_list_=persistent_stroke_list_; } //! Returns \a true if the given duck is currently selected @@ -615,26 +615,26 @@ Duckmatic::add_stroke(etl::smart_ptr > stroke_point_lis } void -Duckmatic::add_persistant_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color) +Duckmatic::add_persistent_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color) { add_stroke(stroke_point_list,color); - persistant_stroke_list_.push_back(stroke_list_.back()); + persistent_stroke_list_.push_back(stroke_list_.back()); } void -Duckmatic::clear_persistant_strokes() +Duckmatic::clear_persistent_strokes() { - persistant_stroke_list_.clear(); + persistent_stroke_list_.clear(); } void -Duckmatic::set_show_persistant_strokes(bool x) +Duckmatic::set_show_persistent_strokes(bool x) { - if(x!=show_persistant_strokes) + if(x!=show_persistent_strokes) { - show_persistant_strokes=x; + show_persistent_strokes=x; if(x) - stroke_list_=persistant_stroke_list_; + stroke_list_=persistent_stroke_list_; else stroke_list_.clear(); } @@ -827,7 +827,7 @@ Duckmatic::save_sketch(const synfig::String& filename)const std::list >::const_iterator iter; - for(iter=persistant_stroke_list_.begin();iter!=persistant_stroke_list_.end();++iter) + for(iter=persistent_stroke_list_.begin();iter!=persistent_stroke_list_.end();++iter) { file<<"C " <<(*iter)->color.get_r()<<' ' @@ -888,7 +888,7 @@ Duckmatic::load_sketch(const synfig::String& filename) synfig::warning("Bad color line \"%s\"",line.c_str()); r=0;g=0;b=0; } - add_persistant_stroke(stroke_data, synfig::Color(r,g,b)); + add_persistent_stroke(stroke_data, synfig::Color(r,g,b)); } break; case 'V': @@ -896,7 +896,7 @@ Duckmatic::load_sketch(const synfig::String& filename) if(!stroke_data) { stroke_data.spawn(); - add_persistant_stroke(stroke_data, synfig::Color(0,0,0)); + add_persistent_stroke(stroke_data, synfig::Color(0,0,0)); } float x,y; if(!strscanf(line,"V %f %f",&x, &y)) diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.h b/synfig-studio/trunk/src/gtkmm/duckmatic.h index 986ed4f..134fc5d 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.h +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.h @@ -159,7 +159,7 @@ private: std::list > stroke_list_; - std::list > persistant_stroke_list_; + std::list > persistent_stroke_list_; synfig::GUIDSet selected_ducks; @@ -206,7 +206,7 @@ protected: /*! \see grid_snap, show_grid */ synfig::Vector grid_size; - bool show_persistant_strokes; + bool show_persistent_strokes; bool axis_lock; @@ -259,8 +259,8 @@ public: synfig::Point snap_point_to_grid(const synfig::Point& x, float radius=0.1)const; - bool get_show_persistant_strokes()const { return show_persistant_strokes; } - void set_show_persistant_strokes(bool x); + bool get_show_persistent_strokes()const { return show_persistent_strokes; } + void set_show_persistent_strokes(bool x); //! Sets the size of the grid void set_grid_size(const synfig::Vector &s); @@ -285,9 +285,9 @@ public: const std::list >& stroke_list()const { return stroke_list_; } - const std::list >& persistant_stroke_list()const { return persistant_stroke_list_; } + const std::list >& persistent_stroke_list()const { return persistent_stroke_list_; } - std::list >& persistant_stroke_list() { return persistant_stroke_list_; } + std::list >& persistent_stroke_list() { return persistent_stroke_list_; } //! \todo We should modify this to support multiple selections etl::handle get_selected_duck()const; @@ -328,9 +328,9 @@ public: void add_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color=synfig::Color(0,0,0)); - void add_persistant_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color=synfig::Color(0,0,0)); + void add_persistent_stroke(etl::smart_ptr > stroke_point_list, const synfig::Color& color=synfig::Color(0,0,0)); - void clear_persistant_strokes(); + void clear_persistent_strokes(); void add_duck(const etl::handle &duck); diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp index 6d7121e..691c375 100644 --- a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp @@ -189,14 +189,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 +204,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 +222,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 +313,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)); @@ -501,7 +501,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; }