X-Git-Url: http://git.datanom.net/lensdb.git/blobdiff_plain/31baed3cfc6c016abc6416a173fd5cc6c7b654c9..refs/heads/master:/src/gui.c?ds=inline diff --git a/src/gui.c b/src/gui.c index 19fcba0..6b55fcc 100644 --- a/src/gui.c +++ b/src/gui.c @@ -30,22 +30,19 @@ #include "icons.h" #include "sqlite-storage.h" #include "scanner.h" +#include "csv.h" static GtkBuilder* builder = NULL; static const gchar* placeholder_str = " Lens notes"; static GtkTreeIter cur_iter; static GtkTreeView* cur_view = NULL; +static gchar* current_filename = NULL; typedef enum { VIEWTYPE_DEFAULT, VIEWTYPE_SEARCH } ViewType; -static void clean(gpointer data) { - g_object_unref(G_OBJECT(builder)); - gtk_main_quit(); -} - static const gchar* COMMENT = "The application is release under GPL v3.0 but the C++ " "Interface used in this application is under its own license " "which is copied here:\n" @@ -57,6 +54,12 @@ static const gchar* COMMENT = "The application is release under GPL v3.0 but the "Contact Phil Harvey for more information. "; +static void clean(gpointer data) { + g_free(current_filename); + g_object_unref(G_OBJECT(builder)); + gtk_main_quit(); +} + /* * GTK_MESSAGE_INFO * GTK_MESSAGE_WARNING @@ -64,18 +67,37 @@ static const gchar* COMMENT = "The application is release under GPL v3.0 but the * GTK_MESSAGE_ERROR * GTK_MESSAGE_OTHER */ -void show_err_msg(GtkMessageType type, const gchar* msg) { +bool show_message(GtkMessageType type, const gchar* msg) { + GtkWidget* dialog = NULL; + bool response = true; 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)); + if (GTK_MESSAGE_QUESTION != type) { + dialog = gtk_message_dialog_new( + GTK_WINDOW(window), + GTK_DIALOG_DESTROY_WITH_PARENT, + type, + GTK_BUTTONS_OK, + msg + ); + + gtk_dialog_run(GTK_DIALOG(dialog)); + } else { + dialog = gtk_message_dialog_new( + GTK_WINDOW(window), + GTK_DIALOG_DESTROY_WITH_PARENT, + type, + GTK_BUTTONS_YES_NO, + msg + ); + + if (GTK_RESPONSE_YES != gtk_dialog_run(GTK_DIALOG(dialog))) { + response = false; + } + } gtk_widget_destroy(dialog); + + return response; } static void hide_input_dialog() { @@ -319,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); @@ -358,6 +382,7 @@ static void add_row(gint maker, Row* row) { GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); GtkWidget* scrolled_window = NULL; Maker* maker_info = get_maker(maker); + //fprintf(stdout, "%lu - %s - %d\n", maker_info->id, maker_info->maker_name, 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) { @@ -365,16 +390,17 @@ static void add_row(gint maker, Row* row) { GtkWidget* tab_label = gtk_label_new(maker_info->maker_name); scrolled_window = add_tab(); treeview = gtk_bin_get_child(GTK_BIN(scrolled_window)); - maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, maker); + maker_info->page = gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label, -1); if (maker_info->page < 0) { /* Huston whe have a problem */ 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } else { update_maker(maker_info); } + //fprintf(stdout, "%lu - %s - %d - %p\n", maker_info->id, maker_info->maker_name, maker_info->page, scrolled_window); maker_free(maker_info); } else { treeview = gtk_bin_get_child(GTK_BIN(scrolled_window)); @@ -503,7 +529,7 @@ G_MODULE_EXPORT void add_maker_clicked_cb(GtkWidget* self, gpointer data) { // 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } else { //gint id = get_maker_id(maker); @@ -516,7 +542,7 @@ G_MODULE_EXPORT void add_maker_clicked_cb(GtkWidget* self, gpointer data) { // 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } g_free(error); @@ -561,7 +587,7 @@ G_MODULE_EXPORT void del_maker_clicked_cb(GtkWidget* self, gpointer data) { // Huston whe have a problem gchar* err = g_strdup_printf("%s: Could not remove Maker '%s'\n", error, label); fprintf(stderr, err); - show_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } g_free(error); @@ -590,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); } @@ -613,16 +641,6 @@ G_MODULE_EXPORT void search_ok_clicked_cb(GtkWidget* self, gpointer data) { GSList* rows = get_lens_by_search(row); row_free(row, NULL); - -/* - for (GSList* elem = rows; elem; elem = elem->next) { - Row* row = elem->data; - Maker* maker = get_maker(row->maker); - fprintf(stderr, "[maker: %s, id: %lu, sn: %s, data: %s, notes: %s]\n", - maker->maker_name, row->id, row->sn, row->data, row->notes); - maker_free(maker); - } -*/ create_search_result_dialog(rows); @@ -683,7 +701,7 @@ G_MODULE_EXPORT void input_ok_clicked_cb(GtkWidget* self, gpointer data) { if (add_lens(row)) { 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } else { GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id")); @@ -700,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); @@ -707,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); @@ -736,7 +758,6 @@ G_MODULE_EXPORT void input_scan_clicked_cb(GtkWidget* self, gpointer data) { * 2. Change tab if maker is is not current tab * 3. Update input_label to the current tab */ - //GtkWidget* input_dialog = GTK_WIDGET(gtk_builder_get_object(builder, "input_dialog")); GtkWidget* header = GTK_WIDGET(gtk_builder_get_object(builder, "label_input_header")); Maker* maker = NULL; gchar* dialog_label = NULL; @@ -780,24 +801,6 @@ G_MODULE_EXPORT void input_scan_clicked_cb(GtkWidget* self, gpointer data) { g_free(path); row_free(row, NULL); -/* - if (add_lens(row)) { - 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 { - GtkWidget* entry_id = GTK_WIDGET(gtk_builder_get_object(builder, "entry_input_id")); - gtk_entry_set_text(GTK_ENTRY(entry_id), g_strdup_printf("%lu", row->id)); - - add_row(get_maker_id(label), row); - } - - row_free(row, NULL); - cur_view = NULL; - - hide_input_dialog(); -*/ } G_MODULE_EXPORT void input_delete_clicked_cb(GtkWidget* self, gpointer data) { @@ -815,7 +818,7 @@ G_MODULE_EXPORT void input_delete_clicked_cb(GtkWidget* self, gpointer data) { if (delete_lens(row)) { gchar* err = g_strdup_printf("Delete 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); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view)); @@ -856,7 +859,7 @@ G_MODULE_EXPORT void input_update_clicked_cb(GtkWidget* self, gpointer data) { if (update_lens(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_err_msg(GTK_MESSAGE_ERROR, err); + show_message(GTK_MESSAGE_ERROR, err); g_free(err); } GtkListStore* store = GTK_LIST_STORE(gtk_tree_view_get_model(cur_view)); @@ -871,19 +874,321 @@ 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(); } +typedef enum { + FILE_SAVE_AS, + FILE_SAVE, + FILE_NEW, + FILE_OPEN +} FileAction; + +static gchar* get_filename(FileAction fileAction, const gchar* title) { + GtkWidget *dialog; + GtkFileChooser *chooser; + GtkFileChooserAction action; + gint res; + GtkWidget* parent_window = GTK_WIDGET(gtk_builder_get_object(builder, "main_window")); + gchar* nameHint = NULL; + gchar* current_dir = NULL; + + if (current_filename != NULL) { + current_dir = g_path_get_dirname(current_filename); + nameHint = g_path_get_basename(current_filename); + } + switch (fileAction) { + case FILE_SAVE_AS: + g_free(nameHint); + nameHint = g_strdup("Untitled document.csv"); + action = GTK_FILE_CHOOSER_ACTION_SAVE; + break; + case FILE_SAVE: + if (nameHint == NULL) + nameHint = g_strdup("Untitled document.csv"); + action = GTK_FILE_CHOOSER_ACTION_SAVE; + break; + case FILE_NEW: + g_free(nameHint); + nameHint = g_strdup("Untitled document.csv"); + action = GTK_FILE_CHOOSER_ACTION_SAVE; + break; + case FILE_OPEN: + action = GTK_FILE_CHOOSER_ACTION_OPEN; + break; + } + + if (FILE_OPEN == fileAction) { + dialog = gtk_file_chooser_dialog_new(title, + GTK_WINDOW(parent_window), + action, + ("_Cancel"), + GTK_RESPONSE_CANCEL, + ("_Open"), + GTK_RESPONSE_ACCEPT, + NULL); + } else { + dialog = gtk_file_chooser_dialog_new(title, + GTK_WINDOW(parent_window), + action, + ("_Cancel"), + GTK_RESPONSE_CANCEL, + ("_Save"), + GTK_RESPONSE_ACCEPT, + NULL); + } + + chooser = GTK_FILE_CHOOSER(dialog); + + GtkFileFilter* filter_csv = gtk_file_filter_new(); + gtk_file_filter_add_mime_type(filter_csv, "text/csv"); + gtk_file_filter_add_mime_type(filter_csv, "application/csv"); + gtk_file_filter_add_mime_type(filter_csv, "application/x-csv"); + gtk_file_filter_add_mime_type(filter_csv, "application/vnd.ms-excel"); + gtk_file_filter_add_mime_type(filter_csv, "text/x-csv"); + gtk_file_filter_add_mime_type(filter_csv, "text/comma-separated-values"); + gtk_file_filter_add_mime_type(filter_csv, "text/x-comma-separated-values"); + gtk_file_filter_add_mime_type(filter_csv, "text/tab-separated-values"); + gtk_file_filter_add_pattern(filter_csv, "*.csv"); + gtk_file_filter_set_name(filter_csv, "CSV files"); + gtk_file_chooser_add_filter(chooser, filter_csv); + GtkFileFilter* filter_plain = gtk_file_filter_new(); + gtk_file_filter_add_mime_type(filter_plain, "text/plain"); + gtk_file_filter_set_name(filter_plain, "Plain text"); + gtk_file_chooser_add_filter(chooser, filter_plain); + + if (FILE_OPEN != fileAction) { + gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE); + GtkFileFilter* filter_all = gtk_file_filter_new(); + gtk_file_filter_add_pattern(filter_all, "*"); + gtk_file_filter_set_name(filter_all, "All files"); + gtk_file_chooser_add_filter(chooser, filter_all); + gtk_file_chooser_set_current_name(chooser, nameHint); + } + + if (current_dir != NULL) + gtk_file_chooser_set_current_folder(chooser, current_dir); + + res = gtk_dialog_run(GTK_DIALOG(dialog)); + if (res == GTK_RESPONSE_ACCEPT) { + g_free(current_filename); + current_filename = gtk_file_chooser_get_filename(chooser); + } + + gtk_widget_destroy (dialog); + g_free(nameHint); + g_free(current_dir); + + return res == GTK_RESPONSE_ACCEPT ? g_strdup(current_filename) : NULL; +} + +void commit(const gchar* filename) { + CvsError* err = NULL; + + if (filename) { + Instructions instructions = { + .file = filename, + .write = true, + .overwrite = true, + .first_line_header = true + }; + CsvParser* parser = csv_parser_new(&instructions, &err); + if (parser) { + dump_storage(parser); + csv_parser_free(parser); + } else { + fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message); + csv_error_clear(&err); + } + } +} + +G_MODULE_EXPORT void onSaveAs(GtkWidget* self, gpointer data) { + gchar* filename = get_filename(FILE_NEW, "New File"); + commit(filename); + g_free(filename); +} + +G_MODULE_EXPORT void onOpen(GtkWidget* self, gpointer data) { + CvsError* err = NULL; + gchar* cvsErr = NULL; + bool replace = false; + GtkWidget* notebook = GTK_WIDGET(gtk_builder_get_object(builder, "notebook")); + + gchar* filename = get_filename(FILE_OPEN, "Open File"); + if (filename) { + Instructions instructions = { + .file = filename, + .first_line_header = true, + .write = false, + .overwrite = false + }; + CsvParser* parser = csv_parser_new(&instructions, &err); + if (!parser) { + fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message); + csv_error_clear(&err); + } else { + if ((replace = show_message(GTK_MESSAGE_QUESTION, "Should file content replace current?")) == true) { + for (gint i = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)); i > 0; i--) { + GtkWidget* window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), i-1); + GtkWidget* treeview = gtk_bin_get_child(GTK_BIN(window)); + 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) { + Maker* maker = get_maker(get_maker_id(elem->data)); + delete_maker(maker->maker_name, &cvsErr); + maker_free(maker); + } + g_slist_foreach(makers, (GFunc)g_free, NULL); + g_slist_free(makers); + } + Record* r = NULL; + while ((r = csv_parser_next_line(parser, &err)) != NULL) { + if (err) { + fprintf(stderr, "[Line: %zu - %s]\n", err->line, err->message); + csv_error_clear(&err); + } + gint id; + if ((id = get_maker_id(r->maker)) == -1) { + id = add_maker(r->maker, &cvsErr); + } + Row* row = row_new(); + row->maker = id; + row->sn = g_strdup(r->sn); + row->data = g_strdup(r->data); + row->notes = g_strdup(r->notes); + csv_record_free(r); + add_lens(row); + if (!replace) + add_row(row->maker, row); + row_free(row, NULL); + } + csv_parser_free(parser); + if (replace) + initialize_notebook(); + } + g_free(filename); + } +} + +G_MODULE_EXPORT void onNew(GtkWidget* self, gpointer data) { + gchar* filename = get_filename(FILE_NEW, "New File"); + commit(filename); + g_free(filename); +} + +G_MODULE_EXPORT void onSave(GtkWidget* self, gpointer data) { + gchar* filename = get_filename(FILE_SAVE, "Save File"); + commit(filename); + g_free(filename); +} + 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);