/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2011 Hiroyuki Yamamoto & The Claws Mail Team
+ * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2004-2017 Hiroyuki Yamamoto & The Claws Mail Team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
gint c;
gchar *tooltip_btn_text = NULL;
gchar *tooltip_entry_text = NULL;
- CLAWS_TIP_DECL();
notebook = gtk_notebook_new();
gtk_widget_show(notebook);
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color1);
- color_buttons.btn_quote_level1 = gtk_button_new();
+ color_buttons.btn_quote_level1 = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_quote_level1);
- gtk_widget_set_size_request (color_buttons.btn_quote_level1, 30, 20);
gtk_box_pack_end (GTK_BOX(hbox), color_buttons.btn_quote_level1,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level1);
CLAWS_SET_TIP(color_buttons.btn_quote_level1,
- Q_("Tooltip|Pick color for 1st level text"));
+ C_("Tooltip", "Pick color for 1st level text"));
hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color2);
- color_buttons.btn_quote_level2 = gtk_button_new();
+ color_buttons.btn_quote_level2 = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_quote_level2);
- gtk_widget_set_size_request (color_buttons.btn_quote_level2, 30, 20);
gtk_box_pack_end (GTK_BOX(hbox), color_buttons.btn_quote_level2,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level2);
CLAWS_SET_TIP(color_buttons.btn_quote_level2,
- Q_("Tooltip|Pick color for 2nd level text"));
+ C_("Tooltip", "Pick color for 2nd level text"));
hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color3);
- color_buttons.btn_quote_level3 = gtk_button_new();
+ color_buttons.btn_quote_level3 = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_quote_level3);
- gtk_widget_set_size_request (color_buttons.btn_quote_level3, 30, 20);
gtk_box_pack_end (GTK_BOX(hbox), color_buttons.btn_quote_level3,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level3);
CLAWS_SET_TIP(color_buttons.btn_quote_level3,
- Q_("Tooltip|Pick color for 3rd level text"));
+ C_("Tooltip", "Pick color for 3rd level text"));
hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
- color_buttons.btn_quote_level1_bg = gtk_button_new();
+ color_buttons.btn_quote_level1_bg = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_quote_level1_bg);
- gtk_widget_set_size_request (color_buttons.btn_quote_level1_bg, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level1_bg,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level1_bg);
CLAWS_SET_TIP(color_buttons.btn_quote_level1_bg,
- Q_("Tooltip|Pick color for 1st level text background"));
+ C_("Tooltip", "Pick color for 1st level text background"));
label_quote_bgcolor1 = gtk_label_new (_("Background"));
gtk_widget_show(label_quote_bgcolor1);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
- color_buttons.btn_quote_level2_bg = gtk_button_new();
+ color_buttons.btn_quote_level2_bg = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_quote_level2_bg);
- gtk_widget_set_size_request (color_buttons.btn_quote_level2_bg, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level2_bg,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level2_bg);
CLAWS_SET_TIP(color_buttons.btn_quote_level2_bg,
- Q_("Tooltip|Pick color for 2nd level text background"));
+ C_("Tooltip", "Pick color for 2nd level text background"));
label_quote_bgcolor2 = gtk_label_new (_("Background"));
gtk_widget_show(label_quote_bgcolor2);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
- color_buttons.btn_quote_level3_bg = gtk_button_new();
+ color_buttons.btn_quote_level3_bg = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_quote_level3_bg);
- gtk_widget_set_size_request (color_buttons.btn_quote_level3_bg, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level3_bg,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level3_bg);
CLAWS_SET_TIP(color_buttons.btn_quote_level3_bg,
- Q_("Tooltip|Pick color for 3rd level text background"));
+ C_("Tooltip", "Pick color for 3rd level text background"));
label_quote_bgcolor3 = gtk_label_new (_("Background"));
gtk_widget_show(label_quote_bgcolor3);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
- color_buttons.btn_uri = gtk_button_new();
+ color_buttons.btn_uri = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_uri);
- gtk_widget_set_size_request (color_buttons.btn_uri, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_uri,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_uri);
CLAWS_SET_TIP(color_buttons.btn_uri,
- Q_("Tooltip|Pick color for links"));
+ C_("Tooltip", "Pick color for links"));
lable_uri = gtk_label_new (_("URI link"));
gtk_widget_show(lable_uri);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
- color_buttons.btn_signature = gtk_button_new();
+ color_buttons.btn_signature = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_signature);
- gtk_widget_set_size_request (color_buttons.btn_signature, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_signature,
FALSE, FALSE, 0);
SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_signature);
CLAWS_SET_TIP(color_buttons.btn_signature,
- Q_("Tooltip|Pick color for signatures"));
+ C_("Tooltip", "Pick color for signatures"));
label_signature = gtk_label_new (_("Signatures"));
gtk_widget_show(label_signature);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
- color_buttons.btn_tgt_folder = gtk_button_new();
+ color_buttons.btn_tgt_folder = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.btn_tgt_folder);
- gtk_widget_set_size_request (color_buttons.btn_tgt_folder, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_tgt_folder,
FALSE, FALSE, 0);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
- color_buttons.btn_color_new = gtk_button_new();
+ color_buttons.btn_color_new = GTKUT_COLOR_BUTTON();
gtk_widget_show (color_buttons.btn_color_new);
- gtk_widget_set_size_request (color_buttons.btn_color_new, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_color_new,
FALSE, FALSE, 0);
for (c = 0; c < (COLORLABELS>>1)+(COLORLABELS&1); c++) {
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
- tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
+ tooltip_btn_text = g_strdup_printf(C_("Tooltip", "Pick color for 'color %d'"), c+1);
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
gtk_box_pack_start(GTK_BOX (vbox_custom_colors1), hbox_custom_color[c],
FALSE, TRUE, 0);
- color_buttons.custom_color[c] = gtk_button_new();
+ color_buttons.custom_color[c] = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.custom_color[c]);
- gtk_widget_set_size_request(color_buttons.custom_color[c], 30, 20);
gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), color_buttons.custom_color[c],
FALSE, FALSE, 0);
CLAWS_SET_TIP(color_buttons.custom_color[c],
tooltip_btn_text);
+ g_free(tooltip_btn_text);
entry_custom_colorlabel[c] = gtk_entry_new();
gtk_widget_show (entry_custom_colorlabel[c]);
FALSE, FALSE, 0);
CLAWS_SET_TIP(entry_custom_colorlabel[c],
tooltip_entry_text);
+ g_free(tooltip_entry_text);
}
for (c = (COLORLABELS>>1)+(COLORLABELS&1); c < COLORLABELS; c++) {
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
- tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
+ tooltip_btn_text = g_strdup_printf(C_("Tooltip", "Pick color for 'color %d'"), c+1);
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
gtk_box_pack_start(GTK_BOX (vbox_custom_colors2), hbox_custom_color[c],
FALSE, TRUE, 0);
- color_buttons.custom_color[c] = gtk_button_new();
+ color_buttons.custom_color[c] = GTKUT_COLOR_BUTTON();
gtk_widget_show(color_buttons.custom_color[c]);
- gtk_widget_set_size_request(color_buttons.custom_color[c], 30, 20);
gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), color_buttons.custom_color[c],
FALSE, FALSE, 0);
CLAWS_SET_TIP(color_buttons.custom_color[c],
tooltip_btn_text);
+ g_free(tooltip_btn_text);
entry_custom_colorlabel[c] = gtk_entry_new();
gtk_widget_show (entry_custom_colorlabel[c]);
FALSE, FALSE, 0);
CLAWS_SET_TIP(entry_custom_colorlabel[c],
tooltip_entry_text);
+
+ g_free(tooltip_entry_text);
}
- g_free(tooltip_btn_text);
- g_free(tooltip_entry_text);
hbox_reset_custom_colors = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox_reset_custom_colors);
G_CALLBACK(prefs_msg_colors_reset_custom_colors), prefs_msg_colors);
set_button_bg_color(color_buttons.btn_quote_level1,
- prefs_common.quote_level1_col);
+ prefs_common.color[COL_QUOTE_LEVEL1]);
set_button_bg_color(color_buttons.btn_quote_level2,
- prefs_common.quote_level2_col);
+ prefs_common.color[COL_QUOTE_LEVEL2]);
set_button_bg_color(color_buttons.btn_quote_level3,
- prefs_common.quote_level3_col);
+ prefs_common.color[COL_QUOTE_LEVEL3]);
set_button_bg_color(color_buttons.btn_quote_level1_bg,
- prefs_common.quote_level1_bgcol);
+ prefs_common.color[COL_QUOTE_LEVEL1_BG]);
set_button_bg_color(color_buttons.btn_quote_level2_bg,
- prefs_common.quote_level2_bgcol);
+ prefs_common.color[COL_QUOTE_LEVEL2_BG]);
set_button_bg_color(color_buttons.btn_quote_level3_bg,
- prefs_common.quote_level3_bgcol);
+ prefs_common.color[COL_QUOTE_LEVEL3_BG]);
set_button_bg_color(color_buttons.btn_uri,
- prefs_common.uri_col);
+ prefs_common.color[COL_URI]);
set_button_bg_color(color_buttons.btn_tgt_folder,
- prefs_common.tgt_folder_col);
+ prefs_common.color[COL_TGT_FOLDER]);
set_button_bg_color(color_buttons.btn_signature,
- prefs_common.signature_col);
+ prefs_common.color[COL_SIGNATURE]);
set_button_bg_color(color_buttons.btn_color_new,
- prefs_common.color_new);
+ prefs_common.color[COL_NEW]);
/* custom colors */
for (c = 0; c < COLORLABELS; c++) {
set_button_bg_color(color_buttons.custom_color[c],
GdkColor color;
gint rgbvalue = 0;
GtkColorSelectionDialog *dialog;
+ GtkWidget *button_ok;
+ GtkWidget *button_cancel;
gint c;
/* custom colors */
if (GPOINTER_TO_INT(type) == c) {
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
- title = g_strdup_printf(Q_("Dialog title|Pick color for 'color %d'"), c+1);
+ title = g_strdup_printf(C_("Dialog title", "Pick color for 'color %d'"), c+1);
rgbvalue = prefs_common.custom_colorlabel[c].color;
break;
}
/* other colors */
if (c == COLORLABELS) {
if(g_ascii_strcasecmp(type, "LEVEL1") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for 1st level text"));
- rgbvalue = prefs_common.quote_level1_col;
+ title = g_strdup(C_("Dialog title", "Pick color for 1st level text"));
+ rgbvalue = prefs_common.color[COL_QUOTE_LEVEL1];
} else if(g_ascii_strcasecmp(type, "LEVEL2") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for 2nd level text"));
- rgbvalue = prefs_common.quote_level2_col;
+ title = g_strdup(C_("Dialog title", "Pick color for 2nd level text"));
+ rgbvalue = prefs_common.color[COL_QUOTE_LEVEL2];
} else if(g_ascii_strcasecmp(type, "LEVEL3") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for 3rd level text"));
- rgbvalue = prefs_common.quote_level3_col;
+ title = g_strdup(C_("Dialog title", "Pick color for 3rd level text"));
+ rgbvalue = prefs_common.color[COL_QUOTE_LEVEL3];
} else if(g_ascii_strcasecmp(type, "LEVEL1BG") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for 1st level text background"));
- rgbvalue = prefs_common.quote_level1_bgcol;
+ title = g_strdup(C_("Dialog title", "Pick color for 1st level text background"));
+ rgbvalue = prefs_common.color[COL_QUOTE_LEVEL1_BG];
} else if(g_ascii_strcasecmp(type, "LEVEL2BG") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for 2nd level text background"));
- rgbvalue = prefs_common.quote_level2_bgcol;
+ title = g_strdup(C_("Dialog title", "Pick color for 2nd level text background"));
+ rgbvalue = prefs_common.color[COL_QUOTE_LEVEL2_BG];
} else if(g_ascii_strcasecmp(type, "LEVEL3BG") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for 3rd level text background"));
- rgbvalue = prefs_common.quote_level3_bgcol;
+ title = g_strdup(C_("Dialog title", "Pick color for 3rd level text background"));
+ rgbvalue = prefs_common.color[COL_QUOTE_LEVEL3_BG];
} else if(g_ascii_strcasecmp(type, "URI") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for links"));
- rgbvalue = prefs_common.uri_col;
+ title = g_strdup(C_("Dialog title", "Pick color for links"));
+ rgbvalue = prefs_common.color[COL_URI];
} else if(g_ascii_strcasecmp(type, "TGTFLD") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for target folder"));
- rgbvalue = prefs_common.tgt_folder_col;
+ title = g_strdup(C_("Dialog title", "Pick color for target folder"));
+ rgbvalue = prefs_common.color[COL_TGT_FOLDER];
} else if(g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for signatures"));
- rgbvalue = prefs_common.signature_col;
+ title = g_strdup(C_("Dialog title", "Pick color for signatures"));
+ rgbvalue = prefs_common.color[COL_SIGNATURE];
} else if(g_ascii_strcasecmp(type, "NEW") == 0) {
- title = g_strdup(Q_("Dialog title|Pick color for folder"));
- rgbvalue = prefs_common.color_new;
+ title = g_strdup(C_("Dialog title", "Pick color for folder"));
+ rgbvalue = prefs_common.color[COL_NEW];
} else {
/* Should never be called */
- g_warning("Unrecognized datatype '%s' in quote_color_set_dialog\n", type);
+ g_warning("Unrecognized datatype '%s' in quote_color_set_dialog", type);
return;
}
}
gtk_window_set_resizable(GTK_WINDOW(color_dialog), FALSE);
manage_window_set_transient(GTK_WINDOW(color_dialog));
- g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->cancel_button),
+ g_object_get(color_dialog, "ok-button", &button_ok,
+ "cancel-button", &button_cancel,
+ NULL);
+
+ g_signal_connect(G_OBJECT(button_cancel),
"clicked", G_CALLBACK(quote_colors_set_dialog_cancel), data);
- g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(color_dialog)->ok_button),
+ g_signal_connect(G_OBJECT(button_ok),
"clicked", G_CALLBACK(quote_colors_set_dialog_ok), data);
g_signal_connect(G_OBJECT(color_dialog), "key_press_event",
G_CALLBACK(quote_colors_set_dialog_key_pressed),data);
dialog = GTK_COLOR_SELECTION_DIALOG(color_dialog);
gtk_color_selection_set_current_color
- (GTK_COLOR_SELECTION(dialog->colorsel), &color);
+ (GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(dialog)), &color);
gtk_widget_show(color_dialog);
}
static void quote_colors_set_dialog_ok(GtkWidget *widget, gpointer data)
{
- GtkColorSelection *colorsel = (GtkColorSelection *)
- ((GtkColorSelectionDialog *)color_dialog)->colorsel;
+ GtkColorSelection *colorsel = GTK_COLOR_SELECTION(
+ gtk_color_selection_dialog_get_color_selection
+ ((GtkColorSelectionDialog *)color_dialog));
GdkColor color;
gint rgbvalue;
gchar *type = (gchar *)data;
/* other colors */
if (c == COLORLABELS) {
if (g_ascii_strcasecmp(type, "LEVEL1") == 0) {
- prefs_common.quote_level1_col = rgbvalue;
+ prefs_common.color[COL_QUOTE_LEVEL1] = rgbvalue;
set_button_bg_color(color_buttons.btn_quote_level1, rgbvalue);
} else if (g_ascii_strcasecmp(type, "LEVEL2") == 0) {
- prefs_common.quote_level2_col = rgbvalue;
+ prefs_common.color[COL_QUOTE_LEVEL2] = rgbvalue;
set_button_bg_color(color_buttons.btn_quote_level2, rgbvalue);
} else if (g_ascii_strcasecmp(type, "LEVEL3") == 0) {
- prefs_common.quote_level3_col = rgbvalue;
+ prefs_common.color[COL_QUOTE_LEVEL3] = rgbvalue;
set_button_bg_color(color_buttons.btn_quote_level3, rgbvalue);
} else if (g_ascii_strcasecmp(type, "LEVEL1BG") == 0) {
- prefs_common.quote_level1_bgcol = rgbvalue;
+ prefs_common.color[COL_QUOTE_LEVEL1_BG] = rgbvalue;
set_button_bg_color(color_buttons.btn_quote_level1_bg, rgbvalue);
} else if (g_ascii_strcasecmp(type, "LEVEL2BG") == 0) {
- prefs_common.quote_level2_bgcol = rgbvalue;
+ prefs_common.color[COL_QUOTE_LEVEL2_BG] = rgbvalue;
set_button_bg_color(color_buttons.btn_quote_level2_bg, rgbvalue);
} else if (g_ascii_strcasecmp(type, "LEVEL3BG") == 0) {
- prefs_common.quote_level3_bgcol = rgbvalue;
+ prefs_common.color[COL_QUOTE_LEVEL3_BG] = rgbvalue;
set_button_bg_color(color_buttons.btn_quote_level3_bg, rgbvalue);
} else if (g_ascii_strcasecmp(type, "URI") == 0) {
- prefs_common.uri_col = rgbvalue;
+ prefs_common.color[COL_URI] = rgbvalue;
set_button_bg_color(color_buttons.btn_uri, rgbvalue);
} else if (g_ascii_strcasecmp(type, "TGTFLD") == 0) {
- prefs_common.tgt_folder_col = rgbvalue;
+ prefs_common.color[COL_TGT_FOLDER] = rgbvalue;
set_button_bg_color(color_buttons.btn_tgt_folder, rgbvalue);
- folderview_set_target_folder_color(prefs_common.tgt_folder_col);
+ folderview_set_target_folder_color(prefs_common.color[COL_TGT_FOLDER]);
} else if (g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
- prefs_common.signature_col = rgbvalue;
+ prefs_common.color[COL_SIGNATURE] = rgbvalue;
set_button_bg_color(color_buttons.btn_signature, rgbvalue);
} else if (g_ascii_strcasecmp(type, "NEW") == 0) {
- prefs_common.color_new = rgbvalue;
+ prefs_common.color[COL_NEW] = rgbvalue;
set_button_bg_color(color_buttons.btn_color_new, rgbvalue);
} else {
g_printerr("Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type);
GdkEventKey *event,
gpointer data)
{
+ GtkColorSelectionDialog *dialog;
+ GtkWidget *button_ok;
+ GtkWidget *button_cancel;
+
+ dialog = GTK_COLOR_SELECTION_DIALOG(widget);
+ g_object_get(dialog, "ok-button", &button_ok,
+ "cancel-button", &button_cancel,
+ NULL);
+
if (event) {
switch (event->keyval) {
- case GDK_Escape:
- gtk_button_clicked(GTK_BUTTON(GTK_COLOR_SELECTION_DIALOG
- (widget)->cancel_button));
+ case GDK_KEY_Escape:
+ gtk_button_clicked(GTK_BUTTON(button_cancel));
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
/* NOTE: changing focus makes widget accept all currently
* changed settings! */
- gtk_widget_grab_focus
- (GTK_COLOR_SELECTION_DIALOG
- (widget)->ok_button);
+ gtk_widget_grab_focus(button_ok);
/* call ok handler */
- gtk_button_clicked(GTK_BUTTON
- (GTK_COLOR_SELECTION_DIALOG
- (widget)->ok_button));
+ gtk_button_clicked(GTK_BUTTON(button_ok));
return TRUE;
default:
break;
newstyle->bg[GTK_STATE_ACTIVE] = color;
gtk_widget_set_style(GTK_WIDGET(widget), newstyle);
+ gtk_style_unref(newstyle);
}
static void prefs_msg_colors_save(PrefsPage *_page)
projects / claws.git / blobdiff