/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2004-2006 Hiroyuki Yamamoto & The Sylpheed-Claws Team
+ * Copyright (C) 2004-2007 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
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
- PACK_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);
-
+ vbox2 = gtkut_get_options_frame(vbox1, &frame_msg, _("Message view"));
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
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);
+ vbox3 = gtkut_get_options_frame(vbox2, &frame_quote, _("Quote"));
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);
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
+ SET_TOGGLE_SENSITIVITY(chkbtn_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_colors, color_buttons.btn_quote_level1_bg);
+ 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);
gtk_widget_show(label_quote_bgcolor1);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor1,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_bgcolor1);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor1);
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
+ SET_TOGGLE_SENSITIVITY(chkbtn_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_colors, color_buttons.btn_quote_level2_bg);
+ 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);
gtk_widget_show(label_quote_bgcolor2);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor2,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_bgcolor2);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor2);
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
+ SET_TOGGLE_SENSITIVITY(chkbtn_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_colors, color_buttons.btn_quote_level3_bg);
+ 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);
gtk_widget_show(label_quote_bgcolor3);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor3,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_bgcolor3);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor3);
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
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"));
-
- 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);
gtk_widget_show (hbox);
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_color_labels = gtkut_get_options_frame(vbox1,
+ &frame_custom_colors, _("Color labels"));
vbox_custom_colors = gtk_vbox_new (FALSE, VSPACING_NARROW);
gtk_widget_show (vbox_custom_colors);
for (c = 0; c < 4; c++) {
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
- tooltip_btn_text = g_strdup_printf(_("Pick color for 'color %d'"), c+1);
+ tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
for (c = 4; c < COLORLABELS; c++) {
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
- tooltip_btn_text = g_strdup_printf(_("Pick color for 'color %d'"), c+1);
+ tooltip_btn_text = g_strdup_printf(Q_("Tooltip|Pick color for 'color %d'"), c+1);
/* TRANSLATORS: 'color %d' refers to the filtering/processing
rule name and should not be translated */
gint c;
/* custom colors */
+ /* leave the extra space at the end of the title, this is for translators' convenience */
for (c = 0; c < COLORLABELS; c++) {
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(_("Pick color for 'color %d'"), c+1);
+ title = g_strdup_printf(Q_("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 quotation level 1"));
+ title = g_strdup(_("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 quotation level 2"));
+ title = g_strdup(_("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 quotation level 3"));
+ title = g_strdup(_("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 quotation level 1 background"));
+ title = g_strdup(_("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 quotation level 2 background"));
+ title = g_strdup(_("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 quotation level 3 background"));
+ title = g_strdup(_("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 URI"));
+ title = g_strdup(_("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"));
rgbvalue = prefs_common.tgt_folder_col;
} else if(g_ascii_strcasecmp(type, "SIGNATURE") == 0) {
- title = g_strdup(_("Pick color for signatures"));
+ title = g_strdup(_("Pick color for signatures "));
rgbvalue = prefs_common.signature_col;
} else if(g_ascii_strcasecmp(type, "NEW") == 0) {
title = g_strdup(_("Pick color for folder"));