[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Andras Mantia <amantia () kde ! org>
Date:       2010-12-18 14:01:28
Message-ID: 20101218140128.7C390AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1207543 by amantia:

Add recursive sync action for the folders.

 M  +4 -1      kmail_part.rc  
 M  +5 -0      kmmainwidget.cpp  
 M  +4 -1      kmmainwin.rc  


--- trunk/KDE/kdepim/kmail/kmail_part.rc #1207542:1207543
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="462" name="kmmainwin" >
+<kpartgui version="463" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -27,6 +27,7 @@
    <Action name="online_status" />
    <Action name="check_mail" />
    <Action name="akonadi_collection_sync"/>
+   <Action name="akonadi_collection_sync_recursive"/>
    <Action name="check_mail_in" />
    <Action name="send_queued" />
    <Action name="send_queued_via" />
@@ -99,6 +100,7 @@
    <Action name="akonadi_mark_all_as_read" />
    <Separator/>
    <Action name="akonadi_collection_sync" />
+   <Action name="akonadi_collection_sync_recursive" />
    <Separator/>
    <Action name="akonadi_move_all_to_trash" />
    <Action name="archive_folder" />
@@ -192,6 +194,7 @@
  </MenuBar>
  <Menu name="akonadi_favoriteview_contextmenu">
   <Action name="akonadi_collection_sync"/>
+  <Action name="akonadi_collection_sync_recursive"/>
   <Action name="akonadi_mark_all_as_read" />
   <Action name="search_messages" />
   <Action name="move_to_trash" />
--- trunk/KDE/kdepim/kmail/kmmainwidget.cpp #1207542:1207543
@@ -170,6 +170,7 @@
 // System includes
 #include <assert.h>
 #include <errno.h> // ugh
+#include <akonadi/standardactionmanager.h>
 
 #include "kmmainwidget.moc"
 
@@ -3769,6 +3770,10 @@
   if ( actionSync && actionSync->isEnabled() ) {
     syncActionList << actionSync;
   }
+  actionSync = akonadiStandardAction( Akonadi::StandardActionManager::SynchronizeCollectionsRecursive );
+  if ( actionSync && actionSync->isEnabled() ) {
+    syncActionList << actionSync;
+  }
   mGUIClient->unplugActionList( "akonadi_collection_sync_actionlist" );
   mGUIClient->plugActionList( "akonadi_collection_sync_actionlist", syncActionList );
 
--- trunk/KDE/kdepim/kmail/kmmainwin.rc #1207542:1207543
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE kpartgui>
-<kpartgui version="462" name="kmmainwin" >
+<kpartgui version="463" name="kmmainwin" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -27,6 +27,7 @@
    <Action name="online_status" />
    <Action name="check_mail" />
    <Action name="akonadi_collection_sync"/>
+   <Action name="akonadi_collection_sync_recursive"/>
    <Action name="check_mail_in" />
    <Action name="send_queued" />
    <Action name="send_queued_via" />
@@ -99,6 +100,7 @@
    <Action name="akonadi_mark_all_as_read" />
    <Separator/>
    <Action name="akonadi_collection_sync" />
+   <Action name="akonadi_collection_sync_recursive" />
    <Separator/>
    <Action name="akonadi_move_all_to_trash" />
    <Action name="archive_folder" />
@@ -192,6 +194,7 @@
  </MenuBar>
  <Menu name="akonadi_favoriteview_contextmenu">
   <Action name="akonadi_collection_sync"/>
+  <Action name="akonadi_collection_sync_recursive"/>
   <Action name="akonadi_mark_all_as_read" />
   <Action name="search_messages" />
   <Action name="move_to_trash" />
[prev in list] [next in list] [prev in thread] [next in thread]