Download as
Browse Code »

Commit a0c5e4bdaef6ad5f0bc27ec35754534e34401d77

Authored by Perry Werneck
1 parent ef4902fe
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes no processo de transferência de arquivos

Showing 4 changed files with 20 additions and 16 deletions   Show diff stats
src/lib3270/ft.c
  Diff comments   View file @a0c5e4b
@@ -230,7 +230,7 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); @@ -230,7 +230,7 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state);
230 char openmode[5] = ""; 230 char openmode[5] = "";
231 int opensize = 0; 231 int opensize = 0;
232 232
233 - openmode[opensize++] = (flags & LIB3270_FT_OPTION_RECEIVE) ? 'r' : 'w'; 233 + openmode[opensize++] = (flags & LIB3270_FT_OPTION_RECEIVE) ? 'w' : 'r';
234 openmode[opensize++] = (flags & LIB3270_FT_OPTION_CRLF) ? 't' : 'b'; 234 openmode[opensize++] = (flags & LIB3270_FT_OPTION_CRLF) ? 't' : 'b';
235 235
236 // É para adicionar? 236 // É para adicionar?
src/pw3270/filetransfer.c
  Diff comments   View file @a0c5e4b
@@ -247,7 +247,7 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch @@ -247,7 +247,7 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch
247 (options & LIB3270_FT_OPTION_RECEIVE) ? _( "Receiving file" ) : _( "Sending file" ), 247 (options & LIB3270_FT_OPTION_RECEIVE) ? _( "Receiving file" ) : _( "Sending file" ),
248 GTK_WINDOW(gtk_widget_get_toplevel(widget)), 248 GTK_WINDOW(gtk_widget_get_toplevel(widget)),
249 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, 249 GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
250 - _( "_Cancel" ), GTK_RESPONSE_CANCEL,NULL ); 250 + _( "_Close" ), GTK_RESPONSE_CANCEL,NULL );
251 251
252 252
253 // Create FT progress dialog 253 // Create FT progress dialog
@@ -261,8 +261,18 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch @@ -261,8 +261,18 @@ gint v3270_transfer_file(GtkWidget *widget, LIB3270_FT_OPTION options, const gch
261 ft->state_changed = ft_state_changed; 261 ft->state_changed = ft_state_changed;
262 ft->message = ft_message; 262 ft->message = ft_message;
263 263
264 - v3270_ft_progress_set_host_filename(progress,remote);  
265 - v3270_ft_progress_set_local_filename(progress,local); 264 + if(options & LIB3270_FT_OPTION_RECEIVE) {
  265 +
  266 + // Recebendo arquivo
  267 + v3270_ft_progress_set_filenames(progress,remote,local);
  268 +
  269 + } else {
  270 +
  271 + // Enviando arquivo
  272 + v3270_ft_progress_set_filenames(progress,local,remote);
  273 +
  274 + }
  275 +
266 v3270_ft_progress_set_message(progress,_("Starting transfer")); 276 v3270_ft_progress_set_message(progress,_("Starting transfer"));
267 277
268 gtk_widget_show_all(progress); 278 gtk_widget_show_all(progress);
src/pw3270/ft/ftprogress.c
  Diff comments   View file @a0c5e4b
@@ -33,8 +33,8 @@ @@ -33,8 +33,8 @@
33 33
34 enum _filename 34 enum _filename
35 { 35 {
36 - TEXT_LOCALFILE,  
37 - TEXT_HOSTFILE, 36 + TEXT_FROM,
  37 + TEXT_TO,
38 TEXT_STATUS, 38 TEXT_STATUS,
39 39
40 TEXT_COUNT 40 TEXT_COUNT
@@ -319,14 +319,9 @@ void v3270_ft_progress_set_message(GtkWidget *widget, const gchar *msg) @@ -319,14 +319,9 @@ void v3270_ft_progress_set_message(GtkWidget *widget, const gchar *msg)
319 gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_STATUS],msg); 319 gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_STATUS],msg);
320 } 320 }
321 321
322 -void v3270_ft_progress_set_host_filename(GtkWidget *widget, const gchar *name) 322 +void v3270_ft_progress_set_filenames(GtkWidget *widget, const gchar *from, const gchar *to)
323 { 323 {
324 g_return_if_fail(GTK_IS_V3270FTProgress(widget)); 324 g_return_if_fail(GTK_IS_V3270FTProgress(widget));
325 - gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_HOSTFILE],name);  
326 -}  
327 -  
328 -void v3270_ft_progress_set_local_filename(GtkWidget *widget, const gchar *name)  
329 -{  
330 - g_return_if_fail(GTK_IS_V3270FTProgress(widget));  
331 - gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_LOCALFILE],name); 325 + gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_FROM],from);
  326 + gtk_label_set_text(GTK_V3270FTProcess(widget)->text[TEXT_TO],to);
332 } 327 }
src/pw3270/ft/v3270ft.h
  Diff comments   View file @a0c5e4b
@@ -94,8 +94,7 @@ @@ -94,8 +94,7 @@
94 LIB3270_EXPORT GtkWidget * v3270_ft_progress_new(void); 94 LIB3270_EXPORT GtkWidget * v3270_ft_progress_new(void);
95 LIB3270_EXPORT void v3270_ft_progress_update(GtkWidget *widget, unsigned long current, unsigned long total, double kbytes_sec); 95 LIB3270_EXPORT void v3270_ft_progress_update(GtkWidget *widget, unsigned long current, unsigned long total, double kbytes_sec);
96 LIB3270_EXPORT void v3270_ft_progress_set_message(GtkWidget *widget, const gchar *msg); 96 LIB3270_EXPORT void v3270_ft_progress_set_message(GtkWidget *widget, const gchar *msg);
97 - LIB3270_EXPORT void v3270_ft_progress_set_host_filename(GtkWidget *widget, const gchar *name);  
98 - LIB3270_EXPORT void v3270_ft_progress_set_local_filename(GtkWidget *widget, const gchar *name); 97 + LIB3270_EXPORT void v3270_ft_progress_set_filenames(GtkWidget *widget, const gchar *from, const gchar *to);
99 LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec); 98 LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec);
100 99
101 100