From 1bd9a779350335c5a1983d860c1e6a3364caeb13 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 11 Feb 2019 11:35:47 -0200 Subject: [PATCH] Working on the new FT dialog components. --- src/dialogs/commondialog.c | 4 +++- src/include/internals.h | 12 ++++++++++++ src/v3270ft/activity.c | 59 ++++------------------------------------------------------- src/v3270ft/activitylist.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/v3270ft/dialog.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------ src/v3270ft/settings.c | 1 - v3270.cbp | 3 +++ 7 files changed, 244 insertions(+), 69 deletions(-) create mode 100644 src/v3270ft/activitylist.c diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c index 2e249ce..c0cbf96 100644 --- a/src/dialogs/commondialog.c +++ b/src/dialogs/commondialog.c @@ -62,7 +62,6 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *paren NULL )); - gtk_window_set_title(GTK_WINDOW(dialog), title); gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE); // https://developer.gnome.org/hig/stable/visual-layout.html.en @@ -79,11 +78,14 @@ LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *paren if(header) { + gtk_header_bar_set_title(GTK_HEADER_BAR(header),title); gtk_header_bar_pack_start(GTK_HEADER_BAR(header),create_button(dialog,_("_Cancel"),G_CALLBACK(cancel_clicked))); gtk_header_bar_pack_end(GTK_HEADER_BAR(header),create_button(dialog,apply,G_CALLBACK(apply_clicked))); } else { + gtk_window_set_title(GTK_WINDOW(dialog), title); + gtk_dialog_add_buttons( GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL, diff --git a/src/include/internals.h b/src/include/internals.h index 1354fc9..8439586 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -69,8 +69,20 @@ G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_grid(GtkAlign align); G_GNUC_INTERNAL GtkWidget * v3270_dialog_create_frame(GtkWidget * child, const gchar *title); + // Activity list widget. + #define GTK_TYPE_V3270_FT_ACTIVITY_LIST (V3270FTActivityList_get_type ()) + #define GTK_V3270_FT_ACTIVITY_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_V3270_FT_ACTIVITY_LIST, V3270FTActivityList)) + #define GTK_V3270_FT_ACTIVITY_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_V3270_FT_ACTIVITY_LIST, V3270FTActivityListClass)) + #define GTK_IS_V3270_FT_ACTIVITY_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_V3270_FT_ACTIVITY_LIST)) + #define GTK_IS_V3270_FT_ACTIVITY_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_V3270_FT_ACTIVITY_LIST)) + #define GTK_V3270_FT_ACTIVITY_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_V3270_FT_ACTIVITY_LIST, V3270FTActivityListClass)) + + typedef struct _V3270FTActivityList V3270FTActivityList; + typedef struct _V3270FTActivityListClass V3270FTActivityListClass; + G_GNUC_INTERNAL GtkWidget * v3270_activity_list_new(); G_GNUC_INTERNAL void v3270_activity_list_append(GtkWidget *widget, GObject *activity); + G_GNUC_INTERNAL void v3270_activity_list_load(GtkWidget *widget); G_END_DECLS diff --git a/src/v3270ft/activity.c b/src/v3270ft/activity.c index fa622f9..baa49d9 100644 --- a/src/v3270ft/activity.c +++ b/src/v3270ft/activity.c @@ -182,64 +182,13 @@ return G_V3270_FT_ACTIVITY(object)->options; } - static void render_local(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) + guint v3270_ft_activity_get_value(GObject * object, LIB3270_FT_VALUE id) { - V3270FTActivity * activity; - gtk_tree_model_get(tree_model, iter, 0, &activity, -1); - g_object_set(G_OBJECT(cell),"text",activity->file.local,NULL); - } - - static void render_remote(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) - { - V3270FTActivity * activity; - gtk_tree_model_get(tree_model, iter, 0, &activity, -1); - g_object_set(G_OBJECT(cell),"text",activity->file.remote,NULL); - } - - GtkWidget * v3270_activity_list_new() - { - GtkTreeModel * model = GTK_TREE_MODEL(gtk_list_store_new(1,G_TYPE_OBJECT)); - GtkWidget * widget = gtk_tree_view_new_with_model(model); - - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(widget),TRUE); - gtk_tree_view_set_reorderable(GTK_TREE_VIEW(widget),TRUE); - - gtk_tree_view_insert_column_with_data_func( - GTK_TREE_VIEW(widget), - -1, - _( "Local file" ), - gtk_cell_renderer_text_new(), - render_local, - 0, NULL - ); - - gtk_tree_view_insert_column_with_data_func( - GTK_TREE_VIEW(widget), - -1, - _( "Remote file" ), - gtk_cell_renderer_text_new(), - render_remote, - 0, NULL - ); - - return widget; + return G_V3270_FT_ACTIVITY(object)->values[id]; } - void v3270_activity_list_append(GtkWidget *widget, GObject *activity) + void v3270_ft_activity_set_value(GObject * object, LIB3270_FT_VALUE id, guint value) { - GtkTreeModel * model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); - GtkTreeIter iter; - gtk_list_store_append((GtkListStore *) model,&iter); - gtk_list_store_set((GtkListStore *) model, &iter, 0, activity, -1); - } - -guint v3270_ft_activity_get_value(GObject * object, LIB3270_FT_VALUE id) -{ - return G_V3270_FT_ACTIVITY(object)->values[id]; -} - -void v3270_ft_activity_set_value(GObject * object, LIB3270_FT_VALUE id, guint value) -{ G_V3270_FT_ACTIVITY(object)->values[id] = value; -} + } diff --git a/src/v3270ft/activitylist.c b/src/v3270ft/activitylist.c new file mode 100644 index 0000000..979465f --- /dev/null +++ b/src/v3270ft/activitylist.c @@ -0,0 +1,163 @@ +/* + * "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., 51 Franklin + * St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Este programa está nomeado como - 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 "private.h" + #include "marshal.h" + +/*--[ Widget definition ]----------------------------------------------------------------------------*/ + + enum _SIGNALS + { + V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL, ///< @brief Indicates if the list has a file name set. + + V3270_ACTIVITY_LIST_LAST_SIGNAL + }; + + struct _V3270FTActivityListClass + { + GtkTreeViewClass parent_class; + + struct + { + void (*has_file)(GtkWidget *, gboolean); + } signal; + + }; + + struct _V3270FTActivityList + { + GtkTreeView parent; + gchar * filename; + + }; + + G_DEFINE_TYPE(V3270FTActivityList, V3270FTActivityList, GTK_TYPE_TREE_VIEW); + + static guint v3270_activity_list_signals[V3270_ACTIVITY_LIST_LAST_SIGNAL] = { 0 }; + +/*--[ Implement ]------------------------------------------------------------------------------------*/ + + static void dispose(GObject *object) + { + debug("%s",__FUNCTION__); + + V3270FTActivityList * list = GTK_V3270_FT_ACTIVITY_LIST(object); + + g_free(list->filename); + + } + + static void V3270FTActivityList_has_file(GtkWidget G_GNUC_UNUSED(*widget), gboolean G_GNUC_UNUSED(has_file)) + { + debug("%s",__FUNCTION__); + } + + static void V3270FTActivityList_class_init(V3270FTActivityListClass *klass) + { + GObjectClass * gobject_class = G_OBJECT_CLASS(klass); + + gobject_class->dispose = dispose; + + klass->signal.has_file = V3270FTActivityList_has_file; + + v3270_activity_list_signals[V3270_ACTIVITY_LIST_HAS_FILE_SIGNAL] = + g_signal_new( "has-file", + G_OBJECT_CLASS_TYPE (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (V3270FTActivityListClass, signal.has_file), + NULL, NULL, + v3270ft_VOID__VOID_BOOLEAN, + G_TYPE_NONE, 1, G_TYPE_BOOLEAN); + + + } + + static void render_local(GtkTreeViewColumn G_GNUC_UNUSED(*tree_column), GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer G_GNUC_UNUSED(data)) + { + GObject * activity; + gtk_tree_model_get(tree_model, iter, 0, &activity, -1); + g_object_set(G_OBJECT(cell),"text",v3270_ft_activity_get_local_filename(activity),NULL); + } + + static void render_remote(GtkTreeViewColumn G_GNUC_UNUSED(*tree_column), GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer G_GNUC_UNUSED(data)) + { + GObject * activity; + gtk_tree_model_get(tree_model, iter, 0, &activity, -1); + g_object_set(G_OBJECT(cell),"text",v3270_ft_activity_get_remote_filename(activity),NULL); + } + + static void V3270FTActivityList_init(V3270FTActivityList *widget) + { + GtkTreeModel * model = GTK_TREE_MODEL(gtk_list_store_new(1,G_TYPE_OBJECT)); + + widget->filename = NULL; + + gtk_tree_view_set_model(GTK_TREE_VIEW(widget),model); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(widget),TRUE); + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(widget),TRUE); + + gtk_tree_view_insert_column_with_data_func( + GTK_TREE_VIEW(widget), + -1, + _( "Local file" ), + gtk_cell_renderer_text_new(), + render_local, + 0, NULL + ); + + gtk_tree_view_insert_column_with_data_func( + GTK_TREE_VIEW(widget), + -1, + _( "Remote file" ), + gtk_cell_renderer_text_new(), + render_remote, + 0, NULL + ); + + } + + GtkWidget * v3270_activity_list_new() + { + return g_object_new(GTK_TYPE_V3270_FT_ACTIVITY_LIST, NULL); + } + + void v3270_activity_list_load(GtkWidget *widget) + { + + } + + void v3270_activity_list_append(GtkWidget *widget, GObject *activity) + { + GtkTreeModel * model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget)); + GtkTreeIter iter; + gtk_list_store_append((GtkListStore *) model,&iter); + gtk_list_store_set((GtkListStore *) model, &iter, 0, activity, -1); + } + diff --git a/src/v3270ft/dialog.c b/src/v3270ft/dialog.c index 123f574..72b65ae 100644 --- a/src/v3270ft/dialog.c +++ b/src/v3270ft/dialog.c @@ -38,7 +38,6 @@ GtkDialog parent; GtkWidget * settings; - GtkWidget * queue; struct { GtkWidget * valid; @@ -47,6 +46,13 @@ GtkWidget * reset; } button; + struct { + GtkWidget * view; + GtkWidget * load; + GtkWidget * save; + GtkWidget * saveAs; + } queue; + }; struct _V3270FTDialogClass @@ -118,14 +124,13 @@ static void reset_clicked(GtkButton G_GNUC_UNUSED(*button), V3270FTDialog *widge static void update_clicked(GtkButton G_GNUC_UNUSED(*button), V3270FTDialog *widget) { v3270_ft_settings_update(widget->settings); - gtk_tree_view_columns_autosize(GTK_TREE_VIEW(widget->queue)); - //gtk_widget_queue_draw(widget->queue); + gtk_tree_view_columns_autosize(GTK_TREE_VIEW(widget->queue.view)); } static void insert_clicked(GtkWidget *button, V3270FTDialog *widget) { GtkTreeIter iter; - GtkTreeModel * model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget->queue)); + GtkTreeModel * model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget->queue.view)); if(gtk_tree_model_get_iter_first(model,&iter)) { @@ -164,7 +169,7 @@ static void insert_clicked(GtkWidget *button, V3270FTDialog *widget) } // Not found, insert it. - v3270_activity_list_append(widget->queue,v3270_ft_settings_create_activity(widget->settings)); + v3270_activity_list_append(widget->queue.view,v3270_ft_settings_create_activity(widget->settings)); } @@ -173,7 +178,13 @@ static void V3270FTDialog_init(V3270FTDialog *widget) widget->settings = v3270_ft_settings_new(); g_signal_connect(G_OBJECT(widget->settings),"validity",G_CALLBACK(validity_changed),widget); - gtk_window_set_title(GTK_WINDOW(widget),_( "3270 File transfer")); + // Does the dialog have header bar? + GtkHeaderBar * header = GTK_HEADER_BAR(gtk_dialog_get_header_bar(GTK_DIALOG(widget))); + + if(header) + gtk_header_bar_set_title(header,_( "3270 File transfer")); + else + gtk_window_set_title(GTK_WINDOW(widget),_( "3270 File transfer")); // https://developer.gnome.org/hig/stable/visual-layout.html.en gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(widget))),18); @@ -213,14 +224,14 @@ static void V3270FTDialog_init(V3270FTDialog *widget) // Create file list view { - widget->queue = v3270_activity_list_new(); - gtk_widget_set_tooltip_markup(widget->queue,_("Files to transfer")); - g_signal_connect(G_OBJECT(widget->queue),"row-activated",G_CALLBACK(activity_selected),widget); + widget->queue.view = v3270_activity_list_new(); + gtk_widget_set_tooltip_markup(widget->queue.view,_("Files to transfer")); + g_signal_connect(G_OBJECT(widget->queue.view),"row-activated",G_CALLBACK(activity_selected),widget); // Put the view inside a scrolled window. GtkWidget * scrolled = gtk_scrolled_window_new(NULL,NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(scrolled),widget->queue); + gtk_container_add(GTK_CONTAINER(scrolled),widget->queue.view); gtk_widget_set_vexpand(scrolled,TRUE); gtk_widget_set_hexpand(scrolled,TRUE); @@ -236,11 +247,47 @@ static void V3270FTDialog_init(V3270FTDialog *widget) v3270_ft_activity_set_remote_filename(activity,"remote---"); v3270_ft_activity_set_options(activity,LIB3270_FT_OPTION_SEND|LIB3270_FT_OPTION_ASCII|LIB3270_FT_OPTION_CRLF|LIB3270_FT_OPTION_REMAP|LIB3270_FT_OPTION_APPEND|LIB3270_FT_RECORD_FORMAT_VARIABLE); - v3270_activity_list_append(widget->queue,activity); + v3270_activity_list_append(widget->queue.view,activity); #endif // DEBUG + // Create Transfer queue buttons + // https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html + widget->queue.load = gtk_button_new_from_icon_name("document-open",GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_set_tooltip_markup(widget->queue.load,_("Get transfer queue from file")); + + widget->queue.save = gtk_button_new_from_icon_name("document-save",GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_set_tooltip_markup(widget->queue.save,_("Save transfer queue")); + gtk_widget_set_sensitive(widget->queue.save,FALSE); + + widget->queue.saveAs = gtk_button_new_from_icon_name("document-save-as",GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_set_tooltip_markup(widget->queue.saveAs,_("Save transfer queue to file")); + + if(header) + { + + debug("Dialog %s header bar","have"); + gtk_header_bar_pack_start(header,widget->queue.load); + gtk_header_bar_pack_start(header,widget->queue.save); + gtk_header_bar_pack_start(header,widget->queue.saveAs); + + gtk_widget_show_all(widget->queue.load); + } + else + { + debug("Dialog %s header bar","don't have"); + + GtkBox * box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6)); + gtk_box_pack_start(GTK_BOX(container),GTK_WIDGET(box),FALSE,FALSE,0); + + gtk_box_pack_end(box,widget->queue.load,FALSE,FALSE,0); + gtk_box_pack_end(box,widget->queue.save,FALSE,FALSE,0); + gtk_box_pack_end(box,widget->queue.saveAs,FALSE,FALSE,0); + + } + } + } LIB3270_EXPORT GtkWidget * v3270_ft_dialog_new(GtkWidget *parent) @@ -251,7 +298,7 @@ LIB3270_EXPORT GtkWidget * v3270_ft_dialog_new(GtkWidget *parent) GtkWidget * dialog = GTK_WIDGET(g_object_new( GTK_TYPE_V3270_FT_DIALOG, - "use-header-bar", 0, // (use_header ? 1 : 0), + "use-header-bar", (use_header ? 1 : 0), NULL )); diff --git a/src/v3270ft/settings.c b/src/v3270ft/settings.c index e6ce160..44fd37f 100644 --- a/src/v3270ft/settings.c +++ b/src/v3270ft/settings.c @@ -102,7 +102,6 @@ debug("%s",__FUNCTION__); } - static void V3270FTSettings_class_init(G_GNUC_UNUSED V3270FTSettingsClass *klass) { GObjectClass * gobject_class = G_OBJECT_CLASS(klass); diff --git a/v3270.cbp b/v3270.cbp index c4c77d6..ee44929 100644 --- a/v3270.cbp +++ b/v3270.cbp @@ -148,6 +148,9 @@ + + -- libgit2 0.21.2