projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2007-10-18 [mones] 3.0.2cvs86
[claws.git] / src / prefs_account.c
diff --git a/src/prefs_account.c b/src/prefs_account.c
index e899d0718e3a65272b5f003b3f5409f29c03ebbd..eadc5eee654a9f72d32db465efc54acf70dce212 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -151,7 +151,6 @@ typedef struct SendPage
 
     GtkWidget *vbox;
 
-       GtkWidget *msgid_checkbtn;
        GtkWidget *customhdr_checkbtn;
        GtkWidget *smtp_auth_checkbtn;
        GtkWidget *smtp_auth_type_optmenu;
@@ -287,7 +286,7 @@ static SendPage send_page;
 static ComposePage compose_page;
 static TemplatesPage templates_page;
 static PrivacyPage privacy_page;
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static SSLPage ssl_page;
 #endif
 static AdvancedPage advanced_page;
@@ -473,10 +472,6 @@ static PrefParam receive_param[] = {
 };
 
 static PrefParam send_param[] = {
-       {"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
-        &send_page.msgid_checkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-
        {"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
         &send_page.customhdr_checkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -655,7 +650,7 @@ static PrefParam privacy_param[] = {
 };
 
 static PrefParam ssl_param[] = {
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
        {"ssl_pop", "0", &tmp_ac_prefs.ssl_pop, P_ENUM,
         &ssl_page.pop_nossl_radiobtn,
         prefs_account_enum_set_data_from_radiobtn,
@@ -1042,7 +1037,7 @@ static void basic_create_widget_func(PrefsPage * _page,
        no_imap_warn_icon = gtk_image_new_from_stock
                         (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
        no_imap_warn_label = gtk_label_new(_("<span weight=\"bold\">Warning: this version of Claws Mail\n"
-                         "has been built without IMAP support.</span>"));
+                         "has been built without IMAP and News support.</span>"));
        gtk_label_set_use_markup(GTK_LABEL(no_imap_warn_label), TRUE);
 
        gtk_box_pack_start(GTK_BOX (optmenubox), no_imap_warn_icon, FALSE, FALSE, 0);
@@ -1329,7 +1324,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_widget_show (local_hbox);
        gtk_box_pack_start (GTK_BOX (local_vbox), local_hbox, FALSE, FALSE, 0);
 
-       local_inbox_label = gtk_label_new (_("Default inbox"));
+       local_inbox_label = gtk_label_new (_("Default Inbox"));
        gtk_widget_show (local_inbox_label);
        gtk_box_pack_start (GTK_BOX (local_hbox), local_inbox_label, FALSE, FALSE, 0);
 
@@ -1415,7 +1410,7 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_widget_show (hbox1);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, FALSE, 0);
 
-       inbox_label = gtk_label_new (_("Default inbox"));
+       inbox_label = gtk_label_new (_("Default Inbox"));
        gtk_widget_show (inbox_label);
        gtk_box_pack_start (GTK_BOX (hbox1), inbox_label, FALSE, FALSE, 0);
 
@@ -1585,7 +1580,6 @@ static void send_create_widget_func(PrefsPage * _page,
        GtkWidget *vbox1;
        GtkWidget *vbox2;
        GtkWidget *frame;
-       GtkWidget *msgid_checkbtn;
        GtkWidget *hbox;
        GtkWidget *customhdr_checkbtn;
        GtkWidget *customhdr_edit_btn;
@@ -1611,8 +1605,6 @@ static void send_create_widget_func(PrefsPage * _page,
 
        vbox2 = gtkut_get_options_frame(vbox1, &frame, _("Header"));
 
-       PACK_CHECK_BUTTON (vbox2, msgid_checkbtn, _("Generate Message-ID"));
-
        hbox = gtk_hbox_new (FALSE, 12);
        gtk_widget_show (hbox);
        gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
@@ -1756,7 +1748,6 @@ static void send_create_widget_func(PrefsPage * _page,
        gtk_widget_show (pop_auth_minutes_lbl);
        gtk_box_pack_start (GTK_BOX (hbox), pop_auth_minutes_lbl, FALSE, FALSE, 0);
        
-       page->msgid_checkbtn     = msgid_checkbtn;
        page->customhdr_checkbtn = customhdr_checkbtn;
 
        page->smtp_auth_checkbtn       = smtp_auth_checkbtn;
@@ -2032,36 +2023,59 @@ static void templates_create_widget_func(PrefsPage * _page,
        TemplatesPage *page = (TemplatesPage *) _page;
        PrefsAccount *ac_prefs = (PrefsAccount *) data;
        GtkWidget *vbox;
+       GtkWidget *vbox2;
+       GtkWidget *notebook;
 
-       vbox = gtk_vbox_new(FALSE, VSPACING);
+       vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox), VBOX_BORDER);
+       
+       notebook = gtk_notebook_new();
+       gtk_widget_show(notebook);
+       gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(notebook), TRUE);
+       gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
+
+       /* compose format */
+       vbox2 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
 
-       /* compose/reply/forward formats */
        quotefmt_create_new_msg_fmt_widgets(
                                window,
-                               vbox,
+                               vbox2,
                                &page->checkbtn_compose_with_format,
-                               _("Use a specific format for new messages"),
                                &page->compose_subject_format,
                                &page->compose_body_format,
                                FALSE);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Compose")));
+
+       /* reply format */      
+       vbox2 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+       
        quotefmt_create_reply_fmt_widgets(
                                window,
-                               vbox,
+                               vbox2,
                                &page->checkbtn_reply_with_format,
-                               _("Use a specific reply quote format"),
                                &page->reply_quotemark,
                                &page->reply_body_format,
                                FALSE);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Reply")));
+
+       /* forward format */    
+       vbox2 = gtk_vbox_new (FALSE, VSPACING);
+       gtk_widget_show (vbox2);
+       gtk_container_set_border_width (GTK_CONTAINER (vbox2), VBOX_BORDER);
+
        quotefmt_create_forward_fmt_widgets(
                                window,
-                               vbox,
+                               vbox2,
                                &page->checkbtn_forward_with_format,
-                               _("Use a specific forward quote format"),
                                &page->forward_quotemark,
                                &page->forward_body_format,
                                FALSE);
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox2, gtk_label_new(_("Forward")));
+
        quotefmt_add_info_button(window, vbox);
 
        tmp_ac_prefs = *ac_prefs;
@@ -2172,7 +2186,7 @@ static void privacy_create_widget_func(PrefsPage * _page,
        page->page.widget = vbox1;
 }
        
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 
 #define CREATE_RADIO_BUTTON(box, btn, btn_p, label, data)              \
 {                                                                      \
@@ -2618,7 +2632,7 @@ static gint prefs_basic_apply(void)
                        inbox =  folder_find_item_from_identifier(mailbox);
                }
                if (inbox == NULL) {
-                       alertpanel_error(_("The default inbox folder doesn't exist."));
+                       alertpanel_error(_("The default Inbox folder doesn't exist."));
                        return -1;
                }
        }
@@ -2695,7 +2709,7 @@ static gint prefs_privacy_apply(void)
        return 0;
 }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static gint prefs_ssl_apply(void)
 {
        prefs_set_data_from_dialog(ssl_param);
@@ -2739,7 +2753,7 @@ static void privacy_destroy_widget_func(PrefsPage *_page)
        /* PrivacyPage *page = (PrivacyPage *) _page; */
 }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static void ssl_destroy_widget_func(PrefsPage *_page)
 {
        /* SSLPage *page = (SSLPage *) _page; */
@@ -2811,7 +2825,7 @@ static gboolean privacy_can_close_func(PrefsPage *_page)
        return prefs_privacy_apply() >= 0;
 }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static gboolean ssl_can_close_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;
@@ -2908,7 +2922,7 @@ static void privacy_save_func(PrefsPage *_page)
                cancelled = FALSE;
 }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static void ssl_save_func(PrefsPage *_page)
 {
        SSLPage *page = (SSLPage *) _page;
@@ -3040,7 +3054,7 @@ static void register_privacy_page(void)
        prefs_account_register_page((PrefsPage *) &privacy_page);
 }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
 static void register_ssl_page(void)
 {
        static gchar *path[3];
@@ -3086,7 +3100,7 @@ void prefs_account_init()
        register_compose_page();
        register_templates_page();
        register_privacy_page();
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
        register_ssl_page();
 #endif
        register_advanced_page();
@@ -3550,7 +3564,7 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
                gtk_widget_hide(optmenu);
                gtk_widget_show(optlabel);
 #ifndef HAVE_LIBETPAN
-               if (protocol == A_IMAP4) {
+               if (protocol == A_IMAP4 || protocol == A_NNTP) {
                        gtk_widget_show(protocol_optmenu->no_imap_warn_icon);
                        gtk_widget_show(protocol_optmenu->no_imap_warn_label);
                } else {
@@ -3599,7 +3613,8 @@ static void prefs_account_set_string_from_combobox(PrefParam *pparam)
        g_return_if_fail(*pparam->widget != NULL);
 
        combobox = *pparam->widget;
-       gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combobox), &iter);
+       g_return_if_fail(gtk_combo_box_get_active_iter(
+                               GTK_COMBO_BOX(combobox), &iter));
 
        str = (gchar **)pparam->data;
        g_free(*str);
@@ -3697,8 +3712,13 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
        gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
        switch(protocol) {
        case A_NNTP:
+#ifndef HAVE_LIBETPAN
+               gtk_widget_show(protocol_optmenu->no_imap_warn_icon);
+               gtk_widget_show(protocol_optmenu->no_imap_warn_label);
+#else
                gtk_widget_hide(protocol_optmenu->no_imap_warn_icon);
                gtk_widget_hide(protocol_optmenu->no_imap_warn_label);
+#endif
                gtk_widget_show(basic_page.nntpserv_label);
                gtk_widget_show(basic_page.nntpserv_entry);
                gtk_table_set_row_spacing (GTK_TABLE (basic_page.serv_table),
@@ -3773,7 +3793,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 FALSE);
                }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_show(ssl_page.nntp_frame);
@@ -3864,7 +3884,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 TRUE);
                }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
@@ -3960,7 +3980,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 FALSE);
                }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_show(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
@@ -4049,7 +4069,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                gtk_toggle_button_set_active
                        (GTK_TOGGLE_BUTTON(receive_page.recvatgetall_checkbtn), FALSE);
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
                gtk_widget_hide(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
@@ -4144,7 +4164,7 @@ static void prefs_account_protocol_changed(GtkComboBox *combobox, gpointer data)
                                 TRUE);
                }
 
-#if USE_OPENSSL
+#if (defined(USE_OPENSSL) || defined (USE_GNUTLS))
                gtk_widget_show(ssl_page.pop_frame);
                gtk_widget_hide(ssl_page.imap_frame);
                gtk_widget_hide(ssl_page.nntp_frame);
Claws Mail