Commit 716a7aa6a9cf00c17797bdb63d5b1ba1b90838bf
1 parent
49374a74
Exists in
master
and in
1 other branch
Replacing deprecated calls with the new ones.
Showing
4 changed files
with
40 additions
and
98 deletions
Show diff stats
src/dialogs/hostselect.c
@@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
18 | * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin | 18 | * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin |
19 | * St, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * St, Fifth Floor, Boston, MA 02110-1301 USA |
20 | * | 20 | * |
21 | - * Este programa está nomeado como hostdialog.c e possui - linhas de código. | 21 | + * Este programa está nomeado como - e possui - linhas de código. |
22 | * | 22 | * |
23 | * Contatos: | 23 | * Contatos: |
24 | * | 24 | * |
@@ -30,8 +30,6 @@ | @@ -30,8 +30,6 @@ | ||
30 | #include "private.h" | 30 | #include "private.h" |
31 | #include <hostselect.h> | 31 | #include <hostselect.h> |
32 | 32 | ||
33 | - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" | ||
34 | - | ||
35 | /*--[ Widget definition ]----------------------------------------------------------------------------*/ | 33 | /*--[ Widget definition ]----------------------------------------------------------------------------*/ |
36 | 34 | ||
37 | static const struct _colortable | 35 | static const struct _colortable |
@@ -80,19 +78,11 @@ | @@ -80,19 +78,11 @@ | ||
80 | 78 | ||
81 | struct _V3270HostSelectWidgetClass | 79 | struct _V3270HostSelectWidgetClass |
82 | { | 80 | { |
83 | -#if GTK_CHECK_VERSION(3,0,0) | ||
84 | GtkBinClass parent_class; | 81 | GtkBinClass parent_class; |
85 | -#else | ||
86 | - GtkVBoxClass parent_class; | ||
87 | -#endif // GTK_CHECK_VERSION | ||
88 | }; | 82 | }; |
89 | 83 | ||
90 | 84 | ||
91 | -#if GTK_CHECK_VERSION(3,0,0) | ||
92 | G_DEFINE_TYPE(V3270HostSelectWidget, V3270HostSelectWidget, GTK_TYPE_BIN); | 85 | G_DEFINE_TYPE(V3270HostSelectWidget, V3270HostSelectWidget, GTK_TYPE_BIN); |
93 | -#else | ||
94 | - G_DEFINE_TYPE(V3270HostSelectWidget, V3270HostSelectWidget, GTK_TYPE_VBOX); | ||
95 | -#endif // GTK_CHECK_VERSION | ||
96 | 86 | ||
97 | /*--[ Implement ]------------------------------------------------------------------------------------*/ | 87 | /*--[ Implement ]------------------------------------------------------------------------------------*/ |
98 | 88 | ||
@@ -130,11 +120,7 @@ static void colortable_changed(GtkComboBox *widget, V3270HostSelectWidget *dialo | @@ -130,11 +120,7 @@ static void colortable_changed(GtkComboBox *widget, V3270HostSelectWidget *dialo | ||
130 | 120 | ||
131 | static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | 121 | static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) |
132 | { | 122 | { |
133 | -#if GTK_CHECK_VERSION(3,0,0) | ||
134 | - GtkGrid * grid = GTK_GRID(gtk_grid_new()); | ||
135 | -#else | ||
136 | - GtkTable * grid = GTK_TABLE(gtk_table_new(3,4,FALSE)); | ||
137 | -#endif // GTK_CHECK_VERSION | 123 | + GtkGrid * grid = GTK_GRID(gtk_grid_new()); |
138 | 124 | ||
139 | GtkWidget * label[ENTRY_COUNT] = | 125 | GtkWidget * label[ENTRY_COUNT] = |
140 | { | 126 | { |
@@ -144,12 +130,19 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | @@ -144,12 +130,19 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | ||
144 | 130 | ||
145 | int f; | 131 | int f; |
146 | 132 | ||
147 | - gtk_container_set_border_width(GTK_CONTAINER(grid),3); | 133 | + gtk_container_set_border_width(GTK_CONTAINER(grid),10); |
134 | + | ||
135 | + gtk_grid_set_row_spacing(grid,5); | ||
136 | + gtk_grid_set_column_spacing(grid,10); | ||
137 | + | ||
138 | + gtk_grid_set_row_homogeneous(grid,FALSE); | ||
139 | + gtk_grid_set_column_homogeneous(grid,FALSE); | ||
140 | + | ||
148 | 141 | ||
149 | for(f=0;f<ENTRY_COUNT;f++) | 142 | for(f=0;f<ENTRY_COUNT;f++) |
150 | { | 143 | { |
151 | widget->input.entry[f] = GTK_ENTRY(gtk_entry_new()); | 144 | widget->input.entry[f] = GTK_ENTRY(gtk_entry_new()); |
152 | - gtk_misc_set_alignment(GTK_MISC(label[f]),0,0.5); | 145 | + gtk_widget_set_halign(label[f],GTK_ALIGN_START); |
153 | gtk_label_set_mnemonic_widget(GTK_LABEL(label[f]),GTK_WIDGET(widget->input.entry[f])); | 146 | gtk_label_set_mnemonic_widget(GTK_LABEL(label[f]),GTK_WIDGET(widget->input.entry[f])); |
154 | } | 147 | } |
155 | 148 | ||
@@ -212,18 +205,12 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | @@ -212,18 +205,12 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | ||
212 | gtk_entry_set_max_length(widget->input.entry[ENTRY_SRVCNAME],6); | 205 | gtk_entry_set_max_length(widget->input.entry[ENTRY_SRVCNAME],6); |
213 | gtk_entry_set_width_chars(widget->input.entry[ENTRY_SRVCNAME],7); | 206 | gtk_entry_set_width_chars(widget->input.entry[ENTRY_SRVCNAME],7); |
214 | 207 | ||
215 | -#if GTK_CHECK_VERSION(3,0,0) | ||
216 | - | ||
217 | gtk_entry_set_placeholder_text(widget->input.entry[ENTRY_SRVCNAME],"telnet"); | 208 | gtk_entry_set_placeholder_text(widget->input.entry[ENTRY_SRVCNAME],"telnet"); |
218 | 209 | ||
219 | gtk_widget_set_hexpand(GTK_WIDGET(widget->input.entry[ENTRY_HOSTNAME]),TRUE); | 210 | gtk_widget_set_hexpand(GTK_WIDGET(widget->input.entry[ENTRY_HOSTNAME]),TRUE); |
220 | gtk_widget_set_hexpand(GTK_WIDGET(widget->input.ssl),TRUE); | 211 | gtk_widget_set_hexpand(GTK_WIDGET(widget->input.ssl),TRUE); |
221 | gtk_widget_set_hexpand(GTK_WIDGET(expander),TRUE); | 212 | gtk_widget_set_hexpand(GTK_WIDGET(expander),TRUE); |
222 | 213 | ||
223 | - gtk_grid_set_row_homogeneous(grid,FALSE); | ||
224 | - gtk_grid_set_column_homogeneous(grid,FALSE); | ||
225 | - gtk_grid_set_column_spacing(grid,5); | ||
226 | - gtk_grid_set_row_spacing(grid,5); | ||
227 | 214 | ||
228 | gtk_grid_attach(grid,label[ENTRY_HOSTNAME],0,0,1,1); | 215 | gtk_grid_attach(grid,label[ENTRY_HOSTNAME],0,0,1,1); |
229 | gtk_grid_attach(grid,GTK_WIDGET(widget->input.entry[ENTRY_HOSTNAME]),1,0,3,1); | 216 | gtk_grid_attach(grid,GTK_WIDGET(widget->input.entry[ENTRY_HOSTNAME]),1,0,3,1); |
@@ -237,13 +224,14 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | @@ -237,13 +224,14 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | ||
237 | // Host options | 224 | // Host options |
238 | { | 225 | { |
239 | GtkGrid *opt = GTK_GRID(gtk_grid_new()); | 226 | GtkGrid *opt = GTK_GRID(gtk_grid_new()); |
227 | + | ||
240 | gtk_grid_set_column_spacing(opt,5); | 228 | gtk_grid_set_column_spacing(opt,5); |
241 | gtk_grid_set_row_spacing(opt,5); | 229 | gtk_grid_set_row_spacing(opt,5); |
242 | 230 | ||
243 | for(f=0;f< (int) G_N_ELEMENTS(comboLabel);f++) | 231 | for(f=0;f< (int) G_N_ELEMENTS(comboLabel);f++) |
244 | { | 232 | { |
245 | GtkWidget *label = gtk_label_new_with_mnemonic(gettext(comboLabel[f])); | 233 | GtkWidget *label = gtk_label_new_with_mnemonic(gettext(comboLabel[f])); |
246 | - gtk_misc_set_alignment(GTK_MISC(label),0,0.5); | 234 | + gtk_widget_set_halign(label,GTK_ALIGN_START); |
247 | gtk_grid_attach(opt,label,0,f+1,1,1); | 235 | gtk_grid_attach(opt,label,0,f+1,1,1); |
248 | gtk_grid_attach(opt,GTK_WIDGET(widget->input.combo[f]),1,f+1,2,1); | 236 | gtk_grid_attach(opt,GTK_WIDGET(widget->input.combo[f]),1,f+1,2,1); |
249 | } | 237 | } |
@@ -252,42 +240,6 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | @@ -252,42 +240,6 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) | ||
252 | } | 240 | } |
253 | gtk_grid_attach(grid,GTK_WIDGET(expander),1,2,5,2); | 241 | gtk_grid_attach(grid,GTK_WIDGET(expander),1,2,5,2); |
254 | 242 | ||
255 | - | ||
256 | -#else | ||
257 | - | ||
258 | - gtk_table_set_row_spacings(grid,5); | ||
259 | - gtk_table_set_col_spacings(grid,5); | ||
260 | - | ||
261 | - gtk_table_attach(grid,label[ENTRY_HOSTNAME],0,1,0,1,GTK_FILL,GTK_FILL,0,0); | ||
262 | - gtk_table_attach(grid,GTK_WIDGET(widget->entry[ENTRY_HOSTNAME]),1,2,0,1,GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,0,0); | ||
263 | - | ||
264 | - gtk_table_attach(grid,label[ENTRY_SRVCNAME],2,3,0,1,GTK_FILL,GTK_FILL,0,0); | ||
265 | - gtk_table_attach(grid,GTK_WIDGET(widget->entry[ENTRY_SRVCNAME]),3,4,0,1,GTK_FILL,GTK_FILL,0,0); | ||
266 | - | ||
267 | - gtk_table_attach(grid,GTK_WIDGET(widget->ssl),1,2,1,2,GTK_FILL,GTK_FILL,0,0); | ||
268 | - | ||
269 | - { | ||
270 | - GtkTable * opt = GTK_TABLE(gtk_table_new(G_N_ELEMENTS(comboLabel),2,FALSE)); | ||
271 | - gtk_table_set_row_spacings(opt,5); | ||
272 | - gtk_table_set_col_spacings(opt,5); | ||
273 | - | ||
274 | - for(f=0;f<G_N_ELEMENTS(comboLabel);f++) | ||
275 | - { | ||
276 | - GtkWidget *label = gtk_label_new_with_mnemonic(gettext(comboLabel[f])); | ||
277 | - gtk_misc_set_alignment(GTK_MISC(label),0,0.5); | ||
278 | - | ||
279 | - gtk_table_attach(opt,label,0,1,f,f+1,GTK_FILL,GTK_FILL,0,0); | ||
280 | - gtk_table_attach(opt,GTK_WIDGET(widget->combo[f]),1,2,f,f+1,GTK_FILL,GTK_FILL,0,0); | ||
281 | - } | ||
282 | - | ||
283 | - gtk_container_add(GTK_CONTAINER(expander),GTK_WIDGET(opt)); | ||
284 | - } | ||
285 | - gtk_table_attach(grid,GTK_WIDGET(expander),1,2,2,3,GTK_FILL,GTK_FILL,0,0); | ||
286 | - | ||
287 | - | ||
288 | -#endif // GTK_CHECK_VERSION | ||
289 | - | ||
290 | - | ||
291 | gtk_widget_show_all(GTK_WIDGET(grid)); | 243 | gtk_widget_show_all(GTK_WIDGET(grid)); |
292 | gtk_container_add(GTK_CONTAINER(widget),GTK_WIDGET(grid)); | 244 | gtk_container_add(GTK_CONTAINER(widget),GTK_WIDGET(grid)); |
293 | } | 245 | } |
@@ -393,20 +345,12 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) | @@ -393,20 +345,12 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) | ||
393 | { | 345 | { |
394 | gtk_widget_set_sensitive(win,TRUE); | 346 | gtk_widget_set_sensitive(win,TRUE); |
395 | 347 | ||
396 | -#if GTK_CHECK_VERSION(2,18,0) | ||
397 | gtk_widget_set_visible(win,TRUE); | 348 | gtk_widget_set_visible(win,TRUE); |
398 | -#else | ||
399 | - gtk_widget_show(win); | ||
400 | -#endif | ||
401 | 349 | ||
402 | switch(gtk_dialog_run(GTK_DIALOG(win))) | 350 | switch(gtk_dialog_run(GTK_DIALOG(win))) |
403 | { | 351 | { |
404 | case GTK_RESPONSE_ACCEPT: | 352 | case GTK_RESPONSE_ACCEPT: |
405 | -#if GTK_CHECK_VERSION(2,18,0) | ||
406 | gtk_widget_set_visible(win,FALSE); | 353 | gtk_widget_set_visible(win,FALSE); |
407 | -#else | ||
408 | - gtk_widget_hide(win); | ||
409 | -#endif | ||
410 | gtk_widget_set_sensitive(win,FALSE); | 354 | gtk_widget_set_sensitive(win,FALSE); |
411 | again = v3270_host_select_apply(GTK_V3270HostSelectWidget(dialog)) != 0; | 355 | again = v3270_host_select_apply(GTK_V3270HostSelectWidget(dialog)) != 0; |
412 | break; | 356 | break; |
src/include/v3270/trace.h
@@ -60,7 +60,6 @@ | @@ -60,7 +60,6 @@ | ||
60 | LIB3270_EXPORT void v3270_trace_append_text(GtkWidget *widget, const gchar *text); | 60 | LIB3270_EXPORT void v3270_trace_append_text(GtkWidget *widget, const gchar *text); |
61 | LIB3270_EXPORT gchar * v3270_trace_get_command(GtkWidget *widget); | 61 | LIB3270_EXPORT gchar * v3270_trace_get_command(GtkWidget *widget); |
62 | LIB3270_EXPORT void v3270_trace_set_destroy_on_close(GtkWidget *widget,gboolean on); | 62 | LIB3270_EXPORT void v3270_trace_set_destroy_on_close(GtkWidget *widget,gboolean on); |
63 | - LIB3270_EXPORT void v3270_trace_set_font_from_string(GtkWidget *widget, const gchar *name); | ||
64 | 63 | ||
65 | G_END_DECLS | 64 | G_END_DECLS |
66 | 65 |
src/testprogram/testprogram.c
@@ -128,6 +128,12 @@ static void print_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) | @@ -128,6 +128,12 @@ static void print_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) | ||
128 | lib3270_print_all(v3270_get_session(terminal)); | 128 | lib3270_print_all(v3270_get_session(terminal)); |
129 | } | 129 | } |
130 | 130 | ||
131 | +static void host_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) | ||
132 | +{ | ||
133 | + v3270_select_host(terminal); | ||
134 | +} | ||
135 | + | ||
136 | + | ||
131 | static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | 137 | static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { |
132 | 138 | ||
133 | GtkWidget * window = gtk_application_window_new(app); | 139 | GtkWidget * window = gtk_application_window_new(app); |
@@ -188,10 +194,14 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | @@ -188,10 +194,14 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | ||
188 | GtkWidget *grid = gtk_grid_new(); | 194 | GtkWidget *grid = gtk_grid_new(); |
189 | GtkWidget *color = v3270_color_scheme_new(); | 195 | GtkWidget *color = v3270_color_scheme_new(); |
190 | GtkWidget *print = gtk_button_new_with_label("Print"); | 196 | GtkWidget *print = gtk_button_new_with_label("Print"); |
191 | - gtk_widget_set_focus_on_click(print,FALSE); | 197 | + GtkWidget *host = gtk_button_new_with_label("Host"); |
192 | 198 | ||
199 | + gtk_widget_set_focus_on_click(print,FALSE); | ||
193 | g_signal_connect(G_OBJECT(print),"clicked",G_CALLBACK(print_clicked),terminal); | 200 | g_signal_connect(G_OBJECT(print),"clicked",G_CALLBACK(print_clicked),terminal); |
194 | 201 | ||
202 | + gtk_widget_set_focus_on_click(host,FALSE); | ||
203 | + g_signal_connect(G_OBJECT(host),"clicked",G_CALLBACK(host_clicked),terminal); | ||
204 | + | ||
195 | gtk_widget_set_can_focus(color,FALSE); | 205 | gtk_widget_set_can_focus(color,FALSE); |
196 | gtk_widget_set_focus_on_click(color,FALSE); | 206 | gtk_widget_set_focus_on_click(color,FALSE); |
197 | v3270_color_scheme_set_rgba(color,v3270_get_color_table(terminal)); | 207 | v3270_color_scheme_set_rgba(color,v3270_get_color_table(terminal)); |
@@ -199,6 +209,7 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | @@ -199,6 +209,7 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { | ||
199 | 209 | ||
200 | gtk_grid_attach(GTK_GRID(grid),color,0,0,1,1); | 210 | gtk_grid_attach(GTK_GRID(grid),color,0,0,1,1); |
201 | gtk_grid_attach(GTK_GRID(grid),print,1,0,1,1); | 211 | gtk_grid_attach(GTK_GRID(grid),print,1,0,1,1); |
212 | + gtk_grid_attach(GTK_GRID(grid),host,2,0,1,1); | ||
202 | 213 | ||
203 | gtk_box_pack_start(GTK_BOX(box),grid,FALSE,TRUE,0); | 214 | gtk_box_pack_start(GTK_BOX(box),grid,FALSE,TRUE,0); |
204 | gtk_box_pack_start(GTK_BOX(box),terminal,TRUE,TRUE,0); | 215 | gtk_box_pack_start(GTK_BOX(box),terminal,TRUE,TRUE,0); |
src/trace/trace.c
@@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
43 | #include <syslog.h> | 43 | #include <syslog.h> |
44 | #endif // HAVE_SYSLOG | 44 | #endif // HAVE_SYSLOG |
45 | 45 | ||
46 | -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" | 46 | +//#pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
47 | 47 | ||
48 | /*--[ Widget definition ]----------------------------------------------------------------------------*/ | 48 | /*--[ Widget definition ]----------------------------------------------------------------------------*/ |
49 | 49 | ||
@@ -175,8 +175,8 @@ static void destroy(GtkWidget *widget) | @@ -175,8 +175,8 @@ static void destroy(GtkWidget *widget) | ||
175 | dialog = gtk_file_chooser_dialog_new( _( "Save trace file" ), | 175 | dialog = gtk_file_chooser_dialog_new( _( "Save trace file" ), |
176 | toplevel, | 176 | toplevel, |
177 | GTK_FILE_CHOOSER_ACTION_SAVE, | 177 | GTK_FILE_CHOOSER_ACTION_SAVE, |
178 | - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, | ||
179 | - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, | 178 | + _( "Cancel" ), GTK_RESPONSE_CANCEL, |
179 | + _( "Save" ), GTK_RESPONSE_ACCEPT, | ||
180 | NULL ); | 180 | NULL ); |
181 | 181 | ||
182 | gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); | 182 | gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); |
@@ -230,21 +230,21 @@ static void destroy(GtkWidget *widget) | @@ -230,21 +230,21 @@ static void destroy(GtkWidget *widget) | ||
230 | 230 | ||
231 | struct submenu | 231 | struct submenu |
232 | { | 232 | { |
233 | - const gchar * stock_id; | 233 | + const gchar * label; |
234 | GCallback action; | 234 | GCallback action; |
235 | }; | 235 | }; |
236 | 236 | ||
237 | - static void build_menu(GtkWidget *menubar, v3270_trace *window, const gchar *name, const struct submenu *item, size_t sz) | 237 | + static void build_menu(GtkWidget *menubar, v3270_trace *window, const gchar *label, const struct submenu *item, size_t sz) |
238 | { | 238 | { |
239 | size_t f; | 239 | size_t f; |
240 | GtkWidget * menu = gtk_menu_new(); | 240 | GtkWidget * menu = gtk_menu_new(); |
241 | - GtkWidget * topitem = gtk_image_menu_item_new_from_stock( name, NULL ); | 241 | + GtkWidget * topitem = gtk_menu_item_new_with_mnemonic(label); |
242 | 242 | ||
243 | gtk_menu_item_set_submenu(GTK_MENU_ITEM(topitem), menu); | 243 | gtk_menu_item_set_submenu(GTK_MENU_ITEM(topitem), menu); |
244 | 244 | ||
245 | for(f=0;f<sz;f++) | 245 | for(f=0;f<sz;f++) |
246 | { | 246 | { |
247 | - GtkWidget *widget = gtk_image_menu_item_new_from_stock( item[f].stock_id, NULL ); | 247 | + GtkWidget *widget = gtk_menu_item_new_with_mnemonic(gettext(item[f].label)); |
248 | gtk_menu_shell_append(GTK_MENU_SHELL(menu),widget); | 248 | gtk_menu_shell_append(GTK_MENU_SHELL(menu),widget); |
249 | g_signal_connect(G_OBJECT(widget), "activate",item[f].action,window); | 249 | g_signal_connect(G_OBJECT(widget), "activate",item[f].action,window); |
250 | } | 250 | } |
@@ -317,37 +317,25 @@ static void destroy(GtkWidget *widget) | @@ -317,37 +317,25 @@ static void destroy(GtkWidget *widget) | ||
317 | 317 | ||
318 | } | 318 | } |
319 | 319 | ||
320 | - void v3270_trace_set_font_from_string(GtkWidget *widget, const gchar *name) | ||
321 | - { | ||
322 | - PangoFontDescription* fontdesc = pango_font_description_from_string(name); | ||
323 | - | ||
324 | - gtk_widget_override_font(V3270_TRACE(widget)->view, fontdesc); | ||
325 | - | ||
326 | - pango_font_description_free(fontdesc); | ||
327 | - } | ||
328 | - | ||
329 | static void v3270_trace_init(v3270_trace *window) | 320 | static void v3270_trace_init(v3270_trace *window) |
330 | { | 321 | { |
331 | - GtkWidget * widget; | ||
332 | -#if GTK_CHECK_VERSION(3,0,0) | ||
333 | - GtkWidget * vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,0); | ||
334 | -#else | ||
335 | - GtkWidget * vbox = gtk_vbox_new(FALSE,0); | ||
336 | -#endif // GTK_CHECK_VERSION | 322 | + GtkWidget * widget; |
323 | + GtkWidget * vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,0); | ||
337 | 324 | ||
338 | // Top menu | 325 | // Top menu |
339 | { | 326 | { |
340 | 327 | ||
328 | + // https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html | ||
341 | static const struct submenu filemenu[] = | 329 | static const struct submenu filemenu[] = |
342 | { | 330 | { |
343 | - { GTK_STOCK_SAVE_AS, G_CALLBACK(menu_save) }, | ||
344 | - { GTK_STOCK_QUIT, G_CALLBACK(menu_close) }, | 331 | + { N_("_Save trace to file"), G_CALLBACK(menu_save) }, |
332 | + { N_("_Close window"), G_CALLBACK(menu_close) }, | ||
345 | 333 | ||
346 | }; | 334 | }; |
347 | 335 | ||
348 | widget = gtk_menu_bar_new(); | 336 | widget = gtk_menu_bar_new(); |
349 | 337 | ||
350 | - build_menu(widget, window, GTK_STOCK_FILE, filemenu, G_N_ELEMENTS(filemenu)); | 338 | + build_menu(widget, window, _( "_File" ), filemenu, G_N_ELEMENTS(filemenu)); |
351 | 339 | ||
352 | gtk_box_pack_start(GTK_BOX(vbox),widget,FALSE,TRUE,0); | 340 | gtk_box_pack_start(GTK_BOX(vbox),widget,FALSE,TRUE,0); |
353 | } | 341 | } |
@@ -359,7 +347,7 @@ static void destroy(GtkWidget *widget) | @@ -359,7 +347,7 @@ static void destroy(GtkWidget *widget) | ||
359 | gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window->scroll),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); | 347 | gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window->scroll),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); |
360 | 348 | ||
361 | window->view = gtk_text_view_new(); | 349 | window->view = gtk_text_view_new(); |
362 | - v3270_trace_set_font_from_string(GTK_WIDGET(window),v3270_get_default_font_name()); | 350 | + gtk_text_view_set_monospace(GTK_TEXT_VIEW(window->view),TRUE); |
363 | 351 | ||
364 | window->text = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->view)); | 352 | window->text = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->view)); |
365 | gtk_text_view_set_editable(GTK_TEXT_VIEW(window->view), TRUE); | 353 | gtk_text_view_set_editable(GTK_TEXT_VIEW(window->view), TRUE); |
@@ -375,7 +363,7 @@ static void destroy(GtkWidget *widget) | @@ -375,7 +363,7 @@ static void destroy(GtkWidget *widget) | ||
375 | gtk_widget_set_sensitive(window->entry,FALSE); | 363 | gtk_widget_set_sensitive(window->entry,FALSE); |
376 | g_signal_connect(G_OBJECT(window->entry),"activate",G_CALLBACK(activate),window); | 364 | g_signal_connect(G_OBJECT(window->entry),"activate",G_CALLBACK(activate),window); |
377 | 365 | ||
378 | - window->button = gtk_button_new_from_stock(GTK_STOCK_OK); | 366 | + window->button = gtk_button_new_from_icon_name("system-run",GTK_ICON_SIZE_BUTTON); |
379 | gtk_box_pack_end(GTK_BOX(widget),window->button,FALSE,FALSE,4); | 367 | gtk_box_pack_end(GTK_BOX(widget),window->button,FALSE,FALSE,4); |
380 | gtk_widget_set_sensitive(window->button,FALSE); | 368 | gtk_widget_set_sensitive(window->button,FALSE); |
381 | gtk_widget_set_focus_on_click(GTK_WIDGET(window->button),FALSE); | 369 | gtk_widget_set_focus_on_click(GTK_WIDGET(window->button),FALSE); |