projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more updates
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_width.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_width.cpp
b/synfig-studio/trunk/src/gtkmm/state_width.cpp
index
fcf20e1
..
52c0e67
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_width.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_width.cpp
@@
-1,4
+1,4
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file state_gradient.cpp
** \brief Template File
**
/*! \file state_gradient.cpp
** \brief Template File
**
@@
-33,15
+33,15
@@
#include <ETL/bezier>
#include <ETL/bezier>
-#include <s
inf
g/valuenode_dynamiclist.h>
-#include <s
inf
gapp/action_system.h>
+#include <s
ynfi
g/valuenode_dynamiclist.h>
+#include <s
ynfi
gapp/action_system.h>
#include "state_width.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
#include "state_width.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
-#include <s
inf
gapp/action.h>
+#include <s
ynfi
gapp/action.h>
#include "event_mouse.h"
#include "event_layerclick.h"
#include "toolbox.h"
#include "event_mouse.h"
#include "event_layerclick.h"
#include "toolbox.h"
@@
-49,8
+49,8
@@
#include <gtkmm/optionmenu.h>
#include "duck.h"
#include <gtkmm/optionmenu.h>
#include "duck.h"
-//#include <s
inf
gapp/value_desc.h>
-#include <s
inf
gapp/main.h>
+//#include <s
ynfi
gapp/value_desc.h>
+#include <s
ynfi
gapp/main.h>
#include <ETL/clock>
#include <ETL/clock>
@@
-60,8
+60,8
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
-using namespace s
inf
gapp;
+using namespace s
ynfi
g;
+using namespace s
ynfi
gapp;
using namespace studio;
/* === M A C R O S ========================================================= */
using namespace studio;
/* === M A C R O S ========================================================= */
@@
-97,7
+97,7
@@
class studio::StateWidth_Context : public sigc::trackable
Duckmatic::Type old_duckmask;
//Toolbox settings
Duckmatic::Type old_duckmask;
//Toolbox settings
- s
inf
gapp::Settings& settings;
+ s
ynfi
gapp::Settings& settings;
//Toolbox display
Gtk::Table options_table;
//Toolbox display
Gtk::Table options_table;
@@
-139,8
+139,8
@@
public:
//Canvas interaction
const etl::handle<CanvasView>& get_canvas_view()const{return canvas_view_;}
//Canvas interaction
const etl::handle<CanvasView>& get_canvas_view()const{return canvas_view_;}
- etl::handle<s
inf
gapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
- s
inf
g::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();}
+ etl::handle<s
ynfi
gapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
+ s
ynfi
g::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();}
WorkArea * get_work_area()const{return canvas_view_->get_work_area();}
//Modifying settings etc.
WorkArea * get_work_area()const{return canvas_view_->get_work_area();}
//Modifying settings etc.
@@
-211,7
+211,7
@@
StateWidth_Context::StateWidth_Context(CanvasView* canvas_view):
prev_workarea_duck_clicking(get_work_area()->allow_duck_clicks),
old_duckmask(get_work_area()->get_type_mask()),
prev_workarea_duck_clicking(get_work_area()->allow_duck_clicks),
old_duckmask(get_work_area()->get_type_mask()),
- settings(s
inf
gapp::Main::get_selected_input_device()->settings()),
+ settings(s
ynfi
gapp::Main::get_selected_input_device()->settings()),
adj_delta(6,0,1,0.001,0.01),
spin_delta(adj_delta,0.01,3),
adj_delta(6,0,1,0.001,0.01),
spin_delta(adj_delta,0.01,3),
@@
-557,7
+557,7
@@
StateWidth_Context::event_mouse_handler(const Smach::event& x)
//Affect the width changes here...
map<handle<Duck>,Real>::iterator i = changetable.begin();
//Affect the width changes here...
map<handle<Duck>,Real>::iterator i = changetable.begin();
- s
inf
gapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Sketch Width"));
+ s
ynfi
gapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("Sketch Width"));
for(; i != changetable.end(); ++i)
{
//for each duck modify IT!!!
for(; i != changetable.end(); ++i)
{
//for each duck modify IT!!!
@@
-578,7
+578,7
@@
StateWidth_Context::event_mouse_handler(const Smach::event& x)
if(!action->is_ready() || !get_canvas_view()->get_instance()->perform_action(action))
{
group.cancel();
if(!action->is_ready() || !get_canvas_view()->get_instance()->perform_action(action))
{
group.cancel();
- s
inf
g::warning("Changing the width action has failed");
+ s
ynfi
g::warning("Changing the width action has failed");
return Smach::RESULT_ERROR;
}
}
return Smach::RESULT_ERROR;
}
}