X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_canvases.cpp;h=1e39a0a59c027ff859105b5f7188cdc3eebaed4b;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=733ea128f866b4b283b2f7a6fe5d84f1057deff9;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp b/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp index 733ea12..1e39a0a 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp @@ -1,20 +1,21 @@ /* === S Y N F I G ========================================================= */ -/*! \file dialog_history.cpp +/*! \file dock_canvases.cpp ** \brief Template File ** -** $Id: dock_canvases.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 */ /* ========================================================================= */ @@ -31,6 +32,8 @@ #include "dock_canvases.h" #include "app.h" #include "canvasview.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -56,7 +59,7 @@ Dock_Canvases::Dock_Canvases(): App::signal_instance_deleted().connect(sigc::mem_fun(*this,&studio::Dock_Canvases::delete_instance)); App::signal_instance_selected().connect(sigc::mem_fun(*this,&studio::Dock_Canvases::set_selected_instance_signal)); - + add(*create_canvas_tree()); /* @@ -102,7 +105,7 @@ Dock_Canvases::create_canvas_tree() studio::Instance::CanvasTreeModel canvas_tree_model; canvas_tree=manage(new class Gtk::TreeView()); { - Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column("ID") ); + Gtk::TreeView::Column* column = Gtk::manage( new Gtk::TreeView::Column(_("ID")) ); // Gtk::CellRendererPixbuf* icon_cellrenderer = Gtk::manage( new Gtk::CellRendererPixbuf() ); //column->pack_start(*icon_cellrenderer,false); @@ -112,7 +115,7 @@ Dock_Canvases::create_canvas_tree() //#ifdef NDEBUG // column->add_attribute(icon_cellrenderer->property_pixbuf(), canvas_tree_model.icon); //#endif - + canvas_tree->append_column(*column); } canvas_tree->set_rules_hint(); @@ -122,7 +125,7 @@ Dock_Canvases::create_canvas_tree() canvas_tree->add_events(Gdk::BUTTON1_MOTION_MASK); canvas_tree->show(); canvas_tree->set_headers_visible(false); - + Gtk::ScrolledWindow *scrolledwindow = manage(new class Gtk::ScrolledWindow()); scrolledwindow->set_flags(Gtk::CAN_FOCUS); scrolledwindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); @@ -189,7 +192,7 @@ Dock_Canvases::set_selected_instance(etl::loose_handle x) if (x==selected_instance) return; - set_selected_instance_(x); + set_selected_instance_(x); } void @@ -197,11 +200,11 @@ Dock_Canvases::new_instance(etl::handle instance) { if(studio::App::shutdown_in_progress) return; - + assert(instance); - + etl::loose_handle loose_instance(instance); - + instance->synfigapp::Instance::signal_filename_changed().connect(sigc::mem_fun(*this,&Dock_Canvases::refresh_instances)); instance->synfigapp::Instance::signal_filename_changed().connect( sigc::bind >( @@ -209,9 +212,9 @@ Dock_Canvases::new_instance(etl::handle instance) loose_instance ) ); - + present(); - + } void