projects
/
synfig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ac9d50
)
Keyframe dialog: enable apply and delete buttons
author
Nikita Kitaev
<nikitakit@gmail.com>
Sun, 11 Apr 2010 03:43:11 +0000
(20:43 -0700)
committer
Nikita Kitaev
<nikitakit@gmail.com>
Sun, 11 Apr 2010 03:55:50 +0000
(20:55 -0700)
synfig-studio/src/gtkmm/dialog_keyframe.cpp
patch
|
blob
|
history
diff --git
a/synfig-studio/src/gtkmm/dialog_keyframe.cpp
b/synfig-studio/src/gtkmm/dialog_keyframe.cpp
index
d69ec50
..
b746490
100644
(file)
--- a/
synfig-studio/src/gtkmm/dialog_keyframe.cpp
+++ b/
synfig-studio/src/gtkmm/dialog_keyframe.cpp
@@
-66,11
+66,11
@@
Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent, etl::handle<synfigapp::Can
add_action_widget(*ok_button,2);
ok_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_ok_pressed));
add_action_widget(*ok_button,2);
ok_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_ok_pressed));
-
/*
Gtk::Button *apply_button(manage(new class Gtk::Button(Gtk::StockID("gtk-apply"))));
+
Gtk::Button *apply_button(manage(new class Gtk::Button(Gtk::StockID("gtk-apply"))));
apply_button->show();
add_action_widget(*apply_button,1);
apply_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_apply_pressed));
apply_button->show();
add_action_widget(*apply_button,1);
apply_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Keyframe::on_apply_pressed));
-*/
+
Gtk::Button *delete_button(manage(new class Gtk::Button(Gtk::StockID("gtk-delete"))));
delete_button->show();
add_action_widget(*delete_button,3);
Gtk::Button *delete_button(manage(new class Gtk::Button(Gtk::StockID("gtk-delete"))));
delete_button->show();
add_action_widget(*delete_button,3);
@@
-86,10
+86,13
@@
Dialog_Keyframe::Dialog_Keyframe(Gtk::Window& parent, etl::handle<synfigapp::Can
get_vbox()->pack_start(*table);
get_vbox()->pack_start(*table);
+/* // \todo Allow setting descriptions for keyframes
+
entry_description.set_text(_("Not yet implemented"));
entry_description.set_text(_("Not yet implemented"));
- //table->attach(*manage(new Gtk::Label(_("Description"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
- //table->attach(entry_description, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+ table->attach(*manage(new Gtk::Label(_("Description"))), 0, 1, 0, 1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+ table->attach(entry_description, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
+*/
table->show_all();
table->show_all();
@@
-118,10
+121,15
@@
Dialog_Keyframe::set_keyframe(const synfig::Keyframe& x)
void
Dialog_Keyframe::on_ok_pressed()
{
void
Dialog_Keyframe::on_ok_pressed()
{
- if(widget_waypoint_model->get_waypoint_model().is_trivial())
- return;
+ on_apply_pressed();
+ hide();
+}
- synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeWaypointSet"));
+
+void
+Dialog_Keyframe::on_delete_pressed()
+{
+ synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeRemove"));
assert(action);
assert(action);
@@
-130,19
+138,29
@@
Dialog_Keyframe::on_ok_pressed()
action->set_param("keyframe",keyframe_);
action->set_param("model",widget_waypoint_model->get_waypoint_model());
action->set_param("keyframe",keyframe_);
action->set_param("model",widget_waypoint_model->get_waypoint_model());
- if(
!
canvas_interface->get_instance()->perform_action(action))
+ if(canvas_interface->get_instance()->perform_action(action))
{
{
+ hide();
}
}
void
}
}
void
-Dialog_Keyframe::on_
delete
_pressed()
+Dialog_Keyframe::on_
apply
_pressed()
{
{
-}
+ if(widget_waypoint_model->get_waypoint_model().is_trivial())
+ return;
+ synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeWaypointSet"));
-void
-Dialog_Keyframe::on_apply_pressed()
-{
+ assert(action);
+
+ action->set_param("canvas",canvas_interface->get_canvas());
+ action->set_param("canvas_interface",canvas_interface);
+ action->set_param("keyframe",keyframe_);
+ action->set_param("model",widget_waypoint_model->get_waypoint_model());
+
+ if(!canvas_interface->get_instance()->perform_action(action))
+ {
+ }
}
}