From a0c5e4bdaef6ad5f0bc27ec35754534e34401d77 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 8 Mar 2016 10:21:44 -0300 Subject: [PATCH] Ajustes no processo de transferência de arquivos --- src/lib3270/ft.c | 2 +- src/pw3270/filetransfer.c | 16 +++++++++++++--- src/pw3270/ft/ftprogress.c | 15 +++++---------- src/pw3270/ft/v3270ft.h | 3 +-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/lib3270/ft.c b/src/lib3270/ft.c index fc61464..07d04f2 100644 --- a/src/lib3270/ft.c +++ b/src/lib3270/ft.c @@ -230,7 +230,7 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); char openmode[5] = ""; int opensize = 0; - openmode[opensize++] = (flags & LIB3270_FT_OPTION_RECEIVE) ? 'r' : 'w'; + openmode[opensize++] = (flags & LIB3270_FT_OPTION_RECEIVE) ? 'w' : 'r'; openmode[opensize++] = (flags & LIB3270_FT_OPTION_CRLF) ? 't' : 'b'; // É para adicionar? diff --git a/src/pw3270/filetransfer.c b/src/pw3270/filetransfer.c index a67902d..45b25cc 100644 --- a/src/pw3270/filetransfer.c +++ b/src/pw3270/filetransfer.c @@ -247,7 +247,7 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch (options & LIB3270_FT_OPTION_RECEIVE) ? _( "Receiving file" ) : _( "Sending file" ), GTK_WINDOW(gtk_widget_get_toplevel(widget)), GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, - _( "_Cancel" ), GTK_RESPONSE_CANCEL,NULL ); + _( "_Close" ), GTK_RESPONSE_CANCEL,NULL ); // Create FT progress dialog @@ -261,8 +261,18 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch ft->state_changed = ft_state_changed; ft->message = ft_message; - v3270_ft_progress_set_host_filename(progress,remote); - v3270_ft_progress_set_local_filename(progress,local); + if(options & LIB3270_FT_OPTION_RECEIVE) { + + // Recebendo arquivo + v3270_ft_progress_set_filenames(progress,remote,local); + + } else { + + // Enviando arquivo + v3270_ft_progress_set_filenames(progress,local,remote); + + } + v3270_ft_progress_set_message(progress,_("Starting transfer")); gtk_widget_show_all(progress); diff --git a/src/pw3270/ft/ftprogress.c b/src/pw3270/ft/ftprogress.c index 3b421a7..43c2e98 100644 --- a/src/pw3270/ft/ftprogress.c +++ b/src/pw3270/ft/ftprogress.c @@ -33,8 +33,8 @@ enum _filename { - TEXT_LOCALFILE, - TEXT_HOSTFILE, + TEXT_FROM, + TEXT_TO, TEXT_STATUS, TEXT_COUNT @@ -319,14 +319,9 @@ void v3270_ft_progress_set_message(GtkWidget *widget, const gchar *msg) gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_STATUS],msg); } -void v3270_ft_progress_set_host_filename(GtkWidget *widget, const gchar *name) +void v3270_ft_progress_set_filenames(GtkWidget *widget, const gchar *from, const gchar *to) { g_return_if_fail(GTK_IS_V3270FTProgress(widget)); - gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_HOSTFILE],name); -} - -void v3270_ft_progress_set_local_filename(GtkWidget *widget, const gchar *name) -{ - g_return_if_fail(GTK_IS_V3270FTProgress(widget)); - gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_LOCALFILE],name); + gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_FROM],from); + gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_TO],to); } diff --git a/src/pw3270/ft/v3270ft.h b/src/pw3270/ft/v3270ft.h index ec40b5f..6bee0c9 100644 --- a/src/pw3270/ft/v3270ft.h +++ b/src/pw3270/ft/v3270ft.h @@ -94,8 +94,7 @@ LIB3270_EXPORT GtkWidget * v3270_ft_progress_new(void); LIB3270_EXPORT void v3270_ft_progress_update(GtkWidget *widget, unsigned long current, unsigned long total, double kbytes_sec); LIB3270_EXPORT void v3270_ft_progress_set_message(GtkWidget *widget, const gchar *msg); - LIB3270_EXPORT void v3270_ft_progress_set_host_filename(GtkWidget *widget, const gchar *name); - LIB3270_EXPORT void v3270_ft_progress_set_local_filename(GtkWidget *widget, const gchar *name); + LIB3270_EXPORT void v3270_ft_progress_set_filenames(GtkWidget *widget, const gchar *from, const gchar *to); LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec); -- libgit2 0.21.2