projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
correction to English
[claws.git] / src / prefs_common.c
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 248cec7a00d02f206c0d8ad128ea4bee9264f566..c9c3d59ffb27ef429e51544a57e6245104d5b5ce 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -117,13 +117,14 @@ static struct Compose {
 
        GtkWidget * checkbtn_forward_as_attachment;
        GtkWidget * checkbtn_smart_wrapping;
+       GtkWidget * checkbtn_block_cursor;
 
        /* spelling */
 #if USE_PSPELL
        GtkWidget *checkbtn_enable_pspell;
        GtkWidget *entry_pspell_path;
        GtkWidget *btn_pspell_path;
-       GtkWidget *optmenu_dictionary_path;
+       GtkWidget *optmenu_dictionary;
 #endif
 
 } compose;
@@ -188,6 +189,7 @@ static struct Interface {
        GtkWidget *checkbtn_warnqueued;
        GtkWidget *checkbtn_addaddrbyclick;
        GtkWidget *optmenu_recvdialog;
+       GtkWidget *optmenu_nextunreadmsgdialog;
 } interface;
 
 static struct Other {
@@ -221,6 +223,8 @@ static void prefs_common_default_signkey_set_optmenu        (PrefParam *pparam);
 #endif
 static void prefs_common_recv_dialog_set_data_from_optmenu(PrefParam *pparam);
 static void prefs_common_recv_dialog_set_optmenu(PrefParam *pparam);
+static void prefs_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam);
+static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam);
 
 #if USE_PSPELL
 static void prefs_dictionary_set_data_from_optmenu(PrefParam *param);
