From 2960cfb383ccdf8440beb458d2311f92caa69836 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 7 Mar 2016 14:48:57 -0300 Subject: [PATCH] Acertando Makefile do diálogo de transferência de arquivos. --- configure.ac | 1 + src/pw3270/ft/Makefile.in | 28 ++++++++++++++++++++-------- src/pw3270/ft/ft.cbp | 4 ++++ src/pw3270/ft/ftdialog.c | 84 +----------------------------------------------------------------------------------- src/pw3270/ft/testprogram.c | 2 -- src/pw3270/ft/v3270ft.h | 1 - 6 files changed, 26 insertions(+), 94 deletions(-) diff --git a/configure.ac b/configure.ac index a518f3d..c1299b1 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,7 @@ AC_PROG_MKDIR_P AC_PROG_LN_S AC_PATH_TOOL([VALGRIND], [valgrind], [no]) +AC_PATH_TOOL([AR], [ar], [ar]) AC_PATH_TOOL([MAKENSIS], [makensis], [no]) AC_PATH_TOOL([WINDRES], [windres], [no]) diff --git a/src/pw3270/ft/Makefile.in b/src/pw3270/ft/Makefile.in index 922987a..8c45a98 100644 --- a/src/pw3270/ft/Makefile.in +++ b/src/pw3270/ft/Makefile.in @@ -26,7 +26,7 @@ MODULE_NAME=ft3270 -SOURCES=ftdialog.c ftprogress.c +SOURCES=ftdialog.c ftprogress.c browse.c #---[ Paths ]------------------------------------------------------------------ @@ -43,6 +43,7 @@ desktopdir=$(datarootdir)/applications MKDIR=@MKDIR_P@ CC=@CC@ LD=@CC@ +AR=@AR@ #---[ Environment ]------------------------------------------------------------ @@ -53,7 +54,7 @@ CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\"$(libdir)\" LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@ DEBUG_CFLAGS=-DDEBUG=1 -g -Wall -DEPENDS ?= *.h ../../include/*.h ../../include/lib3270/*.h +DEPENDS ?= *.h ../../include/*.h ../../include/lib3270/*.h Makefile #---[ Paths ]------------------------------------------------------------------ @@ -83,28 +84,39 @@ $(OBJRLS)/%.o: %.c $(DEPENDS) #---[ Targets ]---------------------------------------------------------------- +Release: \ + $(BINRLS)/$(MODULE_NAME).a + Debug: \ $(BINDBG)/$(MODULE_NAME)@EXEEXT@ run: \ $(BINDBG)/$(MODULE_NAME)@EXEEXT@ - @$(BINDBG)/$(MODULE_NAME)@EXEEXT@ +$(BINDBG)/$(MODULE_NAME).a: \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) + + @$(MKDIR) `dirname $@` + @$(AR) rcs $@ $^ + +$(BINRLS)/$(MODULE_NAME).a: \ + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) + + @$(MKDIR) `dirname $@` + @$(AR) rcs $@ $^ + $(BINDBG)/$(MODULE_NAME)@EXEEXT@: \ $(OBJDBG)/testprogram.o \ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) @$(MKDIR) `dirname $@` - @$(LD) @LDARCH@ @DBGRPATH@ \ - -o $@ \ - $(OBJDBG)/testprogram.o \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) $(LIBS) + @$(LD) @LDARCH@ @DBGRPATH@ -o $@ $^ $(LIBS) cleanDebug: \ clean -clean: +clean: @rm -fr .bin @rm -fr .obj diff --git a/src/pw3270/ft/ft.cbp b/src/pw3270/ft/ft.cbp index 9705669..56c5761 100644 --- a/src/pw3270/ft/ft.cbp +++ b/src/pw3270/ft/ft.cbp @@ -39,12 +39,16 @@ + + + diff --git a/src/pw3270/ft/ftdialog.c b/src/pw3270/ft/ftdialog.c index 66c8a03..6154ab5 100644 --- a/src/pw3270/ft/ftdialog.c +++ b/src/pw3270/ft/ftdialog.c @@ -27,60 +27,7 @@ * */ - #include "v3270ft.h" - -/*--[ Widget definition ]----------------------------------------------------------------------------*/ - - enum _filename - { - FILENAME_LOCAL, - FILENAME_HOST, - - FILENAME_COUNT - }; - - enum _value - { - VALUE_LRECL, - VALUE_BLKSIZE, - VALUE_PRIMSPACE, - VALUE_SECSPACE, - VALUE_DFT, - - VALUE_COUNT - }; - - enum _button - { - BUTTON_ASCII, - BUTTON_CRLF, - BUTTON_APPEND, - BUTTON_REMAP, - - BUTTON_COUNT - }; - - struct _v3270FTD - { - GtkDialog parent; - GtkWidget * filename[FILENAME_COUNT]; /**< Filenames for the transfer */ - GtkWidget * units; /**< Units frame box */ - GtkWidget * ready; /**< Send/Save button */ - GtkToggleButton * button[BUTTON_COUNT]; /**< Buttons */ - GtkToggleButton * recfm[4]; /**< Record format buttons */ - GtkToggleButton * btnUnits[4]; /**< Unit buttons */ - GtkSpinButton * value[VALUE_COUNT]; - gboolean local; /**< TRUE if local filename is ok */ - gboolean remote; /**< TRUE if remote filename is ok */ - LIB3270_FT_OPTION options; - }; - - struct _v3270FTDClass - { - GtkDialogClass parent_class; - - int dummy; - }; + #include "private.h" G_DEFINE_TYPE(v3270FTD, v3270FTD, GTK_TYPE_DIALOG); @@ -122,35 +69,6 @@ static void v3270FTD_init(v3270FTD *widget) { } -static void browse_file(GtkButton *button,v3270FTD *parent) -{ - gboolean recv = (parent->options & LIB3270_FT_OPTION_RECEIVE); - GtkWidget * dialog = gtk_file_chooser_dialog_new - ( - recv ? _( "Select file to receive" ) : _( "Select file to send" ), - GTK_WINDOW(parent), - GTK_FILE_CHOOSER_ACTION_OPEN, - _("_Cancel" ), GTK_RESPONSE_CANCEL, - recv ? _("_Save") : _("_Send"), GTK_RESPONSE_ACCEPT, - NULL - ); - - const gchar * current = gtk_entry_get_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL])); - if(current && *current) - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),current); - - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); - gtk_entry_set_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL]),filename); - g_free(filename); - } - - gtk_widget_destroy(dialog); - - -} - static void toggle_option(GtkToggleButton *button, v3270FTD *dialog) { const struct ftoptions *opt = (const struct ftoptions *) g_object_get_data(G_OBJECT(button),"cfg"); diff --git a/src/pw3270/ft/testprogram.c b/src/pw3270/ft/testprogram.c index ebb75f2..4af6b71 100644 --- a/src/pw3270/ft/testprogram.c +++ b/src/pw3270/ft/testprogram.c @@ -34,8 +34,6 @@ int main (int argc, char *argv[]) { -// GtkWidget *win; - gtk_init (&argc, &argv); { diff --git a/src/pw3270/ft/v3270ft.h b/src/pw3270/ft/v3270ft.h index ed5040b..ec40b5f 100644 --- a/src/pw3270/ft/v3270ft.h +++ b/src/pw3270/ft/v3270ft.h @@ -99,7 +99,6 @@ LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec); - G_END_DECLS #endif // V3270_H_INCLUDED -- libgit2 0.21.2