Added copyright lines for files I've edited this year.
[synfig.git] / synfig-studio / trunk / src / gtkmm / childrentree.cpp
index 227380c..3509c41 100644 (file)
@@ -2,10 +2,11 @@
 /*!    \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-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 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
@@ -36,6 +37,8 @@
 #include <synfigapp/instance.h>
 #include <gtkmm/scrolledwindow.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -96,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);
@@ -113,12 +116,12 @@ 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));
@@ -135,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();
@@ -153,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
@@ -170,25 +173,25 @@ 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("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,"synfig-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);
@@ -252,7 +255,7 @@ ChildrenTree::on_dirty_preview()
 
 void
 ChildrenTree::on_selection_changed()
-{      
+{
        if(0)
                {
                button_raise->set_sensitive(false);
@@ -268,7 +271,7 @@ void
 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;
@@ -276,13 +279,16 @@ ChildrenTree::on_edited_value(const Glib::ustring&path_string,synfig::ValueBase
 }
 
 void
-ChildrenTree::on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button)
+ChildrenTree::on_waypoint_clicked_childrentree(const etl::handle<synfig::Node>& 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<synfigapp::ValueDesc>(row[model.value_desc]),waypoint,button);
+       //! \todo writeme
+
+       // std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
+       // signal_waypoint_clicked_childrentree()(waypoint_set,button,side);
 }
 
 bool
@@ -303,7 +309,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);
@@ -312,10 +318,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;
@@ -328,12 +334,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