X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fgtkmm%2Fcellrenderer_value.cpp;h=eca2a971d3f629c872833105df5efa44e3b6d241;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=45490c1a1153cdba14d828c7e8a2dd59cae8725f;hpb=4cb5360f578f79e5d9e234570018d762ea0a964f;p=synfig.git

diff --git a/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.cpp
index 45490c1..eca2a97 100644
--- a/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/cellrenderer_value.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 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
@@ -54,6 +55,8 @@
 #include "dialog_color.h"
 #include <gtkmm/textview.h>
 
+#include "general.h"
+
 #endif
 
 using namespace synfig;
@@ -65,11 +68,6 @@ using namespace studio;
 
 #define DIGITS		15
 
-#define use_colorspace_gamma()	App::use_colorspace_gamma
-#define colorspace_gamma()	(2.2f)
-#define gamma_in(x)		pow((float)x,1.0f/colorspace_gamma())
-#define gamma_out(x)	pow((float)x,colorspace_gamma())
-
 /* === G L O B A L S ======================================================= */
 
 class studio::ValueBase_Entry : public Gtk::EventBox, public Gtk::CellEditable
@@ -129,7 +127,6 @@ public:
 	}
 	~ValueBase_Entry()
 	{
-		DEBUGPOINT();
 	}
 
 	void on_editing_done()
@@ -154,7 +151,7 @@ public:
 		if(parent)parent->grab_focus();
 		Gtk::CellEditable::on_remove_widget();
 	}
-	void start_editing_vfunc(GdkEvent *event)
+	void start_editing_vfunc(GdkEvent */*event*/)
 	{
 		valuewidget->signal_activate().connect(sigc::mem_fun(*this, &studio::ValueBase_Entry::editing_done));
 		show();
@@ -204,8 +201,11 @@ public:
 	{
 		if(valuewidget)
 			return valuewidget->get_value();
-		return synfig::ValueBase();
+
+		warning("%s:%d this code shouldn't be reached", __FILE__, __LINE__);
+		return *(new synfig::ValueBase());
 	}
+
 	const Glib::ustring &get_path()
 	{
 		return path;
@@ -281,12 +281,13 @@ CellRenderer_ValueBase::CellRenderer_ValueBase():
 	property_attributes()=attr_list;
 
 	property_foreground()=Glib::ustring("#7f7f7f");
-	property_inconsistant()=false;
+	property_inconsistent()=false;
 }
 
 CellRenderer_ValueBase::~CellRenderer_ValueBase()
 {
-//	synfig::info("CellRenderer_ValueBase::~CellRenderer_ValueBase(): deleted");
+	if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+		synfig::info("CellRenderer_ValueBase::~CellRenderer_ValueBase(): Deleted");
 }
 
 void
@@ -371,7 +372,13 @@ CellRenderer_ValueBase::render_vfunc(
 			for(iter=enum_list.begin();iter!=enum_list.end();iter++)
 				if(iter->value==data.get(int()))
 				{
-					property_text()=(Glib::ustring)iter->local_name;
+					// don't show the key_board s_hortcut under_scores
+					String local_name = iter->local_name;
+					String::size_type pos = local_name.find_first_of('_');
+					if (pos != String::npos)
+						property_text() = local_name.substr(0,pos) + local_name.substr(pos+1);
+					else
+						property_text() = local_name;
 					break;
 				}
 		}
@@ -401,7 +408,7 @@ CellRenderer_ValueBase::render_vfunc(
 		if(data.get(etl::handle<synfig::Canvas>()))
 		{
 			if(data.get(etl::handle<synfig::Canvas>())->is_inline())
-				property_text()="<Inline Canvas>";
+				property_text()=_("<Inline Canvas>");
 			else
 				property_text()=(Glib::ustring)data.get(etl::handle<synfig::Canvas>())->get_id();
 		}
@@ -495,12 +502,12 @@ CellRenderer_ValueBase::color_edited(synfig::Color color, Glib::ustring path)
 
 Gtk::CellEditable*
 CellRenderer_ValueBase::start_editing_vfunc(
-	GdkEvent* event,
+	GdkEvent* event __attribute__ ((unused)),
 	Gtk::Widget& widget,
 	const Glib::ustring& path,
-	const Gdk::Rectangle& background_area,
-	const Gdk::Rectangle& cell_area,
-	Gtk::CellRendererState flags)
+	const Gdk::Rectangle& background_area __attribute__ ((unused)),
+	const Gdk::Rectangle& cell_area __attribute__ ((unused)),
+	Gtk::CellRendererState flags __attribute__ ((unused)))
 {
 	// If we aren't editable, then there is nothing to do
 	if(!property_editable())
@@ -548,13 +555,11 @@ CellRenderer_ValueBase::start_editing_vfunc(
 			synfig::String string;
 			string=data.get(string);
 			if(get_paragraph(string))
-			{
 				signal_edited_(path,ValueBase(string));
-			}
 			return NULL;
 		}
-		if(get_param_desc().get_hint()!="filename")
-			return CellRendererText::start_editing_vfunc(event,widget,path,background_area,cell_area,flags);
+		// if(get_param_desc().get_hint()!="filename")
+			// return CellRendererText::start_editing_vfunc(event,widget,path,background_area,cell_area,flags);
 	default:
 		{
 			assert(get_canvas());