Fixed bugs:

[claws.git] / src / prefs_common.h

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 0e320339389e70e714d6468980a726312d5edba9..7308a7a97511bc36305ff1e0195fc5f9a151b9b9 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -27,23 +27,30 @@
 #include <glib.h>
 
 #include "mainwindow.h"
+#include "summaryview.h"
 #include "codeconv.h"
 #include "textview.h"
 
 typedef struct _PrefsCommon    PrefsCommon;
 
+typedef enum {
+       RECV_DIALOG_ALWAYS,
+       RECV_DIALOG_ACTIVE,
+       RECV_DIALOG_NEVER
+} RecvDialogMode;
+
 typedef enum
 {
-       RECVDIALOG_ALWAYS,
-       RECVDIALOG_WINDOW_ACTIVE,
-       RECVDIALOG_NEVER
-} RecvDialogShow;
+       NEXTUNREADMSGDIALOG_ALWAYS,
+       NEXTUNREADMSGDIALOG_ASSUME_YES,
+       NEXTUNREADMSGDIALOG_ASSUME_NO
+} NextUnreadMsgDialogShow;
 
 struct _PrefsCommon
 {
        /* Receive */
        gboolean use_extinc;
-       gchar *extinc_path;
+       gchar *extinc_cmd;
        gboolean inc_local;
        gboolean filter_on_inc;
        gchar *spool_path;
@@ -56,30 +63,41 @@ struct _PrefsCommon
 
        /* Send */
        gboolean use_extsend;
-       gchar *extsend_path;
+       gchar *extsend_cmd;
        gboolean savemsg;
        gboolean queue_msg;
        gchar *outgoing_charset;
 
        /* Compose */
-       gboolean reply_with_quote;
-       gchar *quotemark;
-       gchar *quotefmt;
        gboolean auto_sig;
        gchar *sig_sep;
+       gint undolevels;
        gint linewrap_len;
        gboolean linewrap_quote;
        gboolean linewrap_at_send;
+       gboolean auto_exteditor;
        gboolean reply_account_autosel;
+       gboolean forward_account_autosel;
+       gboolean reedit_account_autosel;
        gboolean show_ruler;
+
+       /* Quote */
+       gboolean reply_with_quote;
+       gchar *quotemark;
+       gchar *quotefmt;
        gchar *fw_quotemark;
        gchar *fw_quotefmt;
        gboolean forward_as_attachment;
        gboolean smart_wrapping;
-       gboolean enable_ispell;
-       gchar *ispell_path;
-       gchar *dictionary_path;
-
+       gboolean block_cursor;
+#if USE_PSPELL
+       gboolean enable_pspell;
+       gchar *pspell_path;
+       gchar *dictionary;
+       gint misspelled_col;
+       gint pspell_sugmode;
+#endif
+        
        /* Display */
        gchar *widgetfont;
        gchar *textfont;
@@ -104,15 +122,10 @@ struct _PrefsCommon
        gint kill_score;
        gint important_score;
 
-       gboolean show_mark;
-       gboolean show_unread;
-       gboolean show_mime;
-       gboolean show_number;
-       gboolean show_score;
-       gboolean show_size;
-       gboolean show_date;
-       gboolean show_from;
-       gboolean show_subject;
+       /* Summary columns visibility, position and size */
+       gboolean summary_col_visible[N_SUMMARY_COLS];
+       gint summary_col_pos[N_SUMMARY_COLS];
+       gint summary_col_size[N_SUMMARY_COLS];
 
        /* Widget size */
        gint folderview_x;
@@ -126,15 +139,6 @@ struct _PrefsCommon
 
        gint summaryview_width;
        gint summaryview_height;
-       gint summary_col_mark;
-       gint summary_col_unread;
-       gint summary_col_mime;
-       gint summary_col_number;
-       gint summary_col_size;
-       gint summary_col_date;
-       gint summary_col_from;
-       gint summary_col_subject;
-       gint summary_col_score;
 
        gint mainview_x;
        gint mainview_y;
@@ -177,9 +181,13 @@ struct _PrefsCommon
        /* MIME viewer */
        gchar *mime_image_viewer;
        gchar *mime_audio_player;
+       gchar *mime_open_cmd;
+
+       GList *mime_open_cmd_history;
 
        /* Privacy */
        gboolean default_encrypt;
+       gboolean ascii_armored;
        gboolean default_sign;
        gboolean auto_check_signatures;
        gboolean gpg_signature_popup;
@@ -194,8 +202,9 @@ struct _PrefsCommon
        gboolean open_unread_on_enter;
        gboolean open_inbox_on_inc;
        gboolean immediate_exec;
+       RecvDialogMode recv_dialog_mode;
+       NextUnreadMsgDialogShow next_unread_msg_dialog;
        gboolean add_address_by_click;
-       RecvDialogShow receive_dialog;
 
        gboolean confirm_on_exit;
        gboolean clean_on_exit;
@@ -211,10 +220,11 @@ struct _PrefsCommon
 
 extern PrefsCommon prefs_common;
 
+void prefs_common_init         ();
 void prefs_common_read_config  (void);
 void prefs_common_save_config  (void);
 void prefs_common_open         (void);
 
-void prefs_summary_display_item_set    (void);
+void prefs_quote_description   (void);
 
 #endif /* __PREFS_COMMON_H__ */