[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-09-10 14:29:39
Message-ID: 20100910142939.78541AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173832 by amantia:

Restore BC with KDE 4.5.x.

 M  +5 -5      standardactionmanager.cpp  
 M  +4 -4      standardactionmanager.h  


--- trunk/KDE/kdepimlibs/akonadi/standardactionmanager.cpp #1173831:1173832
@@ -91,20 +91,20 @@
   { "akonadi_collection_remove_from_favorites", I18N_NOOP( "Remove from Favorite \
Folders" ), "edit-delete", 0, SLOT( slotRemoveFromFavorites() ), NormalAction },  { \
"akonadi_collection_rename_favorite", I18N_NOOP( "Rename Favorite..." ), \
"edit-rename", 0, SLOT( slotRenameFavorite() ), NormalAction },  { \
"akonadi_collection_copy_to_menu", I18N_NOOP( "Copy Folder To..." ), "edit-copy", 0, \
                SLOT( slotCopyCollectionTo( QAction* ) ), MenuAction },
-  { "akonadi_collection_copy_to_dialog", I18N_NOOP( "Copy Folder To..." ), \
"edit-copy", 0, SLOT( slotCopyCollectionTo() ), NormalAction },  { \
"akonadi_item_copy_to_menu", I18N_NOOP( "Copy Item To..." ), "edit-copy", 0, SLOT( \
                slotCopyItemTo( QAction* ) ), MenuAction },
-  { "akonadi_item_copy_to_dialog", I18N_NOOP( "Copy Item To..." ), "edit-copy", 0, \
SLOT( slotCopyItemTo() ), NormalAction },  { "akonadi_item_move_to_menu", I18N_NOOP( \
                "Move Item To..." ), "go-jump", 0, SLOT( slotMoveItemTo( QAction* ) \
                ), MenuAction },
-  { "akonadi_item_move_to_dialog", I18N_NOOP( "Move Item To..." ), "go-jump", 0, \
SLOT( slotMoveItemTo() ), NormalAction },  { "akonadi_collection_move_to_menu", \
I18N_NOOP( "Move Folder To..." ), "go-jump", 0, SLOT( slotMoveCollectionTo( QAction* \
                ) ), MenuAction },
-  { "akonadi_collection_move_to_dialog", I18N_NOOP( "Move Folder To..." ), \
"go-jump", 0, SLOT( slotMoveCollectionTo() ), NormalAction },  { "akonadi_item_cut", \
I18N_NOOP( "&Cut Item" ), "edit-cut", Qt::CTRL + Qt::Key_X, SLOT( slotCutItems() ), \
NormalAction },  { "akonadi_collection_cut", I18N_NOOP( "&Cut Folder" ), "edit-cut", \
Qt::CTRL + Qt::Key_X, SLOT( slotCutCollections() ), NormalAction },  { \
"akonadi_resource_create", I18N_NOOP( "Create Resource" ), "folder-new", 0, SLOT( \
slotCreateResource() ), NormalAction },  { "akonadi_resource_delete", I18N_NOOP( \
"Delete Resource" ), "edit-delete", 0, SLOT( slotDeleteResource() ), NormalAction },  \
{ "akonadi_resource_properties", I18N_NOOP( "&Resource Properties" ), "configure", 0, \
SLOT( slotResourceProperties() ), NormalAction },  { "akonadi_resource_synchronize", \
I18N_NOOP( "Synchronize Resource" ), "view-refresh", 0, SLOT( \
                slotSynchronizeResource() ), NormalAction },
-  { "akonadi_work_offline", I18N_NOOP( "Work Offline" ), "user-offline", 0, SLOT( \
slotToggleWorkOffline(bool) ), ToggleAction } +  { "akonadi_work_offline", I18N_NOOP( \
"Work Offline" ), "user-offline", 0, SLOT( slotToggleWorkOffline(bool) ), \
ToggleAction }, +  { "akonadi_collection_copy_to_dialog", I18N_NOOP( "Copy Folder \
To..." ), "edit-copy", 0, SLOT( slotCopyCollectionTo() ), NormalAction }, +  { \
"akonadi_collection_move_to_dialog", I18N_NOOP( "Move Folder To..." ), "go-jump", 0, \
SLOT( slotMoveCollectionTo() ), NormalAction }, +  { "akonadi_item_copy_to_dialog", \
I18N_NOOP( "Copy Item To..." ), "edit-copy", 0, SLOT( slotCopyItemTo() ), \
NormalAction }, +  { "akonadi_item_move_to_dialog", I18N_NOOP( "Move Item To..." ), \
"go-jump", 0, SLOT( slotMoveItemTo() ), NormalAction }  };
 static const int numActionData = sizeof actionData / sizeof *actionData;
 
--- trunk/KDE/kdepimlibs/akonadi/standardactionmanager.h #1173831:1173832
@@ -143,13 +143,9 @@
       RemoveFromFavoriteCollections,  ///< Remove the collection from the favorite \
                collections model @since 4.4
       RenameFavoriteCollection,  ///< Rename the collection of the favorite \
                collections model @since 4.4
       CopyCollectionToMenu,      ///< Menu allowing to quickly copy a collection \
                into another collection @since 4.4
-      CopyCollectionToDialog,    ///< Copy a collection into another collection, \
                select the target in a dialog @since 4.6
       CopyItemToMenu,            ///< Menu allowing to quickly copy an item into a \
                collection @since 4.4
-      CopyItemToDialog,          ///< Copy an item into a collection, select the \
                target in a dialog @since 4.6
       MoveItemToMenu,            ///< Menu allowing to move item into a collection \
                @since 4.4
-      MoveItemToDialog,          ///< Move an item into a collection, select the \
                target in a dialog @since 4.6
       MoveCollectionToMenu,      ///< Menu allowing to move a collection into \
                another collection @since 4.4
-      MoveCollectionToDialog,    ///< Move a collection into another collection, \
select the target in a dialog @since 4.6  CutItems,                  ///< Cuts the \
                selected items @since 4.4
       CutCollections,            ///< Cuts the selected collections @since 4.4
       CreateResource,            ///< Creates a new resource @since 4.6
@@ -157,6 +153,10 @@
       ResourceProperties,        ///< Provides the resource properties @since 4.6
       SynchronizeResources,      ///< Synchronizes the selected resources @since 4.6
       ToggleWorkOffline,         ///< Toggles the work offline state of all \
resources @since 4.6 +      CopyCollectionToDialog,    ///< Copy a collection into \
another collection, select the target in a dialog @since 4.6 +      \
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  \
LastType                   ///< Marks last action  };
 


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