X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_timetrack.cpp;h=b51fcd81fb28862e28fd50daab231e9f95090898;hb=37600b4b217caa5e316984ec0b035c5e8f9698af;hp=c81a6cd2541f05f8d3ede12d78c63ae7d981791d;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index c81a6cd..b51fcd8 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \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 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 2007 Chris Moore ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -48,7 +50,7 @@ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -60,11 +62,11 @@ class TimeTrackView : public Gtk::TreeView CellRenderer_TimeTrack *cellrenderer_time_track; Glib::RefPtr param_tree_store_; - - Gtk::TreeView *mimic_tree_view; + + Gtk::TreeView *mimic_tree_view; public: - sigc::signal signal_waypoint_clicked; + sigc::signal signal_waypoint_clicked; LayerParamTreeStore::Model model; @@ -77,10 +79,10 @@ public: { int label_index(append_column_editable(_("Name"),model.label)); Gtk::TreeView::Column* label_column = get_column(label_index-1); - + { // --- T I M E T R A C K -------------------------------------------- Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) ); - + // 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; @@ -89,19 +91,19 @@ public: column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc); column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas); //column->add_attribute(cellrenderer_time_track->property_visible(), model.is_value_node); - + //column->pack_start(*cellrenderer_time_track); - + // Finish setting up the column column->set_reorderable(); column->set_resizable(); column->set_min_width(200); - + append_column(*column); } set_rules_hint(); - + set_expander_column(*label_column); label_column->set_visible(false); set_headers_visible(false); @@ -134,7 +136,7 @@ public: std::max( mimic_tree_view->get_vadjustment()->get_value()- mimic_tree_view->get_vadjustment()->get_step_increment(), - mimic_tree_view->get_vadjustment()->get_lower() + mimic_tree_view->get_vadjustment()->get_lower() ) ); mimic_tree_view->get_vadjustment()->value_changed(); @@ -154,7 +156,7 @@ public: ) ) break; const Gtk::TreeRow row = *(get_model()->get_iter(path)); - + if(column && column->get_first_cell_renderer()==cellrenderer_time_track) { Gdk::Rectangle rect; @@ -166,24 +168,24 @@ public: return true; //return signal_param_user_click()(event->button.button,row,COLUMNID_TIME_TRACK); } -/* else +/* else { if(event->button.button==3) { LayerList layer_list(get_selected_layers()); if(layer_list.size()<=1) { - sinfgapp::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())); 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())); - std::list value_desc_list; + Gtk::Menu* menu(manage(new Gtk::Menu())); + std::list value_desc_list; ParamDesc param_desc(row[model.param_desc]); for(;!layer_list.empty();layer_list.pop_back()) - value_desc_list.push_back(sinfgapp::ValueDesc(layer_list.back(),param_desc.get_name())); + value_desc_list.push_back(synfigapp::ValueDesc(layer_list.back(),param_desc.get_name())); App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc_list); menu->popup(event->button.button,gtk_get_current_event_time()); return true; @@ -199,7 +201,7 @@ public: */ } break; - + case GDK_MOTION_NOTIFY: { Gtk::TreeModel::Path path; @@ -212,12 +214,12 @@ public: cell_x,cell_y //int&cell_x,int&cell_y ) ) break; - + if(!get_model()->get_iter(path)) break; - + Gtk::TreeRow row = *(get_model()->get_iter(path)); - + if((event->motion.state&GDK_BUTTON1_MASK ||event->motion.state&GDK_BUTTON3_MASK) && column && cellrenderer_time_track==column->get_first_cell_renderer()) { Gdk::Rectangle rect; @@ -257,12 +259,12 @@ public: cell_x,cell_y //int&cell_x,int&cell_y ) ) break; - + if(!get_model()->get_iter(path)) break; - + Gtk::TreeRow row = *(get_model()->get_iter(path)); - + if(column && cellrenderer_time_track==column->get_first_cell_renderer()) { Gdk::Rectangle rect; @@ -286,7 +288,7 @@ public: void queue_draw_msg() { - sinfg::info("*************QUEUE_DRAW***************** (time track view)"); + synfig::info("*************QUEUE_DRAW***************** (time track view)"); Widget::queue_draw(); } void set_model(Glib::RefPtr store) @@ -296,22 +298,22 @@ public: cellrenderer_time_track->set_canvas_interface(param_tree_store_->canvas_interface()); store->signal_changed().connect(sigc::mem_fun(*this, &TimeTrackView::queue_draw)); } - + void - on_waypoint_changed( sinfg::Waypoint waypoint , sinfg::ValueNode::Handle value_node) + on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node) { - sinfgapp::Action::ParamList param_list; + synfigapp::Action::ParamList param_list; param_list.add("canvas",param_tree_store_->canvas_interface()->get_canvas()); param_list.add("canvas_interface",param_tree_store_->canvas_interface()); param_list.add("value_node",value_node); param_list.add("waypoint",waypoint); // param_list.add("time",canvas_interface()->get_time()); - + etl::handle::cast_static(param_tree_store_->canvas_interface()->get_instance())->process_action("waypoint_set_smart", param_list); } void mimic(Gtk::TreeView *param_tree_view) - { + { mimic_tree_view=param_tree_view; param_tree_view->signal_row_expanded().connect( sigc::hide<0>( @@ -336,47 +338,53 @@ public: ); mimic_resync(); } - + void mimic_resync() { - + if(mimic_tree_view) { Gtk::Adjustment &adjustment(*mimic_tree_view->get_vadjustment()); set_vadjustment(adjustment); - + 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 - on_waypoint_clicked(const Glib::ustring &path_string, sinfg::Waypoint waypoint,int button) + on_waypoint_clicked(const Glib::ustring &/*path_string*/, synfig::Waypoint waypoint,int button) { /* Gtk::TreePath path(path_string); - + const Gtk::TreeRow row = *(get_model()->get_iter(path)); if(!row) return; */ - + ValueNode::Handle value_node(waypoint.get_parent_value_node()); assert(value_node); Gtk::TreeRow row; if(!param_tree_store_->find_first_value_node(value_node, row)) { - sinfg::error(__FILE__":%d: Unable to find the valuenode",__LINE__); + synfig::error(__FILE__":%d: Unable to find the valuenode",__LINE__); return; } - + if(!row) return; - - sinfgapp::ValueDesc value_desc(static_cast(row[model.value_desc])); + + synfigapp::ValueDesc value_desc(static_cast(row[model.value_desc])); signal_waypoint_clicked(value_desc,waypoint,button); } @@ -389,11 +397,18 @@ public: /* === M E T H O D S ======================================================= */ Dock_Timetrack::Dock_Timetrack(): - Dock_CanvasSpecific("timetrack",_("Timetrack"),Gtk::StockID("sinfg-timetrack")) + Dock_CanvasSpecific("timetrack",_("Timetrack"),Gtk::StockID("synfig-timetrack")) { 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(); } @@ -410,7 +425,7 @@ void Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle canvas_view) { LayerParamTreeStore::Model model; - + Glib::RefPtr tree_store( Glib::RefPtr::cast_dynamic( canvas_view->get_tree_model("params") @@ -425,7 +440,7 @@ Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle canvas_view tree_view->signal_waypoint_clicked.connect(sigc::mem_fun(*canvas_view, &studio::CanvasView::on_waypoint_clicked)); - + canvas_view->time_adjustment().signal_value_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw)); canvas_view->time_adjustment().signal_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw)); @@ -439,12 +454,12 @@ Dock_Timetrack::refresh_selected_param() static_cast(get_canvas_view()->get_ext_widget(get_name())) ); Gtk::TreeModel::iterator iter(tree_view->get_selection()->get_selected()); - + if(iter) { LayerParamTreeStore::Model model; get_canvas_view()->work_area->set_selected_value_node( - (sinfg::ValueNode::Handle)(*iter)[model.value_node] + (synfig::ValueNode::Handle)(*iter)[model.value_node] ); } else @@ -467,13 +482,13 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle canvas_v table_=0; } - + if(canvas_view) { TimeTrackView* tree_view(dynamic_cast(canvas_view->get_ext_widget(get_name()))); Gtk::TreeView* param_tree_view(dynamic_cast(canvas_view->get_ext_widget("params"))); tree_view->set_vadjustment(*param_tree_view->get_vadjustment()); - + assert(tree_view); widget_timeslider_->set_time_adjustment(&canvas_view->time_adjustment()); @@ -488,7 +503,7 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle canvas_v table_->attach(*hscrollbar_, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK); table_->attach(*vscrollbar_, 1, 2, 0, 2, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND); add(*table_); - + //add(*last_widget_curves_); table_->show_all(); show_all();