]> git.datanom.net - lensdb.git/blobdiff - src/gui.c
Readd missing feature
[lensdb.git] / src / gui.c
index 22a499866625c4bb5cd41e79b22820a62df2f20b..6b55fccd87e2c78e8ed0e9a0a9495f95b7603142 100644 (file)
--- a/src/gui.c
+++ b/src/gui.c
@@ -341,6 +341,8 @@ static void on_row_activated (GtkTreeView*                  view,
                gtk_widget_show(update_btn);
                GtkWidget* delete_btn = GTK_WIDGET(gtk_builder_get_object(builder, "btn_input_delete"));
                gtk_widget_show(delete_btn);
+               GtkWidget* move_btn = GTK_WIDGET(gtk_builder_get_object(builder, "btn_input_move"));
+               gtk_widget_show(move_btn);
                
                gtk_widget_show_all(input_dialog);
 
@@ -614,6 +616,8 @@ G_MODULE_EXPORT void add_lens_clicked_cb(GtkWidget* self, gpointer data) {
        gtk_widget_hide(update_btn);
        GtkWidget* delete_btn = GTK_WIDGET(gtk_builder_get_object(builder, "btn_input_delete"));
        gtk_widget_hide(delete_btn);
+       GtkWidget* move_btn = GTK_WIDGET(gtk_builder_get_object(builder, "btn_input_move"));
+       gtk_widget_hide(move_btn);
 
        gtk_widget_show_all(input_dialog);
 }
@@ -714,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);
@@ -721,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);
@@ -866,6 +874,78 @@ G_MODULE_EXPORT void input_update_clicked_cb(GtkWidget* self, gpointer data) {
        hide_input_dialog();
 }
 
+G_MODULE_EXPORT void input_move_clicked_cb(GtkWidget* self, gpointer data) {
+       GtkWidget *dialog, *content_area, *combo;
+      
+    GtkWidget* parent = GTK_WIDGET(gtk_builder_get_object(builder, "main_window"));
+       GtkDialogFlags flags = GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT;
+       dialog = gtk_dialog_new_with_buttons("New Maker",
+                                                                                GTK_WINDOW(parent),
+                                                                                flags,
+                                                                                "_OK",
+                                                                                GTK_RESPONSE_ACCEPT,
+                                                                                "_Cancel",
+                                                                                GTK_RESPONSE_REJECT,
+                                                                                NULL);
+               
+       content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+       combo = gtk_combo_box_text_new();
+       GSList* makers = get_makers();
+
+       for (GSList* elem = makers; elem; elem =  elem->next) {
+               gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), g_strdup((const gchar*)elem->data));
+       }
+       gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
+       gtk_widget_show_all(combo);
+       
+       g_slist_foreach(makers, (GFunc)g_free, NULL);
+       g_slist_free(makers);
+       
+       gtk_container_add(GTK_CONTAINER(content_area), combo);
+       
+       gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+       if (response == GTK_RESPONSE_ACCEPT) {
+               Row* row = row_new();
+
+               gchar* maker = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
+               row->maker = get_maker_id(maker);
+               g_free(maker);
+               
+               GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id"));
+               row->id = atol(gtk_entry_get_text(GTK_ENTRY(entry_id)));
+               
+               GtkWidget* entry_sn = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_sn"));
+               row->sn = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry_sn)));
+               
+               GtkWidget* entry_data = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_data"));
+               row->data = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry_data)));
+
+               GtkTextIter start, end;
+               GtkWidget* textview = GTK_WIDGET(gtk_builder_get_object(builder, "textview_input_notes"));
+               GtkTextBuffer* buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
+               gtk_text_buffer_get_bounds (buffer, &start, &end);
+               row->notes = g_strdup(gtk_text_buffer_get_text (buffer, &start, &end, FALSE));
+
+               if (cur_view != NULL) {
+                       if (update_lens_maker(row)) {
+                               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_message(GTK_MESSAGE_ERROR, err);
+                               g_free(err);
+                       }
+                       GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view));
+                       gtk_list_store_remove(store, &cur_iter);
+                       add_row(row->maker, row);
+               }
+
+               row_free(row, NULL);
+               cur_view = NULL;
+       }
+       gtk_widget_destroy(dialog);
+       
+       hide_input_dialog();
+}
+
 G_MODULE_EXPORT void search_result_ok_clicked_cb(GtkWidget* self, gpointer data) {
        hide_search_result_dialog();
 }
@@ -1028,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) {
@@ -1056,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);
@@ -1082,12 +1165,30 @@ 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;
                GtkWidget* window = GTK_WIDGET(gtk_builder_get_object(builder, "main_window"));
+               GtkAccelGroup* accel_group = gtk_accel_group_new();
+               gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
+
                
+               GtkWidget* menu_item_new = GTK_WIDGET(gtk_builder_get_object(builder, "Menu_item_new"));
+               gtk_widget_add_accelerator(menu_item_new, "activate", accel_group, GDK_KEY_n, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+               GtkWidget* menu_item_open = GTK_WIDGET(gtk_builder_get_object(builder, "Menu_item_open"));
+               gtk_widget_add_accelerator(menu_item_open, "activate", accel_group, GDK_KEY_o, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+               GtkWidget* menu_item_save = GTK_WIDGET(gtk_builder_get_object(builder, "Menu_item_save"));
+               gtk_widget_add_accelerator(menu_item_save, "activate", accel_group, GDK_KEY_s, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+               GtkWidget* menu_item_save_as = GTK_WIDGET(gtk_builder_get_object(builder, "Menu_item_save_as"));
+               gtk_widget_add_accelerator(menu_item_save_as, "activate", accel_group, GDK_KEY_a, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
+               GtkWidget* menu_item_quit = GTK_WIDGET(gtk_builder_get_object(builder, "Menu_item_quit"));
+               gtk_widget_add_accelerator(menu_item_quit, "activate", accel_group, GDK_KEY_q, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+
                GtkWidget* add_maker = GTK_WIDGET(gtk_builder_get_object(builder, "add_maker"));
                GtkWidget* add_image = gtk_image_new_from_pixbuf(get_btn_image_maker_new());
                gtk_button_set_image(GTK_BUTTON(add_maker), add_image);
This page took 0.538297 seconds and 5 git commands to generate.