projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a new signal_subcanvas_changed() that is signalled whenever a PasteCanvas' subcan...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
layertree.h
diff --git
a/synfig-studio/trunk/src/gtkmm/layertree.h
b/synfig-studio/trunk/src/gtkmm/layertree.h
index
de02473
..
97b2d27
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/layertree.h
+++ b/
synfig-studio/trunk/src/gtkmm/layertree.h
@@
-47,6
+47,10
@@
/* === M A C R O S ========================================================= */
/* === M A C R O S ========================================================= */
+// comment this out if you don't want the params dialog to have a 'timetrack' column
+// (alternatively, export SYNFIG_DISABLE_PARAMS_PANEL_TIMETRACK=1 in environment at runtime)
+#define TIMETRACK_IN_PARAMS_PANEL
+
/* === T Y P E D E F S ===================================================== */
/* === C L A S S E S & S T R U C T S ======================================= */
/* === T Y P E D E F S ===================================================== */
/* === C L A S S E S & S T R U C T S ======================================= */
@@
-101,14
+105,10
@@
private:
Gtk::Tooltips tooltips_;
Gtk::TreePath last_tooltip_path;
Gtk::Tooltips tooltips_;
Gtk::TreePath last_tooltip_path;
-
-
Gtk::TreeView* layer_tree_view_;
Gtk::TreeView* param_tree_view_;
Gtk::TreeView* layer_tree_view_;
Gtk::TreeView* param_tree_view_;
-
-
Gtk::HBox *hbox;
Gtk::Adjustment layer_amount_adjustment_;
Gtk::HBox *hbox;
Gtk::Adjustment layer_amount_adjustment_;
@@
-123,7
+123,9
@@
private:
Glib::RefPtr<Gtk::TreeModelSort> sorted_layer_tree_store_;
Glib::RefPtr<Gtk::TreeModelSort> sorted_layer_tree_store_;
-// CellRenderer_TimeTrack *cellrenderer_time_track;
+#ifdef TIMETRACK_IN_PARAMS_PANEL
+ CellRenderer_TimeTrack *cellrenderer_time_track;
+#endif // TIMETRACK_IN_PARAMS_PANEL
Gtk::TreeView::Column* column_time_track;
Gtk::TreeView::Column* column_time_track;
@@
-139,7
+141,7
@@
private:
sigc::signal<bool, int, Gtk::TreeRow, ColumnID> signal_param_user_click_;
sigc::signal<bool, int, Gtk::TreeRow, ColumnID> signal_param_user_click_;
- sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int
,synfig::Waypoint::Side
> signal_waypoint_clicked_layertree_;
+ sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int> signal_waypoint_clicked_layertree_;
bool disable_amount_changed_signal;
bool disable_amount_changed_signal;
@@
-172,7
+174,7
@@
private:
void on_layer_toggle(const Glib::ustring& path_string);
void on_layer_toggle(const Glib::ustring& path_string);
- void on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node, const synfig::Time&, const synfig::Time&, int button
, synfig::Waypoint::Side side
);
+ void on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node, const synfig::Time&, const synfig::Time&, int button);
void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node);
void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node);
@@
-190,15
+192,15
@@
private:
public:
public:
- void on_raise_pressed();
+
//
void on_raise_pressed();
- void on_lower_pressed();
+
//
void on_lower_pressed();
- void on_duplicate_pressed();
+
//
void on_duplicate_pressed();
- void on_encapsulate_pressed();
+
//
void on_encapsulate_pressed();
- void on_delete_pressed();
+
//
void on_delete_pressed();
/*
-- ** -- 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 -----------------------------------------
@@
-238,12
+240,10
@@
public:
sigc::signal<bool,int, Gtk::TreeRow, ColumnID>& signal_param_user_click() { return signal_param_user_click_; }
sigc::signal<bool,int, Gtk::TreeRow, ColumnID>& signal_param_user_click() { return signal_param_user_click_; }
- sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int
,synfig::Waypoint::Side
>& signal_waypoint_clicked_layertree() { return signal_waypoint_clicked_layertree_; }
+ sigc::signal<void,synfigapp::ValueDesc,std::set<synfig::Waypoint,std::less<synfig::UniqueID> >,int>& signal_waypoint_clicked_layertree() { return signal_waypoint_clicked_layertree_; }
etl::handle<synfigapp::SelectionManager> get_selection_manager() { return layer_tree_store_->canvas_interface()->get_selection_manager(); }
etl::handle<synfigapp::SelectionManager> get_selection_manager() { return layer_tree_store_->canvas_interface()->get_selection_manager(); }
-
-
void select_layer(synfig::Layer::Handle layer);
void select_layers(const LayerList& layer_list);
void select_all_children_layers(synfig::Layer::Handle layer);
void select_layer(synfig::Layer::Handle layer);
void select_layers(const LayerList& layer_list);
void select_all_children_layers(synfig::Layer::Handle layer);