X-Git-Url: http://git.datanom.net/lensdb.git/blobdiff_plain/7219eb6c08f7775380dbe1542072366d105e3504..refs/heads/master:/src/gui.c?ds=inline diff --git a/src/gui.c b/src/gui.c index 2f0722e..6b55fcc 100644 --- a/src/gui.c +++ b/src/gui.c @@ -718,6 +718,7 @@ G_MODULE_EXPORT void input_ok_clicked_cb(GtkWidget* self, gpointer data) { G_MODULE_EXPORT void input_scan_clicked_cb(GtkWidget* self, gpointer data) { Row* row = row_new(); + GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); GtkWidget* child = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), cur_page); @@ -725,6 +726,9 @@ G_MODULE_EXPORT void input_scan_clicked_cb(GtkWidget* self, gpointer data) { gchar* path = get_image_file(); if (path) { + GtkWidget* close_btn = GTK_WIDGET(gtk_builder_get_object(builder, "btn_input_close")); + g_object_set(G_OBJECT(close_btn), "can-default", TRUE, "has-default", TRUE, NULL); + Scanner_t* sc = scanner_create(path); gchar* sn = get_lens_serial_number(sc); @@ -1104,7 +1108,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 +1138,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); @@ -1158,7 +1165,7 @@ G_MODULE_EXPORT void onSave(GtkWidget* self, gpointer data) { gboolean init_gui() { gboolean fail = TRUE; - builder = gtk_builder_new_from_string(lensdatabase_ui, lensdatabase_ui_len); + builder = gtk_builder_new_from_string((const gchar *) lensdatabase_ui, lensdatabase_ui_size); if (builder != NULL) { fail = FALSE;