From 716a7aa6a9cf00c17797bdb63d5b1ba1b90838bf Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 5 Feb 2019 14:53:11 -0200 Subject: [PATCH] Replacing deprecated calls with the new ones. --- src/dialogs/hostselect.c | 82 +++++++++++++--------------------------------------------------------------------- src/include/v3270/trace.h | 1 - src/testprogram/testprogram.c | 13 ++++++++++++- src/trace/trace.c | 42 +++++++++++++++--------------------------- 4 files changed, 40 insertions(+), 98 deletions(-) diff --git a/src/dialogs/hostselect.c b/src/dialogs/hostselect.c index f49c70e..740e553 100644 --- a/src/dialogs/hostselect.c +++ b/src/dialogs/hostselect.c @@ -18,7 +18,7 @@ * 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 hostdialog.c e possui - linhas de código. + * Este programa está nomeado como - e possui - linhas de código. * * Contatos: * @@ -30,8 +30,6 @@ #include "private.h" #include - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" - /*--[ Widget definition ]----------------------------------------------------------------------------*/ static const struct _colortable @@ -80,19 +78,11 @@ struct _V3270HostSelectWidgetClass { -#if GTK_CHECK_VERSION(3,0,0) GtkBinClass parent_class; -#else - GtkVBoxClass parent_class; -#endif // GTK_CHECK_VERSION }; -#if GTK_CHECK_VERSION(3,0,0) G_DEFINE_TYPE(V3270HostSelectWidget, V3270HostSelectWidget, GTK_TYPE_BIN); -#else - G_DEFINE_TYPE(V3270HostSelectWidget, V3270HostSelectWidget, GTK_TYPE_VBOX); -#endif // GTK_CHECK_VERSION /*--[ Implement ]------------------------------------------------------------------------------------*/ @@ -130,11 +120,7 @@ static void colortable_changed(GtkComboBox *widget, V3270HostSelectWidget *dialo static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) { -#if GTK_CHECK_VERSION(3,0,0) - GtkGrid * grid = GTK_GRID(gtk_grid_new()); -#else - GtkTable * grid = GTK_TABLE(gtk_table_new(3,4,FALSE)); -#endif // GTK_CHECK_VERSION + GtkGrid * grid = GTK_GRID(gtk_grid_new()); GtkWidget * label[ENTRY_COUNT] = { @@ -144,12 +130,19 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) int f; - gtk_container_set_border_width(GTK_CONTAINER(grid),3); + gtk_container_set_border_width(GTK_CONTAINER(grid),10); + + gtk_grid_set_row_spacing(grid,5); + gtk_grid_set_column_spacing(grid,10); + + gtk_grid_set_row_homogeneous(grid,FALSE); + gtk_grid_set_column_homogeneous(grid,FALSE); + for(f=0;finput.entry[f] = GTK_ENTRY(gtk_entry_new()); - gtk_misc_set_alignment(GTK_MISC(label[f]),0,0.5); + gtk_widget_set_halign(label[f],GTK_ALIGN_START); gtk_label_set_mnemonic_widget(GTK_LABEL(label[f]),GTK_WIDGET(widget->input.entry[f])); } @@ -212,18 +205,12 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) gtk_entry_set_max_length(widget->input.entry[ENTRY_SRVCNAME],6); gtk_entry_set_width_chars(widget->input.entry[ENTRY_SRVCNAME],7); -#if GTK_CHECK_VERSION(3,0,0) - gtk_entry_set_placeholder_text(widget->input.entry[ENTRY_SRVCNAME],"telnet"); gtk_widget_set_hexpand(GTK_WIDGET(widget->input.entry[ENTRY_HOSTNAME]),TRUE); gtk_widget_set_hexpand(GTK_WIDGET(widget->input.ssl),TRUE); gtk_widget_set_hexpand(GTK_WIDGET(expander),TRUE); - gtk_grid_set_row_homogeneous(grid,FALSE); - gtk_grid_set_column_homogeneous(grid,FALSE); - gtk_grid_set_column_spacing(grid,5); - gtk_grid_set_row_spacing(grid,5); gtk_grid_attach(grid,label[ENTRY_HOSTNAME],0,0,1,1); 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) // Host options { GtkGrid *opt = GTK_GRID(gtk_grid_new()); + gtk_grid_set_column_spacing(opt,5); gtk_grid_set_row_spacing(opt,5); for(f=0;f< (int) G_N_ELEMENTS(comboLabel);f++) { GtkWidget *label = gtk_label_new_with_mnemonic(gettext(comboLabel[f])); - gtk_misc_set_alignment(GTK_MISC(label),0,0.5); + gtk_widget_set_halign(label,GTK_ALIGN_START); gtk_grid_attach(opt,label,0,f+1,1,1); gtk_grid_attach(opt,GTK_WIDGET(widget->input.combo[f]),1,f+1,2,1); } @@ -252,42 +240,6 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) } gtk_grid_attach(grid,GTK_WIDGET(expander),1,2,5,2); - -#else - - gtk_table_set_row_spacings(grid,5); - gtk_table_set_col_spacings(grid,5); - - gtk_table_attach(grid,label[ENTRY_HOSTNAME],0,1,0,1,GTK_FILL,GTK_FILL,0,0); - gtk_table_attach(grid,GTK_WIDGET(widget->entry[ENTRY_HOSTNAME]),1,2,0,1,GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,0,0); - - gtk_table_attach(grid,label[ENTRY_SRVCNAME],2,3,0,1,GTK_FILL,GTK_FILL,0,0); - gtk_table_attach(grid,GTK_WIDGET(widget->entry[ENTRY_SRVCNAME]),3,4,0,1,GTK_FILL,GTK_FILL,0,0); - - gtk_table_attach(grid,GTK_WIDGET(widget->ssl),1,2,1,2,GTK_FILL,GTK_FILL,0,0); - - { - GtkTable * opt = GTK_TABLE(gtk_table_new(G_N_ELEMENTS(comboLabel),2,FALSE)); - gtk_table_set_row_spacings(opt,5); - gtk_table_set_col_spacings(opt,5); - - for(f=0;fcombo[f]),1,2,f,f+1,GTK_FILL,GTK_FILL,0,0); - } - - gtk_container_add(GTK_CONTAINER(expander),GTK_WIDGET(opt)); - } - gtk_table_attach(grid,GTK_WIDGET(expander),1,2,2,3,GTK_FILL,GTK_FILL,0,0); - - -#endif // GTK_CHECK_VERSION - - gtk_widget_show_all(GTK_WIDGET(grid)); gtk_container_add(GTK_CONTAINER(widget),GTK_WIDGET(grid)); } @@ -393,20 +345,12 @@ LIB3270_EXPORT void v3270_select_host(GtkWidget *widget) { gtk_widget_set_sensitive(win,TRUE); -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_visible(win,TRUE); -#else - gtk_widget_show(win); -#endif switch(gtk_dialog_run(GTK_DIALOG(win))) { case GTK_RESPONSE_ACCEPT: -#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_visible(win,FALSE); -#else - gtk_widget_hide(win); -#endif gtk_widget_set_sensitive(win,FALSE); again = v3270_host_select_apply(GTK_V3270HostSelectWidget(dialog)) != 0; break; diff --git a/src/include/v3270/trace.h b/src/include/v3270/trace.h index ec219f6..952eac6 100644 --- a/src/include/v3270/trace.h +++ b/src/include/v3270/trace.h @@ -60,7 +60,6 @@ LIB3270_EXPORT void v3270_trace_append_text(GtkWidget *widget, const gchar *text); LIB3270_EXPORT gchar * v3270_trace_get_command(GtkWidget *widget); LIB3270_EXPORT void v3270_trace_set_destroy_on_close(GtkWidget *widget,gboolean on); - LIB3270_EXPORT void v3270_trace_set_font_from_string(GtkWidget *widget, const gchar *name); G_END_DECLS diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index 7c10cb2..5f437f9 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -128,6 +128,12 @@ static void print_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) lib3270_print_all(v3270_get_session(terminal)); } +static void host_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) +{ + v3270_select_host(terminal); +} + + static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { GtkWidget * window = gtk_application_window_new(app); @@ -188,10 +194,14 @@ static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { GtkWidget *grid = gtk_grid_new(); GtkWidget *color = v3270_color_scheme_new(); GtkWidget *print = gtk_button_new_with_label("Print"); - gtk_widget_set_focus_on_click(print,FALSE); + GtkWidget *host = gtk_button_new_with_label("Host"); + gtk_widget_set_focus_on_click(print,FALSE); g_signal_connect(G_OBJECT(print),"clicked",G_CALLBACK(print_clicked),terminal); + gtk_widget_set_focus_on_click(host,FALSE); + g_signal_connect(G_OBJECT(host),"clicked",G_CALLBACK(host_clicked),terminal); + gtk_widget_set_can_focus(color,FALSE); gtk_widget_set_focus_on_click(color,FALSE); 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) { gtk_grid_attach(GTK_GRID(grid),color,0,0,1,1); gtk_grid_attach(GTK_GRID(grid),print,1,0,1,1); + gtk_grid_attach(GTK_GRID(grid),host,2,0,1,1); gtk_box_pack_start(GTK_BOX(box),grid,FALSE,TRUE,0); gtk_box_pack_start(GTK_BOX(box),terminal,TRUE,TRUE,0); diff --git a/src/trace/trace.c b/src/trace/trace.c index 7118649..d7be6b7 100644 --- a/src/trace/trace.c +++ b/src/trace/trace.c @@ -43,7 +43,7 @@ #include #endif // HAVE_SYSLOG -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +//#pragma GCC diagnostic ignored "-Wdeprecated-declarations" /*--[ Widget definition ]----------------------------------------------------------------------------*/ @@ -175,8 +175,8 @@ static void destroy(GtkWidget *widget) dialog = gtk_file_chooser_dialog_new( _( "Save trace file" ), toplevel, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _( "Cancel" ), GTK_RESPONSE_CANCEL, + _( "Save" ), GTK_RESPONSE_ACCEPT, NULL ); gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), TRUE); @@ -230,21 +230,21 @@ static void destroy(GtkWidget *widget) struct submenu { - const gchar * stock_id; + const gchar * label; GCallback action; }; - static void build_menu(GtkWidget *menubar, v3270_trace *window, const gchar *name, const struct submenu *item, size_t sz) + static void build_menu(GtkWidget *menubar, v3270_trace *window, const gchar *label, const struct submenu *item, size_t sz) { size_t f; GtkWidget * menu = gtk_menu_new(); - GtkWidget * topitem = gtk_image_menu_item_new_from_stock( name, NULL ); + GtkWidget * topitem = gtk_menu_item_new_with_mnemonic(label); gtk_menu_item_set_submenu(GTK_MENU_ITEM(topitem), menu); for(f=0;fview, fontdesc); - - pango_font_description_free(fontdesc); - } - static void v3270_trace_init(v3270_trace *window) { - GtkWidget * widget; -#if GTK_CHECK_VERSION(3,0,0) - GtkWidget * vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,0); -#else - GtkWidget * vbox = gtk_vbox_new(FALSE,0); -#endif // GTK_CHECK_VERSION + GtkWidget * widget; + GtkWidget * vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,0); // Top menu { + // https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html static const struct submenu filemenu[] = { - { GTK_STOCK_SAVE_AS, G_CALLBACK(menu_save) }, - { GTK_STOCK_QUIT, G_CALLBACK(menu_close) }, + { N_("_Save trace to file"), G_CALLBACK(menu_save) }, + { N_("_Close window"), G_CALLBACK(menu_close) }, }; widget = gtk_menu_bar_new(); - build_menu(widget, window, GTK_STOCK_FILE, filemenu, G_N_ELEMENTS(filemenu)); + build_menu(widget, window, _( "_File" ), filemenu, G_N_ELEMENTS(filemenu)); gtk_box_pack_start(GTK_BOX(vbox),widget,FALSE,TRUE,0); } @@ -359,7 +347,7 @@ static void destroy(GtkWidget *widget) gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(window->scroll),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); window->view = gtk_text_view_new(); - v3270_trace_set_font_from_string(GTK_WIDGET(window),v3270_get_default_font_name()); + gtk_text_view_set_monospace(GTK_TEXT_VIEW(window->view),TRUE); window->text = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window->view)); gtk_text_view_set_editable(GTK_TEXT_VIEW(window->view), TRUE); @@ -375,7 +363,7 @@ static void destroy(GtkWidget *widget) gtk_widget_set_sensitive(window->entry,FALSE); g_signal_connect(G_OBJECT(window->entry),"activate",G_CALLBACK(activate),window); - window->button = gtk_button_new_from_stock(GTK_STOCK_OK); + window->button = gtk_button_new_from_icon_name("system-run",GTK_ICON_SIZE_BUTTON); gtk_box_pack_end(GTK_BOX(widget),window->button,FALSE,FALSE,4); gtk_widget_set_sensitive(window->button,FALSE); gtk_widget_set_focus_on_click(GTK_WIDGET(window->button),FALSE); -- libgit2 0.21.2