Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_curves.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp
index bdd17e6..9268fc2 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!    \file dock_params.cpp
+/* === S Y N F I G ========================================================= */
+/*!    \file dock_curves.cpp
 **     \brief Template File
 **
-**     $Id: dock_curves.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
 **
-**     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
 */
 /* ========================================================================= */
@@ -46,13 +47,15 @@
 #include <gtkmm/scrollbar.h>
 #include "widget_timeslider.h"
 
+#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 ========================================================= */
@@ -64,11 +67,11 @@ using namespace studio;
 /* === M E T H O D S ======================================================= */
 
 Dock_Curves::Dock_Curves():
-       Dock_CanvasSpecific("curves",_("Curves"),Gtk::StockID("sinfg-curves"))
+       Dock_CanvasSpecific("curves",_("Curves"),Gtk::StockID("synfig-curves"))
 {
        last_widget_curves_=0;
        table_=0;
-       
+
        hscrollbar_=new Gtk::HScrollbar();
        vscrollbar_=new Gtk::VScrollbar();
        widget_timeslider_= new Widget_Timeslider();
@@ -90,19 +93,20 @@ _curve_selection_changed(Gtk::TreeView* param_tree_view,Widget_Curves* curves)
        if(!param_tree_view->get_selection()->count_selected_rows())
        {
                curves->clear();
+               curves->refresh();
                return;
        }
-       
-       std::list<sinfgapp::ValueDesc> value_descs;
+
+       std::list<synfigapp::ValueDesc> value_descs;
 
        //std::list<Gtk::TreePath> path_list(
        //param_tree_view->get_selection()->selected_foreach_iter(tmp);
        iter=param_tree_view->get_selection()->get_selected();
-       
+
        value_descs.push_back((*iter)[model.value_desc]);
        curves->set_value_descs(value_descs);
-       
-       //curves->set_value_descs(tmp.value_descs);     
+
+       //curves->set_value_descs(tmp.value_descs);
 }
 
 void
@@ -110,11 +114,11 @@ Dock_Curves::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
 {
        Widget_Curves* curves(new Widget_Curves());
        curves->set_time_adjustment(canvas_view->time_adjustment());
-       
+
        Gtk::TreeView* param_tree_view(
                static_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params"))
        );
-       
+
        param_tree_view->get_selection()->signal_changed().connect(
                sigc::bind(
                        sigc::bind(
@@ -124,7 +128,7 @@ Dock_Curves::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
                        ),param_tree_view
                )
        );
-       
+
        canvas_view->set_ext_widget(get_name(),curves);
 }
 
@@ -135,12 +139,12 @@ Dock_Curves::refresh_selected_param()
                static_cast<Gtk::TreeView*>(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
@@ -163,7 +167,7 @@ Dock_Curves::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
                table_=0;
        }
 
-       
+
        if(canvas_view)
        {
                last_widget_curves_=dynamic_cast<Widget_Curves*>(
@@ -182,7 +186,7 @@ Dock_Curves::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
                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_);
                last_widget_curves_->show();
                table_->show_all();