diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c new file mode 100644 index 0000000..11ce4bb --- /dev/null +++ b/src/dialogs/commondialog.c @@ -0,0 +1,81 @@ +/* + * "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 "private.h" + +/*--[ Implement ]------------------------------------------------------------------------------------*/ + +static void apply_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog) +{ + gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_APPLY); +} + +static void cancel_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog) +{ + gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_CANCEL); +} + +LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *parent, const gchar *apply) +{ + GtkWidget * dialog = + GTK_WIDGET(g_object_new( + GTK_TYPE_DIALOG, + "use-header-bar", 1, + NULL + )); + + gtk_window_set_title(GTK_WINDOW(dialog), title); + gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE); + gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),10); + + if(parent) + { + gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent)); + gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); + gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); + } + + GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); + GtkWidget * button; + + // Cancel button + button = gtk_button_new_with_mnemonic(_("_Cancel")); + gtk_header_bar_pack_start(GTK_HEADER_BAR(header),button); + gtk_button_set_use_underline(GTK_BUTTON (button), TRUE); + g_signal_connect(button,"clicked",G_CALLBACK(cancel_clicked),dialog); + gtk_widget_show(button); + + button = gtk_button_new_with_mnemonic(apply); + gtk_header_bar_pack_end(GTK_HEADER_BAR(header),button); + gtk_button_set_use_underline(GTK_BUTTON (button), TRUE); + g_signal_connect(button,"clicked",G_CALLBACK(apply_clicked),dialog); + gtk_widget_show(button); + + return dialog; +} diff --git a/src/dialogs/hostselect.c b/src/dialogs/hostselect.c index 740e553..d70a2d0 100644 --- a/src/dialogs/hostselect.c +++ b/src/dialogs/hostselect.c @@ -328,14 +328,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) g_return_if_fail(GTK_IS_V3270(widget)); GtkWidget * dialog = v3270_host_select_new(widget); - GtkWidget * win = gtk_dialog_new_with_buttons( - _( "Configure host" ), - GTK_WINDOW(gtk_widget_get_toplevel(widget)), - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, - _( "_Cancel" ), GTK_RESPONSE_REJECT, - _( "C_onnect" ), GTK_RESPONSE_ACCEPT, - NULL ); - + GtkWidget * win = v3270_dialog_new(_("Configure host"), GTK_WINDOW(gtk_widget_get_toplevel(widget)), _("C_onnect")); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(win))),dialog,FALSE,FALSE,2); gtk_widget_show_all(dialog); @@ -349,13 +342,13 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) switch(gtk_dialog_run(GTK_DIALOG(win))) { - case GTK_RESPONSE_ACCEPT: + case GTK_RESPONSE_APPLY: gtk_widget_set_visible(win,FALSE); gtk_widget_set_sensitive(win,FALSE); again = v3270_host_select_apply(GTK_V3270HostSelectWidget(dialog)) != 0; break; - case GTK_RESPONSE_REJECT: + case GTK_RESPONSE_CANCEL: again = FALSE; break; } diff --git a/src/include/v3270.h b/src/include/v3270.h index 253e489..19d3332 100644 --- a/src/include/v3270.h +++ b/src/include/v3270.h @@ -287,6 +287,8 @@ LIB3270_EXPORT int v3270_print_selected(GtkWidget *widget, GError **error); LIB3270_EXPORT int v3270_print_copy(GtkWidget *widget, GError **error); + LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *parent, const gchar *apply); + G_END_DECLS #endif // V3270_H_INCLUDED diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index d5b4b99..a69ac77 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -137,19 +137,10 @@ static void host_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) { - GtkWidget * dialog = gtk_dialog_new_with_buttons ( - _( "Color Setup" ), - NULL, // GTK_WINDOW(gtk_widget_get_toplevel(terminal)), - GTK_DIALOG_DESTROY_WITH_PARENT, - _( "Cancel" ), GTK_RESPONSE_REJECT, - _( "Save" ), GTK_RESPONSE_ACCEPT, - NULL ); - + GtkWidget * dialog = v3270_dialog_new(_("Color setup"), NULL, _("_Save")); GtkWidget * colors = v3270_color_selection_new(terminal); - gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),10); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),colors,TRUE,TRUE,2); gtk_widget_show_all(dialog); -- libgit2 0.21.2