glom r1447 - in trunk: . glom/libglom/data_structure glom/utility_widgets glom/utility_widgets/db_adddel
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: glom r1447 - in trunk: . glom/libglom/data_structure glom/utility_widgets glom/utility_widgets/db_adddel
- Date: Wed, 5 Mar 2008 22:12:18 +0000 (GMT)
Author: murrayc
Date: Wed Mar 5 22:12:18 2008
New Revision: 1447
URL: http://svn.gnome.org/viewvc/glom?rev=1447&view=rev
Log:
2008-03-05 Murray Cumming <murrayc murrayc com>
* glom/libglom/data_structure/glomconversions.cc:
get_text_for_gda_value(): Improved the warning about the unexpected
value type, though I have not yet solved this (minor) problem.
* glom/utility_widgets/dragbar.cc: Improve the titles in the tool
pallete. And please stop using tabs in the source code.
Modified:
trunk/ChangeLog
trunk/glom/libglom/data_structure/glomconversions.cc
trunk/glom/utility_widgets/db_adddel/db_adddel.cc
trunk/glom/utility_widgets/dragbar.cc
Modified: trunk/glom/libglom/data_structure/glomconversions.cc
==============================================================================
--- trunk/glom/libglom/data_structure/glomconversions.cc (original)
+++ trunk/glom/libglom/data_structure/glomconversions.cc Wed Mar 5 22:12:18 2008
@@ -211,8 +211,15 @@
return format_time(the_c_time, locale, iso_format);
}
- else if( (glom_type == Field::TYPE_NUMERIC) && (value.get_value_type() == GDA_TYPE_NUMERIC))
+ else if(glom_type == Field::TYPE_NUMERIC)
{
+ if(value.get_value_type() != GDA_TYPE_NUMERIC)
+ {
+ //TODO: This happens for ID columns, because the TreeModel returns a gchararray GValue, in treeviewcolumn_on_cell_data(). Needs some investigation.
+ std::cerr << "Conversions::get_text_for_gda_value(): glom field type is NUMERIC but GdaValue type is: " << g_type_name(value.get_value_type()) << std::endl;
+ return value.to_string();
+ }
+
const GdaNumeric* gda_numeric = value.get_numeric();
std::string text_in_c_locale;
if(gda_numeric && gda_numeric->number) //A char* - I assume that it formatted as per the C locale. murrayc. TODO: Do we need to look at the other fields?
Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.cc (original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.cc Wed Mar 5 22:12:18 2008
@@ -1992,6 +1992,7 @@
Gtk::CellRendererText* pDerived = dynamic_cast<Gtk::CellRendererText*>(renderer);
if(pDerived)
{
+ //std::cout << "debug field name=" << field->get_name() << ", glom type=" << field->get_glom_type() << std::endl;
const Glib::ustring text = Conversions::get_text_for_gda_value(field->get_glom_type(), value, field->get_formatting_used().m_numeric_format);
//g_assert(text != "NULL");
g_object_set(pDerived->gobj(), "text", text.c_str(), (gpointer)NULL);
Modified: trunk/glom/utility_widgets/dragbar.cc
==============================================================================
--- trunk/glom/utility_widgets/dragbar.cc (original)
+++ trunk/glom/utility_widgets/dragbar.cc Wed Mar 5 22:12:18 2008
@@ -32,8 +32,8 @@
DragBar::DragBar()
{
- // Does look ugly otherwise
- set_size_request(100, 200);
+ // Looks ugly otherwise:
+ set_size_request(100, 200);
Gtk::Image* image_item =
Gtk::manage (new Gtk::Image(GLOM_ICON_DIR "/glom-field.png"));
@@ -55,17 +55,17 @@
DragButton* drag_button = Gtk::manage(new DragButton(*image_button, LayoutWidgetBase::TYPE_BUTTON));
DragButton* drag_text = Gtk::manage(new DragButton(*image_text, LayoutWidgetBase::TYPE_TEXT));
- GtkContainer* container_group = GTK_CONTAINER(egg_tool_item_group_new(_("Container")));
- gtk_container_add (container_group, GTK_WIDGET(drag_group->gobj()));
- gtk_container_add (container_group, GTK_WIDGET(drag_notebook->gobj()));
-
- GtkContainer* fields_group = GTK_CONTAINER(egg_tool_item_group_new(_("Fields")));
- gtk_container_add (fields_group, GTK_WIDGET(drag_item->gobj()));
- gtk_container_add (fields_group, GTK_WIDGET(drag_button->gobj()));
- gtk_container_add (fields_group, GTK_WIDGET(drag_text->gobj()));
+ GtkContainer* container_group = GTK_CONTAINER(egg_tool_item_group_new(_("Containers")));
+ gtk_container_add (container_group, GTK_WIDGET(drag_group->gobj()));
+ gtk_container_add (container_group, GTK_WIDGET(drag_notebook->gobj()));
+
+ GtkContainer* fields_group = GTK_CONTAINER(egg_tool_item_group_new(_("Items")));
+ gtk_container_add (fields_group, GTK_WIDGET(drag_item->gobj()));
+ gtk_container_add (fields_group, GTK_WIDGET(drag_button->gobj()));
+ gtk_container_add (fields_group, GTK_WIDGET(drag_text->gobj()));
- add_group (EGG_TOOL_ITEM_GROUP(container_group));
- add_group (EGG_TOOL_ITEM_GROUP(fields_group));
+ add_group (EGG_TOOL_ITEM_GROUP(container_group));
+ add_group (EGG_TOOL_ITEM_GROUP(fields_group));
set_drag_source();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]