From: Andrea Zagli Date: Mon, 25 Jan 2016 15:10:47 +0000 (+0100) Subject: Utilizzo di GdaExGrid in regioni. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=64475234dde892ab96c2ea5651b6548b4d798110;p=solipa%2Fterritorio Utilizzo di GdaExGrid in regioni. --- diff --git a/configure.ac b/configure.ac index 4ed27ef..5b55e22 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,15 @@ AC_PROG_CC AC_PROG_LIBTOOL AC_PROG_RANLIB +dnl ****************************** +dnl Translations +dnl ****************************** +GETTEXT_PACKAGE=territorio +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for our gettext translation domains.]) +AM_GLIB_GNU_GETTEXT + # Checks for libraries. PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.36 libgda-ui-5.0 >= 5.0.0 diff --git a/data/territorio/gui/territorio.gui b/data/territorio/gui/territorio.gui index 34021b1..3950cc5 100644 --- a/data/territorio/gui/territorio.gui +++ b/data/territorio/gui/territorio.gui @@ -659,183 +659,6 @@ - - - - - - - - - - False - Regioni - Territorio - True - center-on-parent - 550 - 400 - True - - - True - False - 5 - vertical - 5 - - - True - False - <b>Regioni</b> - True - - - False - True - 0 - - - - - True - True - etched-in - - - True - True - lstore_regioni - True - 1 - - - - - - Nome - - - - 1 - - - - - - - - - True - True - 1 - - - - - True - False - 5 - end - - - E_sporta - False - True - True - True - True - - - False - False - 0 - - - - - gtk-new - False - True - True - True - True - - - False - False - 1 - - - - - gtk-edit - False - True - True - True - True - - - False - False - 2 - - - - - gtk-delete - False - True - True - True - True - - - False - False - 3 - - - - - gtk-cancel - False - True - True - True - True - - - False - False - 4 - - - - - gtk-ok - False - True - True - True - True - - - False - False - 5 - - - - - False - True - 2 - - - - - @@ -2272,6 +2095,140 @@ + + False + Regioni - Territorio + True + center-on-parent + 550 + 400 + True + + + True + False + 5 + vertical + 5 + + + True + False + <b>Regioni</b> + True + + + False + True + 0 + + + + + True + True + etched-in + + + + + + True + True + 1 + + + + + True + False + 5 + end + + + gtk-new + False + True + True + True + True + + + False + False + 0 + + + + + gtk-edit + False + True + True + True + True + + + False + False + 2 + + + + + gtk-delete + False + True + True + True + True + + + False + False + 3 + + + + + gtk-cancel + False + True + True + True + True + + + False + False + 4 + + + + + gtk-ok + False + True + True + True + True + + + False + False + 5 + + + + + False + True + 2 + + + + + False Ricerca comuni - Territorio diff --git a/po/Makefile.in.in b/po/Makefile.in.in new file mode 100644 index 0000000..e6c32cb --- /dev/null +++ b/po/Makefile.in.in @@ -0,0 +1,268 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. +# +# - Modified by Owen Taylor to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize + +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = @SHELL@ +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ +datadir = @datadir@ +libdir = @libdir@ +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po +subdir = po + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +MKINSTALLDIRS = mkdir -p + +CC = @CC@ +GENCAT = @GENCAT@ +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge + +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + +SOURCES = +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = LINGUAS ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ +$(POFILES) $(GMOFILES) $(SOURCES) + +POTFILES = \ + +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +INSTOBJEXT = @INSTOBJEXT@ + +.SUFFIXES: +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + $(AM_V_GEN) file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && $(GENCAT) $@ $*.msg + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) \ + --msgid-bugs-address='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&keywords=I18N+L10N&component=general' \ + --add-comments --keyword=_ --keyword=N_ \ + --keyword=C_:1c,2 \ + --keyword=NC_:1c,2 \ + --keyword=g_dcgettext:2 \ + --keyword=g_dngettext:2,3 \ + --keyword=g_dpgettext2:2c,3 \ + --flag=N_:1:pass-c-format \ + --flag=C_:2:pass-c-format \ + --flag=NC_:2:pass-c-format \ + --flag=g_dngettext:2:pass-c-format \ + --flag=g_strdup_printf:1:c-format \ + --flag=g_string_printf:2:c-format \ + --flag=g_string_append_printf:2:c-format \ + --flag=g_error_new:3:c-format \ + --flag=g_set_error:4:c-format \ + --flag=g_markup_printf_escaped:1:c-format \ + --flag=g_log:3:c-format \ + --flag=g_print:1:c-format \ + --flag=g_printerr:1:c-format \ + --flag=g_printf:1:c-format \ + --flag=g_fprintf:2:c-format \ + --flag=g_sprintf:2:c-format \ + --flag=g_snprintf:3:c-format \ + --flag=g_scanner_error:2:c-format \ + --flag=g_scanner_warn:2:c-format \ + $(POTFILES) \ + && test ! -f $(GETTEXT_PACKAGE).po \ + || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ + && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) + +install: install-exec install-data +install-exec: +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + $(MKINSTALLDIRS) $$dir; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ + fi; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ + $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + echo "installing $(srcdir)/$$cat as" \ + "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ + else \ + true; \ + fi; \ + fi; \ + done + if test "$(PACKAGE)" = "glib"; then \ + $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + done + if test "$(PACKAGE)" = "glib"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + fi + +check: all + +dvi info tags TAGS ID: + +mostlyclean: + rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp + rm -fr *.o + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f $(GMOFILES) + +distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) +dist distdir: $(DISTFILES) + dists="$(DISTFILES)"; \ + for file in $$dists; do \ + ln $(srcdir)/$$file $(distdir) 2> /dev/null \ + || cp -p $(srcdir)/$$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + cd $(srcdir); \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \ + if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +# POTFILES is created from POTFILES.in by stripping comments, empty lines +# and Intltool tags (enclosed in square brackets), and appending a full +# relative path to them +POTFILES: POTFILES.in + ( if test 'x$(srcdir)' != 'x.'; then \ + posrcprefix='$(top_srcdir)/'; \ + else \ + posrcprefix="../"; \ + fi; \ + rm -f $@-t $@ \ + && (sed -e '/^#/d' \ + -e "s/^\[.*\] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ + && chmod a-w $@-t \ + && mv $@-t $@ ) + +Makefile: Makefile.in.in ../config.status POTFILES + cd .. \ + && $(SHELL) ./config.status $(subdir)/$@.in + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/regioni.c b/src/regioni.c index 64ce46d..1c61b77 100644 --- a/src/regioni.c +++ b/src/regioni.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +21,7 @@ #include #include +#include #include "regioni.h" #include "regione.h" @@ -47,8 +48,6 @@ static gboolean territorio_regioni_on_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data); -static void territorio_regioni_on_btn_esporta_clicked (GtkButton *button, - gpointer user_data); static void territorio_regioni_on_btn_nuovo_clicked (GtkButton *button, gpointer user_data); static void territorio_regioni_on_btn_modifica_clicked (GtkButton *button, @@ -79,8 +78,11 @@ struct _TerritorioRegioniPrivate TerritorioCommons *commons; GtkWidget *widget; + + GdaExGrid *grid; + GtkWidget *wgrid; GtkTreeSelection *selection; - GtkListStore *lstore_regioni; + GtkTreeStore *lstore_regioni; gboolean selezione; GtkWindow *wtransient; @@ -133,6 +135,8 @@ TerritorioRegioni GError *error; ZakAuthoIResource *ires1; + GdaExGridColumn *gcol; + TerritorioRegioni *a = TERRITORIO_REGIONI (g_object_new (territorio_regioni_get_type (), NULL)); TerritorioRegioniPrivate *priv = TERRITORIO_REGIONI_GET_PRIVATE (a); @@ -154,8 +158,24 @@ TerritorioRegioni } priv->widget = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, (selezione ? "w_regioni" : "vbox4"))); - priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview2"))); - priv->lstore_regioni = GTK_LIST_STORE (gtk_builder_get_object (priv->commons->gtkbuilder, "lstore_regioni")); + + /* creo la gdaexgrid */ + priv->grid = gdaex_grid_new (); + gdaex_grid_set_solipa (priv->grid, priv->commons->solipa); + gdaex_grid_set_title (priv->grid, gtk_label_get_text (GTK_LABEL (gtk_builder_get_object (priv->commons->gtkbuilder, "label9")))); + + gcol = gdaex_grid_column_new_defaults ("ID", "id", G_TYPE_INT); + gdaex_grid_add_column (priv->grid, gcol); + + gcol = gdaex_grid_column_new_defaults ("Nome", "nome", G_TYPE_STRING); + gdaex_grid_add_column (priv->grid, gcol); + + priv->wgrid = gdaex_grid_get_widget (priv->grid); + gtk_container_add (GTK_CONTAINER (gtk_builder_get_object (priv->commons->gtkbuilder, "scrolledwindow2")), priv->wgrid); + gtk_widget_show (priv->wgrid); + + priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->wgrid)); + priv->lstore_regioni = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->wgrid))); if (priv->selezione) { @@ -169,15 +189,13 @@ TerritorioRegioni g_signal_connect (priv->widget, "key-release-event", G_CALLBACK (territorio_regioni_on_key_release_event), (gpointer)a); - g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button54"), - "clicked", G_CALLBACK (territorio_regioni_on_btn_esporta_clicked), (gpointer)a); g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button8"), "clicked", G_CALLBACK (territorio_regioni_on_btn_nuovo_clicked), (gpointer)a); g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button9"), "clicked", G_CALLBACK (territorio_regioni_on_btn_modifica_clicked), (gpointer)a); g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "button10"), "clicked", G_CALLBACK (territorio_regioni_on_btn_elimina_clicked), (gpointer)a); - g_signal_connect (gtk_builder_get_object (priv->commons->gtkbuilder, "treeview2"), + g_signal_connect (priv->wgrid, "row-activated", G_CALLBACK (territorio_regioni_on_trv_territorio_regioni_row_activated), (gpointer)a); if (priv->selezione) @@ -223,42 +241,30 @@ GtkWidget static void territorio_regioni_carica (TerritorioRegioni *territorio_regioni) { - GtkTreeIter iter; - GdaDataModel *dm; - - gint rows; - gint row; + gchar *sql; TerritorioRegioniPrivate *priv = TERRITORIO_REGIONI_GET_PRIVATE (territorio_regioni); - gtk_list_store_clear (priv->lstore_regioni); + gtk_tree_store_clear (priv->lstore_regioni); - dm = gdaex_query (priv->commons->gdaex, - "SELECT c.id, c.nome" - " FROM regioni AS c" - " WHERE c.status <> 'E'" - " ORDER BY c.nome"); - if (dm != NULL) - { - rows = gda_data_model_get_n_rows (dm); - for (row = 0; row < rows; row++) - { - gtk_list_store_append (priv->lstore_regioni, &iter); - gtk_list_store_set (priv->lstore_regioni, &iter, - COL_ID, gdaex_data_model_get_field_value_integer_at (dm, row, "id"), - COL_NOME, gdaex_data_model_get_field_value_stringify_at (dm, row, "nome"), - -1); - } + sql = g_strdup ( "SELECT c.id, c.nome" + " FROM regioni AS c" + " WHERE c.status <> 'E'" + " ORDER BY c.nome"); - g_object_unref (dm); - } + gdaex_grid_fill_from_sql (priv->grid, + priv->commons->gdaex, + sql, + NULL); + + g_free (sql); } static void territorio_regioni_modifica (TerritorioRegioni *territorio_regioni) { GtkTreeIter iter; - guint id; + gchar *id; TerritorioRegioniPrivate *priv = TERRITORIO_REGIONI_GET_PRIVATE (territorio_regioni); @@ -270,7 +276,7 @@ territorio_regioni_modifica (TerritorioRegioni *territorio_regioni) COL_ID, &id, -1); - TerritorioRegione *c = territorio_regione_new (priv->commons, id); + TerritorioRegione *c = territorio_regione_new (priv->commons, strtol (id, NULL, 10)); g_signal_connect (G_OBJECT (c), "aggiornato", G_CALLBACK (territorio_regioni_on_regione_aggiornato), (gpointer)territorio_regioni); @@ -292,7 +298,7 @@ static void territorio_regioni_selezionato (TerritorioRegioni *territorio_regioni) { GtkTreeIter iter; - guint *id; + gchar *id; TerritorioRegioniClass *klass = TERRITORIO_REGIONI_GET_CLASS (territorio_regioni); TerritorioRegioniPrivate *priv = TERRITORIO_REGIONI_GET_PRIVATE (territorio_regioni); @@ -303,7 +309,7 @@ territorio_regioni_selezionato (TerritorioRegioni *territorio_regioni) COL_ID, &id, -1); - g_signal_emit (G_OBJECT (territorio_regioni), klass->selezionato_signal_id, 0, id); + g_signal_emit (G_OBJECT (territorio_regioni), klass->selezionato_signal_id, 0, strtol (id, NULL, 10)); gtk_widget_destroy (priv->widget); g_object_unref (G_OBJECT (territorio_regioni)); @@ -313,7 +319,7 @@ territorio_regioni_selezionato (TerritorioRegioni *territorio_regioni) solipa_message_dialog (GTK_WIDGET (priv->wtransient), GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, - "Occorre prima selezionare una regione"); + "Occorre prima selezionare una regione."); } } @@ -371,48 +377,6 @@ territorio_regioni_on_key_release_event (GtkWidget *widget, return FALSE; } -static void -territorio_regioni_on_btn_esporta_clicked (GtkButton *button, - gpointer user_data) -{ - GtkWidget *transient; - - guint ret; - - TerritorioRegioni *territorio_regioni = (TerritorioRegioni *)user_data; - TerritorioRegioniPrivate *priv = TERRITORIO_REGIONI_GET_PRIVATE (territorio_regioni); - - gchar **columns_title = g_strsplit ("ID|Regione", "|", -1); - - if (priv->selezione) - { - transient = priv->widget; - } - else - { - transient = GTK_WIDGET (gtk_builder_get_object (priv->commons->gtkbuilder, "w_main")); - } - - ret = solipa_gtktreemodel_to_csv_gui (priv->commons->solipa, GTK_WINDOW (transient), GTK_TREE_MODEL (priv->lstore_regioni), - columns_title, g_strv_length (columns_title)); - if (ret == 1) - { - solipa_message_dialog (transient, - GTK_MESSAGE_INFO, - GTK_BUTTONS_OK, - "Salvataggio eseguito con successo."); - } - else if (ret == 0) - { - solipa_message_dialog (transient, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, - "Errore durante il salvataggio."); - } - - g_strfreev (columns_title); -} - static void territorio_regioni_on_btn_nuovo_clicked (GtkButton *button, gpointer user_data) @@ -458,7 +422,7 @@ territorio_regioni_on_btn_elimina_clicked (GtkButton *button, ZakAuthoIResource *ires1; GtkTreeIter iter; - guint id; + gchar *id; TerritorioRegioni *territorio_regioni = (TerritorioRegioni *)user_data; TerritorioRegioniPrivate *priv = TERRITORIO_REGIONI_GET_PRIVATE (territorio_regioni); @@ -485,7 +449,7 @@ territorio_regioni_on_btn_elimina_clicked (GtkButton *button, -1); gdaex_execute (priv->commons->gdaex, - g_strdup_printf ("UPDATE regioni SET status = 'E' WHERE id = %d", id)); + g_strdup_printf ("UPDATE regioni SET status = 'E' WHERE id = %d", strtol (id, NULL, 10))); territorio_regioni_carica (territorio_regioni); } @@ -495,7 +459,7 @@ territorio_regioni_on_btn_elimina_clicked (GtkButton *button, solipa_message_dialog (GTK_WIDGET (priv->wtransient), GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, - "Occorre prima selezionare una regione"); + "Occorre prima selezionare una regione."); } } diff --git a/src/stati.c b/src/stati.c index 120a566..cceaef6 100644 --- a/src/stati.c +++ b/src/stati.c @@ -89,7 +89,7 @@ struct _TerritorioStatiPrivate GdaExGrid *grid; GtkWidget *wgrid; GtkTreeSelection *selection; - GtkListStore *lstore_stati; + GtkTreeStore *lstore_stati; gboolean selezione; GtkWindow *wtransient; @@ -183,7 +183,7 @@ TerritorioStati gtk_widget_show (priv->wgrid); priv->selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->wgrid)); - priv->lstore_stati = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->wgrid))); + priv->lstore_stati = GTK_TREE_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->wgrid))); if (priv->selezione) { @@ -258,7 +258,7 @@ territorio_stati_carica (TerritorioStati *territorio_stati) TerritorioStatiPrivate *priv = TERRITORIO_STATI_GET_PRIVATE (territorio_stati); - gtk_list_store_clear (priv->lstore_stati); + gtk_tree_store_clear (priv->lstore_stati); if (!GDAEX_IS_QUERY_EDITOR (priv->qe) || gdaex_query_editor_get_sql_where (priv->qe) == NULL