projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
canvasview.h
diff --git
a/synfig-studio/trunk/src/gtkmm/canvasview.h
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index
aa43bb8
..
cddcbe2
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/
synfig-studio/trunk/src/gtkmm/canvasview.h
@@
-7,6
+7,7
@@
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007, 2008 Chris Moore
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** Copyright (c) 2007, 2008 Chris Moore
+** Copyright (c) 2009 Carlos López
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-69,6
+70,7
@@
#include "framedial.h"
#include "toggleducksdial.h"
#include "resolutiondial.h"
#include "framedial.h"
#include "toggleducksdial.h"
#include "resolutiondial.h"
+#include "widget_keyframe_list.h"
#include "duckmatic.h"
#include <gtkmm/scale.h>
#include "duckmatic.h"
#include <gtkmm/scale.h>
@@
-275,7
+277,17
@@
private:
bool changing_resolution_;
Gtk::Adjustment quality_adjustment_;
Gtk::SpinButton *quality_spin;
bool changing_resolution_;
Gtk::Adjustment quality_adjustment_;
Gtk::SpinButton *quality_spin;
+ Gtk::Adjustment past_onion_adjustment_;
+ Gtk::SpinButton *past_onion_spin;
+ Gtk::Adjustment future_onion_adjustment_;
+ Gtk::SpinButton *future_onion_spin;
bool updating_quality_;
bool updating_quality_;
+ Gtk::ToggleButton *show_grid;
+ Gtk::ToggleButton *snap_grid;
+ Gtk::ToggleButton *onion_skin;
+ bool toggling_show_grid;
+ bool toggling_snap_grid;
+ bool toggling_onion_skin;
//! Shows current time and allows edition
Widget_Time *current_time_widget;
void on_current_time_widget_changed();
//! Shows current time and allows edition
Widget_Time *current_time_widget;
void on_current_time_widget_changed();
@@
-283,6
+295,9
@@
private:
//! Time slider class. Same than the Time track panel
std::auto_ptr<Widget_Timeslider> timeslider;
//! Time slider class. Same than the Time track panel
std::auto_ptr<Widget_Timeslider> timeslider;
+ //!Keyframe list slider
+ std::auto_ptr<Widget_Keyframe_List> widget_kf_list;
+
std::list<sigc::connection> duck_changed_connections;
/* DEBUGPOINT_CLASS(8);
std::list<sigc::connection> duck_changed_connections;
/* DEBUGPOINT_CLASS(8);
@@
-437,6
+452,11
@@
private:
void decrease_low_res_pixel_size();
void increase_low_res_pixel_size();
void toggle_low_res_pixel_flag();
void decrease_low_res_pixel_size();
void increase_low_res_pixel_size();
void toggle_low_res_pixel_flag();
+ void set_quality(int x);
+ void set_onion_skins();
+ void toggle_show_grid();
+ void toggle_snap_grid();
+ void toggle_onion_skin();
/*
-- ** -- P U B L I C M E T H O D S -----------------------------------------
/*
-- ** -- P U B L I C M E T H O D S -----------------------------------------
@@
-610,6
+630,8
@@
public:
void update_quality();
void update_quality();
+
+
/*
-- ** -- S I G N A L T E R M I N A L S -------------------------------------
*/
/*
-- ** -- S I G N A L T E R M I N A L S -------------------------------------
*/