Download as
Browse Code »

Commit 1037e2bb56ba781e4c2d6714f307e090d1e0464b

Authored by Perry Werneck
1 parent 541f9cc1
Exists in master and in 1 other branch develop

Cleaning up code.

Showing 6 changed files with 21 additions and 166 deletions   Show diff stats
src/dialogs/commondialog.c
  Diff comments   View file @1037e2b
@@ -33,116 +33,6 @@ @@ -33,116 +33,6 @@
33 /*--[ Implement ]------------------------------------------------------------------------------------*/ 33 /*--[ Implement ]------------------------------------------------------------------------------------*/
34 34
35 #if GTK_CHECK_VERSION(3,12,0) 35 #if GTK_CHECK_VERSION(3,12,0)
36 -void v3270_dialog_apply(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog)  
37 -{  
38 - gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_APPLY);  
39 -}  
40 -  
41 -void v3270_dialog_cancel(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog)  
42 -{  
43 - gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_CANCEL);  
44 -}  
45 -  
46 -GtkWidget * v3270_dialog_button_new(GtkWidget *dialog, const gchar *mnemonic, GCallback callback)  
47 -{  
48 - GtkWidget * button = gtk_button_new_with_mnemonic(mnemonic);  
49 - gtk_button_set_use_underline(GTK_BUTTON (button), TRUE);  
50 - g_signal_connect(button,"clicked",callback,dialog);  
51 - gtk_widget_show(button);  
52 - return button;  
53 -}  
54 -#endif // GTK 3.12  
55 -  
56 -LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *title, const gchar *apply)  
57 -{  
58 -#if GTK_CHECK_VERSION(3,12,0)  
59 -  
60 - gboolean use_header;  
61 - g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &use_header, NULL);  
62 -  
63 - GtkWidget * dialog =  
64 - GTK_WIDGET(g_object_new(  
65 - GTK_TYPE_DIALOG,  
66 - "use-header-bar", (use_header ? 1 : 0),  
67 - NULL  
68 - ));  
69 -  
70 -#else  
71 -  
72 - GtkWidget * dialog = gtk_dialog_new();  
73 -  
74 -#endif // GTK 3.12  
75 -  
76 - gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE);  
77 -  
78 - // https://developer.gnome.org/hig/stable/visual-layout.html.en  
79 - gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),18);  
80 -  
81 - if(widget)  
82 - {  
83 - gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(gtk_widget_get_toplevel(widget)));  
84 - gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);  
85 - gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);  
86 - }  
87 -  
88 - gtk_box_set_spacing(  
89 - GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),  
90 - 18  
91 - );  
92 -  
93 - v3270_dialog_setup(dialog,title,apply);  
94 -  
95 - return dialog;  
96 -}  
97 -  
98 -LIB3270_EXPORT void v3270_dialog_setup(GtkWidget *dialog, const gchar *title, const gchar *apply)  
99 -{  
100 -  
101 -/*  
102 -#if GTK_CHECK_VERSION(3,12,0)  
103 -  
104 - GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog));  
105 -  
106 - if(header)  
107 - {  
108 - gtk_header_bar_set_title(GTK_HEADER_BAR(header),title);  
109 - gtk_header_bar_pack_start(GTK_HEADER_BAR(header),v3270_dialog_button_new(dialog,_("_Cancel"),G_CALLBACK(v3270_dialog_cancel)));  
110 - gtk_header_bar_pack_end(GTK_HEADER_BAR(header),v3270_dialog_button_new(dialog,apply,G_CALLBACK(v3270_dialog_apply)));  
111 - }  
112 - else  
113 - {  
114 - gtk_window_set_title(GTK_WINDOW(dialog), title);  
115 -  
116 - gtk_dialog_add_buttons(  
117 - GTK_DIALOG (dialog),  
118 - _("_Cancel"), GTK_RESPONSE_CANCEL,  
119 - apply, GTK_RESPONSE_APPLY,  
120 - NULL  
121 - );  
122 - }  
123 -  
124 -#else  
125 -  
126 - gtk_window_set_title(GTK_WINDOW(dialog), title);  
127 -  
128 - gtk_box_set_spacing(  
129 - GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),  
130 - 18  
131 - );  
132 -  
133 - gtk_dialog_add_buttons(  
134 - GTK_DIALOG (dialog),  
135 - _("_Cancel"), GTK_RESPONSE_CANCEL,  
136 - apply, GTK_RESPONSE_APPLY,  
137 - NULL  
138 - );  
139 -  
140 -#endif // GTK 3.12  
141 -*/  
142 -  
143 -}  
144 -  
145 -#if GTK_CHECK_VERSION(3,12,0)  
146 GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget) 36 GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget)
147 { 37 {
148 38
src/dialogs/settings/widget.c
  Diff comments   View file @1037e2b
@@ -161,3 +161,20 @@ LIB3270_EXPORT void v3270_settings_set_terminal_widget(GtkWidget *widget, GtkWid @@ -161,3 +161,20 @@ LIB3270_EXPORT void v3270_settings_set_terminal_widget(GtkWidget *widget, GtkWid
161 GTK_V3270_SETTINGS_GET_CLASS(widget)->revert(widget,GTK_V3270_SETTINGS(widget)->terminal); 161 GTK_V3270_SETTINGS_GET_CLASS(widget)->revert(widget,GTK_V3270_SETTINGS(widget)->terminal);
162 } 162 }
163 163
  164 + LIB3270_EXPORT const gchar * v3270_settings_get_title(GtkWidget *widget)
  165 + {
  166 + g_return_val_if_fail(GTK_IS_V3270_SETTINGS(widget),NULL);
  167 + return GTK_V3270_SETTINGS(widget)->title;
  168 + }
  169 +
  170 + LIB3270_EXPORT const gchar * v3270_settings_get_label(GtkWidget *widget)
  171 + {
  172 + g_return_val_if_fail(GTK_IS_V3270_SETTINGS(widget),NULL);
  173 + return GTK_V3270_SETTINGS(widget)->label;
  174 + }
  175 +
  176 + LIB3270_EXPORT const gchar * v3270_settings_get_tooltip(GtkWidget *widget)
  177 + {
  178 + g_return_val_if_fail(GTK_IS_V3270_SETTINGS(widget),NULL);
  179 + return GTK_V3270_SETTINGS(widget)->tooltip;
  180 + }
src/include/internals.h
  Diff comments   View file @1037e2b
@@ -144,9 +144,6 @@ @@ -144,9 +144,6 @@
144 144
145 #if GTK_CHECK_VERSION(3,12,0) 145 #if GTK_CHECK_VERSION(3,12,0)
146 G_GNUC_INTERNAL GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget); 146 G_GNUC_INTERNAL GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget);
147 - G_GNUC_INTERNAL void v3270_dialog_cancel(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog);  
148 - G_GNUC_INTERNAL void v3270_dialog_apply(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog);  
149 - G_GNUC_INTERNAL GtkWidget * v3270_dialog_button_new(GtkWidget *dialog, const gchar *mnemonic, GCallback callback);  
150 #endif // ! GTK 3.12 147 #endif // ! GTK 3.12
151 148
152 G_GNUC_INTERNAL void v3270_grid_attach(GtkGrid *grid, const struct v3270_entry_field * description, GtkWidget *widget); 149 G_GNUC_INTERNAL void v3270_grid_attach(GtkGrid *grid, const struct v3270_entry_field * description, GtkWidget *widget);
src/include/v3270/dialogs.h
  Diff comments   View file @1037e2b
