**
** \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
#include "dialog_color.h"
#include <gtkmm/textview.h>
+#include "general.h"
+
#endif
using namespace synfig;
#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
}
~ValueBase_Entry()
{
- DEBUGPOINT();
}
void on_editing_done()
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();
{
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;
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
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;
}
}
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();
}
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())
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());