@@ -346,15 +350,18 @@ static PrefParam param[] = {
         {"smart_wrapping", "TRUE", &prefs_common.smart_wrapping,
         P_BOOL, &compose.checkbtn_smart_wrapping,
         prefs_set_data_from_toggle, prefs_set_toggle},
+       {"block_cursor", "FALSE", &prefs_common.block_cursor,
+        P_BOOL, &compose.checkbtn_block_cursor,
+        prefs_set_data_from_toggle, prefs_set_toggle},
 #if USE_PSPELL
        {"enable_pspell", "TRUE", &prefs_common.enable_pspell,
         P_BOOL, &compose.checkbtn_enable_pspell,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"pspell_path", PSPELL_PATH, &prefs_common.pspell_path, 
+       {"pspell_path", "/usr/local/share/pspell/", &prefs_common.pspell_path, 
         P_STRING, &compose.entry_pspell_path, 
         prefs_set_data_from_entry, prefs_set_entry},
-       {"dictionary_path",  "", &prefs_common.dictionary_path,
-        P_STRING, &compose.optmenu_dictionary_path, 
+       {"dictionary",  "", &prefs_common.dictionary,
+        P_STRING, &compose.optmenu_dictionary, 
         prefs_dictionary_set_data_from_optmenu, prefs_dictionary_set_optmenu },
 #endif
        {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
@@ -605,6 +612,10 @@ static PrefParam param[] = {
         &interface.optmenu_recvdialog,
         prefs_common_recv_dialog_set_data_from_optmenu,
         prefs_common_recv_dialog_set_optmenu},
+       {"nextunreadmsg_dialog", NULL, &prefs_common.next_unread_msg_dialog, P_ENUM,
+        &interface.optmenu_nextunreadmsgdialog,
+        prefs_nextunreadmsgdialog_set_data_from_optmenu,
+        prefs_nextunreadmsgdialog_set_optmenu},
 
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
         P_BOOL, &interface.checkbtn_addaddrbyclick,
@@ -918,7 +929,7 @@ static void prefs_receive_create(void)
        PACK_CHECK_BUTTON (hbox_autochk, checkbtn_autochk,
                           _("Auto-check new mail"));
 
-       label_autochk1 = gtk_label_new (_("each"));
+       label_autochk1 = gtk_label_new (_("every"));
        gtk_widget_show (label_autochk1);
        gtk_box_pack_start (GTK_BOX (hbox_autochk), label_autochk1, FALSE, FALSE, 0);
 
@@ -1178,7 +1189,7 @@ static void prefs_compose_checkbtn_enable_pspell_toggle_cb
 
        toggled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
        gtk_widget_set_sensitive(compose.entry_pspell_path, toggled);
-       gtk_widget_set_sensitive(compose.optmenu_dictionary_path, toggled);
+       gtk_widget_set_sensitive(compose.optmenu_dictionary, toggled);
        gtk_widget_set_sensitive(compose.btn_pspell_path, toggled);
 }
 
@@ -1201,15 +1212,15 @@ static void prefs_compose_btn_pspell_path_clicked_cb(GtkWidget *widget,
                prefs_common.pspell_path = g_strdup_printf("%s%s",tmp,G_DIR_SEPARATOR_S);
 
                new_menu = gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path);
-               gtk_option_menu_set_menu(GTK_OPTION_MENU(compose.optmenu_dictionary_path),
+               gtk_option_menu_set_menu(GTK_OPTION_MENU(compose.optmenu_dictionary),
                                         new_menu);
 
                gtk_entry_set_text(GTK_ENTRY(compose.entry_pspell_path), prefs_common.pspell_path);                                      
                /* select first one */
-               gtk_option_menu_set_history(GTK_OPTION_MENU(compose.optmenu_dictionary_path), 0);
+               gtk_option_menu_set_history(GTK_OPTION_MENU(compose.optmenu_dictionary), 0);
                
-               prefs_common.dictionary_path = gtkpspell_get_dictionary_menu_active_item(
-                               gtk_option_menu_get_menu(GTK_OPTION_MENU(compose.optmenu_dictionary_path)));
+               prefs_common.dictionary = gtkpspell_get_dictionary_menu_active_item(
+                               gtk_option_menu_get_menu(GTK_OPTION_MENU(compose.optmenu_dictionary)));
                g_free(tmp);
        
 
@@ -1269,6 +1280,7 @@ static void prefs_compose_create(void)
 
        GtkWidget *checkbtn_forward_as_attachment;
        GtkWidget *checkbtn_smart_wrapping;
+       GtkWidget *checkbtn_block_cursor;
 
 #if USE_PSPELL
        GtkWidget *frame_spell;
@@ -1279,9 +1291,9 @@ static void prefs_compose_create(void)
        GtkWidget *label_pspell_path;
        GtkWidget *entry_pspell_path;
        GtkWidget *btn_pspell_path;
-       GtkWidget *hbox_dictionary_path;
-       GtkWidget *label_dictionary_path;
-       GtkWidget *optmenu_dictionary_path;
+       GtkWidget *hbox_dictionary;
+       GtkWidget *label_dictionary;
+       GtkWidget *optmenu_dictionary;
 #endif
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
@@ -1445,6 +1457,9 @@ static void prefs_compose_create(void)
 
        PACK_CHECK_BUTTON (vbox1, checkbtn_smart_wrapping,
                           _("Smart wrapping (EXPERIMENTAL)"));
+       
+       PACK_CHECK_BUTTON (vbox1, checkbtn_block_cursor,
+                         _("Block cursor"));
 
 #if USE_PSPELL
        /* spell checker defaults */                       
@@ -1484,20 +1499,20 @@ static void prefs_compose_create(void)
                           GTK_SIGNAL_FUNC(prefs_compose_btn_pspell_path_clicked_cb),
                           NULL);
 
-       hbox_dictionary_path = gtk_hbox_new(FALSE, 8);
-       gtk_widget_show(hbox_dictionary_path);
-       gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_dictionary_path, TRUE, TRUE, 0);
+       hbox_dictionary = gtk_hbox_new(FALSE, 8);
+       gtk_widget_show(hbox_dictionary);
+       gtk_box_pack_start(GTK_BOX(vbox_spell), hbox_dictionary, TRUE, TRUE, 0);
 
-       label_dictionary_path = gtk_label_new(_("Dictionary"));
-       gtk_widget_show(label_dictionary_path);
-       gtk_box_pack_start(GTK_BOX(hbox_dictionary_path), label_dictionary_path, FALSE, FALSE, 0);
+       label_dictionary = gtk_label_new(_("Dictionary"));
+       gtk_widget_show(label_dictionary);
+       gtk_box_pack_start(GTK_BOX(hbox_dictionary), label_dictionary, FALSE, FALSE, 0);
 
-       optmenu_dictionary_path = gtk_option_menu_new();
-       gtk_widget_show(optmenu_dictionary_path);
-       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary_path), 
+       optmenu_dictionary = gtk_option_menu_new();
+       gtk_widget_show(optmenu_dictionary);
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu_dictionary), 
                                 gtkpspell_dictionary_option_menu_new(prefs_common.pspell_path));
