#include "main.h"
#include "prefs.h"
#include "prefs_common.h"
+#include "prefs_display_header.h"
#include "mainwindow.h"
#include "summaryview.h"
#include "messageview.h"
#include "manage_window.h"
+#include "inc.h"
#include "menu.h"
#include "codeconv.h"
#include "utils.h"
#include "gtkutils.h"
#include "alertpanel.h"
#include "folder.h"
-#include "prefs_display_headers.h"
PrefsCommon prefs_common;
GtkWidget *chkbtn_swapfrom;
GtkWidget *chkbtn_hscrollbar;
+ GtkWidget *chkbtn_useaddrbook;
} display;
static struct Message {
{"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
&display.chkbtn_hscrollbar,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"use_address_book", "TRUE", &prefs_common.use_addr_book, P_BOOL,
+ &display.chkbtn_useaddrbook,
+ prefs_set_data_from_toggle, prefs_set_toggle},
{"date_format", "%y/%m/%d(%a) %H:%M", &prefs_common.date_format,
P_STRING, &entry_datefmt,
prefs_set_data_from_entry, prefs_set_entry},
NULL, NULL, NULL},
{"show_number", "TRUE", &prefs_common.show_number, P_BOOL,
NULL, NULL, NULL},
+ {"show_score", "TRUE", &prefs_common.show_score, P_BOOL,
+ NULL, NULL, NULL},
{"show_size", "FALSE", &prefs_common.show_size, P_BOOL,
NULL, NULL, NULL},
{"show_date", "TRUE", &prefs_common.show_date, P_BOOL,
NULL, NULL, NULL},
{"summary_col_number", "40", &prefs_common.summary_col_number, P_INT,
NULL, NULL, NULL},
+ {"summary_col_score", "40", &prefs_common.summary_col_score,
+ P_INT, NULL, NULL, NULL},
{"summary_col_size", "48", &prefs_common.summary_col_size, P_INT,
NULL, NULL, NULL},
{"summary_col_date", "120", &prefs_common.summary_col_date, P_INT,
&message.chkbtn_halfpage,
prefs_set_data_from_toggle, prefs_set_toggle},
+ {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
+ NULL, NULL, NULL},
+
/* MIME viewer */
{"mime_image_viewer", "display '%s'",
&prefs_common.mime_image_viewer, P_STRING, NULL, NULL, NULL},
static void prefs_common_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static void prefs_common_ok (GtkButton *button);
-static void prefs_common_apply (GtkButton *button);
+static void prefs_common_ok (void);
+static void prefs_common_apply (void);
+static void prefs_common_cancel (void);
void prefs_common_read_config(void)
{
void prefs_common_open(void)
{
+ inc_autocheck_timer_remove();
+
if (!dialog.window) {
prefs_common_create();
}
gtk_window_set_title (GTK_WINDOW(dialog.window),
_("Common Preferences"));
gtk_signal_connect (GTK_OBJECT(dialog.window), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
+ GTK_SIGNAL_FUNC(prefs_common_cancel), NULL);
gtk_signal_connect (GTK_OBJECT(dialog.window), "key_press_event",
GTK_SIGNAL_FUNC(prefs_common_key_pressed), NULL);
gtk_signal_connect (GTK_OBJECT(dialog.window), "focus_in_event",
gtk_signal_connect (GTK_OBJECT(dialog.apply_btn), "clicked",
GTK_SIGNAL_FUNC(prefs_common_apply), NULL);
gtk_signal_connect_object (GTK_OBJECT(dialog.cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
+ GTK_SIGNAL_FUNC(prefs_common_cancel),
GTK_OBJECT(dialog.window));
/* create all widgets on notebook */
gtk_widget_show (hbox_autochk);
gtk_box_pack_start (GTK_BOX (vbox2), hbox_autochk, FALSE, FALSE, 0);
- gtk_widget_set_sensitive(hbox_autochk, FALSE);
-
PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk,
_("Auto-check new mail"));
GtkWidget *vbox2;
GtkWidget *chkbtn_swapfrom;
GtkWidget *chkbtn_hscrollbar;
+ GtkWidget *chkbtn_useaddrbook;
GtkWidget *hbox1;
GtkWidget *label_datefmt;
GtkWidget *button_dispitem;
- GtkWidget *button_headers_display;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
PACK_CHECK_BUTTON
(vbox2, chkbtn_swapfrom,
_("Display recipient on `From' column if sender is yourself"));
+ PACK_CHECK_BUTTON
+ (vbox2, chkbtn_useaddrbook,
+ _("Display sender using address book"));
PACK_CHECK_BUTTON
(vbox2, chkbtn_hscrollbar, _("Enable horizontal scroll bar"));
GTK_SIGNAL_FUNC (prefs_summary_display_item_set),
NULL);
- hbox1 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
-
- button_headers_display = gtk_button_new_with_label
- (_(" Set displaying of headers... "));
- gtk_widget_show (button_headers_display);
- gtk_box_pack_start (GTK_BOX (hbox1), button_headers_display, FALSE,
- TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (button_headers_display), "clicked",
- GTK_SIGNAL_FUNC (prefs_display_headers_open),
- NULL);
-
display.entry_textfont = entry_textfont;
display.button_textfont = button_textfont;
display.chkbtn_folder_unread = chkbtn_folder_unread;
display.chkbtn_transhdr = chkbtn_transhdr;
- display.chkbtn_swapfrom = chkbtn_swapfrom;
- display.chkbtn_hscrollbar = chkbtn_hscrollbar;
+ display.chkbtn_swapfrom = chkbtn_swapfrom;
+ display.chkbtn_hscrollbar = chkbtn_hscrollbar;
+ display.chkbtn_useaddrbook = chkbtn_useaddrbook;
}
static void prefs_message_create(void)
GtkWidget *chkbtn_mbalnum;
GtkWidget *chkbtn_disphdrpane;
GtkWidget *chkbtn_disphdr;
+ GtkWidget *button_edit_disphdr;
GtkWidget *hbox_linespc;
GtkWidget *label_linespc;
GtkObject *spinbtn_linespc_adj;
_("Display 2-byte alphabet and numeric with 1-byte character"));
PACK_CHECK_BUTTON(vbox2, chkbtn_disphdrpane,
_("Display header pane above message view"));
- PACK_CHECK_BUTTON(vbox2, chkbtn_disphdr,
- _("Display short headers on message view"));
+
+ hbox1 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox1, FALSE, TRUE, 0);
+
+ PACK_CHECK_BUTTON(hbox1, chkbtn_disphdr,
+ _("Display short headers on message view"));
+
+ button_edit_disphdr = gtk_button_new_with_label (_(" Edit... "));
+ gtk_widget_show (button_edit_disphdr);
+ gtk_box_pack_end (GTK_BOX (hbox1), button_edit_disphdr,
+ FALSE, TRUE, 0);
+ gtk_signal_connect (GTK_OBJECT (button_edit_disphdr), "clicked",
+ GTK_SIGNAL_FUNC (prefs_display_header_open),
+ NULL);
+
+ SET_TOGGLE_SENSITIVITY(chkbtn_disphdr, button_edit_disphdr);
hbox1 = gtk_hbox_new (FALSE, 32);
gtk_widget_show (hbox1);
SET_ACTIVE(S_COL_UNREAD, show_unread);
SET_ACTIVE(S_COL_MIME, show_mime);
SET_ACTIVE(S_COL_NUMBER, show_number);
+ SET_ACTIVE(S_COL_SCORE, show_score);
SET_ACTIVE(S_COL_SIZE, show_size);
SET_ACTIVE(S_COL_DATE, show_date);
SET_ACTIVE(S_COL_FROM, show_from);
GET_ACTIVE(S_COL_UNREAD, show_unread);
GET_ACTIVE(S_COL_MIME, show_mime);
GET_ACTIVE(S_COL_NUMBER, show_number);
+ GET_ACTIVE(S_COL_SCORE, show_score);
GET_ACTIVE(S_COL_SIZE, show_size);
GET_ACTIVE(S_COL_DATE, show_date);
GET_ACTIVE(S_COL_FROM, show_from);
SET_CHECK_BUTTON(S_COL_UNREAD, _("Unread"));
SET_CHECK_BUTTON(S_COL_MIME, _("MIME"));
SET_CHECK_BUTTON(S_COL_NUMBER, _("Number"));
+ SET_CHECK_BUTTON(S_COL_SCORE, _("Score"));
SET_CHECK_BUTTON(S_COL_SIZE, _("Size"));
SET_CHECK_BUTTON(S_COL_DATE, _("Date"));
SET_CHECK_BUTTON(S_COL_FROM, _("From"));
gpointer data)
{
if (event && event->keyval == GDK_Escape)
- gtk_widget_hide(dialog.window);
+ prefs_common_cancel();
}
-static void prefs_common_ok(GtkButton *button)
+static void prefs_common_ok(void)
{
- prefs_common_apply(button);
+ prefs_common_apply();
gtk_widget_hide(dialog.window);
if (quote_desc_win && GTK_WIDGET_VISIBLE(quote_desc_win))
gtk_widget_hide(quote_desc_win);
+
+ inc_autocheck_timer_set();
}
-static void prefs_common_apply(GtkButton *button)
+static void prefs_common_apply(void)
{
prefs_set_data_from_dialog(param);
main_window_reflect_prefs_all();
prefs_common_save_config();
}
+
+static void prefs_common_cancel(void)
+{
+ gtk_widget_hide(dialog.window);
+ inc_autocheck_timer_set();
+}
projects / claws.git / blobdiff