From 303fede16d708e7163b4e8be8b9e546e2e25104c Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 23 May 2016 17:56:34 -0300 Subject: [PATCH] Ajustando diálogo de transferência de arquivos. --- src/pw3270/v3270ft/Makefile.in | 2 +- src/pw3270/v3270ft/ftdialog.cbp | 3 +++ src/pw3270/v3270ft/private.h | 17 +++++++++++------ src/pw3270/v3270ft/select.c | 2 +- src/pw3270/v3270ft/v3270ft.c | 162 ------------------------------------------------------------------------------------------------------------------------------------------------------------------ 5 files changed, 16 insertions(+), 170 deletions(-) diff --git a/src/pw3270/v3270ft/Makefile.in b/src/pw3270/v3270ft/Makefile.in index a560238..43685f9 100644 --- a/src/pw3270/v3270ft/Makefile.in +++ b/src/pw3270/v3270ft/Makefile.in @@ -29,7 +29,7 @@ MODULE_NAME=v3270ft #---[ Application sources ]-------------------------------------------------------------- SOURCES=filelist.c load.c misc.c select.c transfer.c v3270ftprogress.c get.c \ - marshal.c save.c set.c testprogram.c v3270ft.c + marshal.c save.c set.c testprogram.c v3270ft.c tables.c #---[ Configuration values ]------------------------------------------------------------- diff --git a/src/pw3270/v3270ft/ftdialog.cbp b/src/pw3270/v3270ft/ftdialog.cbp index fc5bcd6..3b7554e 100644 --- a/src/pw3270/v3270ft/ftdialog.cbp +++ b/src/pw3270/v3270ft/ftdialog.cbp @@ -112,6 +112,9 @@ + + diff --git a/src/pw3270/v3270ft/private.h b/src/pw3270/v3270ft/private.h index fe6878e..b4fe32d 100644 --- a/src/pw3270/v3270ft/private.h +++ b/src/pw3270/v3270ft/private.h @@ -56,23 +56,24 @@ FT_BUTTON_COUNT } FT_BUTTON; - const struct v3270ft_option { + struct v3270ft_option { LIB3270_FT_OPTION opt; const char * name; const char * label; const char * tooltip; - } ft_option[NUM_OPTIONS_WIDGETS]; + }; + - const struct v3270ft_type { + struct v3270ft_type { LIB3270_FT_OPTION opt; const gchar * name; const gchar * type; const gchar * label; - } ft_type[NUM_TYPES]; + }; - const struct v3270ft_value { + struct v3270ft_value { const gchar * name; guint minval; @@ -80,7 +81,11 @@ const gchar * label; const gchar * tooltip; - } ft_value[LIB3270_FT_VALUE_COUNT]; + }; + + extern const struct v3270ft_option ft_option[]; + extern const struct v3270ft_type ft_type[]; + extern const struct v3270ft_value ft_value[]; struct v3270ft_entry { gint type; ///< Transfer type. diff --git a/src/pw3270/v3270ft/select.c b/src/pw3270/v3270ft/select.c index d6e9260..b59f1f4 100644 --- a/src/pw3270/v3270ft/select.c +++ b/src/pw3270/v3270ft/select.c @@ -64,7 +64,7 @@ gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *bu ( title, GTK_WINDOW(dialog), - GTK_FILE_CHOOSER_ACTION_OPEN, + action, _("_Cancel" ), GTK_RESPONSE_CANCEL, button, GTK_RESPONSE_ACCEPT, NULL diff --git a/src/pw3270/v3270ft/v3270ft.c b/src/pw3270/v3270ft/v3270ft.c index 580ff7e..a3b565b 100644 --- a/src/pw3270/v3270ft/v3270ft.c +++ b/src/pw3270/v3270ft/v3270ft.c @@ -42,168 +42,6 @@ G_DEFINE_TYPE(v3270ft, v3270ft, GTK_TYPE_DIALOG); - -/*--[ Globals ]--------------------------------------------------------------------------------------*/ - -const struct v3270ft_option ft_option[NUM_OPTIONS_WIDGETS] = { - - // Transfer options - { - LIB3270_FT_OPTION_ASCII, - "ascii", - N_("_Text file"), - N_( "Check this if the file consists of character data only.") - }, - { - LIB3270_FT_OPTION_CRLF, - "crlf", - N_("Follow the convention for _ASCII text files."), -#ifdef _WIN32 - N_( "Following the convention for ASCII text files, CR/LF pairs are used to terminate records in the PC file, and a CTRL-Z (x'1A') marks the end of file.") -#else - N_( "Following the convention for ASCII text files, LF is used to terminate records in the PC file.") -#endif // _WIN32 - - }, - { - LIB3270_FT_OPTION_APPEND, - "append", - N_("A_ppend to file"), - N_( "Appends the source file to the destination file.") - }, - { - LIB3270_FT_OPTION_REMAP, - "remap", - N_("Re_map ASCII Characters."), - N_("Remap the text to ensure maximum compatibility between the workstation's character set and encoding and the host's EBCDIC code page.") - }, - - // Record format - { - LIB3270_FT_RECORD_FORMAT_DEFAULT, - "recfm.default", - N_("Default"), - N_("Use host default record format.") - }, - { - LIB3270_FT_RECORD_FORMAT_FIXED, - "recfm.fixed", - N_("Fixed"), - N_("Creates a file with fixed-length records.") - }, - { - LIB3270_FT_RECORD_FORMAT_VARIABLE, - "recfm.variable", - N_("Variable"), - N_("Creates a file with variable-length records.") - }, - { - LIB3270_FT_RECORD_FORMAT_UNDEFINED, - "recfm.undefined", - N_("Undefined"), - N_("Creates a file with undefined-length records (TSO hosts only).") - }, - - // Space allocation units - { - LIB3270_FT_ALLOCATION_UNITS_DEFAULT, - "units.default", - N_("Default"), - NULL - }, - { - LIB3270_FT_ALLOCATION_UNITS_TRACKS, - "units.tracks", - N_("Tracks"), - NULL - }, - { - LIB3270_FT_ALLOCATION_UNITS_CYLINDERS, - "units.cylinders", - N_("Cylinders"), - NULL - }, - { - LIB3270_FT_ALLOCATION_UNITS_AVBLOCK, - "units.avblock", - N_("Avblock"), - NULL - }, - -}; - -const struct v3270ft_type ft_type[NUM_TYPES] = { - - { - LIB3270_FT_OPTION_SEND, - "send", - "binary", - N_("Send file") - }, - { - LIB3270_FT_OPTION_RECEIVE, - "receive", - "binary", - N_("Receive file") - }, - { - LIB3270_FT_OPTION_SEND|LIB3270_FT_OPTION_ASCII|LIB3270_FT_OPTION_CRLF|LIB3270_FT_OPTION_REMAP, - "send", - "text", - N_("Send text file") - }, - { - LIB3270_FT_OPTION_RECEIVE|LIB3270_FT_OPTION_ASCII|LIB3270_FT_OPTION_CRLF|LIB3270_FT_OPTION_REMAP, - "receive", - "text", - N_("Receive text file") - } -}; - -const struct v3270ft_value ft_value[LIB3270_FT_VALUE_COUNT] = { - { - "lrecl", - 0, 32760, - N_( "Record Length:" ), - N_( "Specifies the logical record length (n) for a data set consisting of fixed length records or the maximum logical record length for a data set consisting of variable length records." ) - }, - - - { - "primary", - 0,99999, - N_( "Primary space:" ), - N_( "Primary allocation for a file created on a TSO host.\nThe units are given by the space allocation units option." ) - }, - - { - "blksize", - 0,32760, - N_( "Block size:" ), - N_( "Specifies the block size (n) for a new data set. For data sets containing fixed " \ - "length records, the block size must be a multiple of the record length. " \ - "For data sets containing variable length records, the block size must be " \ - "greater than or equal to the record length plus four bytes. The block size " \ - "must not exceed the track length of the device on which the data set resides." ) - }, - - { - "secondary", - 0,99999, - N_( "Secondary space:" ), - N_( "Secondary allocation for a file created on a TSO host.\nThe units are given by the space allocation units option." ) - }, - - { - "dft", - 0,99999, - N_( "DFT B_uffer size:" ), - N_("Specifies the default buffer size for DFT IND$FILE file transfers.") - }, - -}; - - /*--[ Implement ]------------------------------------------------------------------------------------*/ void v3270ft_remove_all(GtkWidget *widget) { -- libgit2 0.21.2