move signature settings to Account Prefs

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 3c7f90d51bb3312b56b757df04b61dfbbb1934f4..e59327cc09c20cfae7972764e2d617338f1c2580 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -103,9 +103,6 @@ static struct Send {
 } p_send;
 
 static struct Compose {
-       GtkWidget *checkbtn_autosig;
-       GtkWidget *entry_sigsep;
-
        GtkWidget *entry_fw_quotemark;
        GtkWidget *text_fw_quotefmt;
 
@@ -174,7 +171,7 @@ static struct Display {
 
        GtkWidget *chkbtn_swapfrom;
        GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_expand_thread;
+       GtkWidget *chkbtn_threadsubj;
        GtkWidget *entry_datefmt;
 } display;
 
@@ -307,7 +304,7 @@ static PrefParam param[] = {
        {"inc_local", "TRUE", &prefs_common.inc_local, P_BOOL,
         &receive.checkbtn_local,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"filter_on_inc_local", "FALSE", &prefs_common.filter_on_inc, P_BOOL,
+       {"filter_on_inc_local", "TRUE", &prefs_common.filter_on_inc, P_BOOL,
         &receive.checkbtn_filter_on_inc,
         prefs_set_data_from_toggle, prefs_set_toggle},
        {"spool_path", DEFAULT_SPOOL_PATH, &prefs_common.spool_path, P_STRING,
@@ -364,12 +361,6 @@ static PrefParam param[] = {
         prefs_common_encoding_set_optmenu},
 
        /* Compose */
-       {"auto_signature", "TRUE", &prefs_common.auto_sig, P_BOOL,
-        &compose.checkbtn_autosig,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-       {"signature_separator", "-- ", &prefs_common.sig_sep, P_STRING,
-        &compose.entry_sigsep, prefs_set_data_from_entry, prefs_set_entry},
-
        {"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
         &compose.checkbtn_autoextedit,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -515,12 +506,12 @@ static PrefParam param[] = {
        {"use_address_book", "TRUE", &prefs_common.use_addr_book, P_BOOL,
         &display.chkbtn_useaddrbook,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"thread_by_subject", "TRUE", &prefs_common.thread_by_subject, P_BOOL,
+        &display.chkbtn_threadsubj,
+        prefs_set_data_from_toggle, prefs_set_toggle},
        {"date_format", "%y/%m/%d(%a) %H:%M", &prefs_common.date_format,
         P_STRING, &display.entry_datefmt,
         prefs_set_data_from_entry, prefs_set_entry},
-       {"expand_thread", "TRUE", &prefs_common.expand_thread, P_BOOL,
-        &display.chkbtn_expand_thread,
-        prefs_set_data_from_toggle, prefs_set_toggle},
 
        {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
         NULL, NULL, NULL},
@@ -543,7 +534,7 @@ static PrefParam param[] = {
        {"summary_col_show_mark", "TRUE",
         &prefs_common.summary_col_visible[S_COL_MARK], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_unread", "TRUE",
-        &prefs_common.summary_col_visible[S_COL_UNREAD], P_BOOL, NULL, NULL, NULL},
+        &prefs_common.summary_col_visible[S_COL_STATUS], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_mime", "TRUE",
         &prefs_common.summary_col_visible[S_COL_MIME], P_BOOL, NULL, NULL, NULL},
        {"summary_col_show_subject", "TRUE",
@@ -564,7 +555,7 @@ static PrefParam param[] = {
        {"summary_col_pos_mark", "0",
          &prefs_common.summary_col_pos[S_COL_MARK], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_unread", "1",
-         &prefs_common.summary_col_pos[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+         &prefs_common.summary_col_pos[S_COL_STATUS], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_mime", "2",
          &prefs_common.summary_col_pos[S_COL_MIME], P_INT, NULL, NULL, NULL},
        {"summary_col_pos_subject", "3",
@@ -585,7 +576,7 @@ static PrefParam param[] = {
        {"summary_col_size_mark", "10",
         &prefs_common.summary_col_size[S_COL_MARK], P_INT, NULL, NULL, NULL},
        {"summary_col_size_unread", "13",
-        &prefs_common.summary_col_size[S_COL_UNREAD], P_INT, NULL, NULL, NULL},
+        &prefs_common.summary_col_size[S_COL_STATUS], P_INT, NULL, NULL, NULL},
        {"summary_col_size_mime", "10",
         &prefs_common.summary_col_size[S_COL_MIME], P_INT, NULL, NULL, NULL},
        {"summary_col_size_subject", "200",
@@ -1776,12 +1767,6 @@ static void prefs_compose_create(void)
        GtkWidget *vbox2;
        GtkWidget *hbox1;
 
-       GtkWidget *frame_sig;
-       GtkWidget *vbox_sig;
-       GtkWidget *checkbtn_autosig;
-       GtkWidget *label_sigsep;
-       GtkWidget *entry_sigsep;
-
        GtkWidget *checkbtn_autoextedit;
 
        GtkWidget *frame_autosel;
@@ -1825,29 +1810,6 @@ static void prefs_compose_create(void)
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
-       PACK_FRAME(vbox1, frame_sig, _("Signature"));
-
-       vbox_sig = gtk_vbox_new (FALSE, VSPACING_NARROW);
-       gtk_widget_show (vbox_sig);
-       gtk_container_add (GTK_CONTAINER (frame_sig), vbox_sig);
-       gtk_container_set_border_width (GTK_CONTAINER (vbox_sig), 8);
-
-       PACK_CHECK_BUTTON (vbox_sig, checkbtn_autosig,
-                          _("Insert signature automatically"));
-
-       hbox1 = gtk_hbox_new (FALSE, 8);
-       gtk_widget_show (hbox1);
-       gtk_box_pack_start (GTK_BOX (vbox_sig), hbox1, TRUE, TRUE, 0);
-       label_sigsep = gtk_label_new (_("Signature separator"));
-       gtk_widget_show (label_sigsep);
-       gtk_box_pack_start (GTK_BOX (hbox1), label_sigsep, FALSE, FALSE, 0);
-
-       entry_sigsep = gtk_entry_new ();
-       gtk_widget_show (entry_sigsep);
-       gtk_box_pack_start (GTK_BOX (hbox1), entry_sigsep, FALSE, FALSE, 0);
-
-       gtk_widget_set_usize (entry_sigsep, 64, -1);
-
         /* Account autoselection */
        PACK_FRAME(vbox1, frame_autosel, _("Automatic account selection"));
 
@@ -1967,8 +1929,6 @@ static void prefs_compose_create(void)
        compose.entry_quotemark  = entry_quotemark;
        compose.text_quotefmt    = text_quotefmt;
        */
-       compose.checkbtn_autosig = checkbtn_autosig;
-       compose.entry_sigsep     = entry_sigsep;
 
        compose.checkbtn_autoextedit = checkbtn_autoextedit;
 
@@ -2173,7 +2133,7 @@ static void prefs_display_create(void)
        GtkWidget *vbox2;
        GtkWidget *chkbtn_swapfrom;
        GtkWidget *chkbtn_useaddrbook;
-       GtkWidget *chkbtn_expand_thread;
+       GtkWidget *chkbtn_threadsubj;
        GtkWidget *vbox3;
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
@@ -2325,7 +2285,8 @@ static void prefs_display_create(void)
                (vbox2, chkbtn_useaddrbook,
                 _("Display sender using address book"));
        PACK_CHECK_BUTTON
-               (vbox2, chkbtn_expand_thread, _("Expand threads"));
+               (vbox2, chkbtn_threadsubj,
+                _("Thread using subject in addition to standard headers"));
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW_2);
 
@@ -2371,8 +2332,8 @@ static void prefs_display_create(void)
        display.spinbtn_ng_abbrev_len_adj = spinbtn_ng_abbrev_len_adj;
 
        display.chkbtn_swapfrom      = chkbtn_swapfrom;
-       display.chkbtn_expand_thread = chkbtn_expand_thread;
        display.chkbtn_useaddrbook   = chkbtn_useaddrbook;
+       display.chkbtn_threadsubj    = chkbtn_threadsubj;
        display.entry_datefmt        = entry_datefmt;
 }