@@ -36,9 +36,7 @@ @@ -36,9 +36,7 @@
36 G_BEGIN_DECLS 36 G_BEGIN_DECLS
37 37
38 LIB3270_EXPORT GtkWidget * v3270_host_select_new(); 38 LIB3270_EXPORT GtkWidget * v3270_host_select_new();
39 - LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *title, const gchar *apply);  
40 LIB3270_EXPORT void v3270_error_popup(GtkWidget *widget, const gchar *title, const gchar *summary, const gchar *body); 39 LIB3270_EXPORT void v3270_error_popup(GtkWidget *widget, const gchar *title, const gchar *summary, const gchar *body);
41 - LIB3270_EXPORT void v3270_dialog_setup(GtkWidget *dialog, const gchar *title, const gchar *apply);  
42 40
43 LIB3270_EXPORT GtkWidget * v3270_save_dialog_new(GtkWidget *widget, LIB3270_CONTENT_OPTION mode, const gchar *filename); 41 LIB3270_EXPORT GtkWidget * v3270_save_dialog_new(GtkWidget *widget, LIB3270_CONTENT_OPTION mode, const gchar *filename);
44 LIB3270_EXPORT void v3270_save_dialog_run(GtkWidget *widget); 42 LIB3270_EXPORT void v3270_save_dialog_run(GtkWidget *widget);
src/include/v3270/settings.h
  Diff comments   View file @1037e2b
