projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sort alphabetically.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_polygon.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp
index
7d2883b
..
afe6a5b
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_polygon.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_polygon.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file
rotoscop
e_polygon.cpp
+/*! \file
stat
e_polygon.cpp
** \brief Template File
**
** \brief Template File
**
-** $Id
: state_polygon.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-118,10
+118,10
@@
public:
void save_settings();
void reset();
void increment_id();
void save_settings();
void reset();
void increment_id();
- bool
no_
egress_on_selection_change;
- Smach::event_result event_layer_selection_changed_handler(const Smach::event&
x
)
+ bool egress_on_selection_change;
+ Smach::event_result event_layer_selection_changed_handler(const Smach::event&
/*x*/
)
{
{
- if(
!no_
egress_on_selection_change)
+ if(egress_on_selection_change)
throw Smach::egress_exception();
return Smach::RESULT_OK;
}
throw Smach::egress_exception();
return Smach::RESULT_OK;
}
@@
-215,13
+215,13
@@
StatePolygon_Context::increment_id()
StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view):
canvas_view_(canvas_view),
is_working(*canvas_view),
StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view):
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()
),
duckmatic_push(get_work_area()),
settings(synfigapp::Main::get_selected_input_device()->settings()),
entry_id(),
button_make(_("Make"))
{
duckmatic_push(get_work_area()),
settings(synfigapp::Main::get_selected_input_device()->settings()),
entry_id(),
button_make(_("Make"))
{
-
no_egress_on_selection_change=fals
e;
+
egress_on_selection_change=tru
e;
load_settings();
// Set up the tool options dialog
load_settings();
// Set up the tool options dialog
@@
-235,7
+235,7
@@
StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view):
// Turn off layer clicking
// Turn off layer clicking
- get_work_area()->
allow_layer_clicks=false
;
+ get_work_area()->
set_allow_layer_clicks(false)
;
// clear out the ducks
get_work_area()->clear_ducks();
// clear out the ducks
get_work_area()->clear_ducks();
@@
-249,8
+249,8
@@
StatePolygon_Context::StatePolygon_Context(CanvasView* canvas_view):
prev_table_status=get_canvas_view()->tables_are_visible();
if(prev_table_status)get_canvas_view()->hide_tables();
prev_table_status=get_canvas_view()->tables_are_visible();
if(prev_table_status)get_canvas_view()->hide_tables();
- //
Hid
e the time bar
- get_canvas_view()->
hide_timebar(
);
+ //
Disabl
e the time bar
+ get_canvas_view()->
set_sensitive_timebar(false
);
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StatePolygon_Context::on_user_click));
// Connect a signal
//get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StatePolygon_Context::on_user_click));
@@
-289,7
+289,7
@@
StatePolygon_Context::refresh_tool_options()
}
Smach::event_result
}
Smach::event_result
-StatePolygon_Context::event_refresh_tool_options(const Smach::event&
x
)
+StatePolygon_Context::event_refresh_tool_options(const Smach::event&
/*x*/
)
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
@@
-301,15
+301,14
@@
StatePolygon_Context::~StatePolygon_Context()
save_settings();
// Restore layer clicking
save_settings();
// Restore layer clicking
- get_work_area()->
allow_layer_clicks=prev_workarea_layer_status_
;
+ get_work_area()->
set_allow_layer_clicks(prev_workarea_layer_status_)
;
App::dialog_tool_options->clear();
get_canvas_view()->work_area->reset_cursor();
App::dialog_tool_options->clear();
get_canvas_view()->work_area->reset_cursor();
- // Show the time bar
- if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end())
- get_canvas_view()->show_timebar();
+ // Enable the time bar
+ get_canvas_view()->set_sensitive_timebar(true);
// Bring back the tables if they were out before
if(prev_table_status)get_canvas_view()->show_tables();
// Bring back the tables if they were out before
if(prev_table_status)get_canvas_view()->show_tables();
@@
-321,7
+320,7
@@
StatePolygon_Context::~StatePolygon_Context()
}
Smach::event_result
}
Smach::event_result
-StatePolygon_Context::event_stop_handler(const Smach::event&
x
)
+StatePolygon_Context::event_stop_handler(const Smach::event&
/*x*/
)
{
synfig::info("STATE RotoPolygon: Received Stop Event");
//throw Smach::egress_exception();
{
synfig::info("STATE RotoPolygon: Received Stop Event");
//throw Smach::egress_exception();
@@
-331,7
+330,7
@@
StatePolygon_Context::event_stop_handler(const Smach::event& x)
}
Smach::event_result
}
Smach::event_result
-StatePolygon_Context::event_refresh_handler(const Smach::event&
x
)
+StatePolygon_Context::event_refresh_handler(const Smach::event&
/*x*/
)
{
synfig::info("STATE RotoPolygon: Received Refresh Event");
refresh_ducks();
{
synfig::info("STATE RotoPolygon: Received Refresh Event");
refresh_ducks();
@@
-391,10
+390,10
@@
StatePolygon_Context::run()
return;
}
}
return;
}
}
-
no_egress_on_selection_change=tru
e;
+
egress_on_selection_change=fals
e;
get_canvas_interface()->get_selection_manager()->clear_selected_layers();
get_canvas_interface()->get_selection_manager()->set_selected_layer(layer);
get_canvas_interface()->get_selection_manager()->clear_selected_layers();
get_canvas_interface()->get_selection_manager()->set_selected_layer(layer);
-
no_egress_on_selection_change=fals
e;
+
egress_on_selection_change=tru
e;
//get_canvas_interface()->signal_dirty_preview()();
}
/*
//get_canvas_interface()->signal_dirty_preview()();
}
/*