SOURCES: kdepim-kmail_toolbars.patch - Updated

[adgor]

Author: adgor                        Date: Mon Oct  2 10:10:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Updated

---- Files affected:
SOURCES:
   kdepim-kmail_toolbars.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/kdepim-kmail_toolbars.patch
diff -u SOURCES/kdepim-kmail_toolbars.patch:1.4 SOURCES/kdepim-kmail_toolbars.patch:1.5
--- SOURCES/kdepim-kmail_toolbars.patch:1.4	Sun Oct 26 13:43:54 2003
+++ SOURCES/kdepim-kmail_toolbars.patch	Mon Oct  2 12:10:46 2006
@@ -1,17 +1,17 @@
---- kdepim-031024/kmail/kmcomposewin.cpp.orig	2003-10-19 23:36:21.000000000 +0200
-+++ kdepim-031024/kmail/kmcomposewin.cpp	2003-10-24 13:20:53.000000000 +0200
-@@ -892,7 +892,7 @@
+--- kdepim-3.5.4/kmail/kmcomposewin.cpp.orig	2006-07-22 10:14:16.000000000 +0200
++++ kdepim-3.5.4/kmail/kmcomposewin.cpp	2006-10-01 15:08:38.000000000 +0200
+@@ -1220,7 +1220,7 @@
    (void) new KAction (i18n("Cl&ean Spaces"), 0, this, SLOT(slotCleanSpace()),
                        actionCollection(), "clean_spaces");
  
 -  mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), 0, this,
 +  mFixedFontAction = new KToggleAction( i18n("Use Fi&xed Font"), "text", 0, this,
                        SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
+   mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
  
-   //these are checkable!!!
---- kdepim-031006/kmail/kmmainwidget.cpp.orig	2003-10-06 02:19:39.000000000 +0200
-+++ kdepim-031006/kmail/kmmainwidget.cpp	2003-10-07 00:19:52.000000000 +0200
-@@ -2013,7 +2013,7 @@
+--- kdepim-3.5.4/kmail/kmmainwidget.cpp.orig	2006-07-22 10:14:16.000000000 +0200
++++ kdepim-3.5.4/kmail/kmmainwidget.cpp	2006-10-01 15:20:48.000000000 +0200
+@@ -2394,7 +2394,7 @@
    mFindInMessageAction = new KAction( i18n("&Find in Message..."), "find", KStdAccel::shortcut(KStdAccel::Find), this,
  		      SLOT(slotFind()), actionCollection(), "find_in_messages" );
  
@@ -19,32 +19,40 @@
 +  (void) new KAction( i18n("Select &All Messages"), "ok", KStdAccel::selectAll(), this,
  		      SLOT(slotMarkAll()), actionCollection(), "mark_all_messages" );
  
-   (void) new KAction( i18n("Select Message &Text"),
-@@ -2046,10 +2046,10 @@
-   mRemoveFolderAction = new KAction( i18n("&Delete Folder"), "editdelete", 0, this,
+   //----- Folder Menu
+@@ -2434,13 +2434,13 @@
+   mRemoveFolderAction = new KAction( "foo", "editdelete", 0, this,
  		      SLOT(slotRemoveFolder()), actionCollection(), "delete_folder" );
  
 -  mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), 0, this,
 +  mPreferHtmlAction = new KToggleAction( i18n("Prefer &HTML to Plain Text"), "html", 0, this,
  		      SLOT(slotOverrideHtml()), actionCollection(), "prefer_html" );
  
+   mPreferHtmlLoadExtAction = new KToggleAction( i18n("Load E&xternal References"), 0, this,
+ 		      SLOT(slotOverrideHtmlLoadExt()), actionCollection(), "prefer_html_external_refs" );
+ 
 -  mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), 0, this,
 +  mThreadMessagesAction = new KToggleAction( i18n("&Thread Messages"), "view_tree", 0, this,
  		      SLOT(slotOverrideThread()), actionCollection(), "thread_messages" );
  
    mThreadBySubjectAction = new KToggleAction( i18n("Thread Messages also by &Subject"), 0, this,
---- kdepim-030911/kmail/kmreaderwin.cpp~	2003-09-09 23:22:40.000000000 +0200
-+++ kdepim-030911/kmail/kmreaderwin.cpp	2003-09-11 20:15:02.000000000 +0200
-@@ -537,10 +537,10 @@
-                                      ac, "add_bookmarks" );
-   mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, this,
- 			     SLOT(slotUrlSave()), ac, "saveas_url" );
+@@ -2696,7 +2696,7 @@
+ 		     SLOT(slotCollapseAllThreads()),
+ 		     actionCollection(), "collapse_all_threads" );
+ 
 -  mViewSourceAction = new KAction( i18n("&View Source"), Key_V, this,
 +  mViewSourceAction = new KAction( i18n("&View Source"), "source", Key_V, this,
- 		      SLOT(slotShowMsgSrc()), ac, "view_source" );
+                                    SLOT(slotShowMsgSrc()), actionCollection(),
+                                    "view_source" );
+ 
+--- kdepim-3.5.4/kmail/kmreaderwin.cpp.orig	2006-05-22 20:10:53.000000000 +0200
++++ kdepim-3.5.4/kmail/kmreaderwin.cpp	2006-10-01 15:19:19.000000000 +0200
+@@ -665,7 +665,7 @@
+   mUrlSaveAsAction = new KAction( i18n("Save Link As..."), 0, this,
+                                   SLOT(slotUrlSave()), ac, "saveas_url" );
  
 -  mToggleFixFontAction = new KToggleAction( i18n("Use Fi&xed Font"),
 +  mToggleFixFontAction = new KToggleAction( i18n("Use Fi&xed Font"), "text",
-  			Key_X, this, SLOT(slotToggleFixedFont()),
-  			ac, "toggle_fixedfont" );
+                                             Key_X, this, SLOT(slotToggleFixedFont()),
+                                             ac, "toggle_fixedfont" );
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdepim-kmail_toolbars.patch?r1=1.4&r2=1.5&f=u