[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 14:00:52
Message-ID: 20101218140052.A73FEAC8A8 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1207542 by amantia:

Enable/disable the recursive sync together with the non-recursive one.
Set a whatsthis text for the recursive sync. I have no idea why the action text is \
not changed when it is used in kmail though. :(

 M  +2 -0      actionstatemanager.cpp  
 M  +6 -3      kmime/standardmailactionmanager.cpp  


--- trunk/KDE/kdepimlibs/akonadi/actionstatemanager.cpp #1207541:1207542
@@ -168,6 +168,8 @@
   enableAction( StandardActionManager::SynchronizeCollections, \
                atLeastOneCollectionSelected && 
                                                                collectionsAreFolders \
); // it must be a valid folder collection  
+  enableAction( StandardActionManager::SynchronizeCollectionsRecursive, \
atLeastOneCollectionSelected && +                                                     \
collectionsAreFolders ); // it must be a valid folder collection  #ifndef \
QT_NO_CLIPBOARD  enableAction( StandardActionManager::Paste, singleCollectionSelected \
                && // we can paste only into a single collection
                                               PasteHelper::canPaste( \
QApplication::clipboard()->mimeData(), collection ) ); // there must be data on the \
                clipboard
--- trunk/KDE/kdepimlibs/akonadi/kmime/standardmailactionmanager.cpp #1207541:1207542
@@ -85,9 +85,6 @@
       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." ) );  
@@ -140,6 +137,12 @@
       mGenericManager->action( Akonadi::StandardActionManager::SynchronizeResources \
                )->setWhatsThis(
         i18n( "Updates the content of all folders of the selected accounts." ) );
 
+      mGenericManager->setActionText( \
Akonadi::StandardActionManager::SynchronizeCollectionsRecursive, +                    \
ki18np( "Update folder and its subfolders", "Update folders and their subfolders" ) \
); +
+      mGenericManager->action( \
Akonadi::StandardActionManager::SynchronizeCollectionsRecursive )->setWhatsThis( +    \
i18n( "Update the content of the selected folders and their subfolders." ) ); +
       mGenericManager->setContextText(
         StandardActionManager::CreateCollection, StandardActionManager::DialogTitle,
         i18nc( "@title:window", "New Folder" ) );


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