projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added copyright lines for files I've edited this year.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dock_timetrack.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index
45e9723
..
f081520
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@
-2,10
+2,11
@@
/*! \file dock_timetrack.cpp
** \brief Template File
**
/*! \file dock_timetrack.cpp
** \brief Template File
**
-** $Id
: dock_timetrack.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
+** 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
@@
-43,6
+44,9
@@
#include "workarea.h"
#include "widget_timeslider.h"
#include "layerparamtreestore.h"
#include "workarea.h"
#include "widget_timeslider.h"
#include "layerparamtreestore.h"
+#include "general.h"
+#include <synfig/timepointcollect.h>
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-65,7
+69,7
@@
class TimeTrackView : public Gtk::TreeView
Gtk::TreeView *mimic_tree_view;
public:
Gtk::TreeView *mimic_tree_view;
public:
- sigc::signal<void,synfigapp::ValueDesc,s
ynfig::Waypoint,int> signal_waypoint_clicked
;
+ sigc::signal<void,synfigapp::ValueDesc,s
td::set<synfig::Waypoint, std::less<UniqueID> >,int,synfig::Waypoint::Side> signal_waypoint_clicked_timetrackview
;
LayerParamTreeStore::Model model;
LayerParamTreeStore::Model model;
@@
-85,7
+89,7
@@
public:
// Set up the value-node cell-renderer
cellrenderer_time_track=LayerParamTreeStore::add_cell_renderer_value_node(column);
cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
// Set up the value-node cell-renderer
cellrenderer_time_track=LayerParamTreeStore::add_cell_renderer_value_node(column);
cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
- cellrenderer_time_track->signal_waypoint_clicked
().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked
) );
+ cellrenderer_time_track->signal_waypoint_clicked
_cellrenderer().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked_timetrackview
) );
cellrenderer_time_track->signal_waypoint_changed().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_changed) );
column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc);
column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
cellrenderer_time_track->signal_waypoint_changed().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_changed) );
column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc);
column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
@@
-176,11
+180,13
@@
public:
{
synfigapp::ValueDesc value_desc(row[model.value_desc]);
Gtk::Menu* menu(manage(new Gtk::Menu()));
{
synfigapp::ValueDesc value_desc(row[model.value_desc]);
Gtk::Menu* menu(manage(new Gtk::Menu()));
+ menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc,0.5f);
menu->popup(event->button.button,gtk_get_current_event_time());
return true;
}
Gtk::Menu* menu(manage(new Gtk::Menu()));
App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc,0.5f);
menu->popup(event->button.button,gtk_get_current_event_time());
return true;
}
Gtk::Menu* menu(manage(new Gtk::Menu()));
+ menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
std::list<synfigapp::ValueDesc> value_desc_list;
ParamDesc param_desc(row[model.param_desc]);
for(;!layer_list.empty();layer_list.pop_back())
std::list<synfigapp::ValueDesc> value_desc_list;
ParamDesc param_desc(row[model.param_desc]);
for(;!layer_list.empty();layer_list.pop_back())
@@
-349,37
+355,40
@@
public:
if(adjustment.get_page_size()>get_height())
adjustment.set_page_size(get_height());
if(adjustment.get_page_size()>get_height())
adjustment.set_page_size(get_height());
- cellrenderer_time_track->set_fixed_size(-1,18);
+ int row_height = 0;
+ if(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT"))
+ row_height = atoi(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT"));
+ if (row_height < 3)
+ row_height = 18;
+
+ cellrenderer_time_track->set_fixed_size(-1,row_height);
}
}
void
}
}
void
- on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button)
+ on_waypoint_clicked_timetrackview(const etl::handle<synfig::Node>& node,
+ const synfig::Time& time,
+ const synfig::Time& time_offset __attribute__ ((unused)),
+ int button,
+ synfig::Waypoint::Side side)
{
{
-/*
- Gtk::TreePath path(path_string);
-
- const Gtk::TreeRow row = *(get_model()->get_iter(path));
- if(!row)
- return;
-*/
+ std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
+ synfig::waypoint_collect(waypoint_set,time,node);
- ValueNode::Handle value_node(waypoint.get_parent_value_node());
- assert(value_node);
+ synfigapp::ValueDesc value_desc;
- Gtk::TreeRow row;
- if(!param_tree_store_->find_first_value_node(value_node, row))
+ if (waypoint_set.size() == 1)
{
{
- synfig::error(__FILE__":%d: Unable to find the valuenode",__LINE__);
- return;
- }
+ ValueNode::Handle value_node(waypoint_set.begin()->get_parent_value_node());
+ assert(value_node);
- if(!row)
- return;
-
- synfigapp::ValueDesc value_desc(static_cast<synfigapp::ValueDesc>(row[model.value_desc]));
+ Gtk::TreeRow row;
+ if (param_tree_store_->find_first_value_node(value_node, row) && row)
+ value_desc = static_cast<synfigapp::ValueDesc>(row[model.value_desc]);
+ }
- signal_waypoint_clicked(value_desc,waypoint,button);
+ if (!waypoint_set.empty())
+ signal_waypoint_clicked_timetrackview(value_desc,waypoint_set,button,side);
}
};
}
};
@@
-394,7
+403,14
@@
Dock_Timetrack::Dock_Timetrack():
{
table_=0;
widget_timeslider_= new Widget_Timeslider();
{
table_=0;
widget_timeslider_= new Widget_Timeslider();
- widget_timeslider_->set_size_request(-1,22);
+
+ int header_height = 0;
+ if(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT"))
+ header_height = atoi(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT"));
+ if (header_height < 3)
+ header_height = 22;
+
+ widget_timeslider_->set_size_request(-1,header_height);
hscrollbar_=new Gtk::HScrollbar();
vscrollbar_=new Gtk::VScrollbar();
}
hscrollbar_=new Gtk::HScrollbar();
vscrollbar_=new Gtk::VScrollbar();
}
@@
-424,7
+440,7
@@
Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
Gtk::TreeView* param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params")));
tree_view->mimic(param_tree_view);
Gtk::TreeView* param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params")));
tree_view->mimic(param_tree_view);
- tree_view->signal_waypoint_clicked
.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked
));
+ tree_view->signal_waypoint_clicked
_timetrackview.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked_canvasview
));
canvas_view->time_adjustment().signal_value_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
canvas_view->time_adjustment().signal_value_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));