@@ -70,6 +70,10 @@ @@ -70,6 +70,10 @@
70 LIB3270_EXPORT void v3270_settings_apply(GtkWidget *widget); 70 LIB3270_EXPORT void v3270_settings_apply(GtkWidget *widget);
71 LIB3270_EXPORT void v3270_settings_revert(GtkWidget *widget); 71 LIB3270_EXPORT void v3270_settings_revert(GtkWidget *widget);
72 72
  73 + LIB3270_EXPORT const gchar * v3270_settings_get_title(GtkWidget *widget);
  74 + LIB3270_EXPORT const gchar * v3270_settings_get_label(GtkWidget *widget);
  75 + LIB3270_EXPORT const gchar * v3270_settings_get_tooltip(GtkWidget *widget);
  76 +
73 /// @brief Popup a settings dialog for the terminal. 77 /// @brief Popup a settings dialog for the terminal.
74 LIB3270_EXPORT void v3270_settings_popup_dialog(GtkWidget *settings, GtkWidget *terminal, gboolean modal); 78 LIB3270_EXPORT void v3270_settings_popup_dialog(GtkWidget *settings, GtkWidget *terminal, gboolean modal);
75 79
src/testprogram/toolbar.c
  Diff comments   View file @1037e2b
@@ -60,16 +60,6 @@ @@ -60,16 +60,6 @@
60 FALSE 60 FALSE
61 ); 61 );
62 62
63 - /*  
64 - GtkWidget * dialog = v3270_settings_dialog_new(terminal, v3270_font_chooser_widget_new());  
65 -  
66 -// v3270_dialog_setup(dialog,_("Font setup"),_("_Save"));  
67 -  
68 - gtk_widget_show_all(dialog);  
69 - gtk_dialog_run(GTK_DIALOG(dialog));  
70 - gtk_widget_destroy(dialog);  
71 - */  
72 -  
73 } 63 }
74 64
75 static void preferences_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) 65 static void preferences_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal)
@@ -117,13 +107,6 @@ @@ -117,13 +107,6 @@
117 v3270_error_popup(terminal,"title","summary","body"); 107 v3270_error_popup(terminal,"title","summary","body");
118 108
119 /* 109 /*
120 - GtkWidget * dialog = v3270_dialog_new(terminal, _("test"), _("test"));  
121 - GtkWidget * trace = v3270_trace_new(terminal);  
122 - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),trace,TRUE,TRUE,2);  
123 - */  
124 -  
125 -  
126 - /*  
127 // 110 //
128 // Test transfer dialog. 111 // Test transfer dialog.
129 // 112 //
@@ -165,18 +148,6 @@ @@ -165,18 +148,6 @@
165 */ 148 */
166 149
167 /* 150 /*
168 - //  
169 - // Test worker widget  
170 - //  
171 - GtkWidget * dialog = v3270_dialog_new(terminal, _("test"), _("test"));  
172 - GtkWidget * worker = v3270_ft_worker_new();  
173 - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),worker,TRUE,TRUE,2);  
174 - v3270_ft_worker_set_session(worker,v3270_get_session(terminal));  
175 - v3270_ft_worker_set_activity(worker,activity);  
176 - v3270_ft_worker_start(worker);  
177 - */  
178 -  
179 - /*  
180 gtk_widget_show_all(dialog); 151 gtk_widget_show_all(dialog);
181 gtk_dialog_run(GTK_DIALOG(dialog)); 152 gtk_dialog_run(GTK_DIALOG(dialog));
182 gtk_widget_destroy(dialog); 153 gtk_widget_destroy(dialog);
@@ -197,28 +168,6 @@ @@ -197,28 +168,6 @@
197 static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) 168 static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal)
198 { 169 {
199 v3270_edit_color_table(terminal); 170 v3270_edit_color_table(terminal);
200 -  
201 - /*  
202 - GtkWidget * dialog = v3270_dialog_new(terminal, _("Color setup"), _("_Save"));  
203 - GtkWidget * colors = v3270_color_selection_new(terminal);  
204 -  
205 - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),colors,TRUE,TRUE,2);  
206 -  
207 - gtk_widget_show_all(dialog);  
208 -  
209 - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)  
210 - {  
211 - g_message("Accepted");  
212 - }  
213 - else  
214 - {  
215 - g_message("Cancel");  
216 - v3270_color_selection_reset(colors);  
217 - }  
218 -  
219 - gtk_widget_destroy(dialog);  
220 - */  
221 -  
222 } 171 }
223 172
224 static void zoom_in_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) 173 static void zoom_in_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal)