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

List:       kde-commits
Subject:    KDE/kdepimlibs/akonadi
From:       Andras Mantia <amantia () kde ! org>
Date:       2010-12-18 13:37:00
Message-ID: 20101218133700.7FF73AC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1207536 by amantia:

Add action to sync the collections recursively.

 M  +3 -0      kmime/standardmailactionmanager.cpp  
 M  +19 -2     standardactionmanager.cpp  
 M  +2 -0      standardactionmanager.h  


--- trunk/KDE/kdepimlibs/akonadi/kmime/standardmailactionmanager.cpp #1207535:1207536
@@ -85,6 +85,9 @@
       mGenericManager->setActionText( \
                Akonadi::StandardActionManager::SynchronizeCollections,
                                       ki18np( "Update Folder", "Update Folders" ) );
 
+      mGenericManager->setActionText( \
Akonadi::StandardActionManager::SynchronizeCollectionsRecursive, +                    \
ki18np( "Update folder and its subfolders", "Update folders and their subfolders" ) \
); +
       mGenericManager->action( \
Akonadi::StandardActionManager::SynchronizeCollections )->setWhatsThis(  i18n( \
"Update the content of the selected folders." ) );  
--- trunk/KDE/kdepimlibs/akonadi/standardactionmanager.cpp #1207535:1207536
@@ -102,7 +102,8 @@
   { "akonadi_collection_copy_to_dialog", I18N_NOOP( "Copy Folder To..." ), \
I18N_NOOP( "Copy To" ), "edit-copy", 0, SLOT( slotCopyCollectionTo() ), NormalAction \
},  { "akonadi_collection_move_to_dialog", I18N_NOOP( "Move Folder To..." ), \
I18N_NOOP( "Move To" ), "go-jump", 0, SLOT( slotMoveCollectionTo() ), NormalAction }, \
{ "akonadi_item_copy_to_dialog", I18N_NOOP( "Copy Item To..." ), I18N_NOOP( "Copy To" \
                ), "edit-copy", 0, SLOT( slotCopyItemTo() ), NormalAction },
-  { "akonadi_item_move_to_dialog", I18N_NOOP( "Move Item To..." ), I18N_NOOP( "Move \
To" ), "go-jump", 0, SLOT( slotMoveItemTo() ), NormalAction } +  { \
"akonadi_item_move_to_dialog", I18N_NOOP( "Move Item To..." ), I18N_NOOP( "Move To" \
), "go-jump", 0, SLOT( slotMoveItemTo() ), NormalAction }, +  { \
"akonadi_collection_sync_recursive", I18N_NOOP( "&Synchronize Folder Recursively" ), \
I18N_NOOP( "Synchronize Recursively" ), "view-refresh", Qt::CTRL + Qt::Key_F5, SLOT( \
slotSynchronizeCollectionRecursive() ), NormalAction }  };
 static const int numStandardActionData = sizeof standardActionData / sizeof \
*standardActionData;  
@@ -527,10 +528,26 @@
         return;
 
       foreach( Collection collection, collections ) {
-        AgentManager::self()->synchronizeCollection( collection );
+        AgentManager::self()->synchronizeCollection( collection, false );
       }
     }
 
+    void slotSynchronizeCollectionRecursive()
+    {
+      Q_ASSERT( collectionSelectionModel );
+      const QModelIndexList list = collectionSelectionModel->selectedRows();
+      if ( list.isEmpty() )
+        return;
+
+      const Collection::List collections = selectedCollections();
+      if ( collections.isEmpty() )
+        return;
+
+      foreach( Collection collection, collections ) {
+        AgentManager::self()->synchronizeCollection( collection, true );
+      }
+    }
+
     void slotCollectionProperties()
     {
       const QModelIndexList list = collectionSelectionModel->selectedRows();
--- trunk/KDE/kdepimlibs/akonadi/standardactionmanager.h #1207535:1207536
@@ -157,6 +157,7 @@
       MoveCollectionToDialog,    ///< Move a collection into another collection, \
                select the target in a dialog @since 4.6
       CopyItemToDialog,          ///< Copy an item into a collection, select the \
                target in a dialog @since 4.6
       MoveItemToDialog,          ///< Move an item into a collection, select the \
target in a dialog @since 4.6 +      SynchronizeCollectionsRecursive,    ///< \
Synchronizes collections in a recursive way @since 4.6  LastType                   \
///< Marks last action  };
 
@@ -337,6 +338,7 @@
     Q_PRIVATE_SLOT( d, void slotCutCollections() )
     Q_PRIVATE_SLOT( d, void slotDeleteCollection() )
     Q_PRIVATE_SLOT( d, void slotSynchronizeCollection() )
+    Q_PRIVATE_SLOT( d, void slotSynchronizeCollectionRecursive() )
     Q_PRIVATE_SLOT( d, void slotCollectionProperties() )
     Q_PRIVATE_SLOT( d, void slotCopyItems() )
     Q_PRIVATE_SLOT( d, void slotCutItems() )


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