gtk_main_quit();
}
+/*
+ * GTK_MESSAGE_INFO
+ * GTK_MESSAGE_WARNING
+ * GTK_MESSAGE_QUESTION
+ * GTK_MESSAGE_ERROR
+ * GTK_MESSAGE_OTHER
+ */
+void show_err_msg(GtkMessageType type, const gchar* msg) {
+ GtkWidget* window = GTK_WIDGET(gtk_builder_get_object(builder, "main_window"));
+
+ GtkWidget* dialog = gtk_message_dialog_new(
+ GTK_WINDOW(window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ type,
+ GTK_BUTTONS_OK,
+ msg);
+
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_destroy(dialog);
+}
+
static void hide_input_dialog() {
GtkWidget* input_dialog = GTK_WIDGET(gtk_builder_get_object(builder, "input_dialog"));
GtkTreeIter iter;
GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
+ GtkWidget* scrolled_window = NULL;
Maker* maker_info = get_maker(maker);
- GtkWidget* scrolled_window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), maker_info->page);
+ if (maker_info->page >= 0)
+ scrolled_window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), maker_info->page);
if (scrolled_window == NULL) {
/* new maker */
GtkWidget* tab_label = gtk_label_new(maker_info->maker_name);
maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, maker);
if (maker_info->page < 0) {
/* Huston whe have a problem */
- fprintf(stderr, "%s: Could not create tab\n", maker_info->maker_name);
+ gchar* err = g_strdup_printf("%s: Could not create tab\n", maker_info->maker_name);
+ fprintf(stderr, err);
+ show_err_msg(GTK_MESSAGE_ERROR, err);
+ g_free(err);
} else {
update_maker(maker_info);
}
} else {
treeview = gtk_bin_get_child(GTK_BIN(scrolled_window));
}
- store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)));
- gtk_list_store_append(store, &iter);
- gtk_list_store_set (store, &iter,
- COLUMN_DEFAULT_SN, row->sn,
- COLUMN_DEFAULT_DATA, row->data,
- COLUMN_DEFAULT_NOTES, row->notes,
- COLUMN_DEFAULT_ID, row->id,
- -1);
+
+ if (row) {
+ store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)));
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set (store, &iter,
+ COLUMN_DEFAULT_SN, row->sn,
+ COLUMN_DEFAULT_DATA, row->data,
+ COLUMN_DEFAULT_NOTES, row->notes,
+ COLUMN_DEFAULT_ID, row->id,
+ -1);
+ }
+
gtk_widget_show_all(notebook);
}
for (ids = makers; ids; ids = ids->next) {
gint id = get_maker_id(ids->data);
GSList* lenses = get_lens_by_maker(id);
- for (rows = lenses; rows; rows = rows->next) {
- Row* row = rows->data;
- add_row(id, row);
+ if (lenses) {
+ for (rows = lenses; rows; rows = rows->next) {
+ Row* row = rows->data;
+ add_row(id, row);
+ }
+ g_slist_foreach(lenses, (GFunc)row_free, NULL);
+ g_slist_free(lenses);
+ lenses = NULL;
+ } else {
+ add_row(id, NULL);
}
- g_slist_foreach(lenses, (GFunc)row_free, NULL);
- g_slist_free(lenses);
- lenses = NULL;
}
g_slist_foreach(makers, (GFunc)g_free, NULL);
g_slist_free(makers);
if (res == GTK_RESPONSE_ACCEPT) {
const gchar* maker = gtk_entry_get_text(GTK_ENTRY(maker_entry));
- fprintf(stderr, "%s\n", maker);
-
- GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
- GtkWidget* tab_label = gtk_label_new(maker);
- GtkListStore* store = gtk_list_store_new(4,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INT64);
- GtkWidget* treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_DATA);
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_SN);
- g_signal_connect(treeview, "row-activated", G_CALLBACK(on_row_activated), NULL);
- g_object_unref(store);
- add_columns(GTK_TREE_VIEW(treeview), VIEWTYPE_DEFAULT);
- GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- g_object_set(scrolled_window, "vexpand", TRUE, NULL);
- gtk_container_add(GTK_CONTAINER(scrolled_window), treeview);
- gint page = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label);
- if (page < 0) {
- // Huston whe have a problem
- fprintf(stderr, "%s: Could not create tab\n", maker);
+ gchar* error = NULL;
+
+ if (!add_maker(maker, &error)) {
+ GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
+ GtkWidget* tab_label = gtk_label_new(maker);
+ gint page = gtk_notebook_append_page(GTK_NOTEBOOK(notebook), NULL, tab_label);
+ if (page < 0) {
+ // Huston whe have a problem
+ gchar* err = g_strdup_printf("%s: Could not create tab\n", maker);
+ fprintf(stderr, err);
+ show_err_msg(GTK_MESSAGE_ERROR, err);
+ g_free(err);
+ } else {
+ gtk_widget_show_all(notebook);
+ }
} else {
- //update_maker(maker_info);
- gtk_widget_show_all(notebook);
+ // Huston whe have a problem
+ gchar* err = g_strdup_printf("%s: Could not add Maker '%s'\n", error, maker);
+ fprintf(stderr, err);
+ show_err_msg(GTK_MESSAGE_ERROR, err);
+ g_free(err);
}
+ g_free(error);
}
-
+
gtk_widget_destroy(dialog);
-/*
- g_signal_connect_swapped(dialog,
- "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
-
- gtk_container_add (GTK_CONTAINER(content_area), maker_entry);
- gtk_widget_show_all (dialog);
-*/
-/*
- GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook"));
-
- GtkWidget* tab_label = gtk_label_new(maker_info->maker_name);
- store = gtk_list_store_new(4,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INT64);
- treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_DATA);
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COLUMN_DEFAULT_SN);
- g_signal_connect(treeview, "row-activated", G_CALLBACK(on_row_activated), NULL);
- g_object_unref(store);
- add_columns(GTK_TREE_VIEW(treeview), VIEWTYPE_DEFAULT);
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- g_object_set(scrolled_window, "vexpand", TRUE, NULL);
- gtk_container_add(GTK_CONTAINER(scrolled_window), treeview);
- maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, maker);
- if (maker_info->page < 0) {
- // Huston whe have a problem
- fprintf(stderr, "%s: Could not create tab\n", maker_info->maker_name);
- } else {
- update_maker(maker_info);
- }
- */
}
G_MODULE_EXPORT void add_lens_clicked_cb(GtkWidget* self, gpointer data) {
G_MODULE_EXPORT void input_ok_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);
+ const gchar* label = gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(notebook), child);
+
+ row->maker = get_maker_id(label);
+
GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id"));
row->id = atol(gtk_entry_get_text(GTK_ENTRY(entry_id)));
if (cur_view != NULL) {
if (update_lens(row)) {
- fprintf(stderr, "Update failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
+ gchar* err = g_strdup_printf("Update failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
+ fprintf(stderr, err);
+ show_err_msg(GTK_MESSAGE_ERROR, err);
+ g_free(err);
}
GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view));
gtk_list_store_set(store, &cur_iter, COLUMN_DEFAULT_SN, row->sn, -1);
gtk_list_store_set(store, &cur_iter, COLUMN_DEFAULT_NOTES, row->notes, -1);
} else {
/* New lens */
- 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);
- const gchar* label = gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(notebook), child);
if (add_lens(row)) {
- fprintf(stderr, "Add failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
+ gchar* err = g_strdup_printf("Add failed: [id: %ld, sn: %s, data: %s, notes: %s]\n", row->id, row->sn, row->data, row->notes);
+ fprintf(stderr, err);
+ show_err_msg(GTK_MESSAGE_ERROR, err);
+ g_free(err);
} else {
add_row(get_maker_id(label), row);
}