From 1037e2bb56ba781e4c2d6714f307e090d1e0464b Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 8 Nov 2019 14:10:01 -0300 Subject: [PATCH] Cleaning up code. --- src/dialogs/commondialog.c | 110 -------------------------------------------------------------------------------------------------------------- src/dialogs/settings/widget.c | 17 +++++++++++++++++ src/include/internals.h | 3 --- src/include/v3270/dialogs.h | 2 -- src/include/v3270/settings.h | 4 ++++ src/testprogram/toolbar.c | 51 --------------------------------------------------- 6 files changed, 21 insertions(+), 166 deletions(-) diff --git a/src/dialogs/commondialog.c b/src/dialogs/commondialog.c index c5b0a2e..13a905f 100644 --- a/src/dialogs/commondialog.c +++ b/src/dialogs/commondialog.c @@ -33,116 +33,6 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ #if GTK_CHECK_VERSION(3,12,0) -void v3270_dialog_apply(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog) -{ - gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_APPLY); -} - -void v3270_dialog_cancel(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog) -{ - gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_CANCEL); -} - -GtkWidget * v3270_dialog_button_new(GtkWidget *dialog, const gchar *mnemonic, GCallback callback) -{ - GtkWidget * button = gtk_button_new_with_mnemonic(mnemonic); - gtk_button_set_use_underline(GTK_BUTTON (button), TRUE); - g_signal_connect(button,"clicked",callback,dialog); - gtk_widget_show(button); - return button; -} -#endif // GTK 3.12 - -LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *title, const gchar *apply) -{ -#if GTK_CHECK_VERSION(3,12,0) - - gboolean use_header; - g_object_get(gtk_settings_get_default(), "gtk-dialogs-use-header", &use_header, NULL); - - GtkWidget * dialog = - GTK_WIDGET(g_object_new( - GTK_TYPE_DIALOG, - "use-header-bar", (use_header ? 1 : 0), - NULL - )); - -#else - - GtkWidget * dialog = gtk_dialog_new(); - -#endif // GTK 3.12 - - gtk_window_set_deletable(GTK_WINDOW(dialog),FALSE); - - // https://developer.gnome.org/hig/stable/visual-layout.html.en - gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),18); - - if(widget) - { - gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(gtk_widget_get_toplevel(widget))); - gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); - gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); - } - - gtk_box_set_spacing( - GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), - 18 - ); - - v3270_dialog_setup(dialog,title,apply); - - return dialog; -} - -LIB3270_EXPORT void v3270_dialog_setup(GtkWidget *dialog, const gchar *title, const gchar *apply) -{ - -/* -#if GTK_CHECK_VERSION(3,12,0) - - GtkWidget * header = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); - - if(header) - { - gtk_header_bar_set_title(GTK_HEADER_BAR(header),title); - gtk_header_bar_pack_start(GTK_HEADER_BAR(header),v3270_dialog_button_new(dialog,_("_Cancel"),G_CALLBACK(v3270_dialog_cancel))); - gtk_header_bar_pack_end(GTK_HEADER_BAR(header),v3270_dialog_button_new(dialog,apply,G_CALLBACK(v3270_dialog_apply))); - } - else - { - gtk_window_set_title(GTK_WINDOW(dialog), title); - - gtk_dialog_add_buttons( - GTK_DIALOG (dialog), - _("_Cancel"), GTK_RESPONSE_CANCEL, - apply, GTK_RESPONSE_APPLY, - NULL - ); - } - -#else - - gtk_window_set_title(GTK_WINDOW(dialog), title); - - gtk_box_set_spacing( - GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), - 18 - ); - - gtk_dialog_add_buttons( - GTK_DIALOG (dialog), - _("_Cancel"), GTK_RESPONSE_CANCEL, - apply, GTK_RESPONSE_APPLY, - NULL - ); - -#endif // GTK 3.12 -*/ - -} - -#if GTK_CHECK_VERSION(3,12,0) GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget) { diff --git a/src/dialogs/settings/widget.c b/src/dialogs/settings/widget.c index 4ccca66..c3b35e2 100644 --- a/src/dialogs/settings/widget.c +++ b/src/dialogs/settings/widget.c @@ -161,3 +161,20 @@ LIB3270_EXPORT void v3270_settings_set_terminal_widget(GtkWidget *widget, GtkWid GTK_V3270_SETTINGS_GET_CLASS(widget)->revert(widget,GTK_V3270_SETTINGS(widget)->terminal); } + LIB3270_EXPORT const gchar * v3270_settings_get_title(GtkWidget *widget) + { + g_return_val_if_fail(GTK_IS_V3270_SETTINGS(widget),NULL); + return GTK_V3270_SETTINGS(widget)->title; + } + + LIB3270_EXPORT const gchar * v3270_settings_get_label(GtkWidget *widget) + { + g_return_val_if_fail(GTK_IS_V3270_SETTINGS(widget),NULL); + return GTK_V3270_SETTINGS(widget)->label; + } + + LIB3270_EXPORT const gchar * v3270_settings_get_tooltip(GtkWidget *widget) + { + g_return_val_if_fail(GTK_IS_V3270_SETTINGS(widget),NULL); + return GTK_V3270_SETTINGS(widget)->tooltip; + } diff --git a/src/include/internals.h b/src/include/internals.h index 415785e..abf8f18 100644 --- a/src/include/internals.h +++ b/src/include/internals.h @@ -144,9 +144,6 @@ #if GTK_CHECK_VERSION(3,12,0) G_GNUC_INTERNAL GtkHeaderBar * v3270_dialog_get_header_bar(GtkWidget * widget); - G_GNUC_INTERNAL void v3270_dialog_cancel(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog); - G_GNUC_INTERNAL void v3270_dialog_apply(GtkButton G_GNUC_UNUSED(*button), GtkWidget *dialog); - G_GNUC_INTERNAL GtkWidget * v3270_dialog_button_new(GtkWidget *dialog, const gchar *mnemonic, GCallback callback); #endif // ! GTK 3.12 G_GNUC_INTERNAL void v3270_grid_attach(GtkGrid *grid, const struct v3270_entry_field * description, GtkWidget *widget); diff --git a/src/include/v3270/dialogs.h b/src/include/v3270/dialogs.h index 0421f46..478f5a2 100644 --- a/src/include/v3270/dialogs.h +++ b/src/include/v3270/dialogs.h @@ -36,9 +36,7 @@ G_BEGIN_DECLS LIB3270_EXPORT GtkWidget * v3270_host_select_new(); - LIB3270_EXPORT GtkWidget * v3270_dialog_new(GtkWidget *widget, const gchar *title, const gchar *apply); LIB3270_EXPORT void v3270_error_popup(GtkWidget *widget, const gchar *title, const gchar *summary, const gchar *body); - LIB3270_EXPORT void v3270_dialog_setup(GtkWidget *dialog, const gchar *title, const gchar *apply); LIB3270_EXPORT GtkWidget * v3270_save_dialog_new(GtkWidget *widget, LIB3270_CONTENT_OPTION mode, const gchar *filename); LIB3270_EXPORT void v3270_save_dialog_run(GtkWidget *widget); diff --git a/src/include/v3270/settings.h b/src/include/v3270/settings.h index b11023c..8038139 100644 --- a/src/include/v3270/settings.h +++ b/src/include/v3270/settings.h @@ -70,6 +70,10 @@ LIB3270_EXPORT void v3270_settings_apply(GtkWidget *widget); LIB3270_EXPORT void v3270_settings_revert(GtkWidget *widget); + LIB3270_EXPORT const gchar * v3270_settings_get_title(GtkWidget *widget); + LIB3270_EXPORT const gchar * v3270_settings_get_label(GtkWidget *widget); + LIB3270_EXPORT const gchar * v3270_settings_get_tooltip(GtkWidget *widget); + /// @brief Popup a settings dialog for the terminal. LIB3270_EXPORT void v3270_settings_popup_dialog(GtkWidget *settings, GtkWidget *terminal, gboolean modal); diff --git a/src/testprogram/toolbar.c b/src/testprogram/toolbar.c index e4310b6..0fc8938 100644 --- a/src/testprogram/toolbar.c +++ b/src/testprogram/toolbar.c @@ -60,16 +60,6 @@ FALSE ); - /* - GtkWidget * dialog = v3270_settings_dialog_new(terminal, v3270_font_chooser_widget_new()); - -// v3270_dialog_setup(dialog,_("Font setup"),_("_Save")); - - gtk_widget_show_all(dialog); - gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); - */ - } static void preferences_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) @@ -117,13 +107,6 @@ v3270_error_popup(terminal,"title","summary","body"); /* - GtkWidget * dialog = v3270_dialog_new(terminal, _("test"), _("test")); - GtkWidget * trace = v3270_trace_new(terminal); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),trace,TRUE,TRUE,2); - */ - - - /* // // Test transfer dialog. // @@ -165,18 +148,6 @@ */ /* - // - // Test worker widget - // - GtkWidget * dialog = v3270_dialog_new(terminal, _("test"), _("test")); - GtkWidget * worker = v3270_ft_worker_new(); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),worker,TRUE,TRUE,2); - v3270_ft_worker_set_session(worker,v3270_get_session(terminal)); - v3270_ft_worker_set_activity(worker,activity); - v3270_ft_worker_start(worker); - */ - - /* gtk_widget_show_all(dialog); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); @@ -197,28 +168,6 @@ static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) { v3270_edit_color_table(terminal); - - /* - GtkWidget * dialog = v3270_dialog_new(terminal, _("Color setup"), _("_Save")); - GtkWidget * colors = v3270_color_selection_new(terminal); - - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),colors,TRUE,TRUE,2); - - gtk_widget_show_all(dialog); - - if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { - g_message("Accepted"); - } - else - { - g_message("Cancel"); - v3270_color_selection_reset(colors); - } - - gtk_widget_destroy(dialog); - */ - } static void zoom_in_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) -- libgit2 0.21.2