2007-01-13 [colin] 2.7.0cvs21

[claws.git] / src / prefs_msg_colors.c

diff --git a/src/prefs_msg_colors.c b/src/prefs_msg_colors.c
index 1eb4814684d0a1e7638ce45b2ad0d1390199e262..e0011f2b55bdfe93d9109562e97fc324f7b44387 100644 (file)
--- a/src/prefs_msg_colors.c
+++ b/src/prefs_msg_colors.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -140,13 +140,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        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);
@@ -163,12 +157,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        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);
@@ -373,12 +362,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        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);
@@ -417,12 +401,8 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        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);
@@ -445,7 +425,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        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 */
@@ -477,7 +457,7 @@ void prefs_msg_colors_create_widget(PrefsPage *_page, GtkWindow *window,
        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 */
@@ -609,7 +589,7 @@ static void quote_color_set_dialog(GtkWidget *widget, gpointer data)
                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;
                }