Download as
Browse Code »

Commit 2960cfb383ccdf8440beb458d2311f92caa69836

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

Acertando Makefile do diálogo de transferência de arquivos.

Showing 6 changed files with 26 additions and 94 deletions   Show diff stats
@@ -63,6 +63,7 @@ AC_PROG_MKDIR_P @@ -63,6 +63,7 @@ AC_PROG_MKDIR_P
63 AC_PROG_LN_S 63 AC_PROG_LN_S
64 64
65 AC_PATH_TOOL([VALGRIND], [valgrind], [no]) 65 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
  66 +AC_PATH_TOOL([AR], [ar], [ar])
66 67
67 AC_PATH_TOOL([MAKENSIS], [makensis], [no]) 68 AC_PATH_TOOL([MAKENSIS], [makensis], [no])
68 AC_PATH_TOOL([WINDRES], [windres], [no]) 69 AC_PATH_TOOL([WINDRES], [windres], [no])
src/pw3270/ft/Makefile.in
  Diff comments   View file @2960cfb
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 26
27 MODULE_NAME=ft3270 27 MODULE_NAME=ft3270
28 28
29 -SOURCES=ftdialog.c ftprogress.c 29 +SOURCES=ftdialog.c ftprogress.c browse.c
30 30
31 #---[ Paths ]------------------------------------------------------------------ 31 #---[ Paths ]------------------------------------------------------------------
32 32
@@ -43,6 +43,7 @@ desktopdir=$(datarootdir)/applications @@ -43,6 +43,7 @@ desktopdir=$(datarootdir)/applications
43 MKDIR=@MKDIR_P@ 43 MKDIR=@MKDIR_P@
44 CC=@CC@ 44 CC=@CC@
45 LD=@CC@ 45 LD=@CC@
  46 +AR=@AR@