-       gtk_box_pack_start(GTK_BOX(hbox_dictionary_path), optmenu_dictionary_path, FALSE, FALSE, 0);
-       gtk_widget_set_sensitive(optmenu_dictionary_path, prefs_common.enable_pspell);
+       gtk_box_pack_start(GTK_BOX(hbox_dictionary), optmenu_dictionary, FALSE, FALSE, 0);
+       gtk_widget_set_sensitive(optmenu_dictionary, prefs_common.enable_pspell);
 #endif
 
        /*
@@ -1522,12 +1537,14 @@ static void prefs_compose_create(void)
                checkbtn_forward_as_attachment;
        compose.checkbtn_smart_wrapping = 
                checkbtn_smart_wrapping;
+       compose.checkbtn_block_cursor   =
+               checkbtn_block_cursor;
 
 #if USE_PSPELL
        compose.checkbtn_enable_pspell = checkbtn_enable_pspell;
        compose.entry_pspell_path      = entry_pspell_path;
        compose.btn_pspell_path        = btn_pspell_path;
-       compose.optmenu_dictionary_path = optmenu_dictionary_path;
+       compose.optmenu_dictionary     = optmenu_dictionary;
 #endif
 }
 
@@ -2041,6 +2058,11 @@ static void prefs_interface_create(void)
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
 
+       GtkWidget *hbox2;
+       GtkWidget *optmenu_nextunreadmsgdialog;
+       GtkWidget *optmenu_nextunreadmsgdialog_menu;
+       GtkWidget *nextunreadmsgdialog_menuitem;
+
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
@@ -2116,6 +2138,32 @@ static void prefs_interface_create(void)
                (vbox_addr, checkbtn_addaddrbyclick,
                 _("Add address to destination when double-clicked"));
 
+       /* Next Unread Message Dialog */
+       hbox2 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox2);
+       gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, FALSE, 0);
+
+       label = gtk_label_new (_("Show no-unread-message dialog"));
+       gtk_widget_show (label);
+       gtk_box_pack_start (GTK_BOX (hbox2), label, FALSE, FALSE, 0);
+
+       optmenu_nextunreadmsgdialog = gtk_option_menu_new ();
+       gtk_widget_show (optmenu_nextunreadmsgdialog);
+       gtk_box_pack_start (GTK_BOX (hbox2), optmenu_nextunreadmsgdialog,
+                           FALSE, FALSE, 0);
+
+       optmenu_nextunreadmsgdialog_menu = gtk_menu_new ();
+       MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
+                     _("Always"),  NEXTUNREADMSGDIALOG_ALWAYS);
+       MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
+                     _("Assume 'Yes'"),  NEXTUNREADMSGDIALOG_ASSUME_YES);
+       MENUITEM_ADD (optmenu_nextunreadmsgdialog_menu, nextunreadmsgdialog_menuitem,
+                     _("Assume 'No'"), NEXTUNREADMSGDIALOG_ASSUME_NO);
+
+       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_nextunreadmsgdialog),
+                                 optmenu_nextunreadmsgdialog_menu);
+
+
        /* Receive Dialog */
 /*     hbox = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox);
@@ -2162,15 +2210,16 @@ static void prefs_interface_create(void)
                           _("Warn if there are queued messages"));
 
        /* interface.checkbtn_emacs          = checkbtn_emacs; */
-       interface.checkbtn_openunread     = checkbtn_openunread;
-       interface.checkbtn_openinbox      = checkbtn_openinbox;
-       interface.checkbtn_immedexec      = checkbtn_immedexec;
-       interface.optmenu_recvdialog      = optmenu_recvdialog;
-       interface.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
-       interface.checkbtn_confonexit     = checkbtn_confonexit;
-       interface.checkbtn_cleanonexit    = checkbtn_cleanonexit;
-       interface.checkbtn_askonclean     = checkbtn_askonclean;
-       interface.checkbtn_warnqueued     = checkbtn_warnqueued;
+       interface.checkbtn_openunread         = checkbtn_openunread;
+       interface.checkbtn_openinbox          = checkbtn_openinbox;
+       interface.checkbtn_immedexec          = checkbtn_immedexec;
+       interface.optmenu_recvdialog          = optmenu_recvdialog;
+       interface.checkbtn_addaddrbyclick     = checkbtn_addaddrbyclick;
+       interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
+       interface.checkbtn_confonexit         = checkbtn_confonexit;
+       interface.checkbtn_cleanonexit        = checkbtn_cleanonexit;
+       interface.checkbtn_askonclean         = checkbtn_askonclean;
+       interface.checkbtn_warnqueued         = checkbtn_warnqueued;
 }
 
 static void prefs_other_create(void)
@@ -3280,6 +3329,44 @@ static void prefs_common_apply(void)
        inc_autocheck_timer_set();
 }
 
+static void prefs_nextunreadmsgdialog_set_data_from_optmenu(PrefParam *pparam)
+{
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       *((NextUnreadMsgDialogShow *)pparam->data) = GPOINTER_TO_INT
+               (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+}
+
+static void prefs_nextunreadmsgdialog_set_optmenu(PrefParam *pparam)
+{
+       NextUnreadMsgDialogShow dialog_show;
+       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+
+       dialog_show = *((NextUnreadMsgDialogShow *)pparam->data);
+
+       switch (dialog_show) {
+       case NEXTUNREADMSGDIALOG_ALWAYS:
+               gtk_option_menu_set_history(optmenu, 0);
+               break;
+       case NEXTUNREADMSGDIALOG_ASSUME_YES:
+               gtk_option_menu_set_history(optmenu, 1);
+               break;
+       case NEXTUNREADMSGDIALOG_ASSUME_NO:
+               gtk_option_menu_set_history(optmenu, 2);
+               break;
+       default:
+       }
+
+       menu = gtk_option_menu_get_menu(optmenu);
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
+       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+}
+
 static void prefs_common_cancel(void)
 {
        gtk_widget_hide(dialog.window);
Claws Mail