From f9c5ddcf81aa9efa27f1fb0f56c469d7d01af49e Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 4 Dec 2018 15:53:47 -0200 Subject: [PATCH] Ajustando processo de compilação de teste dos widgets. --- Makefile.in | 5 +++-- src/include/v3270/filetransfer.h | 46 +++++++++++++++++++++++----------------------- src/v3270/private.h | 6 ++---- src/v3270ft/private.h | 8 ++++++++ src/v3270ft/testprogram.c | 132 ------------------------------------------------------------------------------------------------------------------------------------ v3270.cbp | 14 ++++++++------ 6 files changed, 44 insertions(+), 167 deletions(-) delete mode 100644 src/v3270ft/testprogram.c diff --git a/Makefile.in b/Makefile.in index 8e5769a..1f372e6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,7 +34,7 @@ SOURCES= \ $(wildcard src/dialogs/*.c) TEST_SOURCES= \ - $(wildcard testprogram/*.c) + $(wildcard src/testprogram/*.c) #---[ Tools ]---------------------------------------------------------------------------- @@ -341,7 +341,8 @@ $(BINDBG)/$(LIBNAME)@EXEEXT@: \ @$(MKDIR) `dirname $@` @echo $< ... - @$(LD) -o $@ $^ $(LDFLAGS) $(LIBS) + $(LD) -o $@ $^ $(LDFLAGS) $(LIBS) + run: \ $(BINDBG)/$(LIBNAME)@EXEEXT@ diff --git a/src/include/v3270/filetransfer.h b/src/include/v3270/filetransfer.h index 4969429..95ac8ee 100644 --- a/src/include/v3270/filetransfer.h +++ b/src/include/v3270/filetransfer.h @@ -50,34 +50,34 @@ typedef struct _v3270ftClass v3270ftClass; - GtkWidget * v3270ft_new(void); - GType v3270ft_get_type(void); - void v3270ft_set_options(GtkWidget *widget, LIB3270_FT_OPTION opt); - LIB3270_FT_OPTION v3270ft_get_options(GtkWidget *widget); - void v3270ft_reset(GtkWidget *widget); - gboolean v3270ft_is_valid(GtkWidget *widget); - guint v3270ft_get_length(GtkWidget *widget); - void v3270ft_select_first(GtkWidget *widget); - void v3270ft_select_last(GtkWidget *widget); - void v3270ft_select_previous(GtkWidget *widget); - void v3270ft_select_next(GtkWidget *widget); - void v3270ft_remove_selected(GtkWidget *widget); - void v3270ft_remove_all(GtkWidget *widget); - void v3270ft_save(GtkWidget *widget,const gchar *filename); - void v3270ft_load(GtkWidget *widget,const gchar *filename); + LIB3270_EXPORT GtkWidget * v3270ft_new(void); + LIB3270_EXPORT GType v3270ft_get_type(void); + LIB3270_EXPORT void v3270ft_set_options(GtkWidget *widget, LIB3270_FT_OPTION opt); + LIB3270_EXPORT LIB3270_FT_OPTION v3270ft_get_options(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_reset(GtkWidget *widget); + LIB3270_EXPORT gboolean v3270ft_is_valid(GtkWidget *widget); + LIB3270_EXPORT guint v3270ft_get_length(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_select_first(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_select_last(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_select_previous(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_select_next(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_remove_selected(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_remove_all(GtkWidget *widget); + LIB3270_EXPORT void v3270ft_save(GtkWidget *widget,const gchar *filename); + LIB3270_EXPORT void v3270ft_load(GtkWidget *widget,const gchar *filename); - gboolean v3270ft_has_selected(GtkWidget *widget); - gboolean v3270ft_has_next(GtkWidget *widget); + LIB3270_EXPORT gboolean v3270ft_has_selected(GtkWidget *widget); + LIB3270_EXPORT gboolean v3270ft_has_next(GtkWidget *widget); - const gchar * v3270ft_get_local_filename(GtkWidget *widget); - const gchar * v3270ft_get_remote_filename(GtkWidget *widget); + LIB3270_EXPORT const gchar * v3270ft_get_local_filename(GtkWidget *widget); + LIB3270_EXPORT const gchar * v3270ft_get_remote_filename(GtkWidget *widget); - void v3270ft_append_file(GtkWidget *widget, const gchar *filename, gboolean text); - guint v3270ft_append_selection(GtkWidget *widget, GtkSelectionData *data); + LIB3270_EXPORT void v3270ft_append_file(GtkWidget *widget, const gchar *filename, gboolean text); + LIB3270_EXPORT guint v3270ft_append_selection(GtkWidget *widget, GtkSelectionData *data); - gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ... ) G_GNUC_NULL_TERMINATED; + LIB3270_EXPORT gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ... ) G_GNUC_NULL_TERMINATED; - gint v3270ft_transfer(GtkWidget *dialog, H3270 *session); + LIB3270_EXPORT gint v3270ft_transfer(GtkWidget *dialog, H3270 *session); G_END_DECLS diff --git a/src/v3270/private.h b/src/v3270/private.h index 6c173a6..5573ec4 100644 --- a/src/v3270/private.h +++ b/src/v3270/private.h @@ -27,7 +27,6 @@ * */ -#include #include #define ENABLE_NLS @@ -36,9 +35,8 @@ #include #include -#ifndef V3270_H_INCLUDED - #include -#endif +#include +#include G_BEGIN_DECLS diff --git a/src/v3270ft/private.h b/src/v3270ft/private.h index c5ff09c..1b1d997 100644 --- a/src/v3270ft/private.h +++ b/src/v3270ft/private.h @@ -32,6 +32,14 @@ #define PRIVATE_H_INCLUDED 1 + #include + + #define ENABLE_NLS + #define GETTEXT_PACKAGE PACKAGE_NAME + + #include + #include + #include #include #include diff --git a/src/v3270ft/testprogram.c b/src/v3270ft/testprogram.c deleted file mode 100644 index 918e0b1..0000000 --- a/src/v3270ft/testprogram.c +++ /dev/null @@ -1,132 +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. 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., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Este programa está nomeado como testprogram.c e possui - linhas de código. - * - * Contatos: - * - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) - * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) - * - */ - - #include - #include - #include - #include - - /*---[ Implement ]----------------------------------------------------------------------------------*/ - -static gboolean popup_menu(GtkWidget *widget, gboolean selected, gboolean online, GdkEventButton *event, gpointer user_data) { - - if(!online) - return FALSE; - - GtkWidget * dialog = v3270ft_new(); - - v3270ft_load(dialog,"transfer.xml"); - - gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(widget))); - - do { - - gtk_widget_show_all(dialog); - - switch(gtk_dialog_run(GTK_DIALOG(dialog))) { - case GTK_RESPONSE_APPLY: - case GTK_RESPONSE_OK: - case GTK_RESPONSE_YES: - gtk_widget_hide(dialog); - v3270ft_transfer(dialog,v3270_get_session(widget)); - break; - - case GTK_RESPONSE_CANCEL: - case GTK_RESPONSE_NO: - case GTK_RESPONSE_DELETE_EVENT: - v3270ft_remove_all(dialog); - break; - - default: - g_warning("Unexpected response from v3270ft"); - } - - } while(v3270ft_get_length(dialog) > 0); - - gtk_widget_destroy(dialog); - - return TRUE; - -} - -static void activate(GtkApplication* app, gpointer user_data) { - - const gchar * search[] = { - - g_get_user_config_dir(), - g_get_user_data_dir(), - g_get_home_dir(), - NULL - - }; - - GtkWidget * window = gtk_application_window_new(app); - GtkWidget * terminal = v3270_new(); - gchar * filename = NULL; - - // Setup terminal - GKeyFile * conf = g_key_file_new(); - - g_key_file_load_from_dirs(conf,"pw3270.conf",(const gchar **) search, &filename,G_KEY_FILE_NONE,NULL); - g_message("Configuration from %s",filename); - - // v3270_set_from_keyfile(terminal,conf); - - g_key_file_unref(conf); - - v3270_connect(terminal); - - g_signal_connect(terminal,"popup",G_CALLBACK(popup_menu),NULL); - - // Setup and show window - gtk_window_set_title(GTK_WINDOW(window), "Window"); - gtk_window_set_position(GTK_WINDOW(window),GTK_WIN_POS_CENTER); - gtk_window_set_default_size (GTK_WINDOW (window), 800, 500); - gtk_container_add(GTK_CONTAINER(window),terminal); - gtk_widget_show_all (window); - -} - -int main (int argc, char **argv) { - - GtkApplication *app; - int status; - - app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE); - - g_signal_connect (app, "activate", G_CALLBACK(activate), NULL); - - status = g_application_run (G_APPLICATION (app), argc, argv); - g_object_unref (app); - - g_message("rc=%d",status); - return status; -} - diff --git a/v3270.cbp b/v3270.cbp index 85bc486..7761ebe 100644 --- a/v3270.cbp +++ b/v3270.cbp @@ -3,6 +3,7 @@