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
/
workarea.h
diff --git
a/synfig-studio/trunk/src/gtkmm/workarea.h
b/synfig-studio/trunk/src/gtkmm/workarea.h
index
04cbcab
..
989ac8d
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/workarea.h
+++ b/
synfig-studio/trunk/src/gtkmm/workarea.h
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007, 2008 Chris Moore
**
** 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
@@
-105,6
+106,7
@@
class WorkArea : public Gtk::Table, public Duckmatic
friend class WorkAreaTarget_Full;
friend class DirtyTrap;
friend class WorkAreaRenderer;
friend class WorkAreaTarget_Full;
friend class DirtyTrap;
friend class WorkAreaRenderer;
+ friend class WorkAreaProgress;
/*
-- ** -- P U B L I C T Y P E S ---------------------------------------------
/*
-- ** -- P U B L I C T Y P E S ---------------------------------------------
@@
-225,6
+227,7
@@
private:
bool canceled_;
int quality;
bool canceled_;
int quality;
+ int low_res_pixel_size;
bool dirty_trap_enabled;
bool dirty_trap_enabled;
@@
-232,14
+235,18
@@
private:
bool onion_skin;
bool onion_skin;
+ //! stores the future [1] and past [0] onion skins based on keyframes
+ int onion_skins[2];
etl::loose_handle<synfig::ValueNode> selected_value_node_;
etl::loose_handle<synfig::ValueNode> selected_value_node_;
- bool
queued
;
- bool
rendering
;
+ bool
allow_duck_clicks
;
+ bool
allow_layer_clicks
;
bool cancel;
bool cancel;
-
bool curr_guide_is_x;
bool curr_guide_is_x;
+ bool dirty;
+ bool queued;
+ bool rendering;
/*
-- ** -- P U B L I C D A T A -----------------------------------------------
/*
-- ** -- P U B L I C D A T A -----------------------------------------------
@@
-254,6
+261,10
@@
public:
bool get_canceled()const { return canceled_; }
bool get_queued()const { return queued; }
bool get_rendering()const { return rendering; }
bool get_canceled()const { return canceled_; }
bool get_queued()const { return queued; }
bool get_rendering()const { return rendering; }
+#ifdef SINGLE_THREADED
+ bool get_updating()const;
+ void stop_updating(bool cancel = false);
+#endif
bool get_full_frame()const { return full_frame; }
//int get_w()const { return w; }
//int get_h()const { return h; }
bool get_full_frame()const { return full_frame; }
//int get_w()const { return w; }
//int get_h()const { return h; }
@@
-261,18
+272,21
@@
public:
int get_tile_w()const { return tile_w; }
int get_tile_h()const { return tile_h; }
int get_tile_w()const { return tile_w; }
int get_tile_h()const { return tile_h; }
+ bool get_allow_layer_clicks() { return allow_layer_clicks; }
+ void set_allow_layer_clicks(bool value) { allow_layer_clicks=value; }
+
+ bool get_allow_duck_clicks() { return allow_duck_clicks; }
+ void set_allow_duck_clicks(bool value) { allow_duck_clicks=value; }
+
// used in renderer_ducks.cpp
bool solid_lines;
// used in renderer_ducks.cpp
bool solid_lines;
- // used in workarea.cpp
- bool dirty;
- // used in mod_mirror/state_mirror.cpp
- bool allow_layer_clicks;
- // used in state_draw.cpp
- bool allow_duck_clicks;
// used in renderer_guides.cpp
GuideList::iterator curr_guide;
// used in renderer_guides.cpp
GuideList::iterator curr_guide;
+ // used in renderer_timecode.cpp
+ int timecode_width, timecode_height;
+
/*
-- ** -- P R I V A T E M E T H O D S ---------------------------------------
*/
/*
-- ** -- P R I V A T E M E T H O D S ---------------------------------------
*/
@@
-336,6
+350,7
@@
public:
void set_onion_skin(bool x);
bool get_onion_skin()const;
void toggle_onion_skin() { set_onion_skin(!get_onion_skin()); }
void set_onion_skin(bool x);
bool get_onion_skin()const;
void toggle_onion_skin() { set_onion_skin(!get_onion_skin()); }
+ void set_onion_skins(int *onions);
void set_selected_value_node(etl::loose_handle<synfig::ValueNode> x);
void set_selected_value_node(etl::loose_handle<synfig::ValueNode> x);
@@
-397,8
+412,10
@@
public:
void popup_menu();
int get_quality()const { return quality; }
void popup_menu();
int get_quality()const { return quality; }
+ int get_low_res_pixel_size()const { return low_res_pixel_size; }
void set_quality(int x);
void set_quality(int x);
+ void set_low_res_pixel_size(int x);
int get_w()const { return w; }
int get_w()const { return w; }