diff --git a/AUTHORS b/AUTHORS index 669cd67..f639990 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,3 +21,6 @@ Tim Nelson David Mansfield Numerous patches + +Jeff Smith + Patches too numerous to enumerate. diff --git a/ChangeLog b/ChangeLog index 9408d7b..a73b1c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Nov 13 20:33:42 EST 2004 Brian Bruns + * src/gmdb2/gmdb.h: remove redeclaration errors + * src/gmdb2/sql.c: fix compiler warnings + * src/gmdb2/debug.c: + * src/gmdb2/file.c: + * src/gmdb2/schema.c: + * src/gmdb2/sql.c: + * src/gmdb2/table_export.c: patch #1038578 from Filip Van Raemdonck + Wed Oct 27 22:32:33 CDT 2004 Jeff Smith * src/util/mdb-sql.c: Various mdb-sql improvements diff --git a/src/gmdb2/debug.c b/src/gmdb2/debug.c index 059baeb..66baf2f 100644 --- a/src/gmdb2/debug.c +++ b/src/gmdb2/debug.c @@ -16,7 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "gmdb.h" + #include +#include +#include + extern GtkWidget *app; extern MdbHandle *mdb; @@ -329,7 +333,11 @@ gmdb_debug_display_cb(GtkWidget *w, GladeXML *xml) page = atol(gtk_entry_get_text(GTK_ENTRY(entry))); } if (page>gmdb_get_max_page(mdb) || page<0) { - gnome_warning_dialog("Page entered is outside valid page range."); + GtkWidget* dlg = gtk_message_dialog_new (gtk_widget_get_toplevel (w), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Page entered is outside valid page range.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); } /* add to the navigation list */ diff --git a/src/gmdb2/file.c b/src/gmdb2/file.c index fcdfc0a..4c43a33 100644 --- a/src/gmdb2/file.c +++ b/src/gmdb2/file.c @@ -16,7 +16,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "gmdb.h" + #include +#include +#include +#include GtkWidget *file_selector; MdbHandle *mdb; @@ -109,7 +113,11 @@ gmdb_file_open(gchar *file_path) gmdb_reset_widgets(); mdb = mdb_open(file_path, MDB_NOFLAGS); if (!mdb) { - gnome_warning_dialog("Unable to open file."); + GtkWidget* dlg = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Unable to open file.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); return; } mdb_set_default_backend(mdb, "access"); diff --git a/src/gmdb2/gmdb.h b/src/gmdb2/gmdb.h index 17c06cc..6a961ae 100644 --- a/src/gmdb2/gmdb.h +++ b/src/gmdb2/gmdb.h @@ -25,6 +25,8 @@ GtkWidget *gmdb_table_def_new(MdbCatalogEntry *entry); GtkWidget *gmdb_table_export_new(MdbCatalogEntry *entry); void gmdb_table_export(MdbCatalogEntry *entry) ; +void gmdb_table_export_populate_dialog(GladeXML *xml); + void gmdb_file_select_cb(GtkWidget *w, gpointer data); void gmdb_file_open_cb(GtkWidget *w, gpointer data); void gmdb_file_close_cb(GtkWidget *w, gpointer data); @@ -45,6 +47,9 @@ void gmdb_debug_tab_new(GtkWidget *notebook); void gmdb_debug_new_cb(GtkWidget *w, gpointer *data); void gmdb_debug_set_dissect_cb(GtkWidget *w, GladeXML *xml); +void gmdb_sql_save_query(GladeXML *xml, gchar *file_path); +void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml); + unsigned long gmdb_prefs_get_maxrows(); extern GtkWidget *gmdb_prefs_new(); diff --git a/src/gmdb2/schema.c b/src/gmdb2/schema.c index bdb8151..cb7518a 100644 --- a/src/gmdb2/schema.c +++ b/src/gmdb2/schema.c @@ -17,6 +17,10 @@ */ #include "gmdb.h" +#include +#include +#include + extern GtkWidget *app; extern MdbHandle *mdb; @@ -44,13 +48,17 @@ gchar quotechar; gchar lineterm[5]; gchar *str; int rows=0; -char msg[100]; char *the_relation; - + GtkWidget *dlg; + printf("file path %s\n",file_path); if ((outfile=fopen(file_path, "w"))==NULL) { - gnome_warning_dialog("Unable to Open File!"); + GtkWidget* dlg = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Unable to open file.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); return; } mdb_set_default_backend(mdb,backend); @@ -113,8 +121,11 @@ char *the_relation; } fclose(outfile); - sprintf(msg,"Schema exported successfully.\n"); - gnome_ok_dialog(msg); + dlg = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Schema exported successfully.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); } void gmdb_schema_export_cb(GtkWidget *w, gpointer data) diff --git a/src/gmdb2/sql.c b/src/gmdb2/sql.c index 51bd372..84e1ce4 100644 --- a/src/gmdb2/sql.c +++ b/src/gmdb2/sql.c @@ -17,6 +17,9 @@ */ #include "gmdb.h" +#include +#include + #if SQL typedef struct GMdbSQLWindow { @@ -58,7 +61,7 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml) { gchar *file_path; GladeXML *sql_xml; - GtkWidget *filesel; + GtkWidget *filesel, *dlg; FILE *outfile; int i; int need_headers = 0; @@ -68,7 +71,6 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml) gchar lineterm[5]; gchar *str, *buf; int rows=0, n_columns; - char msg[100]; GtkWidget *treeview; GtkTreeViewColumn *col; GList *glist; @@ -88,7 +90,11 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml) file_path = gmdb_export_get_filepath(xml); if ((outfile=fopen(file_path, "w"))==NULL) { - gnome_warning_dialog("Unable to Open File!"); + dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Unable to open file.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); return; } @@ -129,8 +135,11 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml) fclose(outfile); gtk_widget_destroy(filesel); - sprintf(msg,"%d Rows exported successfully.\n", rows); - gnome_ok_dialog(msg); + dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("%d rows successfully exported."), rows); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); } void gmdb_sql_write_cb(GtkWidget *w, GladeXML *xml) @@ -407,7 +416,11 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) _mdb_sql(sql); if (yyparse()) { /* end unsafe */ - gnome_warning_dialog("Couldn't parse SQL"); + GtkWidget* dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Couldn't parse SQL.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); mdb_sql_reset(sql); return; } @@ -418,7 +431,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) for (i=0;inum_columns;i++) gtypes[i]=G_TYPE_STRING; - store = (GtkTreeStore *) gtk_tree_view_get_model(treeview); + store = (GtkTreeStore *) gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); if (store) { i=0; while (column = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), i)) { @@ -645,7 +658,11 @@ gmdb_sql_save_query(GladeXML *xml, gchar *file_path) gchar *buf; if (!(out=fopen(file_path, "w"))) { - gnome_warning_dialog("Unable to open file."); + GtkWidget* dlg = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Unable to open file.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); return; } textview = glade_xml_get_widget(xml, "sql_textview"); @@ -668,7 +685,11 @@ gmdb_sql_load_query(GladeXML *xml, gchar *file_path) int len; if (!(in=fopen(file_path, "r"))) { - gnome_warning_dialog("Unable to open file."); + GtkWidget* dlg = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Unable to open file.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); return; } textview = glade_xml_get_widget(xml, "sql_textview"); @@ -708,7 +729,11 @@ GtkTreeIter *iter2; void gmdb_sql_new_cb(GtkWidget *w, gpointer data) { - gnome_ok_dialog("SQL support was not built in.\nRun configure with the --enable-sql option."); + GtkWidget* dlg = gtk_message_dialog_new (gtk_widget_get_toplevel (w), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, + _("SQL support was not built.\nRun configure with the --enable-sql option.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); } #endif diff --git a/src/gmdb2/table_export.c b/src/gmdb2/table_export.c index b96d503..4fb4630 100644 --- a/src/gmdb2/table_export.c +++ b/src/gmdb2/table_export.c @@ -17,6 +17,10 @@ */ #include "gmdb.h" +#include +#include +#include + extern GtkWidget *app; extern MdbHandle *mdb; GladeXML *exportwin_xml; @@ -157,10 +161,9 @@ gchar quotechar; gchar lineterm[5]; gchar *str; int rows=0; -char msg[100]; -GtkWidget *exportwin; - + GtkWidget *exportwin, *dlg; + gmdb_export_get_delimiter(exportwin_xml, delimiter, 10); gmdb_export_get_lineterm(exportwin_xml, lineterm, 5); need_quote = gmdb_export_get_quote(exportwin_xml); @@ -170,7 +173,11 @@ GtkWidget *exportwin; // printf("file path %s\n",file_path); if ((outfile=fopen(file_path, "w"))==NULL) { - gnome_warning_dialog("Unable to Open File!"); + GtkWidget* dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + _("Unable to open file.")); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); return; } @@ -216,8 +223,11 @@ GtkWidget *exportwin; fclose(outfile); exportwin = glade_xml_get_widget (exportwin_xml, "export_dialog"); gtk_widget_destroy(exportwin); - sprintf(msg,"%d Rows exported successfully.\n", rows); - gnome_ok_dialog(msg); + dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, + _("%d rows successfully exported."), rows); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); } void gmdb_table_export(MdbCatalogEntry *entry) {