more sensitivity fixes to redirect mode
authorPaul Mangan <paul@claws-mail.org>
Mon, 18 Nov 2002 14:28:06 +0000 (14:28 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 18 Nov 2002 14:28:06 +0000 (14:28 +0000)
ChangeLog.claws
configure.in
src/compose.c

index 9e952305e9197a9019970823d071eee86b650f93..d2253c7c495cbc840d54552497c03b6d3d5c90b0 100644 (file)
@@ -1,3 +1,12 @@
+2002-11-18 [paul]      0.8.5claws169
+
+       * src/compose.c
+               more sensitivity fixes to redirect mode:
+               * disable toolbar draft button
+               * allow only Address book in the Tools menu
+               * disable editing of message by the spell
+                 checker
+
 2002-11-18 [paul]      0.8.5claws168
 
        * src/compose.c
index 8cafc399df73331695ad57bbf2390a7033582a0b..9e6ddfa76da4027d70a493b4f5d9e6f3bb02b784 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws168
+EXTRA_VERSION=claws169
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 297983b6102213f2794dfc0b5de703d100e36b0c..d86fd7c5ca5ddda2d87fa34870d5240e2dd84097 100644 (file)
@@ -1280,7 +1280,6 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
        menu_set_sensitive(ifactory, "/File/Attach file", FALSE);
        menu_set_sensitive(ifactory, "/File/Insert signature", FALSE);
        menu_set_sensitive(ifactory, "/Edit", FALSE);
-       menu_set_sensitive(ifactory, "/Spelling", FALSE);
        menu_set_sensitive(ifactory, "/Message/Save to draft folder", FALSE);
        menu_set_sensitive(ifactory, "/Message/Save and keep editing", FALSE);
 #if USE_GPGME
@@ -1291,8 +1290,10 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
 #endif
        menu_set_sensitive(ifactory, "/Message/Priority", FALSE);
        menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
-       menu_set_sensitive(ifactory, "/Tools", FALSE);
+       menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
+       menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
        
+       gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
        gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
        gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
        gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
@@ -4947,34 +4948,35 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        compose->redirect_filename = NULL;
        compose->undostruct = undostruct;
 #if USE_ASPELL
-       
        menu_set_sensitive(ifactory, "/Spelling", FALSE);
-        if (prefs_common.enable_aspell && prefs_common.dictionary &&
-           strcmp(prefs_common.dictionary, _("None"))) {
-               gtkaspell = gtkaspell_new((const gchar*)prefs_common.dictionary,
-                                         conv_get_current_charset_str(),
-                                         prefs_common.misspelled_col,
-                                         prefs_common.check_while_typing,
-                                         prefs_common.use_alternate,
-                                         GTK_STEXT(text));
-               if (!gtkaspell) {
-                       alertpanel_error(_("Spell checker could not be started.\n%s"), gtkaspellcheckers->error_message);
-                       gtkaspell_checkers_reset_error();
-               } else {
+       if (mode != COMPOSE_REDIRECT) {
+               if (prefs_common.enable_aspell && prefs_common.dictionary &&
+                   strcmp(prefs_common.dictionary, _("None"))) {
+                       gtkaspell = gtkaspell_new((const gchar*)prefs_common.dictionary,
+                                                 conv_get_current_charset_str(),
+                                                 prefs_common.misspelled_col,
+                                                 prefs_common.check_while_typing,
+                                                 prefs_common.use_alternate,
+                                                 GTK_STEXT(text));
+                       if (!gtkaspell) {
+                               alertpanel_error(_("Spell checker could not be started.\n%s"), gtkaspellcheckers->error_message);
+                               gtkaspell_checkers_reset_error();
+                       } else {
 
-                       GtkWidget *menuitem;
+                               GtkWidget *menuitem;
 
-                       if (!gtkaspell_set_sug_mode(gtkaspell, prefs_common.aspell_sugmode)) {
-                               debug_print("Aspell: could not set suggestion mode %s\n",
-                                   gtkaspellcheckers->error_message);
-                               gtkaspell_checkers_reset_error();
-                       }
+                               if (!gtkaspell_set_sug_mode(gtkaspell, prefs_common.aspell_sugmode)) {
+                                       debug_print("Aspell: could not set suggestion mode %s\n",
+                                       gtkaspellcheckers->error_message);
+                                       gtkaspell_checkers_reset_error();
+                               }
 
-                       menuitem = gtk_item_factory_get_item(ifactory, "/Spelling/Spelling Configuration");
-                       gtkaspell_populate_submenu(gtkaspell, menuitem);
-                       menu_set_sensitive(ifactory, "/Spelling", TRUE);
-                       }
-        }
+                               menuitem = gtk_item_factory_get_item(ifactory, "/Spelling/Spelling Configuration");
+                               gtkaspell_populate_submenu(gtkaspell, menuitem);
+                               menu_set_sensitive(ifactory, "/Spelling", TRUE);
+                               }
+               }
+       }
 #endif
 
        compose_select_account(compose, account);
@@ -5000,7 +5002,14 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        addressbook_set_target_compose(compose);
        update_compose_actions_menu(ifactory, "/Tools/Actions", compose);
-       compose_set_template_menu(compose);
+       
+       if (mode != COMPOSE_REDIRECT)
+               compose_set_template_menu(compose);
+       else {
+               GtkWidget *menuitem;
+               menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Template");
+               menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
+       }
 
        compose_list = g_list_append(compose_list, compose);