From b8df67f883f716aab5b9fd53658e749df08f5267 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 6 Feb 2019 14:49:24 -0200 Subject: [PATCH] Small adjustment in the file transfer dialog. --- src/testprogram/testprogram.c | 16 ++++++++++++++-- src/v3270ft/Makefile.in | 180 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ src/v3270ft/v3270ft.c | 9 ++++++--- 3 files changed, 20 insertions(+), 185 deletions(-) delete mode 100644 src/v3270ft/Makefile.in diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index fea1db3..1310c22 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -42,6 +42,7 @@ /*---[ Implement ]----------------------------------------------------------------------------------*/ + /* static gboolean popup_menu(GtkWidget *widget, G_GNUC_UNUSED gboolean selected, gboolean online, G_GNUC_UNUSED GdkEventButton *event, G_GNUC_UNUSED gpointer user_data) { if(!online) @@ -82,6 +83,7 @@ static gboolean popup_menu(GtkWidget *widget, G_GNUC_UNUSED gboolean selected, g return TRUE; } + */ static gboolean field_clicked(GtkWidget *widget, gboolean connected, V3270_OIA_FIELD field, GdkEventButton *event, GtkWidget *window) { @@ -145,6 +147,15 @@ static void disconnect_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *term lib3270_disconnect(v3270_get_session(terminal)); } +static void ft_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) +{ + GtkWidget * dialog = v3270ft_new(); + gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(terminal))); + gtk_widget_show_all(dialog); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +} + static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) { GtkWidget * dialog = v3270_dialog_new(_("Color setup"), NULL, _("_Save")); @@ -227,7 +238,7 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { g_message("width=%d",(int) g_value_get_int(&val)); g_value_unset(&val); - g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL); + // g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL); // Create box GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL,2); @@ -242,7 +253,8 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { { "gtk-disconnect", G_CALLBACK(disconnect_clicked), "Disconnect from host" }, { "gtk-select-color", G_CALLBACK(color_clicked), "Edit or change color scheme" }, { "gtk-home", G_CALLBACK(host_clicked), "Configure host" }, - { "gtk-print", G_CALLBACK(print_clicked), "Print screen contents" } + { "gtk-print", G_CALLBACK(print_clicked), "Print screen contents" }, + { "gtk-harddisk", G_CALLBACK(ft_clicked), "Open file transfer dialog" } }; GtkWidget * toolbar = gtk_toolbar_new(); diff --git a/src/v3270ft/Makefile.in b/src/v3270ft/Makefile.in deleted file mode 100644 index a7791fe..0000000 --- a/src/v3270ft/Makefile.in +++ /dev/null @@ -1,180 +0,0 @@ -# -# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a -# aplicativos mainframe. Registro no INPI sob o nome G3270. -# -# Copyright (C) <2008> -# -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela -# Free Software Foundation. -# -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para -# obter mais detalhes. -# -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este -# programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple -# Place, Suite 330, Boston, MA, 02111-1307, USA -# -# Contatos: -# -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) -# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) -# - -MODULE_NAME=v3270ft - -SOURCES=marshal.c filelist.c load.c misc.c select.c transfer.c v3270ftprogress.c \ - get.c save.c set.c v3270ft.c tables.c - -#---[ Configuration values ]------------------------------------------------------------- - -PACKAGE_NAME=@PACKAGE_NAME@ -PACKAGE_VERSION=@PACKAGE_VERSION@ -PACKAGE_TARNAME=@PACKAGE_TARNAME@ - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -sbindir=@sbindir@ -libdir=@libdir@ - -BASEDIR=@BASEDIR@ -SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME) -POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME) - -OBJDIR=.obj -OBJDBG=$(OBJDIR)/Debug -OBJRLS=$(OBJDIR)/Release - -MKDIR=@MKDIR_P@ -CC=@CC@ -LD=@CC@ -AR=@AR@ -GENMARSHAL=@GENMARSHAL@ -XGETTEXT=@XGETTEXT@ -MSGCAT=@MSGCAT@ -INSTALL=@INSTALL@ -INSTALL_DATA=@INSTALL_DATA@ - -CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ @PW3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@ - -#---[ Rules ]---------------------------------------------------------------------------- - -DEPENDS= \ - $(BASEDIR)/src/include/*.h \ - @LIB3270_INCLUDEPATH@/*.h \ - $(BASEDIR)/src/include/v3270/*.h \ - $(BASEDIR)/src/include/pw3270/*.h - -$(OBJDBG)/%.o: \ - %.c \ - $(DEPENDS) - - @echo $< ... - @$(MKDIR) `dirname $@` - @$(CC) $(CFLAGS) \ - @DBG_CFLAGS@ \ - -DBUILD_DATE=`date +"0x%Y%m%d"`\ - -o $@ -c $< - -$(OBJRLS)/%.o: \ - %.c \ - $(DEPENDS) - - @echo $< ... - @$(MKDIR) `dirname $@` - @$(CC) $(CFLAGS) \ - @RLS_CFLAGS@ \ - -DBUILD_DATE=`date +"0x%Y%m%d"` \ - -o $@ -c $< - -$(POTDIR)/%.pot: %.c - - @echo $(notdir $@) ... - @$(MKDIR) `dirname $@` - @$(XGETTEXT) \ - --default-domain=$(PACKAGE) \ - --language=C \ - --keyword=_ \ - --keyword=N_ \ - --keyword=MSG_:2 \ - --output=$@ \ - $< - - @touch $@ - -marshal.h: \ - genmarshal - - @echo $< ... - @$(MKDIR) `dirname $@` - @$(GENMARSHAL) --prefix=$(MODULE_NAME) --header genmarshal > $@ - -marshal.c: \ - marshal.h - - @echo $< ... - @$(MKDIR) `dirname $@` - @$(GENMARSHAL) --prefix=$(MODULE_NAME) --body genmarshal > $@ - -#---[ Release Targets ]------------------------------------------------------------------ - -Release: \ - $(BASEDIR)/.obj/Release/$(MODULE_NAME).a - -$(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) - - @echo $@ ... - @$(MKDIR) `dirname $@` - @$(AR) rcs $@ $^ - -pot: \ - $(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot - -$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \ - $(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot) - - @rm -f $@ - @mkdir -p `dirname $@` - @$(MSGCAT) --sort-output $^ > $@ - -$(SRCDIR): \ - clean - - @$(MKDIR) $@ - @$(INSTALL_DATA) *.c *.h *.in *.cbp genmarshal $@ - -#---[ Debug Targets ]-------------------------------------------------------------------- - -Debug: \ - $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a - -$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a: \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) - - @echo $@ ... - @$(MKDIR) `dirname $@` - @$(AR) rcs $@ $^ - -#---[ Clean Targets]--------------------------------------------------------------------- - -cleanDebug: - - @rm -fr $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a \ - $(OBJDBG) - -cleanRelease: - - @rm -fr $(BASEDIR)/.obj/Release/$(MODULE_NAME).a \ - $(OBJRLS) - -clean: \ - cleanDebug \ - cleanRelease - - diff --git a/src/v3270ft/v3270ft.c b/src/v3270ft/v3270ft.c index 32a0d2a..c2001a0 100644 --- a/src/v3270ft/v3270ft.c +++ b/src/v3270ft/v3270ft.c @@ -83,9 +83,11 @@ static void v3270ft_class_init(v3270ftClass *klass) { GtkGrid * v3270ft_new_grid(void) { GtkGrid * grid = GTK_GRID(gtk_grid_new()); - gtk_grid_set_column_spacing(grid,4); - gtk_grid_set_row_spacing(grid,4); - gtk_container_set_border_width(GTK_CONTAINER(grid),3); + + // https://developer.gnome.org/hig/stable/visual-layout.html.en + gtk_grid_set_row_spacing(GTK_GRID(grid),6); + gtk_grid_set_column_spacing(GTK_GRID(grid),12); + return grid; } @@ -351,6 +353,7 @@ static void v3270ft_init(v3270ft *dialog) { GtkWidget * entry[G_N_ELEMENTS(label)]; // Initialize + gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),18); gtk_window_set_title(GTK_WINDOW(dialog),_( "3270 File transfer")); gtk_window_set_resizable(GTK_WINDOW(dialog),FALSE); gtk_container_set_border_width(GTK_CONTAINER(box),3); -- libgit2 0.21.2