X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fcellrenderer_time.cpp;h=25b1e899391330985158cc2e848d7fb3d7f6fa4f;hb=f9d8a24a671b759c2be95bc10cd330f310b7dcc2;hp=e7fe1fad230e5cc77bca037ff4bf43792034e379;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp index e7fe1fa..25b1e89 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp @@ -1,20 +1,21 @@ -/* === S I N F G =========================================================== */ +/* === S Y N F I G ========================================================= */ /*! \file cellrenderer_time.cpp ** \brief Template File ** -** $Id: cellrenderer_time.cpp,v 1.1.1.1 2005/01/07 03:34:35 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 */ /* ========================================================================= */ @@ -40,7 +41,7 @@ using namespace std; //using namespace etl; -using namespace sinfg; +using namespace synfig; using namespace studio; /* === M A C R O S ========================================================= */ @@ -58,7 +59,7 @@ using namespace studio; CellRenderer_Time::CellRenderer_Time(): Glib::ObjectBase (typeid(CellRenderer_Time)), Gtk::CellRendererText (), - property_time_(*this,"time",sinfg::Time(0)), + property_time_(*this,"time",synfig::Time(0)), property_fps_(*this,"fps", float(0)) { CellRendererText::signal_edited().connect(sigc::mem_fun(*this,&studio::CellRenderer_Time::string_edited_)); @@ -66,7 +67,7 @@ CellRenderer_Time::CellRenderer_Time(): CellRenderer_Time::~CellRenderer_Time() { - sinfg::info("CellRenderer_Time::~CellRenderer_Time(): deleted"); + synfig::info("CellRenderer_Time::~CellRenderer_Time(): deleted"); } void @@ -96,7 +97,7 @@ CellRenderer_Time::render_vfunc( const Time time(property_time_); const float fps((Real)Time(property_fps_)); - + property_text()=(Glib::ustring)time.get_string(fps,App::get_time_format()); CellRendererText::render_vfunc(window,widget,background_area,ca,expose_area,flags); @@ -118,7 +119,7 @@ CellRenderer_Time::start_editing_vfunc( const Time time(property_time_); const float fps((Real)Time(property_fps_)); - + property_text()=(Glib::ustring)time.get_string(fps,App::get_time_format()|Time::FORMAT_FULL); #if 0 Widget_Time* widget_time(manage(new Widget_Time));