46 47
47 #---[ Environment ]------------------------------------------------------------ 48 #---[ Environment ]------------------------------------------------------------
48 49
@@ -53,7 +54,7 @@ CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\"$(libdir)\" @@ -53,7 +54,7 @@ CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @GTK_CFLAGS@ @GTKMAC_CFLAGS@ -DLIBDIR=\"$(libdir)\"
53 LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@ 54 LIBS=@LIBS@ @GTK_LIBS@ @GTKMAC_LIBS@
54 55
55 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall 56 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
56 -DEPENDS ?= *.h ../../include/*.h ../../include/lib3270/*.h 57 +DEPENDS ?= *.h ../../include/*.h ../../include/lib3270/*.h Makefile
57 58
58 #---[ Paths ]------------------------------------------------------------------ 59 #---[ Paths ]------------------------------------------------------------------
59 60
@@ -83,28 +84,39 @@ $(OBJRLS)/%.o: %.c $(DEPENDS) @@ -83,28 +84,39 @@ $(OBJRLS)/%.o: %.c $(DEPENDS)
83 84
84 #---[ Targets ]---------------------------------------------------------------- 85 #---[ Targets ]----------------------------------------------------------------
85 86
  87 +Release: \
  88 + $(BINRLS)/$(MODULE_NAME).a
  89 +
86 Debug: \ 90 Debug: \
87 $(BINDBG)/$(MODULE_NAME)@EXEEXT@ 91 $(BINDBG)/$(MODULE_NAME)@EXEEXT@
88 92
89 run: \ 93 run: \
90 $(BINDBG)/$(MODULE_NAME)@EXEEXT@ 94 $(BINDBG)/$(MODULE_NAME)@EXEEXT@
91 -  
92 @$(BINDBG)/$(MODULE_NAME)@EXEEXT@ 95 @$(BINDBG)/$(MODULE_NAME)@EXEEXT@
93 96
  97 +$(BINDBG)/$(MODULE_NAME).a: \
  98 + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
  99 +
  100 + @$(MKDIR) `dirname $@`
  101 + @$(AR) rcs $@ $^
  102 +
  103 +$(BINRLS)/$(MODULE_NAME).a: \
  104 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
  105 +
  106 + @$(MKDIR) `dirname $@`
  107 + @$(AR) rcs $@ $^
  108 +
94 $(BINDBG)/$(MODULE_NAME)@EXEEXT@: \ 109 $(BINDBG)/$(MODULE_NAME)@EXEEXT@: \
95 $(OBJDBG)/testprogram.o \ 110 $(OBJDBG)/testprogram.o \
96 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) 111 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
97 112
98 @$(MKDIR) `dirname $@` 113 @$(MKDIR) `dirname $@`
99 - @$(LD) @LDARCH@ @DBGRPATH@ \  
100 - -o $@ \  
101 - $(OBJDBG)/testprogram.o \  
102 - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) $(LIBS) 114 + @$(LD) @LDARCH@ @DBGRPATH@ -o $@ $^ $(LIBS)
103 115
104 cleanDebug: \ 116 cleanDebug: \
105 clean 117 clean
106 118
107 -clean: 119 +clean:
108 @rm -fr .bin 120 @rm -fr .bin
109 @rm -fr .obj 121 @rm -fr .obj
110 122
src/pw3270/ft/ft.cbp
  Diff comments   View file @2960cfb
@@ -39,12 +39,16 @@ @@ -39,12 +39,16 @@
39 <Add option="`pkg-config --libs gtk+-3.0`" /> 39 <Add option="`pkg-config --libs gtk+-3.0`" />
40 </Linker> 40 </Linker>
41 <Unit filename="Makefile.in" /> 41 <Unit filename="Makefile.in" />
  42 + <Unit filename="browse.c">
  43 + <Option compilerVar="CC" />
  44 + </Unit>
42 <Unit filename="ftdialog.c"> 45 <Unit filename="ftdialog.c">
43 <Option compilerVar="CC" /> 46 <Option compilerVar="CC" />
44 </Unit> 47 </Unit>
45 <Unit filename="ftprogress.c"> 48 <Unit filename="ftprogress.c">
46 <Option compilerVar="CC" /> 49 <Option compilerVar="CC" />
47 </Unit> 50 </Unit>
  51 + <Unit filename="private.h" />
48 <Unit filename="testprogram.c"> 52 <Unit filename="testprogram.c">
49 <Option compilerVar="CC" /> 53 <Option compilerVar="CC" />
50 </Unit> 54 </Unit>
src/pw3270/ft/ftdialog.c
  Diff comments   View file @2960cfb
@@ -27,60 +27,7 @@ @@ -27,60 +27,7 @@
27 * 27 *
28 */ 28 */
29 29
30 - #include "v3270ft.h"  
31 -  
32 -/*--[ Widget definition ]----------------------------------------------------------------------------*/  
33 -  
34 - enum _filename  
35 - {  
36 - FILENAME_LOCAL,  
37 - FILENAME_HOST,  
38 -  
39 - FILENAME_COUNT  
40 - };  
41 -  
42 - enum _value  
43 - {  
44 - VALUE_LRECL,  
45 - VALUE_BLKSIZE,  
46 - VALUE_PRIMSPACE,  
47 - VALUE_SECSPACE,  
48 - VALUE_DFT,  
49 -  
50 - VALUE_COUNT  
51 - };  
52 -  
53 - enum _button  
54 - {  
55 - BUTTON_ASCII,  
56 - BUTTON_CRLF,  
57 - BUTTON_APPEND,  
58 - BUTTON_REMAP,  
59 -  
60 - BUTTON_COUNT  
61 - };  
62 -  
63 - struct _v3270FTD  
64 - {  
65 - GtkDialog parent;  
66 - GtkWidget * filename[FILENAME_COUNT]; /**< Filenames for the transfer */  
67 - GtkWidget * units; /**< Units frame box */  
68 - GtkWidget * ready; /**< Send/Save button */  
69 - GtkToggleButton * button[BUTTON_COUNT]; /**< Buttons */  
70 - GtkToggleButton * recfm[4]; /**< Record format buttons */  
71 - GtkToggleButton * btnUnits[4]; /**< Unit buttons */  
72 - GtkSpinButton * value[VALUE_COUNT];  
73 - gboolean local; /**< TRUE if local filename is ok */  
74 - gboolean remote; /**< TRUE if remote filename is ok */  
75 - LIB3270_FT_OPTION options;  
76 - };  
77 -  
78 - struct _v3270FTDClass  
79 - {  
80 - GtkDialogClass parent_class;  
81 -  
82 - int dummy;  
83 - }; 30 + #include "private.h"
84 31
85 G_DEFINE_TYPE(v3270FTD, v3270FTD, GTK_TYPE_DIALOG); 32 G_DEFINE_TYPE(v3270FTD, v3270FTD, GTK_TYPE_DIALOG);
86 33
@@ -122,35 +69,6 @@ static void v3270FTD_init(v3270FTD *widget) @@ -122,35 +69,6 @@ static void v3270FTD_init(v3270FTD *widget)
122 { 69 {
123 } 70 }
124 71
125 -static void browse_file(GtkButton *button,v3270FTD *parent)  
126 -{  
127 - gboolean recv = (parent->options & LIB3270_FT_OPTION_RECEIVE);  
128 - GtkWidget * dialog = gtk_file_chooser_dialog_new  
129 - (  
130 - recv ? _( "Select file to receive" ) : _( "Select file to send" ),  
131 - GTK_WINDOW(parent),  
132 - GTK_FILE_CHOOSER_ACTION_OPEN,  
133 - _("_Cancel" ), GTK_RESPONSE_CANCEL,  
134 - recv ? _("_Save") : _("_Send"), GTK_RESPONSE_ACCEPT,  
135 - NULL  
136 - );  
137 -  
138 - const gchar * current = gtk_entry_get_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL]));  
139 - if(current && *current)  
140 - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),current);  
141 -  
142 - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)  
143 - {  
144 - gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));  
145 - gtk_entry_set_text(GTK_ENTRY(parent->filename[FILENAME_LOCAL]),filename);  
146 - g_free(filename);  
147 - }  
148 -  
149 - gtk_widget_destroy(dialog);  
150 -  
151 -  
152 -}  
153 -  
154 static void toggle_option(GtkToggleButton *button, v3270FTD *dialog) 72 static void toggle_option(GtkToggleButton *button, v3270FTD *dialog)
155 { 73 {
156 const struct ftoptions *opt = (const struct ftoptions *) g_object_get_data(G_OBJECT(button),"cfg"); 74 const struct ftoptions *opt = (const struct ftoptions *) g_object_get_data(G_OBJECT(button),"cfg");
src/pw3270/ft/testprogram.c
  Diff comments   View file @2960cfb
@@ -34,8 +34,6 @@ @@ -34,8 +34,6 @@
34 34
35 int main (int argc, char *argv[]) 35 int main (int argc, char *argv[])
36 { 36 {
37 -// GtkWidget *win;  
38 -  
39 gtk_init (&argc, &argv); 37 gtk_init (&argc, &argv);
40 38
41 { 39 {
src/pw3270/ft/v3270ft.h
  Diff comments   View file @2960cfb
@@ -99,7 +99,6 @@ @@ -99,7 +99,6 @@
99 LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec); 99 LIB3270_EXPORT void v3270_ft_progress_complete(GtkWidget *widget,unsigned long length,double kbytes_sec);
100 100
101 101
102 -  
103 G_END_DECLS 102 G_END_DECLS
104 103
105 #endif // V3270_H_INCLUDED 104 #endif // V3270_H_INCLUDED