Commit b8df67f883f716aab5b9fd53658e749df08f5267
1 parent
b23ffbad
Exists in
master
and in
1 other branch
Small adjustment in the file transfer dialog.
Showing
3 changed files
with
20 additions
and
185 deletions
Show diff stats
src/testprogram/testprogram.c
@@ -42,6 +42,7 @@ | @@ -42,6 +42,7 @@ | ||
42 | 42 | ||
43 | /*---[ Implement ]----------------------------------------------------------------------------------*/ | 43 | /*---[ Implement ]----------------------------------------------------------------------------------*/ |
44 | 44 | ||
45 | + /* | ||
45 | static gboolean popup_menu(GtkWidget *widget, G_GNUC_UNUSED gboolean selected, gboolean online, G_GNUC_UNUSED GdkEventButton *event, G_GNUC_UNUSED gpointer user_data) { | 46 | static gboolean popup_menu(GtkWidget *widget, G_GNUC_UNUSED gboolean selected, gboolean online, G_GNUC_UNUSED GdkEventButton *event, G_GNUC_UNUSED gpointer user_data) { |
46 | 47 | ||
47 | if(!online) | 48 | if(!online) |
@@ -82,6 +83,7 @@ static gboolean popup_menu(GtkWidget *widget, G_GNUC_UNUSED gboolean selected, g | @@ -82,6 +83,7 @@ static gboolean popup_menu(GtkWidget *widget, G_GNUC_UNUSED gboolean selected, g | ||
82 | return TRUE; | 83 | return TRUE; |
83 | 84 | ||
84 | } | 85 | } |
86 | + */ | ||
85 | 87 | ||
86 | static gboolean field_clicked(GtkWidget *widget, gboolean connected, V3270_OIA_FIELD field, GdkEventButton *event, GtkWidget *window) | 88 | static gboolean field_clicked(GtkWidget *widget, gboolean connected, V3270_OIA_FIELD field, GdkEventButton *event, GtkWidget *window) |
87 | { | 89 | { |
@@ -145,6 +147,15 @@ static void disconnect_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *term | @@ -145,6 +147,15 @@ static void disconnect_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *term | ||
145 | lib3270_disconnect(v3270_get_session(terminal)); | 147 | lib3270_disconnect(v3270_get_session(terminal)); |
146 | } | 148 | } |
147 | 149 | ||
150 | +static void ft_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) | ||
151 | +{ | ||
152 | + GtkWidget * dialog = v3270ft_new(); | ||
153 | + gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(terminal))); | ||
154 | + gtk_widget_show_all(dialog); | ||
155 | + gtk_dialog_run(GTK_DIALOG(dialog)); | ||
156 | + gtk_widget_destroy(dialog); | ||
157 | +} | ||
158 | + | ||
148 | static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) | 159 | static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) |
149 | { | 160 | { |
150 | GtkWidget * dialog = v3270_dialog_new(_("Color setup"), NULL, _("_Save")); | 161 | GtkWidget * dialog = v3270_dialog_new(_("Color setup"), NULL, _("_Save")); |
@@ -227,7 +238,7 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | @@ -227,7 +238,7 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | ||
227 | g_message("width=%d",(int) g_value_get_int(&val)); | 238 | g_message("width=%d",(int) g_value_get_int(&val)); |
228 | g_value_unset(&val); | 239 | g_value_unset(&val); |
229 | 240 | ||
230 | - g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL); | 241 | + // g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL); |
231 | 242 | ||
232 | // Create box | 243 | // Create box |
233 | GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL,2); | 244 | GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL,2); |
@@ -242,7 +253,8 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | @@ -242,7 +253,8 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | ||
242 | { "gtk-disconnect", G_CALLBACK(disconnect_clicked), "Disconnect from host" }, | 253 | { "gtk-disconnect", G_CALLBACK(disconnect_clicked), "Disconnect from host" }, |
243 | { "gtk-select-color", G_CALLBACK(color_clicked), "Edit or change color scheme" }, | 254 | { "gtk-select-color", G_CALLBACK(color_clicked), "Edit or change color scheme" }, |
244 | { "gtk-home", G_CALLBACK(host_clicked), "Configure host" }, | 255 | { "gtk-home", G_CALLBACK(host_clicked), "Configure host" }, |
245 | - { "gtk-print", G_CALLBACK(print_clicked), "Print screen contents" } | 256 | + { "gtk-print", G_CALLBACK(print_clicked), "Print screen contents" }, |
257 | + { "gtk-harddisk", G_CALLBACK(ft_clicked), "Open file transfer dialog" } | ||
246 | }; | 258 | }; |
247 | 259 | ||
248 | GtkWidget * toolbar = gtk_toolbar_new(); | 260 | GtkWidget * toolbar = gtk_toolbar_new(); |
src/v3270ft/Makefile.in
@@ -1,180 +0,0 @@ | @@ -1,180 +0,0 @@ | ||
1 | -# | ||
2 | -# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 | ||
3 | -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a | ||
4 | -# aplicativos mainframe. Registro no INPI sob o nome G3270. | ||
5 | -# | ||
6 | -# Copyright (C) <2008> <Banco do Brasil S.A.> | ||
7 | -# | ||
8 | -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob | ||
9 | -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela | ||
10 | -# Free Software Foundation. | ||
11 | -# | ||
12 | -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER | ||
13 | -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO | ||
14 | -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para | ||
15 | -# obter mais detalhes. | ||
16 | -# | ||
17 | -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este | ||
18 | -# programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple | ||
19 | -# Place, Suite 330, Boston, MA, 02111-1307, USA | ||
20 | -# | ||
21 | -# Contatos: | ||
22 | -# | ||
23 | -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) | ||
24 | -# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) | ||
25 | -# | ||
26 | - | ||
27 | -MODULE_NAME=v3270ft | ||
28 | - | ||
29 | -SOURCES=marshal.c filelist.c load.c misc.c select.c transfer.c v3270ftprogress.c \ | ||
30 | - get.c save.c set.c v3270ft.c tables.c | ||
31 | - | ||
32 | -#---[ Configuration values ]------------------------------------------------------------- | ||
33 | - | ||
34 | -PACKAGE_NAME=@PACKAGE_NAME@ | ||
35 | -PACKAGE_VERSION=@PACKAGE_VERSION@ | ||
36 | -PACKAGE_TARNAME=@PACKAGE_TARNAME@ | ||
37 | - | ||
38 | -prefix=@prefix@ | ||
39 | -exec_prefix=@exec_prefix@ | ||
40 | -bindir=@bindir@ | ||
41 | -sbindir=@sbindir@ | ||
42 | -libdir=@libdir@ | ||
43 | - | ||
44 | -BASEDIR=@BASEDIR@ | ||
45 | -SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME) | ||
46 | -POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME) | ||
47 | - | ||
48 | -OBJDIR=.obj | ||
49 | -OBJDBG=$(OBJDIR)/Debug | ||
50 | -OBJRLS=$(OBJDIR)/Release | ||
51 | - | ||
52 | -MKDIR=@MKDIR_P@ | ||
53 | -CC=@CC@ | ||
54 | -LD=@CC@ | ||
55 | -AR=@AR@ | ||
56 | -GENMARSHAL=@GENMARSHAL@ | ||
57 | -XGETTEXT=@XGETTEXT@ | ||
58 | -MSGCAT=@MSGCAT@ | ||
59 | -INSTALL=@INSTALL@ | ||
60 | -INSTALL_DATA=@INSTALL_DATA@ | ||
61 | - | ||
62 | -CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @PW3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ | ||
63 | -LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@ | ||
64 | - | ||
65 | -#---[ Rules ]---------------------------------------------------------------------------- | ||
66 | - | ||
67 | -DEPENDS= \ | ||
68 | - $(BASEDIR)/src/include/*.h \ | ||
69 | - @LIB3270_INCLUDEPATH@/*.h \ | ||
70 | - $(BASEDIR)/src/include/v3270/*.h \ | ||
71 | - $(BASEDIR)/src/include/pw3270/*.h | ||
72 | - | ||
73 | -$(OBJDBG)/%.o: \ | ||
74 | - %.c \ | ||
75 | - $(DEPENDS) | ||
76 | - | ||
77 | - @echo $< ... | ||
78 | - @$(MKDIR) `dirname $@` | ||
79 | - @$(CC) $(CFLAGS) \ | ||
80 | - @DBG_CFLAGS@ \ | ||
81 | - -DBUILD_DATE=`date +"0x%Y%m%d"`\ | ||
82 | - -o $@ -c $< | ||
83 | - | ||
84 | -$(OBJRLS)/%.o: \ | ||
85 | - %.c \ | ||
86 | - $(DEPENDS) | ||
87 | - | ||
88 | - @echo $< ... | ||
89 | - @$(MKDIR) `dirname $@` | ||
90 | - @$(CC) $(CFLAGS) \ | ||
91 | - @RLS_CFLAGS@ \ | ||
92 | - -DBUILD_DATE=`date +"0x%Y%m%d"` \ | ||
93 | - -o $@ -c $< | ||
94 | - | ||
95 | -$(POTDIR)/%.pot: %.c | ||
96 | - | ||
97 | - @echo $(notdir $@) ... | ||
98 | - @$(MKDIR) `dirname $@` | ||
99 | - @$(XGETTEXT) \ | ||
100 | - --default-domain=$(PACKAGE) \ | ||
101 | - --language=C \ | ||
102 | - --keyword=_ \ | ||
103 | - --keyword=N_ \ | ||
104 | - --keyword=MSG_:2 \ | ||
105 | - --output=$@ \ | ||
106 | - $< | ||
107 | - | ||
108 | - @touch $@ | ||
109 | - | ||
110 | -marshal.h: \ | ||
111 | - genmarshal | ||
112 | - | ||
113 | - @echo $< ... | ||
114 | - @$(MKDIR) `dirname $@` | ||
115 | - @$(GENMARSHAL) --prefix=$(MODULE_NAME) --header genmarshal > $@ | ||
116 | - | ||
117 | -marshal.c: \ | ||
118 | - marshal.h | ||
119 | - | ||
120 | - @echo $< ... | ||
121 | - @$(MKDIR) `dirname $@` | ||
122 | - @$(GENMARSHAL) --prefix=$(MODULE_NAME) --body genmarshal > $@ | ||
123 | - | ||
124 | -#---[ Release Targets ]------------------------------------------------------------------ | ||
125 | - | ||
126 | -Release: \ | ||
127 | - $(BASEDIR)/.obj/Release/$(MODULE_NAME).a | ||
128 | - | ||
129 | -$(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \ | ||
130 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) | ||
131 | - | ||
132 | - @echo $@ ... | ||
133 | - @$(MKDIR) `dirname $@` | ||
134 | - @$(AR) rcs $@ $^ | ||
135 | - | ||
136 | -pot: \ | ||
137 | - $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot | ||
138 | - | ||
139 | -$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \ | ||
140 | - $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot) | ||
141 | - | ||
142 | - @rm -f $@ | ||
143 | - @mkdir -p `dirname $@` | ||
144 | - @$(MSGCAT) --sort-output $^ > $@ | ||
145 | - | ||
146 | -$(SRCDIR): \ | ||
147 | - clean | ||
148 | - | ||
149 | - @$(MKDIR) $@ | ||
150 | - @$(INSTALL_DATA) *.c *.h *.in *.cbp genmarshal $@ | ||
151 | - | ||
152 | -#---[ Debug Targets ]-------------------------------------------------------------------- | ||
153 | - | ||
154 | -Debug: \ | ||
155 | - $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a | ||
156 | - | ||
157 | -$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a: \ | ||
158 | - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) | ||
159 | - | ||
160 | - @echo $@ ... | ||
161 | - @$(MKDIR) `dirname $@` | ||
162 | - @$(AR) rcs $@ $^ | ||
163 | - | ||
164 | -#---[ Clean Targets]--------------------------------------------------------------------- | ||
165 | - | ||
166 | -cleanDebug: | ||
167 | - | ||
168 | - @rm -fr $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a \ | ||
169 | - $(OBJDBG) | ||
170 | - | ||
171 | -cleanRelease: | ||
172 | - | ||
173 | - @rm -fr $(BASEDIR)/.obj/Release/$(MODULE_NAME).a \ | ||
174 | - $(OBJRLS) | ||
175 | - | ||
176 | -clean: \ | ||
177 | - cleanDebug \ | ||
178 | - cleanRelease | ||
179 | - | ||
180 | - |
src/v3270ft/v3270ft.c
@@ -83,9 +83,11 @@ static void v3270ft_class_init(v3270ftClass *klass) { | @@ -83,9 +83,11 @@ static void v3270ft_class_init(v3270ftClass *klass) { | ||
83 | 83 | ||
84 | GtkGrid * v3270ft_new_grid(void) { | 84 | GtkGrid * v3270ft_new_grid(void) { |
85 | GtkGrid * grid = GTK_GRID(gtk_grid_new()); | 85 | GtkGrid * grid = GTK_GRID(gtk_grid_new()); |
86 | - gtk_grid_set_column_spacing(grid,4); | ||
87 | - gtk_grid_set_row_spacing(grid,4); | ||
88 | - gtk_container_set_border_width(GTK_CONTAINER(grid),3); | 86 | + |
87 | + // https://developer.gnome.org/hig/stable/visual-layout.html.en | ||
88 | + gtk_grid_set_row_spacing(GTK_GRID(grid),6); | ||
89 | + gtk_grid_set_column_spacing(GTK_GRID(grid),12); | ||
90 | + | ||
89 | return grid; | 91 | return grid; |
90 | } | 92 | } |
91 | 93 | ||
@@ -351,6 +353,7 @@ static void v3270ft_init(v3270ft *dialog) { | @@ -351,6 +353,7 @@ static void v3270ft_init(v3270ft *dialog) { | ||
351 | GtkWidget * entry[G_N_ELEMENTS(label)]; | 353 | GtkWidget * entry[G_N_ELEMENTS(label)]; |
352 | 354 | ||
353 | // Initialize | 355 | // Initialize |
356 | + gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),18); | ||
354 | gtk_window_set_title(GTK_WINDOW(dialog),_( "3270 File transfer")); | 357 | gtk_window_set_title(GTK_WINDOW(dialog),_( "3270 File transfer")); |
355 | gtk_window_set_resizable(GTK_WINDOW(dialog),FALSE); | 358 | gtk_window_set_resizable(GTK_WINDOW(dialog),FALSE); |
356 | gtk_container_set_border_width(GTK_CONTAINER(box),3); | 359 | gtk_container_set_border_width(GTK_CONTAINER(box),3); |