X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fchildrentree.cpp;h=a7b91f40d0dba5173aeb42f429f8dd6293996115;hb=9fc17cc46bd63a7508b82c967801a09be882fe57;hp=82a675c98cb4b3c76dd41a40136de775ee26a2c6;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp index 82a675c..a7b91f4 100644 --- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp +++ b/synfig-studio/trunk/src/gtkmm/childrentree.cpp @@ -1,20 +1,22 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file childrentree.cpp ** \brief Template File ** -** $Id: childrentree.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) 2008 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 */ /* ========================================================================= */ @@ -31,17 +33,19 @@ #include "childrentree.h" #include "cellrenderer_value.h" #include "cellrenderer_timetrack.h" -#include -#include +#include +#include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ using namespace std; using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -95,14 +99,14 @@ ChildrenTree::ChildrenTree() // Pack the label into the column column->pack_start(model.label,true); - // Finish setting up the column + // Finish setting up the column column->set_reorderable(); column->set_resizable(); column->set_clickable(); column->set_min_width(150); - column->set_sort_column_id(model.label); + column->set_sort_column(model.label); tree_view.append_column(*column); - + } { // --- T Y P E -------------------------------------------------------- int cols_count = tree_view.append_column(_("Type"),model.type); @@ -112,16 +116,16 @@ ChildrenTree::ChildrenTree() column->set_reorderable(); column->set_resizable(); column->set_clickable(); - column->set_sort_column_id(model.type); + column->set_sort_column(model.type); } } { // --- V A L U E ----------------------------------------------------- Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ValueBase")) ); - + // Set up the value cell-renderer cellrenderer_value=ChildrenTreeStore::add_cell_renderer_value(column); cellrenderer_value->signal_edited().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_edited_value)); - cellrenderer_value->property_value()=sinfg::ValueBase(); + cellrenderer_value->property_value()=synfig::ValueBase(); // Finish setting up the column tree_view.append_column(*column); @@ -134,16 +138,16 @@ ChildrenTree::ChildrenTree() { // --- T I M E T R A C K -------------------------------------------- Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("Time Track")) ); column_time_track=column; - + // Set up the value-node cell-renderer cellrenderer_time_track=ChildrenTreeStore::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, &studio::ChildrenTree::on_waypoint_clicked) ); + cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_waypoint_clicked_childrentree) ); column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc); column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas); //column->pack_start(*cellrenderer_time_track); - + // Finish setting up the column column->set_reorderable(); column->set_resizable(); @@ -152,10 +156,10 @@ ChildrenTree::ChildrenTree() // This makes things easier to read. tree_view.set_rules_hint(); - + // Make us more sensitive to several events tree_view.add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK | Gdk::BUTTON2_MOTION_MASK|Gdk::POINTER_MOTION_MASK); - + tree_view.signal_event().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_tree_event)); // Create a scrolled window for that tree @@ -169,25 +173,22 @@ ChildrenTree::ChildrenTree() attach(*scroll_children_tree, 0, 3, 0, 1, Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL, 0, 0); hbox=manage(new Gtk::HBox()); - + attach(*hbox, 0, 1, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::SHRINK, 0, 0); - - tree_view.set_enable_search(true); tree_view.set_search_column(model.label); - - + /* Gtk::Image *icon; - //Gtk::IconSize iconsize(Gtk::IconSize::from_name("sinfg-small_icon")); + //Gtk::IconSize iconsize(Gtk::IconSize::from_name("synfig-small_icon")); Gtk::IconSize iconsize(Gtk::ICON_SIZE_SMALL_TOOLBAR); - SMALL_BUTTON(button_raise,"gtk-go-up","Raise"); - SMALL_BUTTON(button_lower,"gtk-go-down","Lower"); - SMALL_BUTTON(button_duplicate,"sinfg-duplicate","Duplicate"); - SMALL_BUTTON(button_delete,"gtk-delete","Delete"); - + SMALL_BUTTON(button_raise,"gtk-go-up",_("Raise")); + SMALL_BUTTON(button_lower,"gtk-go-down",_("Lower")); + SMALL_BUTTON(button_duplicate,"synfig-duplicate",_("Duplicate")); + SMALL_BUTTON(button_delete,"gtk-delete",_("Delete")); + hbox->pack_start(*button_raise,Gtk::PACK_SHRINK); hbox->pack_start(*button_lower,Gtk::PACK_SHRINK); hbox->pack_start(*button_duplicate,Gtk::PACK_SHRINK); @@ -204,11 +205,8 @@ ChildrenTree::ChildrenTree() button_delete->set_sensitive(false); */ - - get_selection()->signal_changed().connect(sigc::mem_fun(*this, &studio::ChildrenTree::on_selection_changed)); - tree_view.set_reorderable(true); hbox->show(); @@ -219,7 +217,6 @@ ChildrenTree::ChildrenTree() //get_selection()->set_mode(Gtk::SELECTION_MULTIPLE); } - ChildrenTree::~ChildrenTree() { } @@ -251,7 +248,7 @@ ChildrenTree::on_dirty_preview() void ChildrenTree::on_selection_changed() -{ +{ if(0) { button_raise->set_sensitive(false); @@ -262,12 +259,11 @@ ChildrenTree::on_selection_changed() } } - void -ChildrenTree::on_edited_value(const Glib::ustring&path_string,sinfg::ValueBase value) +ChildrenTree::on_edited_value(const Glib::ustring&path_string,synfig::ValueBase value) { Gtk::TreePath path(path_string); - + const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path)); row[model.value]=value; @@ -275,13 +271,16 @@ ChildrenTree::on_edited_value(const Glib::ustring&path_string,sinfg::ValueBase v } void -ChildrenTree::on_waypoint_clicked(const Glib::ustring &path_string, sinfg::Waypoint waypoint,int button) +ChildrenTree::on_waypoint_clicked_childrentree(const etl::handle& node __attribute__ ((unused)), + const synfig::Time& time __attribute__ ((unused)), + const synfig::Time& time_offset __attribute__ ((unused)), + int button __attribute__ ((unused)), + synfig::Waypoint::Side side __attribute__ ((unused))) { - Gtk::TreePath path(path_string); - - const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path)); - - signal_waypoint_clicked()(static_cast(row[model.value_desc]),waypoint,button); + //! \todo writeme + + // std::set > waypoint_set; + // signal_waypoint_clicked_childrentree()(waypoint_set,button); } bool @@ -302,7 +301,7 @@ ChildrenTree::on_tree_event(GdkEvent *event) ) ) break; const Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path)); - + if(column->get_first_cell_renderer()==cellrenderer_time_track) { return signal_user_click()(event->button.button,row,COLUMNID_TIME_TRACK); @@ -311,10 +310,10 @@ ChildrenTree::on_tree_event(GdkEvent *event) return signal_user_click()(event->button.button,row,COLUMNID_VALUE); else return signal_user_click()(event->button.button,row,COLUMNID_ID); - + } break; - + case GDK_MOTION_NOTIFY: { Gtk::TreeModel::Path path; @@ -327,12 +326,12 @@ ChildrenTree::on_tree_event(GdkEvent *event) cell_x,cell_y //int&cell_x,int&cell_y ) ) break; - + if(!tree_view.get_model()->get_iter(path)) break; - + Gtk::TreeRow row = *(tree_view.get_model()->get_iter(path)); - + if(cellrenderer_time_track==column->get_first_cell_renderer()) { // Movement on TimeLine