From: Michael Rasmussen Date: Sat, 16 Nov 2024 22:19:43 +0000 (+0100) Subject: Import and overwrite X-Git-Url: http://git.datanom.net/lensdb.git/commitdiff_plain/ee9e0b2f3ad3d6db9142b404bb4ff8b388b33c85?ds=sidebyside Import and overwrite Signed-off-by: Michael Rasmussen --- diff --git a/src/csv.c b/src/csv.c index b48eafc..ce04a33 100644 --- a/src/csv.c +++ b/src/csv.c @@ -36,6 +36,7 @@ //static FILE* csv_file = NULL; typedef enum { + ID, SN, MAKER, LENS, @@ -52,7 +53,7 @@ struct _CsvParser { static inline const gchar* stringFromFields(Fields f) { - static const char *strings[] = { "SN", "MAKER", "LENS", "NOTES", "DATE" }; + static const char *strings[] = { "ID", "SN", "MAKER", "LENS", "NOTES", "DATE" }; return strings[f]; } diff --git a/src/gui.c b/src/gui.c index 2f0722e..adf4e27 100644 --- a/src/gui.c +++ b/src/gui.c @@ -1104,7 +1104,9 @@ G_MODULE_EXPORT void onOpen(GtkWidget* self, gpointer data) { GtkTreeModel* model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); GtkListStore* store = GTK_LIST_STORE(model); gtk_list_store_clear(store); + //gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), NULL); gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), i-1); + gtk_widget_queue_draw(GTK_WIDGET(notebook)); } GSList* makers = get_makers(); for (GSList* elem = makers; elem; elem = elem->next) { @@ -1132,7 +1134,8 @@ G_MODULE_EXPORT void onOpen(GtkWidget* self, gpointer data) { row->notes = g_strdup(r->notes); csv_record_free(r); add_lens(row); - add_row(row->maker, row); + if (!replace) + add_row(row->maker, row); row_free(row, NULL); } csv_parser_free(parser);