From 367055b65bdd6b7465a0cb2fdffe3c5163bb1285 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 29 Jul 2019 15:46:30 -0300 Subject: [PATCH] Replacing save dialog with the new version from v3270. --- src/include/pw3270.h | 2 +- src/pw3270/dialog.c | 180 +++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/pw3270/print.c | 20 ++++++++++---------- src/pw3270/window.c | 2 +- 4 files changed, 15 insertions(+), 189 deletions(-) diff --git a/src/include/pw3270.h b/src/include/pw3270.h index 956e0c8..ef6b9f5 100644 --- a/src/include/pw3270.h +++ b/src/include/pw3270.h @@ -89,7 +89,7 @@ LIB3270_EXPORT void pw3270_set_action_state(GtkAction *action, gboolean on); - LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, LIB3270_PRINT_MODE src); + LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, LIB3270_CONTENT_OPTION src); LIB3270_EXPORT gboolean pw3270_set_keyboard_action(GtkWidget *widget, const gchar *key_name, GtkAction *action); diff --git a/src/pw3270/dialog.c b/src/pw3270/dialog.c index a7a3de2..22ced36 100644 --- a/src/pw3270/dialog.c +++ b/src/pw3270/dialog.c @@ -185,193 +185,19 @@ } - static void save_text(GtkWindow *toplevel,const gchar *filename, const gchar *text, const gchar *encoding, const gchar *errmsg) - { - GError * error = NULL; - - if(encoding && g_ascii_strcasecmp(encoding,"UTF-8")) - { - // Convert to target charset and save - gsize bytes_written; - gchar * converted = g_convert_with_fallback(text,-1,encoding,"UTF-8",NULL,NULL,&bytes_written,&error); - - if(!error) - g_file_set_contents(filename,converted,-1,&error); - - g_free(converted); - } - else - { - // Same charset, save file - g_file_set_contents(filename,text,-1,&error); - } - - if(error) - { - GtkWidget *popup = gtk_message_dialog_new_with_markup( - toplevel, - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR,GTK_BUTTONS_CLOSE, - gettext(errmsg),filename); - - gtk_window_set_title(GTK_WINDOW(popup),_("Can't save file")); - - gtk_message_dialog_format_secondary_markup(GTK_MESSAGE_DIALOG(popup),"%s",error->message); - g_error_free(error); - - gtk_dialog_run(GTK_DIALOG(popup)); - gtk_widget_destroy(popup); - - } - - } - - static GtkFileChooserConfirmation confirm_overwrite(GtkFileChooser *chooser, GObject *action) - { - const gchar * attr = g_object_get_data(action,"overwrite"); - GtkFileChooserConfirmation ret = GTK_FILE_CHOOSER_CONFIRMATION_ACCEPT_FILENAME; - GtkWidget * dialog; - - if(attr && !g_ascii_strcasecmp(attr,"yes")) - return ret; - - dialog = gtk_message_dialog_new_with_markup( GTK_WINDOW(chooser), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION,GTK_BUTTONS_OK_CANCEL, - "%s",_("The file already exists. Replace it?")); - - - if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK) - ret = GTK_FILE_CHOOSER_CONFIRMATION_SELECT_AGAIN; - - gtk_widget_destroy(dialog); - - return ret; - - } - - static int save_dialog(GtkAction *action, GtkWidget *widget, const gchar *title, const gchar *errmsg, const gchar *text) - { - GtkWindow * toplevel = GTK_WINDOW(gtk_widget_get_toplevel(widget)); - const gchar * user_title = g_object_get_data(G_OBJECT(action),"title"); - const gchar * filename = g_object_get_data(G_OBJECT(action),"filename"); - - /* - const gchar * extension = g_object_get_data(G_OBJECT(action),"extension"); - - if(!extension) - extension = "txt"; - */ - - if(!text) - return 0; - - - if(filename) - { - save_text(toplevel,filename,text,g_object_get_data(G_OBJECT(action),"encoding"),errmsg); - } - else - { - GtkWidget * dialog; - gchar * ptr; - gchar * encattr = NULL; - - dialog = gtk_file_chooser_dialog_new( gettext(user_title ? user_title : title), - toplevel, - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL ); - - gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); - g_signal_connect(GTK_FILE_CHOOSER(dialog), "confirm-overwrite", G_CALLBACK(confirm_overwrite), G_OBJECT(action)); - - add_option_menus(dialog, action, &encattr); - - ptr = get_string_from_config("save",gtk_action_get_name(action),""); - if(*ptr) - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),ptr); - else - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),g_get_user_special_dir(G_USER_DIRECTORY_DOCUMENTS)); - g_free(ptr); - - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - ptr = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - if(ptr) - { - trace("Saving \"%s\"",ptr); - set_string_to_config("save",gtk_action_get_name(action),"%s",ptr); - save_text(toplevel,ptr,text,encattr,errmsg); - g_free(ptr); - } - } - - if(encattr) - g_free(encattr); - - trace("Removing dialog %p",dialog); - gtk_widget_destroy(dialog); - } - - return 0; - } - void save_all_action(GtkAction *action, GtkWidget *widget) { - gchar *text = v3270_get_text(widget,0,-1); - - trace("Action %s activated on widget %p text=%p",gtk_action_get_name(action),widget,text); - - if(!text) - { - g_warning("%s","Buffer contents was NULL"); - return; - } - - save_dialog( action, - widget, - N_( "Save screen to file" ), - N_( "Can't save screen to file\n%s" ), - text); - - g_free(text); - + v3270_save_all(widget,g_object_get_data(G_OBJECT(action),"filename"),NULL); } void save_selected_action(GtkAction *action, GtkWidget *widget) { - gchar *text = v3270_get_selected(widget,FALSE); - - trace("Action %s activated on widget %p",gtk_action_get_name(action),widget); - - if(text) - { - save_dialog( action, - widget, - N_( "Save selection to file" ), - N_( "Can't save selection to file\n%s" ), - text); - g_free(text); - } + v3270_save_selected(widget,g_object_get_data(G_OBJECT(action),"filename"),NULL); } void save_copy_action(GtkAction *action, GtkWidget *widget) { - gchar *text = v3270_get_copy(widget); - - trace("Action %s activated on widget %p",gtk_action_get_name(action),widget); - - if(text) - { - save_dialog( action, - widget, - N_( "Save copy to file" ), - N_( "Can't save copy to file\n%s" ), - text); - g_free(text); - } + v3270_save_copy(widget,g_object_get_data(G_OBJECT(action),"filename"),NULL); } static void paste_filename(GtkWidget *widget, const gchar *filename, const gchar *encoding) diff --git a/src/pw3270/print.c b/src/pw3270/print.c index e0b9086..24a62bd 100644 --- a/src/pw3270/print.c +++ b/src/pw3270/print.c @@ -50,7 +50,7 @@ { GdkRGBA color[V3270_COLOR_COUNT]; int show_selection : 1; - LIB3270_PRINT_MODE src; + LIB3270_CONTENT_OPTION src; GtkWidget * widget; H3270 * session; @@ -185,7 +185,7 @@ unsigned char c; unsigned short attr; - if(!lib3270_get_element(info->session,baddr++,&c,&attr) && (info->src == LIB3270_PRINT_ALL || (attr & LIB3270_ATTR_SELECTED))) + if(!lib3270_get_element(info->session,baddr++,&c,&attr) && (info->src == LIB3270_CONTENT_ALL || (attr & LIB3270_ATTR_SELECTED))) { if(!info->show_selection) attr &= ~LIB3270_ATTR_SELECTED; @@ -506,7 +506,7 @@ static gchar * enum_to_string(GType type, guint enum_value) // Selection checkbox widget = gtk_check_button_new_with_label( _("Print selection box") ); - if(info->src == LIB3270_PRINT_ALL) + if(info->src == LIB3270_CONTENT_ALL) { info->show_selection = get_boolean_from_config("print","selection",FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget),info->show_selection); @@ -798,12 +798,12 @@ static gchar * enum_to_string(GType type, guint enum_value) void print_all_action(GtkAction *action, GtkWidget *widget) { - pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_ALL); + pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_CONTENT_ALL); } void print_selected_action(GtkAction *action, GtkWidget *widget) { - pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_SELECTED); + pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_CONTENT_SELECTED); } static void draw_text(GtkPrintOperation *prt, GtkPrintContext *context, gint pg, PRINT_INFO *info) @@ -833,10 +833,10 @@ static gchar * enum_to_string(GType type, guint enum_value) void print_copy_action(GtkAction *action, GtkWidget *widget) { - pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_COPY); + pw3270_print(widget,G_OBJECT(action),GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_CONTENT_COPY); } - LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, LIB3270_PRINT_MODE src) + LIB3270_EXPORT int pw3270_print(GtkWidget *widget, GObject *action, GtkPrintOperationAction oper, LIB3270_CONTENT_OPTION src) { PRINT_INFO * info = NULL; GtkPrintOperation * print; @@ -862,12 +862,12 @@ static gchar * enum_to_string(GType type, guint enum_value) switch(src) { - case LIB3270_PRINT_ALL: - case LIB3270_PRINT_SELECTED: + case LIB3270_CONTENT_ALL: + case LIB3270_CONTENT_SELECTED: g_signal_connect(print,"draw_page",G_CALLBACK(draw_screen),info); break; - case LIB3270_PRINT_COPY: + case LIB3270_CONTENT_COPY: text = v3270_get_copy(widget); diff --git a/src/pw3270/window.c b/src/pw3270/window.c index 6399eb5..dc0a769 100644 --- a/src/pw3270/window.c +++ b/src/pw3270/window.c @@ -644,7 +644,7 @@ static GtkWidget * trace_window = NULL; static void print_all(GtkWidget *widget, GtkWidget *window) { - pw3270_print(widget, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_PRINT_ALL); + pw3270_print(widget, NULL, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, LIB3270_CONTENT_ALL); } static void toggle_changed(GtkWidget *widget, LIB3270_TOGGLE id, gboolean toggled, const gchar *name, GtkWindow *toplevel) -- libgit2 0.21.2