/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2006 Hiroyuki Yamamoto & The Claws Mail Team
+ * Copyright (C) 2004-2012 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * 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"
GtkWidget *window;
- GtkWidget *chkbtn_enable_colors;
- GtkWidget *chkbtn_enable_bgcolors;
- GtkWidget *chkbtn_recycle_colors;
+ GtkWidget *checkbtn_enable_colors;
+ GtkWidget *checkbtn_enable_bgcolors;
+ GtkWidget *checkbtn_recycle_colors;
/* custom colors */
GtkWidget *entry_custom_colorlabel[COLORLABELS];
static void prefs_msg_colors_reset_custom_colors(GtkWidget *widget,
gpointer data);
-void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
+static void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
gpointer data)
{
MsgColorsPage *prefs_msg_colors = (MsgColorsPage *) _page;
+ GtkWidget *notebook;
GtkWidget *vbox1;
GtkWidget *vbox2;
- GtkWidget *chkbtn_enable_colors;
+ GtkWidget *checkbtn_enable_colors;
GtkWidget *label_quote_level1;
GtkWidget *label_quote_level2;
GtkWidget *label_quote_level3;
GtkWidget *label_quote_color1;
GtkWidget *label_quote_color2;
GtkWidget *label_quote_color3;
- GtkWidget *chkbtn_enable_bgcolors;
+ GtkWidget *checkbtn_enable_bgcolors;
GtkWidget *label_quote_bgcolor1;
GtkWidget *label_quote_bgcolor2;
GtkWidget *label_quote_bgcolor3;
GtkWidget *lable_uri;
GtkWidget *label_signature;
GtkWidget *label_tgt_folder;
- GtkWidget *chkbtn_recycle_colors;
+ GtkWidget *checkbtn_recycle_colors;
GtkWidget *hbox;
GtkWidget *label_color_new;
GtkWidget *frame_msg;
GtkWidget *vbox_quotefg;
GtkWidget *vbox_quotebg;
/* custom colors */
- GtkWidget *vbox_color_labels;
GtkWidget *hbox_custom_colors;
GtkWidget *vbox_custom_colors;
GtkWidget *vbox_custom_colors1;
GtkWidget *vbox_custom_colors2;
- GtkWidget *frame_custom_colors;
GtkWidget *hbox_reset_custom_colors;
GtkWidget *btn_reset_custom_colors;
GtkWidget *hbox_custom_color[COLORLABELS];
GtkWidget *entry_custom_colorlabel[COLORLABELS];
gint c;
- GtkTooltips *tooltips;
gchar *tooltip_btn_text = NULL;
gchar *tooltip_entry_text = NULL;
- vbox1 = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ notebook = gtk_notebook_new();
+ gtk_widget_show(notebook);
+
+ vbox1 = gtk_vbox_new (FALSE, VBOX_BORDER);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox1,
+ gtk_label_new(_("Other")));
- PACK_FRAME(vbox1, frame_msg, _("Message view"));
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_msg, _("Message view"));
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame_msg), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
+ gtk_widget_show (hbox);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
+ PACK_CHECK_BUTTON (hbox, checkbtn_enable_colors,
+ _("Enable coloration of message text"));
- hbox = gtk_hbox_new(FALSE, 8);
- gtk_widget_show (hbox);
- hbox_quote = gtk_hbox_new(FALSE, 8);
+ hbox_quote = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox_quote);
- vbox_quotefg = gtk_vbox_new(FALSE, 8);
+ vbox_quotefg = gtk_vbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (vbox_quotefg);
- vbox_quotebg = gtk_vbox_new(FALSE, 8);
-#if GTK_CHECK_VERSION(2, 8, 0)
+ vbox_quotebg = gtk_vbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (vbox_quotebg);
-#endif
+ vbox3 = gtkut_get_options_frame(vbox2, &frame_quote, _("Quote"));
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, frame_quote);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
- PACK_CHECK_BUTTON (hbox, chkbtn_enable_colors,
- _("Enable coloration of message text"));
-
- PACK_FRAME(vbox2, frame_quote, _("Quote"));
-
- vbox3 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox3);
- gtk_container_add (GTK_CONTAINER (frame_quote), vbox3);
- gtk_container_set_border_width (GTK_CONTAINER (vbox3), VBOX_BORDER);
-
gtk_box_pack_start (GTK_BOX (vbox3), hbox_quote, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox_quote), vbox_quotefg, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox_quote), vbox_quotebg, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
- PACK_CHECK_BUTTON (hbox, chkbtn_recycle_colors,
+ PACK_CHECK_BUTTON (hbox, checkbtn_recycle_colors,
_("Cycle quote colors"));
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, chkbtn_recycle_colors);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, chkbtn_recycle_colors,
- _("If there are more than 3 quote levels, the colors will be reused"),
- NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, checkbtn_recycle_colors);
- hbox = gtk_hbox_new(FALSE, 8);
+ CLAWS_SET_TIP(checkbtn_recycle_colors,
+ _("If there are more than 3 quote levels, the colors will be reused"));
+
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
gtk_widget_show(label_quote_level1);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_level1,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_level1);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_level1);
label_quote_color1 = gtk_label_new (_("Text"));
gtk_widget_show(label_quote_color1);
gtk_box_pack_end (GTK_BOX(hbox), label_quote_color1,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_color1);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color1);
color_buttons.btn_quote_level1 = gtk_button_new();
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(chkbtn_enable_colors, color_buttons.btn_quote_level1);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level1,
- _("Pick color for 1st level text"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level1);
+
+ CLAWS_SET_TIP(color_buttons.btn_quote_level1,
+ C_("Tooltip", "Pick color for 1st level text"));
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
gtk_widget_show(label_quote_level2);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_level2,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_level2);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_level2);
label_quote_color2 = gtk_label_new (_("Text"));
gtk_widget_show(label_quote_color2);
gtk_box_pack_end (GTK_BOX(hbox), label_quote_color2,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_color2);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color2);
color_buttons.btn_quote_level2 = gtk_button_new();
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(chkbtn_enable_colors, color_buttons.btn_quote_level2);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level2,
- _("Pick color for 2nd level text"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level2);
- hbox = gtk_hbox_new(FALSE, 8);
+ CLAWS_SET_TIP(color_buttons.btn_quote_level2,
+ C_("Tooltip", "Pick color for 2nd level text"));
+
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotefg), hbox, FALSE, TRUE, 0);
gtk_widget_show(label_quote_level3);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_level3,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_level3);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_level3);
label_quote_color3 = gtk_label_new (_("Text"));
gtk_widget_show(label_quote_color3);
gtk_box_pack_end (GTK_BOX(hbox), label_quote_color3,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_color3);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_quote_color3);
color_buttons.btn_quote_level3 = gtk_button_new();
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(chkbtn_enable_colors, color_buttons.btn_quote_level3);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level3,
- _("Pick color for 3rd level text"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_quote_level3);
+
+ CLAWS_SET_TIP(color_buttons.btn_quote_level3,
+ C_("Tooltip", "Pick color for 3rd level text"));
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
- PACK_CHECK_BUTTON (hbox, chkbtn_enable_bgcolors,
+ PACK_CHECK_BUTTON (hbox, checkbtn_enable_bgcolors,
_("Enable coloration of text background"));
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, chkbtn_enable_bgcolors);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, checkbtn_enable_bgcolors);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, 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();
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(chkbtn_enable_bgcolors, color_buttons.btn_quote_level1_bg);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level1_bg,
- _("Pick color for 1st level text background"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level1_bg);
+
+ CLAWS_SET_TIP(color_buttons.btn_quote_level1_bg,
+ C_("Tooltip", "Pick color for 1st level text background"));
label_quote_bgcolor1 = gtk_label_new (_("Background"));
gtk_widget_show(label_quote_bgcolor1);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor1,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor1);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label_quote_bgcolor1);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, hbox);
+ 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();
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(chkbtn_enable_bgcolors, color_buttons.btn_quote_level2_bg);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level2_bg,
- _("Pick color for 2nd level text background"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level2_bg);
+
+ CLAWS_SET_TIP(color_buttons.btn_quote_level2_bg,
+ C_("Tooltip", "Pick color for 2nd level text background"));
label_quote_bgcolor2 = gtk_label_new (_("Background"));
gtk_widget_show(label_quote_bgcolor2);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor2,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor2);
-
- hbox = gtk_hbox_new(FALSE, 8);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label_quote_bgcolor2);
+
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, hbox);
+ 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();
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(chkbtn_enable_bgcolors, color_buttons.btn_quote_level3_bg);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level3_bg,
- _("Pick color for 3rd level text background"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, color_buttons.btn_quote_level3_bg);
+
+ CLAWS_SET_TIP(color_buttons.btn_quote_level3_bg,
+ C_("Tooltip", "Pick color for 3rd level text background"));
label_quote_bgcolor3 = gtk_label_new (_("Background"));
gtk_widget_show(label_quote_bgcolor3);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor3,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor3);
-
- hbox = gtk_hbox_new(FALSE, 8);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_bgcolors, label_quote_bgcolor3);
+
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
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(chkbtn_enable_colors, color_buttons.btn_uri);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_uri,
- _("Pick color for links"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_uri);
+
+ CLAWS_SET_TIP(color_buttons.btn_uri,
+ C_("Tooltip", "Pick color for links"));
lable_uri = gtk_label_new (_("URI link"));
gtk_widget_show(lable_uri);
gtk_box_pack_start (GTK_BOX(hbox), lable_uri, FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, lable_uri);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, lable_uri);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
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(chkbtn_enable_colors, color_buttons.btn_signature);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_signature,
- _("Pick color for signatures"), NULL);
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, color_buttons.btn_signature);
+
+ CLAWS_SET_TIP(color_buttons.btn_signature,
+ C_("Tooltip", "Pick color for signatures"));
label_signature = gtk_label_new (_("Signatures"));
gtk_widget_show(label_signature);
gtk_box_pack_start (GTK_BOX(hbox), label_signature, FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_signature);
-
- PACK_FRAME(vbox1, frame_folder, _("Folder list"));
+ SET_TOGGLE_SENSITIVITY(checkbtn_enable_colors, label_signature);
- vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox2);
- gtk_container_add (GTK_CONTAINER (frame_folder), vbox2);
- gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_folder, _("Folder list"));
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, TRUE, 0);
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);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_tgt_folder,
+
+ CLAWS_SET_TIP(color_buttons.btn_tgt_folder,
_("Pick color for Target folder. "
"Target folder is used when the option 'Execute immediately "
- "when moving or deleting messages' is turned off"), NULL);
+ "when moving or deleting messages' is turned off"));
label_tgt_folder = gtk_label_new (_("Target folder"));
gtk_widget_show(label_tgt_folder);
gtk_box_pack_start (GTK_BOX(hbox), label_tgt_folder, FALSE, FALSE, 0);
- hbox = gtk_hbox_new(FALSE, 8);
+ hbox = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox);
gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
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);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.btn_color_new,
- _("Pick color for folders containing new messages"), NULL);
+
+ CLAWS_SET_TIP(color_buttons.btn_color_new,
+ _("Pick color for folders containing new messages"));
label_color_new = gtk_label_new (_("Folder containing new messages"));
gtk_widget_show(label_color_new);
gtk_box_pack_start (GTK_BOX(hbox), label_color_new, FALSE, FALSE, 0);
/* custom colors */
- PACK_FRAME (vbox1, frame_custom_colors, _("Color labels"));
-
- vbox_color_labels = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_color_labels);
- gtk_container_add (GTK_CONTAINER (frame_custom_colors), vbox_color_labels);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_color_labels), VBOX_BORDER);
-
vbox_custom_colors = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (vbox_custom_colors);
- gtk_box_pack_start(GTK_BOX(vbox_color_labels), vbox_custom_colors,
- FALSE, FALSE, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_custom_colors), VBOX_BORDER);
+ gtk_notebook_prepend_page(GTK_NOTEBOOK(notebook), vbox_custom_colors,
+ gtk_label_new(_("Color labels")));
hbox_custom_colors = gtk_hbox_new(FALSE, 8);
gtk_widget_show(hbox_custom_colors);
gtk_widget_show (vbox_custom_colors2);
gtk_box_pack_start (GTK_BOX (hbox_custom_colors), vbox_custom_colors2, FALSE, FALSE, 0);
- for (c = 0; c < 4; c++) {
+ 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_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);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.custom_color[c],
- tooltip_btn_text, NULL);
+
+ CLAWS_SET_TIP(color_buttons.custom_color[c],
+ tooltip_btn_text);
entry_custom_colorlabel[c] = gtk_entry_new();
gtk_widget_show (entry_custom_colorlabel[c]);
gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), entry_custom_colorlabel[c],
FALSE, FALSE, 0);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, entry_custom_colorlabel[c],
- tooltip_entry_text, NULL);
+ CLAWS_SET_TIP(entry_custom_colorlabel[c],
+ tooltip_entry_text);
}
- for (c = 4; c < COLORLABELS; c++) {
+ 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_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);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, color_buttons.custom_color[c],
- tooltip_btn_text, NULL);
+ CLAWS_SET_TIP(color_buttons.custom_color[c],
+ tooltip_btn_text);
entry_custom_colorlabel[c] = gtk_entry_new();
gtk_widget_show (entry_custom_colorlabel[c]);
gtk_box_pack_start(GTK_BOX (hbox_custom_color[c]), entry_custom_colorlabel[c],
FALSE, FALSE, 0);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, entry_custom_colorlabel[c],
- tooltip_entry_text, NULL);
+ CLAWS_SET_TIP(entry_custom_colorlabel[c],
+ tooltip_entry_text);
}
g_free(tooltip_btn_text);
g_free(tooltip_entry_text);
- hbox_reset_custom_colors = gtk_hbox_new(FALSE, 8);
+ hbox_reset_custom_colors = gtk_hbox_new(FALSE, VBOX_BORDER);
gtk_widget_show (hbox_reset_custom_colors);
- gtk_box_pack_start(GTK_BOX (vbox_color_labels), hbox_reset_custom_colors,
+ gtk_box_pack_start(GTK_BOX (vbox_custom_colors), hbox_reset_custom_colors,
FALSE, FALSE, 0);
btn_reset_custom_colors = gtk_button_new_with_label(_(" Use default "));
gettext(SAFE_STRING (prefs_common.custom_colorlabel[c].label)));
}
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_enable_colors),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_colors),
prefs_common.enable_color);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_enable_bgcolors),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_enable_bgcolors),
prefs_common.enable_bgcolor);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_recycle_colors),
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_recycle_colors),
prefs_common.recycle_quote_colors);
- prefs_msg_colors->chkbtn_enable_colors = chkbtn_enable_colors;
- prefs_msg_colors->chkbtn_enable_bgcolors = chkbtn_enable_bgcolors;
- prefs_msg_colors->chkbtn_recycle_colors = chkbtn_recycle_colors;
+ prefs_msg_colors->checkbtn_enable_colors = checkbtn_enable_colors;
+ prefs_msg_colors->checkbtn_enable_bgcolors = checkbtn_enable_bgcolors;
+ prefs_msg_colors->checkbtn_recycle_colors = checkbtn_recycle_colors;
/* custom colors */
for (c = 0; c < COLORLABELS; c++) {
prefs_msg_colors->entry_custom_colorlabel[c] = entry_custom_colorlabel[c];
}
-
- prefs_msg_colors->page.widget = vbox1;
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+
+ prefs_msg_colors->page.widget = notebook;
}
static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
{
gchar *type = (gchar *)data;
gchar *title = NULL;
- gdouble color[4] = {0.0, 0.0, 0.0, 0.0};
+ 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 */
- /* leave the extra space at the end of the titles, this is for translators' convenience */
if (c == COLORLABELS) {
if(g_ascii_strcasecmp(type, "LEVEL1") == 0) {
- title = g_strdup(_("Pick color for 1st level text "));
+ title = g_strdup(C_("Dialog title", "Pick color for 1st level text"));
rgbvalue = prefs_common.quote_level1_col;
} else if(g_ascii_strcasecmp(type, "LEVEL2") == 0) {
- title = g_strdup(_("Pick color for 2nd level text "));
+ title = g_strdup(C_("Dialog title", "Pick color for 2nd level text"));
rgbvalue = prefs_common.quote_level2_col;
} else if(g_ascii_strcasecmp(type, "LEVEL3") == 0) {
- title = g_strdup(_("Pick color for 3rd level text "));
+ title = g_strdup(C_("Dialog title", "Pick color for 3rd level text"));
rgbvalue = prefs_common.quote_level3_col;
} else if(g_ascii_strcasecmp(type, "LEVEL1BG") == 0) {
- title = g_strdup(_("Pick color for 1st level text background "));
+ title = g_strdup(C_("Dialog title", "Pick color for 1st level text background"));
rgbvalue = prefs_common.quote_level1_bgcol;
} else if(g_ascii_strcasecmp(type, "LEVEL2BG") == 0) {
- title = g_strdup(_("Pick color for 2nd level text background "));
+ title = g_strdup(C_("Dialog title", "Pick color for 2nd level text background"));
rgbvalue = prefs_common.quote_level2_bgcol;
} else if(g_ascii_strcasecmp(type, "LEVEL3BG") == 0) {
- title = g_strdup(_("Pick color for 3rd level text background "));
+ title = g_strdup(C_("Dialog title", "Pick color for 3rd level text background"));
rgbvalue = prefs_common.quote_level3_bgcol;
} else if(g_ascii_strcasecmp(type, "URI") == 0) {
- title = g_strdup(_("Pick color for links "));
+ title = g_strdup(C_("Dialog title", "Pick color for links"));
rgbvalue = prefs_common.uri_col;
} else if(g_ascii_strcasecmp(type, "TGTFLD") == 0) {
- title = g_strdup(_("Pick color for target folder"));
+ title = g_strdup(C_("Dialog title", "Pick color for target folder"));
rgbvalue = prefs_common.tgt_folder_col;
} else if(g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
- title = g_strdup(_("Pick color for signatures "));
+ title = g_strdup(C_("Dialog title", "Pick color for signatures"));
rgbvalue = prefs_common.signature_col;
} else if(g_ascii_strcasecmp(type, "NEW") == 0) {
- title = g_strdup(_("Pick color for folder"));
+ title = g_strdup(C_("Dialog title", "Pick color for folder"));
rgbvalue = prefs_common.color_new;
} else {
/* Should never be called */
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);
/* preselect the previous color in the color selection dialog */
- color[0] = (gdouble) ((rgbvalue & 0xff0000) >> 16) / 255.0;
- color[1] = (gdouble) ((rgbvalue & 0x00ff00) >> 8) / 255.0;
- color[2] = (gdouble) (rgbvalue & 0x0000ff) / 255.0;
+
+ gtkut_convert_int_to_gdk_color(rgbvalue, &color);
+
dialog = GTK_COLOR_SELECTION_DIALOG(color_dialog);
- gtk_color_selection_set_color
- (GTK_COLOR_SELECTION(dialog->colorsel), color);
+ gtk_color_selection_set_current_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;
- gdouble color[4];
- gint red, green, blue, rgbvalue;
+ GtkColorSelection *colorsel = GTK_COLOR_SELECTION(
+ gtk_color_selection_dialog_get_color_selection
+ ((GtkColorSelectionDialog *)color_dialog));
+ GdkColor color;
+ gint rgbvalue;
gchar *type = (gchar *)data;
gint c;
- gtk_color_selection_get_color(colorsel, color);
-
- red = (gint) (color[0] * 255.0);
- green = (gint) (color[1] * 255.0);
- blue = (gint) (color[2] * 255.0);
- rgbvalue = (gint) ((red * 0x10000) | (green * 0x100) | blue);
+ gtk_color_selection_get_current_color(colorsel, &color);
+ rgbvalue = gtkut_convert_gdk_color_to_int(&color);
/* custom colors */
prefs_common.color_new = rgbvalue;
set_button_bg_color(color_buttons.btn_color_new, rgbvalue);
} else {
- fprintf(stderr, "Unrecognized datatype '%s' in quote_color_set_dialog_ok\n", type);
+ 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;
gtk_widget_set_style(GTK_WIDGET(widget), newstyle);
}
-void prefs_msg_colors_save(PrefsPage *_page)
+static void prefs_msg_colors_save(PrefsPage *_page)
{
MsgColorsPage *page = (MsgColorsPage *) _page;
gint c;
prefs_common.enable_color =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->chkbtn_enable_colors));
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_colors));
prefs_common.enable_bgcolor =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->chkbtn_enable_bgcolors));
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_bgcolors));
prefs_common.recycle_quote_colors =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->chkbtn_recycle_colors));
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_recycle_colors));
/* custom colors */
for (c = 0; c < COLORLABELS; c++) {
projects / claws.git / blobdiff