diff --git a/src/dialogs/settings/colors.c b/src/dialogs/settings/colors.c index 6ac97f4..992c6db 100644 --- a/src/dialogs/settings/colors.c +++ b/src/dialogs/settings/colors.c @@ -381,13 +381,3 @@ static void load(GtkWidget G_GNUC_UNUSED(*w), GtkWidget *terminal) return GTK_WIDGET(settings); } - - LIB3270_EXPORT void v3270_edit_color_table(GtkWidget *terminal) - { - v3270_settings_popup_dialog( - v3270_color_settings_new(), - terminal, - FALSE - ); - - } diff --git a/src/include/v3270/colorscheme.h b/src/include/v3270/colorscheme.h index fc27224..f750cfd 100644 --- a/src/include/v3270/colorscheme.h +++ b/src/include/v3270/colorscheme.h @@ -66,7 +66,6 @@ LIB3270_EXPORT void v3270_color_scheme_set_text(GtkWidget *widget, const gchar *colors); LIB3270_EXPORT GtkWidget * v3270_color_selection_new() G_GNUC_DEPRECATED; - LIB3270_EXPORT void v3270_edit_color_table(GtkWidget *terminal); G_END_DECLS diff --git a/src/terminal/actions/table.c b/src/terminal/actions/table.c index b9ceb2d..0f9e2f8 100644 --- a/src/terminal/actions/table.c +++ b/src/terminal/actions/table.c @@ -26,8 +26,11 @@ static int fire_copy_as_html(GtkWidget *widget, const struct _v3270_action * action); static int fire_copy_as_pixbuff(GtkWidget *widget, const struct _v3270_action * action); + + // Dialogs static int fire_accelerators_dialog(GtkWidget *widget, const struct _v3270_action * action); static int fire_host_dialog(GtkWidget *widget, const struct _v3270_action * action); + static int fire_color_dialog(GtkWidget *widget, const struct _v3270_action * action); /*--[ Implement ]------------------------------------------------------------------------------------*/ @@ -333,6 +336,15 @@ .activate = fire_host_dialog }, + { + .group = LIB3270_ACTION_GROUP_NONE, + .name = "dialog-colors", + .icon = "gtk-select-color", + .label = N_("Terminal colors"), + .summary = N_("Edit terminal colors"), + .activate = fire_color_dialog + }, + // // Terminator // @@ -425,3 +437,12 @@ */ } + + static int fire_color_dialog(GtkWidget *widget, const struct _v3270_action G_GNUC_UNUSED(* action)) { + v3270_settings_popup_dialog( + v3270_color_settings_new(), + widget, + FALSE + ); + return 0; + } diff --git a/src/testprogram/toolbar.c b/src/testprogram/toolbar.c index f380e13..4e56f70 100644 --- a/src/testprogram/toolbar.c +++ b/src/testprogram/toolbar.c @@ -198,11 +198,6 @@ v3270_clipboard_set(terminal,V3270_COPY_TEXT,FALSE); } - static void color_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) - { - v3270_edit_color_table(terminal); - } - static void zoom_in_clicked(GtkButton G_GNUC_UNUSED(*button), GtkWidget *terminal) { v3270_zoom_in(terminal); @@ -242,7 +237,7 @@ // { "network-server", G_CALLBACK(host_clicked), "Configure host" }, // { "preferences-desktop-font", G_CALLBACK(font_clicked), "Select font" }, - { "gtk-select-color", G_CALLBACK(color_clicked), "Edit or change color scheme" }, +// { "gtk-select-color", G_CALLBACK(color_clicked), "Edit or change color scheme" }, { "zoom-in", G_CALLBACK(zoom_in_clicked), "Zoom in" }, -- libgit2 0.21.2