]> saetta.ns0.it Git - libgdaex/commitdiff
Removed GdaExGrid, now in standalone package.
authorAndrea Zagli <andrea.zagli@email.it>
Mon, 17 Aug 2015 15:54:18 +0000 (17:54 +0200)
committerAndrea Zagli <andrea.zagli@email.it>
Mon, 17 Aug 2015 15:56:05 +0000 (17:56 +0200)
configure.ac
src/Makefile.am
src/grid.c [deleted file]
src/grid.h [deleted file]
src/gridcolumn.c [deleted file]
src/gridcolumn.h [deleted file]
src/libgdaex.h
tests/Makefile.am
tests/grid.c [deleted file]
tests/grid.db [deleted file]

index 3ada138be619fc8369773489e870c0635468b81e..1719743dbd50acbdcbbf27713ff6831a274c3121 100644 (file)
@@ -48,28 +48,6 @@ PKG_CHECK_MODULES(GDAEX, [gmodule-2.0 >= 2
 AC_SUBST(GDAEX_CFLAGS)
 AC_SUBST(GDAEX_LIBS)
 
-PKG_CHECK_EXISTS(libreptool >= 0.2.2, [LIBREPTOOL_FOUND=yes], [LIBREPTOOL_FOUND=no])
-
-AM_CONDITIONAL(LIBREPTOOL_FOUND, test $LIBREPTOOL_FOUND = yes)
-
-if test $LIBREPTOOL_FOUND = yes; then
-PKG_CHECK_MODULES(REPTOOL, libreptool >= 0.2.2)
-
-AC_SUBST(REPTOOL_CFLAGS)
-AC_SUBST(REPTOOL_LIBS)
-fi
-
-PKG_CHECK_EXISTS(libsolipa >= 0.4.0, [LIBSOLIPA_FOUND=yes], [LIBSOLIPA_FOUND=no])
-
-AM_CONDITIONAL(LIBSOLIPA_FOUND, test $LIBSOLIPA_FOUND = yes)
-
-if test $LIBSOLIPA_FOUND = yes; then
-PKG_CHECK_MODULES(SOLIPA, libsolipa >= 0.4.0)
-
-AC_SUBST(SOLIPA_CFLAGS)
-AC_SUBST(SOLIPA_LIBS)
-fi
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([string.h])
index 8f8f5a0542558b0091e1702751fd6c5bab1bc726..610d7214ccd029b085ad01bd7229b0bd4c4cfcbd 100644 (file)
@@ -8,29 +8,9 @@ AM_CPPFLAGS = -I$(top_srcdir) \
 
 LIBS = $(GDAEX_LIBS)
 
-if LIBREPTOOL_FOUND
-AM_CPPFLAGS += \
-               $(REPTOOL_CFLAGS) \
-               -DREPTOOL_FOUND=1
-
-LIBS += \
-        $(REPTOOL_LIBS)
-endif
-
-if LIBSOLIPA_FOUND
-AM_CPPFLAGS += \
-               $(SOLIPA_CFLAGS) \
-               -DSOLIPA_FOUND=1
-
-LIBS += \
-        $(SOLIPA_LIBS)
-endif
-
 lib_LTLIBRARIES = libgdaex.la
 
 libgdaex_la_SOURCES = gdaex.c \
-                      grid.c \
-                      gridcolumn.c \
                       queryeditor.c \
                       queryeditor_widget_interface.c \
                       queryeditorentry.c \
@@ -40,8 +20,6 @@ libgdaex_la_LDFLAGS = -no-undefined
 
 libgdaex_include_HEADERS = libgdaex.h \
                            gdaex.h \
-                           grid.h \
-                           gridcolumn.h \
                            queryeditor.h \
                            queryeditor_widget_interface.h \
                            queryeditorentry.h \
diff --git a/src/grid.c b/src/grid.c
deleted file mode 100644 (file)
index 43577da..0000000
+++ /dev/null
@@ -1,904 +0,0 @@
-/*
- *  grid.c
- *
- *  Copyright (C) 2010-2014 Andrea Zagli <azagli@libero.it>
- *
- *  This file is part of libgdaex.
- *  
- *  libgdaex_grid 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.
- *  
- *  libgdaex_grid 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.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with libgdaex; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-       #include <config.h>
-#endif
-
-#include <glib/gi18n-lib.h>
-
-#include <gtk/gtk.h>
-
-#if defined (REPTOOL_FOUND) || defined (SOLIPA_FOUND)
-       #include <gdk/gdk.h>
-#endif
-
-#ifdef REPTOOL_FOUND
-       #include <libreptool/libreptool.h>
-#endif
-
-#include "grid.h"
-
-static void gdaex_grid_class_init (GdaExGridClass *klass);
-static void gdaex_grid_init (GdaExGrid *gdaex_grid);
-
-static void gdaex_grid_set_property (GObject *object,
-                               guint property_id,
-                               const GValue *value,
-                               GParamSpec *pspec);
-static void gdaex_grid_get_property (GObject *object,
-                               guint property_id,
-                               GValue *value,
-                               GParamSpec *pspec);
-
-#if defined (REPTOOL_FOUND) || defined (SOLIPA_FOUND)
-static gboolean gdaex_grid_on_key_release_event (GtkWidget *widget,
-                            GdkEventKey *event,
-                            gpointer user_data);
-#endif
-
-#ifdef REPTOOL_FOUND
-static void gdaex_grid_on_print_menu_activate (GtkMenuItem *menuitem,
-                                   gpointer user_data);
-#endif
-
-#ifdef SOLIPA_FOUND
-static void gdaex_grid_on_export_menu_activate (GtkMenuItem *menuitem,
-                                   gpointer user_data);
-#endif
-
-static gboolean gdaex_grid_on_button_press_event (GtkWidget *widget,
-                                                  GdkEventButton *event,
-                                                  gpointer user_data);
-static gboolean gdaex_grid_on_popup_menu (GtkWidget *widget,
-                                          gpointer user_data);
-static void gdaex_grid_on_menu_item_toggled (GtkCheckMenuItem *checkmenuitem,
-                                             gpointer user_data);
-
-static GtkTreeModel *gdaex_grid_get_model (GdaExGrid *grid);
-static GtkTreeView *gdaex_grid_get_view (GdaExGrid *grid);
-
-#define GDAEX_GRID_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDAEX_TYPE_GRID, GdaExGridPrivate))
-
-typedef struct _GdaExGridPrivate GdaExGridPrivate;
-struct _GdaExGridPrivate
-       {
-               GPtrArray *columns; /* GdaExGridColumn */
-
-               gchar *title;
-
-               GtkTreeModel *model;
-               GtkWidget *view;
-               GtkWidget *menu;
-
-#ifdef SOLIPA_FOUND
-               Solipa *solipa;
-#endif
-       };
-
-G_DEFINE_TYPE (GdaExGrid, gdaex_grid, G_TYPE_OBJECT)
-
-static void
-gdaex_grid_class_init (GdaExGridClass *klass)
-{
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       g_type_class_add_private (object_class, sizeof (GdaExGridPrivate));
-
-       object_class->set_property = gdaex_grid_set_property;
-       object_class->get_property = gdaex_grid_get_property;
-}
-
-static void
-gdaex_grid_init (GdaExGrid *gdaex_grid)
-{
-       GdaExGridPrivate *priv = GDAEX_GRID_GET_PRIVATE (gdaex_grid);
-
-       priv->columns = g_ptr_array_new ();
-       priv->title = NULL;
-       priv->view = NULL;
-       priv->menu = NULL;
-}
-
-GdaExGrid
-*gdaex_grid_new ()
-{
-       GdaExGrid *gdaex_grid = GDAEX_GRID (g_object_new (gdaex_grid_get_type (), NULL));
-
-       GdaExGridPrivate *priv = GDAEX_GRID_GET_PRIVATE (gdaex_grid);
-
-       return gdaex_grid;
-}
-
-void
-gdaex_grid_set_title (GdaExGrid *grid, const gchar *title)
-{
-       GdaExGridPrivate *priv;
-
-       g_return_if_fail (GDAEX_IS_GRID (grid));
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       if (priv->title != NULL)
-               {
-                       g_free (priv->title);
-               }
-
-       if (title != NULL)
-               {
-                       priv->title = g_strdup (title);
-               }
-       else
-               {
-                       priv->title = NULL;
-               }
-}
-
-const gchar
-*gdaex_grid_get_title (GdaExGrid *grid)
-{
-       GdaExGridPrivate *priv;
-
-       g_return_val_if_fail (GDAEX_IS_GRID (grid), NULL);
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       if (priv->title != NULL)
-               {
-                       return g_strdup (priv->title);
-               }
-       else
-               {
-                       return NULL;
-               }
-}
-
-void
-gdaex_grid_add_column (GdaExGrid *grid, GdaExGridColumn *column)
-{
-       GdaExGridPrivate *priv;
-
-       g_return_if_fail (GDAEX_IS_GRID (grid));
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       g_ptr_array_add (priv->columns, g_object_ref (column));
-}
-
-void
-gdaex_grid_add_columns (GdaExGrid *grid, GSList *columns)
-{
-       GSList *first;
-
-       g_return_if_fail (GDAEX_IS_GRID (grid));
-
-       first = columns;
-       while (first != NULL)
-               {
-                       gdaex_grid_add_column (grid, (GdaExGridColumn *)first->data);
-                       first = g_slist_next (first);
-               }
-}
-
-void
-gdaex_grid_clear (GdaExGrid *grid)
-{
-       GdaExGridPrivate *priv;
-
-       guint col;
-
-       g_return_if_fail (GDAEX_IS_GRID (grid));
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       for (col = 0; priv->columns->len; col++)
-               {
-                       g_object_unref (g_ptr_array_index (priv->columns, col));
-               }
-
-       g_ptr_array_remove_range (priv->columns, 0, priv->columns->len);
-       g_ptr_array_unref (priv->columns);
-
-       priv->columns = g_ptr_array_new ();
-}
-
-GtkWidget
-*gdaex_grid_get_widget (GdaExGrid *grid)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID (grid), NULL);
-
-       return GTK_WIDGET (gdaex_grid_get_view (grid));
-}
-
-gboolean
-gdaex_grid_fill_from_sql_with_missing_func (GdaExGrid *grid,
-                                            GdaEx *gdaex,
-                                            const gchar *sql,
-                                            GdaExGridFillListStoreMissingFunc missing_func, gpointer user_data,
-                                            GError **error)
-{
-       GdaDataModel *dm;
-
-       gchar *_sql;
-
-       gboolean ret;
-
-       g_return_val_if_fail (GDAEX_IS_GRID (grid), FALSE);
-       g_return_val_if_fail (IS_GDAEX (gdaex), FALSE);
-       g_return_val_if_fail (sql != NULL, FALSE);
-
-       _sql = g_strstrip (g_strdup (sql));
-
-       g_return_val_if_fail (g_strcmp0 (_sql, "") != 0, FALSE);
-
-       dm = gdaex_query (gdaex, _sql);
-       g_free (_sql);
-       ret = gdaex_grid_fill_from_datamodel_with_missing_func (grid, dm, missing_func, user_data, error);
-       g_object_unref (dm);
-
-       return ret;
-}
-
-gboolean
-gdaex_grid_fill_from_datamodel_with_missing_func (GdaExGrid *grid,
-                                                  GdaDataModel *dm,
-                                                  GdaExGridFillListStoreMissingFunc missing_func, gpointer user_data,
-                                                  GError **error)
-{
-       GdaExGridPrivate *priv;
-
-       GdaDataModelIter *dm_iter;
-       GtkTreeIter iter;
-
-       const gchar *field_name;
-
-       guint cols;
-       guint cols_sorted;
-       guint col;
-
-       GType col_gtype;
-
-       GdaExGridColumn *gdaex_col;
-       GType gdaex_col_gtype;
-
-       GdaColumn *gda_col;
-       GType gda_col_gtype;
-
-       gint *columns;
-       GValue *values;
-
-       GDateTime *gdatetime;
-       gdouble dval;
-
-       gboolean call_missing_func;
-
-       g_return_val_if_fail (GDAEX_IS_GRID (grid), FALSE);
-       g_return_val_if_fail (GDA_IS_DATA_MODEL (dm), FALSE);
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       if (priv->model == NULL)
-               {
-                       gdaex_grid_get_model (grid);
-               }
-       g_return_val_if_fail (GTK_IS_TREE_MODEL (priv->model), FALSE);
-
-       dm_iter = gda_data_model_create_iter (dm);
-       g_return_val_if_fail (GDA_IS_DATA_MODEL_ITER (dm_iter), FALSE);
-
-       gtk_list_store_clear (GTK_LIST_STORE (priv->model));
-
-       cols = gtk_tree_model_get_n_columns (priv->model);
-       columns = g_new0 (gint, cols);
-       values = g_new0 (GValue, cols);
-
-       call_missing_func = FALSE;
-
-       while (gda_data_model_iter_move_next (dm_iter))
-               {
-                       gtk_list_store_append (GTK_LIST_STORE (priv->model), &iter);
-
-                       cols_sorted = priv->columns->len;
-                       for (col = 0; col < priv->columns->len; col++)
-                               {
-                                       GValue gval = {0};
-
-                                       columns[col] = col;
-
-                                       col_gtype = gtk_tree_model_get_column_type (priv->model, col);
-
-                                       gdaex_col = (GdaExGridColumn *)g_ptr_array_index (priv->columns, col);
-                                       field_name = gdaex_grid_column_get_field_name (gdaex_col);
-
-                                       g_value_init (&gval, col_gtype);
-
-                                       /* checking if field exists */
-                                       if (gda_data_model_get_column_index (dm, field_name) == -1)
-                                               {
-                                                       call_missing_func = TRUE;
-                                               }
-                                       else
-                                               {
-                                                       switch (col_gtype)
-                                                               {
-                                                                       case G_TYPE_STRING:
-                                                                               gda_col = gda_data_model_describe_column (dm, col);
-                                                                               gda_col_gtype = gda_column_get_g_type (gda_col);
-
-                                                                               switch (gda_col_gtype)
-                                                                                       {
-                                                                                               case G_TYPE_STRING:
-                                                                                                       g_value_set_string (&gval, gdaex_data_model_iter_get_field_value_stringify_at (dm_iter, field_name));
-                                                                                                       break;
-
-                                                                                               case G_TYPE_BOOLEAN:
-                                                                                                       g_value_set_string (&gval, gdaex_data_model_iter_get_field_value_boolean_at (dm_iter, field_name) ? "X" : "");
-                                                                                                       break;
-
-                                                                                               case G_TYPE_INT:
-                                                                                               case G_TYPE_FLOAT:
-                                                                                               case G_TYPE_DOUBLE:
-                                                                                                       dval = gdaex_data_model_iter_get_field_value_double_at (dm_iter, field_name);
-                                                                                                       g_value_set_string (&gval, gdaex_format_money (dval, gdaex_grid_column_get_decimals ((GdaExGridColumn *)g_ptr_array_index (priv->columns, col)), FALSE));
-                                                                                                       break;
-
-                                                                                               default:
-                                                                                                       if (gda_col_gtype == G_TYPE_DATE
-                                                                                                               || gda_col_gtype == G_TYPE_DATE_TIME
-                                                                                                               || gda_col_gtype == GDA_TYPE_TIMESTAMP)
-                                                                                                               {
-                                                                                                                       gdatetime = gdaex_data_model_iter_get_field_value_gdatetime_at (dm_iter, field_name);
-                                                                                                                       /* TODO find default format from locale */
-                                                                                                                       g_value_set_string (&gval, g_date_time_format (gdatetime, gda_col_gtype == G_TYPE_DATE ? "%d/%m/%Y" : "%d/%m/%Y %H.%M.%S"));
-                                                                                                                       g_date_time_unref (gdatetime);
-                                                                                                               }
-                                                                                                       else
-                                                                                                               {
-                                                                                                                       g_value_set_string (&gval, gdaex_data_model_iter_get_field_value_stringify_at (dm_iter, field_name));
-                                                                                                               }
-                                                                                                       break;
-                                                                                       }
-
-                                                                               break;
-
-                                                                       case G_TYPE_INT:
-                                                                               g_value_set_int (&gval, gdaex_data_model_iter_get_field_value_integer_at (dm_iter, field_name));
-                                                                               break;
-
-                                                                       case G_TYPE_FLOAT:
-                                                                               g_value_set_float (&gval, gdaex_data_model_iter_get_field_value_float_at (dm_iter, field_name));
-                                                                               break;
-
-                                                                       case G_TYPE_DOUBLE:
-                                                                               g_value_set_double (&gval, gdaex_data_model_iter_get_field_value_double_at (dm_iter, field_name));
-                                                                               break;
-
-                                                                       case G_TYPE_BOOLEAN:
-                                                                               g_value_set_boolean (&gval, gdaex_data_model_iter_get_field_value_boolean_at (dm_iter, field_name));
-                                                                               break;
-
-                                                                       default:
-                                                                               gval = *gda_value_new_from_string (gdaex_data_model_iter_get_field_value_stringify_at (dm_iter, field_name), col_gtype);
-                                                                               break;
-                                                               }
-                                               }
-                                       values[col] = gval;
-
-                                       gdaex_col_gtype = gdaex_grid_column_get_gtype (gdaex_col);
-
-                                       if ((gdaex_col_gtype == G_TYPE_DATE
-                                            || gdaex_col_gtype == G_TYPE_DATE_TIME
-                                            || gdaex_col_gtype == GDA_TYPE_TIMESTAMP
-                                            || ((gdaex_col_gtype == G_TYPE_INT
-                                                 || gdaex_col_gtype == G_TYPE_FLOAT
-                                                 || gdaex_col_gtype == G_TYPE_DOUBLE)
-                                                && gdaex_grid_column_get_decimals (gdaex_col) > -1))
-                                           && gdaex_grid_column_get_sortable (gdaex_col))
-                                               {
-                                                       columns[cols_sorted] = cols_sorted;
-
-                                                       GValue gval = {0};
-                                                       if (gdaex_col_gtype == G_TYPE_DATE
-                                                           || gdaex_col_gtype == G_TYPE_DATE_TIME
-                                                           || gdaex_col_gtype == GDA_TYPE_TIMESTAMP)
-                                                               {
-                                                                       g_value_init (&gval, G_TYPE_STRING);
-                                                                       gdatetime = gdaex_data_model_iter_get_field_value_gdatetime_at (dm_iter, field_name);
-                                                                       g_value_set_string (&gval, gdatetime != NULL ? g_date_time_format (gdatetime, gdaex_col_gtype == G_TYPE_DATE ? "%Y%m%d" : "%Y%m%d%H%M%S") : "");
-                                                                       g_date_time_unref (gdatetime);
-                                                               }
-                                                       else if (gdaex_col_gtype == G_TYPE_INT)
-                                                               {
-                                                                       g_value_init (&gval, G_TYPE_INT);
-                                                                       g_value_set_int (&gval, gdaex_data_model_iter_get_field_value_integer_at (dm_iter, field_name));
-                                                               }
-                                                       else if (gdaex_col_gtype == G_TYPE_FLOAT)
-                                                               {
-                                                                       g_value_init (&gval, G_TYPE_FLOAT);
-                                                                       g_value_set_float (&gval, gdaex_data_model_iter_get_field_value_float_at (dm_iter, field_name));
-                                                               }
-                                                       else if (gdaex_col_gtype == G_TYPE_DOUBLE)
-                                                               {
-                                                                       g_value_init (&gval, G_TYPE_DOUBLE);
-                                                                       g_value_set_double (&gval, gdaex_data_model_iter_get_field_value_double_at (dm_iter, field_name));
-                                                               }
-                                                       values[cols_sorted] = gval;
-                                                       cols_sorted++;
-                                               }
-                               }
-
-                       gtk_list_store_set_valuesv (GTK_LIST_STORE (priv->model), &iter, columns, values, cols);
-                       if (call_missing_func
-                           && missing_func != NULL)
-                               {
-                                       missing_func (GTK_LIST_STORE (priv->model), &iter, user_data);
-                               }
-               }
-
-       return TRUE;
-}
-
-gboolean
-gdaex_grid_fill_from_sql (GdaExGrid *grid, GdaEx *gdaex, const gchar *sql, GError **error)
-{
-       return gdaex_grid_fill_from_sql_with_missing_func (grid, gdaex, sql, NULL, NULL, error);
-}
-
-gboolean
-gdaex_grid_fill_from_datamodel (GdaExGrid *grid, GdaDataModel *dm, GError **error)
-{
-       return gdaex_grid_fill_from_datamodel_with_missing_func (grid, dm, NULL, NULL, error);
-}
-
-#ifdef SOLIPA_FOUND
-void
-gdaex_grid_set_solipa (GdaExGrid *grid, Solipa *solipa)
-{
-       GdaExGridPrivate *priv;
-
-       g_return_if_fail (GDAEX_IS_GRID (grid));
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       priv->solipa = solipa;
-}
-#endif
-
-/* PRIVATE */
-static void
-gdaex_grid_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-       GdaExGrid *gdaex_grid = GDAEX_GRID (object);
-       GdaExGridPrivate *priv = GDAEX_GRID_GET_PRIVATE (gdaex_grid);
-
-       switch (property_id)
-               {
-                       default:
-                               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-                               break;
-               }
-}
-
-static void
-gdaex_grid_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-       GdaExGrid *gdaex_grid = GDAEX_GRID (object);
-       GdaExGridPrivate *priv = GDAEX_GRID_GET_PRIVATE (gdaex_grid);
-
-       switch (property_id)
-               {
-                       default:
-                               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-                               break;
-               }
-}
-
-static GtkTreeModel
-*gdaex_grid_get_model (GdaExGrid *grid)
-{
-       /* TODO for now it returns always a GtkListStore */
-       GdaExGridPrivate *priv;
-
-       guint cols;
-       guint col;
-
-       GdaExGridColumn *gcolumn;
-
-       GType *gtype;
-       GType col_gtype;
-
-       g_return_val_if_fail (GDAEX_IS_GRID (grid), NULL);
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       cols = priv->columns->len;
-       gtype = g_new0 (GType, cols);
-
-       for (col = 0; col < priv->columns->len; col++)
-               {
-                       gcolumn = (GdaExGridColumn *)g_ptr_array_index (priv->columns, col);
-
-                       col_gtype = gdaex_grid_column_get_gtype (gcolumn);
-                       if (col_gtype == G_TYPE_DATE
-                           || col_gtype == G_TYPE_DATE_TIME
-                           || col_gtype == GDA_TYPE_TIMESTAMP
-                           || ((col_gtype == G_TYPE_INT
-                                || col_gtype == G_TYPE_FLOAT
-                                || col_gtype == G_TYPE_DOUBLE)
-                               && gdaex_grid_column_get_decimals (gcolumn) > -1))
-                               {
-                                       gtype[col] = G_TYPE_STRING;
-
-                                       if (gdaex_grid_column_get_sortable (gcolumn))
-                                               {
-                                                       /* add one column for sorting */
-                                                       gtype = g_renew (GType, gtype, ++cols);
-                                                       if (col_gtype == G_TYPE_DATE
-                                                           || col_gtype == G_TYPE_DATE_TIME
-                                                           || col_gtype == GDA_TYPE_TIMESTAMP)
-                                                               {
-                                                                       gtype[cols - 1] = G_TYPE_STRING;
-                                                               }
-                                                       else
-                                                               {
-                                                                       gtype[cols - 1] = col_gtype;
-                                                               }
-                                               }
-                               }
-                       else
-                               {
-                                       gtype[col] = col_gtype;
-                               }
-               }
-
-       if (priv->model != NULL)
-               {
-                       g_object_unref (priv->model);
-               }
-       priv->model = GTK_TREE_MODEL (gtk_list_store_newv (cols, gtype));
-
-       return priv->model;
-}
-
-static GtkTreeView
-*gdaex_grid_get_view (GdaExGrid *grid)
-{
-       GtkWidget *view;
-
-       GdaExGridPrivate *priv;
-
-       GtkTreeModel *model;
-       GdaExGridColumn *gcolumn;
-       GtkTreeViewColumn *vcolumn;
-
-       GList *cells;
-
-       GType col_gtype;
-
-       guint col;
-       guint cols_sorted;
-
-       GtkWidget *mitem;
-       GtkWidget *submitem;
-
-       g_return_val_if_fail (GDAEX_IS_GRID (grid), NULL);
-
-       priv = GDAEX_GRID_GET_PRIVATE (grid);
-
-       model = gdaex_grid_get_model (grid);
-       view = gtk_tree_view_new_with_model (model);
-
-       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
-
-       if (priv->menu != NULL)
-               {
-                       g_free (priv->menu);
-               }
-       if (priv->columns->len > 0)
-               {
-                       priv->menu = gtk_menu_new ();
-               }
-       else
-               {
-                       priv->menu = NULL;
-               }
-
-       mitem = gtk_menu_item_new_with_mnemonic (_("_Columns"));
-       gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), mitem);
-       gtk_widget_show (mitem);
-
-       submitem = gtk_menu_new ();
-       gtk_menu_item_set_submenu (GTK_MENU_ITEM (mitem), submitem);
-       gtk_widget_show (submitem);
-
-       cols_sorted = 0;
-       for (col = 0; col < priv->columns->len; col++)
-               {
-                       gcolumn = (GdaExGridColumn *)g_ptr_array_index (priv->columns, col);
-                       vcolumn = gdaex_grid_column_get_column (gcolumn);
-                       if (vcolumn)
-                               {
-                                       cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (vcolumn));
-                                       cells = g_list_first (cells);
-
-                                       col_gtype = gdaex_grid_column_get_gtype (gcolumn);
-                                       if (col_gtype == G_TYPE_BOOLEAN)
-                                               {
-                                                       gtk_tree_view_column_add_attribute (vcolumn, (GtkCellRenderer *)cells->data, "active", col);
-                                               }
-                                       else
-                                               {
-                                                       gtk_tree_view_column_add_attribute (vcolumn, (GtkCellRenderer *)cells->data, "text", col);
-                                               }
-                                       g_object_set_data (G_OBJECT (vcolumn), "rpt_text_col_idx", g_strdup_printf ("%d", col));
-
-                                       if (gdaex_grid_column_get_sortable (gcolumn))
-                                               {
-                                                       if (col_gtype == G_TYPE_DATE
-                                                           || col_gtype == G_TYPE_DATE_TIME
-                                                           || col_gtype == GDA_TYPE_TIMESTAMP
-                                                           || ((col_gtype == G_TYPE_INT
-                                                                || col_gtype == G_TYPE_FLOAT
-                                                                || col_gtype == G_TYPE_DOUBLE)
-                                                                && gdaex_grid_column_get_decimals ((GdaExGridColumn *)g_ptr_array_index (priv->columns, col)) > -1))
-                                                               {
-                                                                       gtk_tree_view_column_set_sort_column_id (vcolumn, priv->columns->len + cols_sorted++);
-                                                               }
-                                                       else
-                                                               {
-                                                                       gtk_tree_view_column_set_sort_column_id (vcolumn, col);
-                                                               }
-                                               }
-
-                                       gtk_tree_view_append_column (GTK_TREE_VIEW (view), vcolumn);
-
-                                       /* popup menu */
-                                       mitem = gtk_check_menu_item_new_with_label (gdaex_grid_column_get_title (gcolumn));
-                                       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mitem), gdaex_grid_column_get_visible (gcolumn));
-
-                                       g_object_set_data (G_OBJECT (mitem), "GdaExGridColumn", gcolumn);
-
-                                       g_signal_connect (G_OBJECT (mitem), "toggled",
-                                                         G_CALLBACK (gdaex_grid_on_menu_item_toggled), (gpointer)grid);
-
-                                       gtk_menu_shell_append (GTK_MENU_SHELL (submitem), mitem);
-                                       gtk_widget_show (mitem);
-                               }
-               }
-
-       priv->view = view;
-       if (priv->menu != NULL)
-               {
-                       gtk_menu_attach_to_widget (GTK_MENU (priv->menu), priv->view, NULL);
-
-                       g_signal_connect (G_OBJECT (priv->view), "button-press-event",
-                                         G_CALLBACK (gdaex_grid_on_button_press_event), (gpointer)grid);
-                       g_signal_connect (G_OBJECT (priv->view), "popup-menu",
-                                         G_CALLBACK (gdaex_grid_on_popup_menu), (gpointer)grid);
-
-#ifdef REPTOOL_FOUND
-                       mitem = gtk_menu_item_new_with_mnemonic (_("_Print..."));
-                       gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), mitem);
-                       gtk_widget_show (mitem);
-
-                       g_signal_connect (mitem,
-                                         "activate", G_CALLBACK (gdaex_grid_on_print_menu_activate), (gpointer)grid);
-#endif
-
-#ifdef SOLIPA_FOUND
-                       mitem = gtk_menu_item_new_with_mnemonic (_("_Export..."));
-                       gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), mitem);
-                       gtk_widget_show (mitem);
-
-                       g_signal_connect (mitem,
-                                         "activate", G_CALLBACK (gdaex_grid_on_export_menu_activate), (gpointer)grid);
-#endif
-       }
-
-#ifdef REPTOOL_FOUND
-       g_signal_connect (view,
-                         "key-release-event", G_CALLBACK (gdaex_grid_on_key_release_event), (gpointer)grid);
-#endif
-
-       return GTK_TREE_VIEW (priv->view);
-}
-
-#if defined (REPTOOL_FOUND) || defined (SOLIPA_FOUND)
-static gboolean
-gdaex_grid_on_key_release_event (GtkWidget *widget,
-                            GdkEventKey *event,
-                            gpointer user_data)
-{
-       switch (event->keyval)
-               {
-#ifdef REPTOOL_FOUND
-                       case GDK_KEY_F12:
-                               {
-                                       if (event->state & GDK_CONTROL_MASK)
-                                               {
-                                                       gdaex_grid_on_print_menu_activate (NULL, user_data);
-                                                       return TRUE;
-                                               }
-                                       break;
-                               }
-#endif
-
-#ifdef SOLIPA_FOUND
-                       case GDK_KEY_F11:
-                               {
-                                       if (event->state & GDK_CONTROL_MASK)
-                                               {
-                                                       gdaex_grid_on_export_menu_activate (NULL, user_data);
-                                                       return TRUE;
-                                               }
-                                       break;
-                               }
-#endif
-
-                       default:
-                               break;
-               }
-
-       return FALSE;
-}
-#endif
-
-#ifdef REPTOOL_FOUND
-static void
-gdaex_grid_on_print_menu_activate (GtkMenuItem *menuitem,
-                                   gpointer user_data)
-{
-       GdaExGridPrivate *priv;
-
-       RptReport *rptr;
-       RptPrint *rptp;
-
-       gchar *_title;
-
-       priv = GDAEX_GRID_GET_PRIVATE (user_data);
-
-       if (priv->title != NULL)
-               {
-                       _title = g_strdup_printf ("\"%s\"", priv->title);
-               }
-       else
-               {
-                       _title = NULL;
-               }
-       rptr = rpt_report_new_from_gtktreeview (GTK_TREE_VIEW (priv->view), _title);
-
-       if (rptr != NULL)
-               {
-                       xmlDoc *report = rpt_report_get_xml (rptr);
-                       rpt_report_set_output_type (rptr, RPT_OUTPUT_GTK);
-
-                       xmlDoc *rptprint = rpt_report_get_xml_rptprint (rptr);
-
-                       rptp = rpt_print_new_from_xml (rptprint);
-                       if (rptp != NULL)
-                               {
-                                       rpt_print_set_output_type (rptp, RPT_OUTPUT_GTK);
-                                       rpt_print_print (rptp, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->view))));
-                               }
-               }
-
-       if (_title != NULL)
-               {
-                       g_free (_title);
-               }
-}
-#endif
-
-#ifdef SOLIPA_FOUND
-static void
-gdaex_grid_on_export_menu_activate (GtkMenuItem *menuitem,
-                                    gpointer user_data)
-{
-       GdaExGridPrivate *priv;
-
-       gint col;
-       GdaExGridColumn *gcolumn;
-       GString *gstr;
-
-       priv = GDAEX_GRID_GET_PRIVATE (user_data);
-
-       if (!IS_SOLIPA (priv->solipa))
-               {
-                       g_warning ("No Solipa object found");
-                       return;
-               }
-
-       if (priv->columns->len)
-               {
-                       gstr = g_string_new ("");
-                       for (col = 0; col < priv->columns->len; col++)
-                               {
-                                       gcolumn = (GdaExGridColumn *)g_ptr_array_index (priv->columns, col);
-                                       if (gdaex_grid_column_get_visible (gcolumn))
-                                               {
-                                                       g_string_append_printf (gstr, "|%s", gdaex_grid_column_get_title (gcolumn));
-                                               }
-                                       else
-                                               {
-                                                       g_string_append (gstr, "|{SKIP}");
-                                               }
-                               }
-
-                       gchar **columns_title = g_strsplit (gstr->str + 1, "|", -1);
-
-                       solipa_gtktreemodel_to_csv_gui (priv->solipa, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (priv->view))), priv->model,
-                                                       columns_title, g_strv_length (columns_title));
-
-                       g_strfreev (columns_title);
-
-                       return;
-               }
-}
-#endif
-
-static gboolean
-gdaex_grid_on_button_press_event (GtkWidget *widget,
-                                  GdkEventButton *event,
-                                  gpointer user_data)
-{
-       GdaExGridPrivate *priv;
-
-       if (event->type == GDK_BUTTON_PRESS && event->button == 3)
-               {
-                       priv = GDAEX_GRID_GET_PRIVATE (user_data);
-
-                       gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL, NULL, NULL,
-                                       event->button, event->time);
-                       return TRUE;
-               }
-
-       return FALSE;
-}
-
-static gboolean
-gdaex_grid_on_popup_menu (GtkWidget *widget,
-                          gpointer user_data)
-{
-       GdaExGridPrivate *priv;
-
-       priv = GDAEX_GRID_GET_PRIVATE (user_data);
-       gtk_menu_popup (GTK_MENU (priv->menu), NULL, NULL, NULL, NULL,
-                       0, gtk_get_current_event_time ());
-
-       return TRUE;
-}
-
-static void
-gdaex_grid_on_menu_item_toggled (GtkCheckMenuItem *checkmenuitem,
-                                 gpointer user_data)
-{
-       GdaExGridPrivate *priv;
-
-       priv = GDAEX_GRID_GET_PRIVATE (user_data);
-
-       GdaExGridColumn *gcolumn = g_object_get_data (G_OBJECT (checkmenuitem), "GdaExGridColumn");
-
-       gdaex_grid_column_set_visible (gcolumn,
-                                      gtk_check_menu_item_get_active (checkmenuitem));
-}
diff --git a/src/grid.h b/src/grid.h
deleted file mode 100644 (file)
index 0f3ff31..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *  grid.h
- *
- *  Copyright (C) 2010-2014 Andrea Zagli <azagli@libero.it>
- *
- *  This file is part of libgdaex.
- *  
- *  libgdaex 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.
- *  
- *  libgdaex 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.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with libgdaex; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *  
- */
-
-#ifndef __GDAEX_GRID_H__
-#define __GDAEX_GRID_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#ifdef SOLIPA_FOUND
-       #include <libsolipa/libsolipa.h>
-#endif
-
-#include "gdaex.h"
-#include "gridcolumn.h"
-
-G_BEGIN_DECLS
-
-
-#define GDAEX_TYPE_GRID                 (gdaex_grid_get_type ())
-#define GDAEX_GRID(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDAEX_TYPE_GRID, GdaExGrid))
-#define GDAEX_GRID_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GDAEX_TYPE_GRID, GdaExGridClass))
-#define GDAEX_IS_GRID(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDAEX_TYPE_GRID))
-#define GDAEX_IS_GRID_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GDAEX_TYPE_GRID))
-#define GDAEX_GRID_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GDAEX_TYPE_GRID, GdaExGridClass))
-
-
-typedef struct _GdaExGrid GdaExGrid;
-typedef struct _GdaExGridClass GdaExGridClass;
-
-struct _GdaExGrid
-       {
-               GObject parent;
-       };
-
-struct _GdaExGridClass
-       {
-               GObjectClass parent_class;
-       };
-
-GType gdaex_grid_get_type (void) G_GNUC_CONST;
-
-
-GdaExGrid *gdaex_grid_new (void);
-
-void gdaex_grid_set_title (GdaExGrid *grid, const gchar *title);
-const gchar *gdaex_grid_get_title (GdaExGrid *grid);
-
-void gdaex_grid_add_column (GdaExGrid *grid, GdaExGridColumn *column);
-void gdaex_grid_add_columns (GdaExGrid *grid, GSList *columns);
-
-void gdaex_grid_clear (GdaExGrid *grid);
-
-GtkWidget *gdaex_grid_get_widget (GdaExGrid *grid);
-
-typedef void (*GdaExGridFillListStoreMissingFunc) (GtkListStore *lstore, GtkTreeIter *iter, gpointer user_data);
-
-gboolean gdaex_grid_fill_from_sql_with_missing_func (GdaExGrid *grid,
-                                                     GdaEx *gdaex,
-                                                     const gchar *sql,
-                                                     GdaExGridFillListStoreMissingFunc missing_func, gpointer user_data,
-                                                     GError **error);
-gboolean gdaex_grid_fill_from_datamodel_with_missing_func (GdaExGrid *grid,
-                                                           GdaDataModel *dm,
-                                                           GdaExGridFillListStoreMissingFunc missing_func, gpointer user_data,
-                                                           GError **error);
-
-gboolean gdaex_grid_fill_from_sql (GdaExGrid *grid, GdaEx *gdaex, const gchar *sql, GError **error);
-gboolean gdaex_grid_fill_from_datamodel (GdaExGrid *grid, GdaDataModel *dm, GError **error);
-
-#ifdef SOLIPA_FOUND
-void gdaex_grid_set_solipa (GdaExGrid *grid, Solipa *solipa);
-#endif
-
-
-G_END_DECLS
-
-#endif /* __GDAEX_GRID_H__ */
diff --git a/src/gridcolumn.c b/src/gridcolumn.c
deleted file mode 100644 (file)
index ed84b67..0000000
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- *  gridcolumn.c
- *
- *  Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
- *
- *  This file is part of libgdaex.
- *  
- *  libgdaex_grid_column 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.
- *  
- *  libgdaex_grid_column 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.
- *  
- *  You should have received a copy of the GNU General Public License
- *  along with libgdaex; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-       #include <config.h>
-#endif
-
-#include <libgda/libgda.h>
-
-#include "gridcolumn.h"
-
-static void gdaex_grid_column_class_init (GdaExGridColumnClass *klass);
-static void gdaex_grid_column_init (GdaExGridColumn *gdaex_grid_column);
-
-static void gdaex_grid_column_set_property (GObject *object,
-                               guint property_id,
-                               const GValue *value,
-                               GParamSpec *pspec);
-static void gdaex_grid_column_get_property (GObject *object,
-                               guint property_id,
-                               GValue *value,
-                               GParamSpec *pspec);
-
-#define GDAEX_GRID_COLUMN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDAEX_TYPE_GRID_COLUMN, GdaExGridColumnPrivate))
-
-typedef struct _GdaExGridColumnPrivate GdaExGridColumnPrivate;
-struct _GdaExGridColumnPrivate
-       {
-               gchar *title;
-               gchar *field_name;
-               GType type;
-               gboolean visible;
-               gboolean resizable;
-               gboolean sortable;
-               gboolean reorderable;
-               gint decimals;
-
-               GtkTreeViewColumn *vcolumn;
-       };
-
-G_DEFINE_TYPE (GdaExGridColumn, gdaex_grid_column, G_TYPE_OBJECT)
-
-static void
-gdaex_grid_column_class_init (GdaExGridColumnClass *klass)
-{
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       g_type_class_add_private (object_class, sizeof (GdaExGridColumnPrivate));
-
-       object_class->set_property = gdaex_grid_column_set_property;
-       object_class->get_property = gdaex_grid_column_get_property;
-}
-
-static void
-gdaex_grid_column_init (GdaExGridColumn *gdaex_grid_column)
-{
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (gdaex_grid_column);
-
-       priv->title = NULL;
-       priv->field_name = NULL;
-       priv->type = G_TYPE_NONE;
-       priv->visible = FALSE;
-       priv->resizable = FALSE;
-       priv->sortable = FALSE;
-       priv->reorderable = FALSE;
-       priv->decimals = -1;
-       priv->vcolumn = NULL;
-}
-
-GdaExGridColumn
-*gdaex_grid_column_new (const gchar *title,
-                        const gchar *field_name,
-                        GType type,
-                        gboolean visible,
-                        gboolean resizable,
-                        gboolean sortable,
-                        gboolean reorderable,
-                        gint decimals)
-{
-       GdaExGridColumn *gdaex_grid_column = GDAEX_GRID_COLUMN (g_object_new (gdaex_grid_column_get_type (), NULL));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (gdaex_grid_column);
-
-       gdaex_grid_column_set_title (gdaex_grid_column, title);
-       gdaex_grid_column_set_field_name (gdaex_grid_column, field_name);
-       gdaex_grid_column_set_gtype (gdaex_grid_column, type);
-       gdaex_grid_column_set_visible (gdaex_grid_column, visible);
-       gdaex_grid_column_set_resizable (gdaex_grid_column, resizable);
-       gdaex_grid_column_set_sortable (gdaex_grid_column, sortable);
-       gdaex_grid_column_set_reorderable (gdaex_grid_column, reorderable);
-       gdaex_grid_column_set_decimals (gdaex_grid_column, decimals);
-
-       return gdaex_grid_column;
-}
-
-GdaExGridColumn
-*gdaex_grid_column_new_defaults (const gchar *title,
-                                 const gchar *field_name,
-                                 GType type)
-{
-       return gdaex_grid_column_new (title,
-                                     field_name,
-                                     type,
-                                     TRUE,
-                                     TRUE,
-                                     TRUE,
-                                     TRUE,
-                                     type == G_TYPE_FLOAT || type == G_TYPE_DOUBLE ? 2 : 0);
-}
-
-void
-gdaex_grid_column_set_title (GdaExGridColumn *column, const gchar *title)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       g_free (priv->title);
-       priv->title = g_strdup (title);
-
-       if (priv->vcolumn != NULL)
-               {
-                       gtk_tree_view_column_set_title (priv->vcolumn, priv->title);
-               }
-}
-
-const gchar
-*gdaex_grid_column_get_title (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), NULL);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return (const gchar *)g_strdup (priv->title);
-}
-
-void
-gdaex_grid_column_set_field_name (GdaExGridColumn *column, const gchar *field_name)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       g_free (priv->field_name);
-       priv->field_name = g_strdup (field_name);
-}
-
-const gchar
-*gdaex_grid_column_get_field_name (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), NULL);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return (const gchar *)g_strdup (priv->field_name);
-}
-
-void
-gdaex_grid_column_set_gtype (GdaExGridColumn *column, GType type)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       priv->type = type;
-}
-
-GType
-gdaex_grid_column_get_gtype (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), G_TYPE_NONE);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return priv->type;
-}
-
-void
-gdaex_grid_column_set_visible (GdaExGridColumn *column, gboolean visible)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       priv->visible = visible;
-
-       if (priv->vcolumn != NULL)
-               {
-                       gtk_tree_view_column_set_visible (priv->vcolumn, priv->visible);
-               }
-}
-
-gboolean
-gdaex_grid_column_get_visible (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), FALSE);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return priv->visible;
-}
-
-void
-gdaex_grid_column_set_resizable (GdaExGridColumn *column, gboolean resizable)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       priv->resizable = resizable;
-
-       if (priv->vcolumn != NULL)
-               {
-                       gtk_tree_view_column_set_resizable (priv->vcolumn, priv->resizable);
-               }
-}
-
-gboolean
-gdaex_grid_column_get_resizable (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), FALSE);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return priv->resizable;
-}
-
-void
-gdaex_grid_column_set_sortable (GdaExGridColumn *column, gboolean sortable)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       priv->sortable = sortable;
-
-       if (priv->vcolumn != NULL)
-               {
-                       gtk_tree_view_column_set_clickable (priv->vcolumn, priv->sortable);
-               }
-}
-
-gboolean
-gdaex_grid_column_get_sortable (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), FALSE);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return priv->sortable;
-}
-
-void
-gdaex_grid_column_set_reorderable (GdaExGridColumn *column, gboolean reorderable)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       priv->reorderable = reorderable;
-
-       if (priv->vcolumn != NULL)
-               {
-                       gtk_tree_view_column_set_reorderable (priv->vcolumn, priv->reorderable);
-               }
-}
-
-gboolean
-gdaex_grid_column_get_reorderable (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), FALSE);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return priv->reorderable;
-}
-
-void
-gdaex_grid_column_set_decimals (GdaExGridColumn *column, gint decimals)
-{
-       g_return_if_fail (GDAEX_IS_GRID_COLUMN (column));
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       priv->decimals = decimals;
-}
-
-gint
-gdaex_grid_column_get_decimals (GdaExGridColumn *column)
-{
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), FALSE);
-
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       return priv->decimals;
-}
-
-GtkTreeViewColumn
-*gdaex_grid_column_get_column (GdaExGridColumn *column)
-{
-       GdaExGridColumnPrivate *priv;
-
-       GtkCellRenderer *renderer;
-
-       g_return_val_if_fail (GDAEX_IS_GRID_COLUMN (column), NULL);
-
-       priv = GDAEX_GRID_COLUMN_GET_PRIVATE (column);
-
-       renderer = NULL;
-       if (priv->type == G_TYPE_STRING
-           || priv->type == G_TYPE_DATE
-           || priv->type == G_TYPE_DATE_TIME
-           || priv->type == GDA_TYPE_TIMESTAMP)
-               {
-                       renderer = gtk_cell_renderer_text_new ();
-               }
-       else if (priv->type == G_TYPE_INT
-           || priv->type == G_TYPE_FLOAT
-           || priv->type == G_TYPE_DOUBLE)
-               {
-                       if (priv->decimals > -1)
-                               {
-                                       renderer = gtk_cell_renderer_text_new ();
-                               }
-                       else
-                               {
-                                       renderer = gtk_cell_renderer_spin_new ();
-                               }
-                       gtk_cell_renderer_set_alignment (renderer, 1.0, 0.5);
-               }
-       else if (priv->type == G_TYPE_BOOLEAN)
-               {
-                       renderer = gtk_cell_renderer_toggle_new ();
-                       gtk_cell_renderer_set_alignment (renderer, 0.5, 0.5);
-               }
-       else
-               {
-                       g_warning ("Error on creating the renderer for column «%s».", priv->title);
-                       return NULL;
-               }
-
-       if (priv->vcolumn != NULL)
-               {
-                       g_object_unref (priv->vcolumn);
-               }
-       priv->vcolumn = gtk_tree_view_column_new ();
-
-       gtk_tree_view_column_pack_start (priv->vcolumn, renderer, TRUE);
-
-       gtk_tree_view_column_set_title (priv->vcolumn, priv->title);
-       gtk_tree_view_column_set_resizable (priv->vcolumn, priv->resizable);
-       gtk_tree_view_column_set_clickable (priv->vcolumn, priv->sortable);
-       gtk_tree_view_column_set_reorderable (priv->vcolumn, priv->reorderable);
-
-       gtk_tree_view_column_set_visible (priv->vcolumn, priv->visible);
-
-       return priv->vcolumn;
-}
-
-/* PRIVATE */
-static void
-gdaex_grid_column_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
-{
-       GdaExGridColumn *gdaex_grid_column = GDAEX_GRID_COLUMN (object);
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (gdaex_grid_column);
-
-       switch (property_id)
-               {
-                       default:
-                               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-                               break;
-               }
-}
-
-static void
-gdaex_grid_column_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
-{
-       GdaExGridColumn *gdaex_grid_column = GDAEX_GRID_COLUMN (object);
-       GdaExGridColumnPrivate *priv = GDAEX_GRID_COLUMN_GET_PRIVATE (gdaex_grid_column);
-
-       switch (property_id)
-               {
-                       default:
-                               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-                               break;
-               }
-}
diff --git a/src/gridcolumn.h b/src/gridcolumn.h
deleted file mode 100644 (file)
index 8ab8c68..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  gridcolumn.h
- *
- *  Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
- *
- *  This file is part of libgdaex.
- *
- *  libgdaex 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.
- *
- *  libgdaex 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with libgdaex; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *  
- */
-
-#ifndef __GDAEX_GRID_COLUMN_H__
-#define __GDAEX_GRID_COLUMN_H__
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-
-#define GDAEX_TYPE_GRID_COLUMN                 (gdaex_grid_column_get_type ())
-#define GDAEX_GRID_COLUMN(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDAEX_TYPE_GRID_COLUMN, GdaExGridColumn))
-#define GDAEX_GRID_COLUMN_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), GDAEX_TYPE_GRID_COLUMN, GdaExGridColumnClass))
-#define GDAEX_IS_GRID_COLUMN(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDAEX_TYPE_GRID_COLUMN))
-#define GDAEX_IS_GRID_COLUMN_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), GDAEX_TYPE_GRID_COLUMN))
-#define GDAEX_GRID_COLUMN_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), GDAEX_TYPE_GRID_COLUMN, GdaExGridColumnClass))
-
-
-typedef struct _GdaExGridColumn GdaExGridColumn;
-typedef struct _GdaExGridColumnClass GdaExGridColumnClass;
-
-struct _GdaExGridColumn
-       {
-               GObject parent;
-       };
-
-struct _GdaExGridColumnClass
-       {
-               GObjectClass parent_class;
-       };
-
-GType gdaex_grid_column_get_type (void) G_GNUC_CONST;
-
-
-GdaExGridColumn *gdaex_grid_column_new (const gchar *title,
-                                        const gchar *field_name,
-                                        GType type,
-                                        gboolean visible,
-                                        gboolean resizable,
-                                        gboolean sortable,
-                                        gboolean reorderable,
-                                        gint decimals);
-
-GdaExGridColumn *gdaex_grid_column_new_defaults (const gchar *title,
-                                                 const gchar *field_name,
-                                                 GType type);
-
-void gdaex_grid_column_set_title (GdaExGridColumn *column, const gchar *title);
-const gchar *gdaex_grid_column_get_title (GdaExGridColumn *column);
-
-void gdaex_grid_column_set_field_name (GdaExGridColumn *column, const gchar *field_name);
-const gchar *gdaex_grid_column_get_field_name (GdaExGridColumn *column);
-
-void gdaex_grid_column_set_gtype (GdaExGridColumn *column, GType type);
-GType gdaex_grid_column_get_gtype (GdaExGridColumn *column);
-
-void gdaex_grid_column_set_visible (GdaExGridColumn *column, gboolean visible);
-gboolean gdaex_grid_column_get_visible (GdaExGridColumn *column);
-
-void gdaex_grid_column_set_resizable (GdaExGridColumn *column, gboolean resizable);
-gboolean gdaex_grid_column_get_resizable (GdaExGridColumn *column);
-
-void gdaex_grid_column_set_sortable (GdaExGridColumn *column, gboolean sortable);
-gboolean gdaex_grid_column_get_sortable (GdaExGridColumn *column);
-
-void gdaex_grid_column_set_reorderable (GdaExGridColumn *column, gboolean reorderable);
-gboolean gdaex_grid_column_get_reorderable (GdaExGridColumn *column);
-
-void gdaex_grid_column_set_decimals (GdaExGridColumn *column, gint decimals);
-gint gdaex_grid_column_get_decimals (GdaExGridColumn *column);
-
-GtkTreeViewColumn *gdaex_grid_column_get_column (GdaExGridColumn *column);
-
-
-G_END_DECLS
-
-#endif /* __GDAEX_GRID_COLUMN_H__ */
index cd347f5a34bcd6a917f5069b8a80d7507f4ff712..603c471d55456ff9084d84ab6fe94c4cb846eb31 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  libgdaex.h
  *
- *  Copyright (C) 2005-2011 Andrea Zagli <azagli@libero.it>
+ *  Copyright (C) 2005-2015 Andrea Zagli <azagli@libero.it>
  *
  *  This file is part of libgdaex.
  *
@@ -25,8 +25,6 @@
 
 
 #include "gdaex.h"
-#include "grid.h"
-#include "gridcolumn.h"
 #include "queryeditor.h"
 #include "queryeditor_widget_interface.h"
 #include "sqlbuilder.h"
index 4ed3489c499b78dbc61f3865279564ad4e040e63..57543bd0ec2b36e2abdf2805b09e96056443fcf3 100644 (file)
@@ -5,18 +5,8 @@ AM_CPPFLAGS = $(GDAEX_CFLAGS) \
               -I$(top_srcdir)/src \
               -DTESTSDIR="\"@abs_builddir@\""
 
-if LIBSOLIPA_FOUND
-AM_CPPFLAGS += \
-               $(SOLIPA_CFLAGS) \
-               -DSOLIPA_FOUND=1
-
-LIBS += \
-        $(SOLIPA_LIBS)
-endif
-
 noinst_PROGRAMS = fill_liststore \
                   getsql \
-                  grid \
                   query_editor \
                   select \
                   sqlbuilder \
@@ -24,5 +14,4 @@ noinst_PROGRAMS = fill_liststore \
 
 LDADD = $(top_builddir)/src/libgdaex.la
 
