* 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() {
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);
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) {
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));
// 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);
// 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);
// 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);
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);
}
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);
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"));
* 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;
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) {
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));
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));
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();
}
action = GTK_FILE_CHOOSER_ACTION_SAVE;
break;
case FILE_OPEN:
- if (nameHint == NULL)
- nameHint = g_strdup("Untitled document.csv");
action = GTK_FILE_CHOOSER_ACTION_OPEN;
break;
}
GTK_RESPONSE_ACCEPT,
NULL);
}
- GtkFileFilter* filter = gtk_file_filter_new();
- gtk_file_filter_add_pattern(filter, "*.csv");
chooser = GTK_FILE_CHOOSER(dialog);
- gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
- gtk_file_chooser_set_filter(chooser, filter);
+
+ 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);
- gtk_file_chooser_set_current_name(chooser, (nameHint));
+ 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);
}
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");
- fprintf(stdout, "(onOpen) file: %s\n", filename);
-
- g_free(filename);
+ 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) {
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);