projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1677632: newly drawn lines are joined on to existing lines and ducks wherever...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_circle.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_circle.cpp
b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
index
3969a6f
..
2975edf
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_circle.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_circle.cpp
@@
-1,20
+1,21
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file state_circle.cpp
** \brief Template File
**
** $Id: state_circle.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
**
** \legal
/*! \file state_circle.cpp
** \brief Template File
**
** $Id: state_circle.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
**
** \legal
-** Copyright (c) 2002
Robert B. Quattlebaum Jr.
+** Copyright (c) 2002
-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
**
-**
You may not copy, print, publish, or in any
-**
other way distribute this software without
-**
a prior written agreement with
-**
the copyright holder
.
+**
This package is distributed in the hope that it will be useful,
+**
but WITHOUT ANY WARRANTY; without even the implied warranty of
+**
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**
General Public License for more details
.
** \endlegal
*/
/* ========================================================================= */
** \endlegal
*/
/* ========================================================================= */
@@
-31,15
+32,15
@@
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
-#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_circle.h"
#include "canvasview.h"
#include "workarea.h"
#include "app.h"
#include "state_circle.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"
@@
-47,7
+48,7
@@
#include <gtkmm/optionmenu.h>
#include "duck.h"
#include "widget_enum.h"
#include <gtkmm/optionmenu.h>
#include "duck.h"
#include "widget_enum.h"
-#include <s
inf
gapp/main.h>
+#include <s
ynfi
gapp/main.h>
#endif
#endif
@@
-55,7
+56,7
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
using namespace studio;
/* === M A C R O S ========================================================= */
using namespace studio;
/* === M A C R O S ========================================================= */
@@
-91,7
+92,7
@@
class studio::StateCircle_Context : public sigc::trackable
bool prev_workarea_layer_status_;
//Toolbox settings
bool prev_workarea_layer_status_;
//Toolbox settings
- s
inf
gapp::Settings& settings;
+ s
ynfi
gapp::Settings& settings;
//Toolbox display
Gtk::Table options_table;
//Toolbox display
Gtk::Table options_table;
@@
-108,8
+109,8
@@
class studio::StateCircle_Context : public sigc::trackable
public:
public:
- s
inf
g::String get_id()const { return entry_id.get_text(); }
- void set_id(const s
inf
g::String& x) { return entry_id.set_text(x); }
+ s
ynfi
g::String get_id()const { return entry_id.get_text(); }
+ void set_id(const s
ynfi
g::String& x) { return entry_id.set_text(x); }
int get_falloff()const { return enum_falloff.get_value(); }
void set_falloff(int x) { return enum_falloff.set_value(x); }
int get_falloff()const { return enum_falloff.get_value(); }
void set_falloff(int x) { return enum_falloff.set_value(x); }
@@
-137,8
+138,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.
@@
-272,7
+273,7
@@
StateCircle_Context::StateCircle_Context(CanvasView* canvas_view):
is_working(*canvas_view),
duckmatic_push(get_work_area()),
prev_workarea_layer_status_(get_work_area()->allow_layer_clicks),
is_working(*canvas_view),
duckmatic_push(get_work_area()),
prev_workarea_layer_status_(get_work_area()->allow_layer_clicks),
- settings(s
inf
gapp::Main::get_selected_input_device()->settings()),
+ settings(s
ynfi
gapp::Main::get_selected_input_device()->settings()),
entry_id(),
adj_feather(0,0,1,0.01,0.1),
spin_feather(adj_feather,0.1,3),
entry_id(),
adj_feather(0,0,1,0.01,0.1),
spin_feather(adj_feather,0.1,3),
@@
-391,8
+392,8
@@
StateCircle_Context::event_refresh_handler(const Smach::event& x)
void
StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
{
void
StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
{
- s
inf
gapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("New Circle"));
- s
infgapp::PushMode push_mode(get_canvas_interface(),sinf
gapp::MODE_NORMAL);
+ s
ynfi
gapp::Action::PassiveGrouper group(get_canvas_interface()->get_instance().get(),_("New Circle"));
+ s
ynfigapp::PushMode push_mode(get_canvas_interface(),synfi
gapp::MODE_NORMAL);
Layer::Handle layer;
Layer::Handle layer;
@@
-407,7
+408,7
@@
StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
canvas=layer->get_canvas();
}
canvas=layer->get_canvas();
}
- const s
inf
g::TransformStack& transform(get_canvas_view()->get_curr_transform_stack());
+ const s
ynfi
g::TransformStack& transform(get_canvas_view()->get_curr_transform_stack());
const Point p1(transform.unperform(_p1));
const Point p2(transform.unperform(_p2));
const Point p1(transform.unperform(_p1));
const Point p2(transform.unperform(_p2));