-EXTRA_DIST = test_prefix.db \
-             grid.db
+EXTRA_DIST = test_prefix.db
diff --git a/tests/grid.c b/tests/grid.c
deleted file mode 100644 (file)
index 3fa3509..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2011-2014 Andrea Zagli <azagli@libero.it>
- *
- *  This program 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.
- *
- *  This program 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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <libgdaex.h>
-
-GdaExGridColumn *gcol_birthday;
-
-static void
-missing_func (GtkListStore *lstore, GtkTreeIter *iter, gpointer user_data)
-{
-       gtk_list_store_set (lstore, iter,
-                           7, "missing",
-                           -1);
-}
-
-static void
-on_btn_birthday_clicked (GtkButton *button,
-                         gpointer user_data)
-{
-       gdaex_grid_column_set_visible (gcol_birthday, !gdaex_grid_column_get_visible (gcol_birthday));
-}
-
-int
-main (int argc, char **argv)
-{
-       GdaEx *gdaex;
-
-       GtkWidget *w;
-       GtkWidget *vbox;
-       GtkWidget *scrolledw;
-       GtkWidget *hbtnbox;
-       GtkWidget *btn;
-
-       GdaExGrid *grid;
-       GdaExGridColumn *gcol;
-       GtkWidget *wgrid;
-
-       gtk_init (&argc, &argv);
-
-       gdaex = gdaex_new_from_string (g_strdup_printf ("SQLite://DB_DIR=%s;DB_NAME=grid.db", TESTSDIR));
-       if (gdaex == NULL)
-               {
-                       g_error ("Unable to connect to the db.");
-               }
-
-       w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-       gtk_window_set_default_size (GTK_WINDOW (w), 550, 350);
-       g_signal_connect (w, "delete-event",
-                         G_CALLBACK (gtk_false), NULL);
-       g_signal_connect (w, "destroy",
-                         G_CALLBACK (gtk_main_quit), NULL);
-
-       vbox = gtk_vbox_new (FALSE, 0);
-       gtk_container_add (GTK_CONTAINER (w), vbox);
-
-       scrolledw = gtk_scrolled_window_new (NULL, NULL);
-       gtk_box_pack_start (GTK_BOX (vbox), scrolledw, TRUE, TRUE, 0);
-
-       grid = gdaex_grid_new ();
-       gdaex_grid_set_title (grid, "The grid title");
-
-#ifdef SOLIPA_FOUND
-       gdaex_grid_set_solipa (grid, solipa_new ());
-#endif
-
-       gcol = gdaex_grid_column_new ("ID", "id", G_TYPE_INT, TRUE, FALSE, FALSE, FALSE, -1);
-       gdaex_grid_add_column (grid, gcol);
-
-       gcol = gdaex_grid_column_new ("Name", "name", G_TYPE_STRING, TRUE, TRUE, TRUE, TRUE, -1);
-       gdaex_grid_add_column (grid, gcol);
-
-       gcol = gdaex_grid_column_new_defaults ("Surname", "surname", G_TYPE_STRING);
-       gdaex_grid_add_column (grid, gcol);
-
-       gcol = gdaex_grid_column_new_defaults ("Age", "age", G_TYPE_INT);
-       gdaex_grid_add_column (grid, gcol);
-
-       gcol_birthday = gdaex_grid_column_new ("Birthday", "birthday", G_TYPE_DATE, FALSE, TRUE, TRUE, TRUE, -1);
-       gdaex_grid_add_column (grid, gcol_birthday);
-
-       gcol = gdaex_grid_column_new_defaults ("Incoming", "incoming", G_TYPE_DOUBLE);
-       gdaex_grid_add_column (grid, gcol);
-
-       gcol = gdaex_grid_column_new ("Married", "married", G_TYPE_BOOLEAN, TRUE, TRUE, TRUE, TRUE, -1);
-       gdaex_grid_add_column (grid, gcol);
-
-       gcol = gdaex_grid_column_new_defaults ("Missing", "missing", G_TYPE_STRING);
-       gdaex_grid_add_column (grid, gcol);
-
-       wgrid = gdaex_grid_get_widget (grid);
-       gtk_container_add (GTK_CONTAINER (scrolledw), wgrid);
-
-       gdaex_grid_fill_from_sql_with_missing_func (grid, gdaex, "SELECT * FROM clients", missing_func, NULL, NULL);
-
-       hbtnbox = gtk_hbutton_box_new ();
-       gtk_box_pack_start (GTK_BOX (vbox), hbtnbox, FALSE, FALSE, 0);
-
-       btn = gtk_button_new_with_label ("Hide/Show Birthday");
-       gtk_box_pack_start (GTK_BOX (hbtnbox), btn, TRUE, TRUE, 0);
-
-       g_signal_connect (G_OBJECT (btn), "clicked",
-                         G_CALLBACK (on_btn_birthday_clicked), NULL);
-
-       gtk_widget_show_all (w);
-
-       gtk_main ();
-
-       return 0;
-}
diff --git a/tests/grid.db b/tests/grid.db
deleted file mode 100644 (file)
index abc3267..0000000
Binary files a/tests/grid.db and /dev/null differ