Commit e1db95dbf204780a8e6d1598a599c2458e3f2f0e
1 parent
07335315
Exists in
master
and in
1 other branch
Creating standard dialog to avoid the repeating of the same code.
Showing
4 changed files
with
87 additions
and
20 deletions
Show diff stats
... | ... | @@ -0,0 +1,81 @@ |
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., 51 Franklin | |
19 | + * St, Fifth Floor, Boston, MA 02110-1301 USA | |
20 | + * | |
21 | + * Este programa está nomeado como - e possui - linhas de código. | |
22 | + * | |
23 | + * Contatos: | |
24 | + * | |
25 | + * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) | |
26 | + * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) | |
27 | + * | |
28 | + */ | |
29 | + | |
30 | + #include "private.h" | |
31 | + | |
32 | +/*--[ Implement ]------------------------------------------------------------------------------------*/ | |
33 | + | |
34 | +static void apply_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog) | |
35 | +{ | |
36 | + gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_APPLY); | |
37 | +} | |
38 | + | |
39 | +static void cancel_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog) | |
40 | +{ | |
41 | + gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_CANCEL); | |
42 | +} | |
43 | + | |
44 | +LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *parent, const gchar *apply) | |
45 | +{ | |
46 | + GtkWidget * dialog = | |
47 | + GTK_WIDGET(g_object_new( | |
48 | + GTK_TYPE_DIALOG, | |
49 | + "use-header-bar", 1, | |
50 | + NULL | |
51 | + )); | |
52 | + | |
53 | + gtk_window_set_title(GTK_WINDOW(dialog), title); | |
54 | + gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE); | |
55 | + gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),10); | |
56 | + | |
57 | + if(parent) | |
58 | + { | |
59 | + gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent)); | |
60 | + gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); | |
61 | + gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); | |
62 | + } | |
63 | + | |
64 | + GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); | |
65 | + GtkWidget * button; | |
66 | + | |
67 | + // Cancel button | |
68 | + button = gtk_button_new_with_mnemonic(_("_Cancel")); | |
69 | + gtk_header_bar_pack_start(GTK_HEADER_BAR(header),button); | |
70 | + gtk_button_set_use_underline(GTK_BUTTON (button), TRUE); | |
71 | + g_signal_connect(button,"clicked",G_CALLBACK(cancel_clicked),dialog); | |
72 | + gtk_widget_show(button); | |
73 | + | |
74 | + button = gtk_button_new_with_mnemonic(apply); | |
75 | + gtk_header_bar_pack_end(GTK_HEADER_BAR(header),button); | |
76 | + gtk_button_set_use_underline(GTK_BUTTON (button), TRUE); | |
77 | + g_signal_connect(button,"clicked",G_CALLBACK(apply_clicked),dialog); | |
78 | + gtk_widget_show(button); | |
79 | + | |
80 | + return dialog; | |
81 | +} | ... | ... |
src/dialogs/hostselect.c
... | ... | @@ -328,14 +328,7 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) |
328 | 328 | g_return_if_fail(GTK_IS_V3270(widget)); |
329 | 329 | |
330 | 330 | GtkWidget * dialog = v3270_host_select_new(widget); |
331 | - GtkWidget * win = gtk_dialog_new_with_buttons( | |
332 | - _( "Configure host" ), | |
333 | - GTK_WINDOW(gtk_widget_get_toplevel(widget)), | |
334 | - GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, | |
335 | - _( "_Cancel" ), GTK_RESPONSE_REJECT, | |
336 | - _( "C_onnect" ), GTK_RESPONSE_ACCEPT, | |
337 | - NULL ); | |
338 | - | |
331 | + GtkWidget * win = v3270_dialog_new(_("Configure host"), GTK_WINDOW(gtk_widget_get_toplevel(widget)), _("C_onnect")); | |
339 | 332 | |
340 | 333 | gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(win))),dialog,FALSE,FALSE,2); |
341 | 334 | gtk_widget_show_all(dialog); |
... | ... | @@ -349,13 +342,13 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) |
349 | 342 | |
350 | 343 | switch(gtk_dialog_run(GTK_DIALOG(win))) |
351 | 344 | { |
352 | - case GTK_RESPONSE_ACCEPT: | |
345 | + case GTK_RESPONSE_APPLY: | |
353 | 346 | gtk_widget_set_visible(win,FALSE); |
354 | 347 | gtk_widget_set_sensitive(win,FALSE); |
355 | 348 | again = v3270_host_select_apply(GTK_V3270HostSelectWidget(dialog)) != 0; |
356 | 349 | break; |
357 | 350 | |
358 | - case GTK_RESPONSE_REJECT: | |
351 | + case GTK_RESPONSE_CANCEL: | |
359 | 352 | again = FALSE; |
360 | 353 | break; |
361 | 354 | } | ... | ... |
src/include/v3270.h
... | ... | @@ -287,6 +287,8 @@ |
287 | 287 | LIB3270_EXPORT int v3270_print_selected(GtkWidget *widget, GError **error); |
288 | 288 | LIB3270_EXPORT int v3270_print_copy(GtkWidget *widget, GError **error); |
289 | 289 | |
290 | + LIB3270_EXPORT GtkWidget * v3270_dialog_new(const gchar *title, GtkWindow *parent, const gchar *apply); | |
291 | + | |
290 | 292 | G_END_DECLS |
291 | 293 | |
292 | 294 | #endif // V3270_H_INCLUDED | ... | ... |
src/testprogram/testprogram.c
... | ... | @@ -137,19 +137,10 @@ static void host_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) |
137 | 137 | |
138 | 138 | static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) |
139 | 139 | { |
140 | - GtkWidget * dialog = gtk_dialog_new_with_buttons ( | |
141 | - _( "Color Setup" ), | |
142 | - NULL, // GTK_WINDOW(gtk_widget_get_toplevel(terminal)), | |
143 | - GTK_DIALOG_DESTROY_WITH_PARENT, | |
144 | - _( "Cancel" ), GTK_RESPONSE_REJECT, | |
145 | - _( "Save" ), GTK_RESPONSE_ACCEPT, | |
146 | - NULL ); | |
147 | - | |
140 | + GtkWidget * dialog = v3270_dialog_new(_("Color setup"), NULL, _("_Save")); | |
148 | 141 | |
149 | 142 | GtkWidget * colors = v3270_color_selection_new(terminal); |
150 | 143 | |
151 | - gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),10); | |
152 | - | |
153 | 144 | gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),colors,TRUE,TRUE,2); |
154 | 145 | |
155 | 146 | gtk_widget_show_all(dialog); | ... | ... |