Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp
index ec12b7f..d8a2b89 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dock_layergroups.cpp
 **     \brief Template File
 **
-**     $Id: dock_layergroups.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
 */
 /* ========================================================================= */
@@ -44,13 +45,15 @@
 #include "layergrouptree.h"
 #include "groupactionmanager.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 ========================================================= */
@@ -62,24 +65,24 @@ using namespace studio;
 /* === M E T H O D S ======================================================= */
 
 Dock_LayerGroups::Dock_LayerGroups():
-       Dock_CanvasSpecific("groups",_("Groups"),Gtk::StockID("sinfg-group")),
+       Dock_CanvasSpecific("groups",_("Groups"),Gtk::StockID("synfig-group")),
        action_group_group_ops(Gtk::ActionGroup::create()),
        group_action_manager(new GroupActionManager)
-{      
+{
        group_action_manager->set_ui_manager(App::ui_manager());
 
-       action_group_group_ops->add( Gtk::Action::create("toolbar-groups", "Group Ops") );
+       action_group_group_ops->add( Gtk::Action::create("toolbar-groups", _("Group Ops")) );
 
        action_group_add=Gtk::Action::create("action-group_add", Gtk::Stock::ADD,_("Add a New Group"),_("Add a New Group"));
        action_group_group_ops->add(action_group_add);
        action_group_add->set_sensitive(false);
-       
+
        App::ui_manager()->insert_action_group(action_group_group_ops);
 
     Glib::ustring ui_info =
        "<ui>"
        "       <toolbar action='toolbar-groups'>"
-       "       <toolitem action='action-group_remove' />"
+       "       <toolitem action='action-GroupRemove' />"
        "       <toolitem action='action-group_add' />"
        "       </toolbar>"
        "</ui>"
@@ -87,7 +90,7 @@ Dock_LayerGroups::Dock_LayerGroups():
 
        App::ui_manager()->add_ui_from_string(ui_info);
 
-       set_toolbar(*dynamic_cast<Gtk::Toolbar*>(App::ui_manager()->get_widget("/toolbar-groups")));    
+       set_toolbar(*dynamic_cast<Gtk::Toolbar*>(App::ui_manager()->get_widget("/toolbar-groups")));
 }
 
 Dock_LayerGroups::~Dock_LayerGroups()
@@ -115,17 +118,17 @@ Dock_LayerGroups::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas
        if(canvas_view)
        {
                Gtk::Widget* tree_view(canvas_view->get_ext_widget(get_name()));
-       
+
                add(*tree_view);
                tree_view->show();
-               
+
                group_action_manager->set_group_tree(dynamic_cast<LayerGroupTree*>(tree_view));
                group_action_manager->set_canvas_interface(canvas_view->canvas_interface());
                group_action_manager->refresh();
        }
        else
        {
-               clear_previous();               
+               clear_previous();
                group_action_manager->clear();
                group_action_manager->set_canvas_interface(0);
                group_action_manager->set_group_tree(0);