--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/bwins/glxcommoncommandhandlersu.def Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/bwins/glxcommoncommandhandlersu.def Tue Jan 26 11:58:28 2010 +0200
@@ -1,67 +1,69 @@
EXPORTS
- ?NewL@CGlxCommandHandlerHelp@@SAPAV1@VTGlxHelpContext@@@Z @ 1 NONAME ; class CGlxCommandHandlerHelp * CGlxCommandHandlerHelp::NewL(class TGlxHelpContext)
- ?HandleItemAddedL@CGlxCommandHandlerNewMedia@@MAEXHHPAVMGlxMediaList@@@Z @ 2 NONAME ; void CGlxCommandHandlerNewMedia::HandleItemAddedL(int, int, class MGlxMediaList *)
- ?ExecuteLD@CGlxCommandHandlerNewMedia@@QAEHAAVTGlxMediaId@@@Z @ 3 NONAME ; int CGlxCommandHandlerNewMedia::ExecuteLD(class TGlxMediaId &)
- ??1CGlxCommandHandlerFilterImagesOrVideos@@UAE@XZ @ 4 NONAME ; CGlxCommandHandlerFilterImagesOrVideos::~CGlxCommandHandlerFilterImagesOrVideos(void)
- ?OfferKeyEventL@CGlxSingleGraphicPopupMenuStyleListBox@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 5 NONAME ; enum TKeyResponse CGlxSingleGraphicPopupMenuStyleListBox::OfferKeyEventL(struct TKeyEvent const &, enum TEventCode)
- ?IncrementRefCount@CGlxImageViewerManager@@QAEXXZ @ 6 NONAME ; void CGlxImageViewerManager::IncrementRefCount(void)
- ??0CGlxMediaListAdaptor@@QAE@PBVMGlxMediaList@@H@Z @ 7 NONAME ; CGlxMediaListAdaptor::CGlxMediaListAdaptor(class MGlxMediaList const *, int)
- ?NewL@CGlxCommandHandlerUpload@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 8 NONAME ; class CGlxCommandHandlerUpload * CGlxCommandHandlerUpload::NewL(class MGlxMediaListProvider *, int)
- ?NewL@CGlxCommandHandlerRename@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 9 NONAME ; class CGlxCommandHandlerRename * CGlxCommandHandlerRename::NewL(class MGlxMediaListProvider *, int)
- ?NewL@CGlxCommandHandlerSend@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 10 NONAME ; class CGlxCommandHandlerSend * CGlxCommandHandlerSend::NewL(class MGlxMediaListProvider *, int)
- ??1CGlxCommandHandlerUpload@@UAE@XZ @ 11 NONAME ; CGlxCommandHandlerUpload::~CGlxCommandHandlerUpload(void)
- ??1CGlxCommandHandlerNewMedia@@UAE@XZ @ 12 NONAME ; CGlxCommandHandlerNewMedia::~CGlxCommandHandlerNewMedia(void)
- ??1CGlxCommandHandlerSlideshow@@UAE@XZ @ 13 NONAME ; CGlxCommandHandlerSlideshow::~CGlxCommandHandlerSlideshow(void)
- ?NewL@CGlxCommandHandlerAiwShowMap@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 14 NONAME ; class CGlxCommandHandlerAiwShowMap * CGlxCommandHandlerAiwShowMap::NewL(class MGlxMediaListProvider *, int)
- ??1CGlxCommandHandlerSave@@UAE@XZ @ 15 NONAME ; CGlxCommandHandlerSave::~CGlxCommandHandlerSave(void)
- ?NewL@CGlxCommandHandlerDelete@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 16 NONAME ; class CGlxCommandHandlerDelete * CGlxCommandHandlerDelete::NewL(class MGlxMediaListProvider *, int, int)
- ??1CGlxCommandHandlerAddToContainer@@UAE@XZ @ 17 NONAME ; CGlxCommandHandlerAddToContainer::~CGlxCommandHandlerAddToContainer(void)
- ??0CGlxMediaSelectionPopup@@QAE@XZ @ 18 NONAME ; CGlxMediaSelectionPopup::CGlxMediaSelectionPopup(void)
- ?NewL@CGlxCommandHandlerRotate@@SAPAV1@PAVMGlxMediaListProvider@@PAVMGlxLayoutOwner@@H@Z @ 19 NONAME ; class CGlxCommandHandlerRotate * CGlxCommandHandlerRotate::NewL(class MGlxMediaListProvider *, class MGlxLayoutOwner *, int)
- ?NewL@CGlxCommandHandlerNewMedia@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 20 NONAME ; class CGlxCommandHandlerNewMedia * CGlxCommandHandlerNewMedia::NewL(class MGlxMediaListProvider *)
- ?ExecuteLD@CGlxMediaSelectionPopup@@QAEPAVCMPXCollectionPath@@AAV2@AAHHHPAVCMPXMedia@@@Z @ 21 NONAME ; class CMPXCollectionPath * CGlxMediaSelectionPopup::ExecuteLD(class CMPXCollectionPath &, int &, int, int, class CMPXMedia *)
- ?NewL@CGlxCommandHandlerCopyAndMove@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 22 NONAME ; class CGlxCommandHandlerCopyAndMove * CGlxCommandHandlerCopyAndMove::NewL(class MGlxMediaListProvider *, int)
- ?OkToExit@CGlxCommandHandlerNewMedia@@UBEHXZ @ 23 NONAME ; int CGlxCommandHandlerNewMedia::OkToExit(void) const
- ??1CGlxCommandHandlerBack@@UAE@XZ @ 24 NONAME ; CGlxCommandHandlerBack::~CGlxCommandHandlerBack(void)
- ?NewPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 25 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewPreviousViewCommandHandlerL(class MGlxMediaListProvider *)
- ??1CGlxCommandHandlerCopyAndMove@@UAE@XZ @ 26 NONAME ; CGlxCommandHandlerCopyAndMove::~CGlxCommandHandlerCopyAndMove(void)
- ?SetContainerId@CGlxCommandHandlerRemoveFrom@@QAEXVTGlxMediaId@@@Z @ 27 NONAME ; void CGlxCommandHandlerRemoveFrom::SetContainerId(class TGlxMediaId)
- ?NewL@CGlxCommandHandlerVideoPlayback@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 28 NONAME ; class CGlxCommandHandlerVideoPlayback * CGlxCommandHandlerVideoPlayback::NewL(class MGlxMediaListProvider *)
- ?MdcaCount@CGlxMediaListAdaptor@@UBEHXZ @ 29 NONAME ; int CGlxMediaListAdaptor::MdcaCount(void) const
- ??0TGlxHelpContext@@QAE@XZ @ 30 NONAME ; TGlxHelpContext::TGlxHelpContext(void)
- ??1CGlxCommandHandlerSortOrder@@UAE@XZ @ 31 NONAME ; CGlxCommandHandlerSortOrder::~CGlxCommandHandlerSortOrder(void)
- ?NewL@CGlxCommandHandlerFilterImagesOrVideos@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 32 NONAME ; class CGlxCommandHandlerFilterImagesOrVideos * CGlxCommandHandlerFilterImagesOrVideos::NewL(class MGlxMediaListProvider *)
- ??1CGlxCommandHandlerRemoveFrom@@UAE@XZ @ 33 NONAME ; CGlxCommandHandlerRemoveFrom::~CGlxCommandHandlerRemoveFrom(void)
- ?NewL@CGlxCommandHandlerAiwShowMapHardKey@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 34 NONAME ; class CGlxCommandHandlerAiwShowMapHardKey * CGlxCommandHandlerAiwShowMapHardKey::NewL(class MGlxMediaListProvider *, int)
- ?NewL@CGlxCommandHandlerHideUi@@SAPAV1@XZ @ 35 NONAME ; class CGlxCommandHandlerHideUi * CGlxCommandHandlerHideUi::NewL(void)
- ?NewL@CGlxCommandHandlerAiwAssign@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 36 NONAME ; class CGlxCommandHandlerAiwAssign * CGlxCommandHandlerAiwAssign::NewL(class MGlxMediaListProvider *, int)
- ??1CGlxCommandHandlerSend@@UAE@XZ @ 37 NONAME ; CGlxCommandHandlerSend::~CGlxCommandHandlerSend(void)
- ?NewAddToTagCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 38 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToTagCommandHandlerL(class MGlxMediaListProvider *, int)
- ?ImageUri@CGlxImageViewerManager@@QAEPAVHBufC16@@XZ @ 39 NONAME ; class HBufC16 * CGlxImageViewerManager::ImageUri(void)
- ?NewL@CGlxCommandHandlerOpen@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 40 NONAME ; class CGlxCommandHandlerOpen * CGlxCommandHandlerOpen::NewL(class MGlxMediaListProvider *)
- ??1CGlxCommandHandlerDelete@@UAE@XZ @ 41 NONAME ; CGlxCommandHandlerDelete::~CGlxCommandHandlerDelete(void)
- ??1CGlxCommandHandlerDetails@@UAE@XZ @ 42 NONAME ; CGlxCommandHandlerDetails::~CGlxCommandHandlerDetails(void)
- ??1CGlxCommandHandlerDownload@@UAE@XZ @ 43 NONAME ; CGlxCommandHandlerDownload::~CGlxCommandHandlerDownload(void)
- ?NewL@CGlxCommandHandlerSave@@SAPAV1@XZ @ 44 NONAME ; class CGlxCommandHandlerSave * CGlxCommandHandlerSave::NewL(void)
- ??1CGlxCommandHandlerOpen@@UAE@XZ @ 45 NONAME ; CGlxCommandHandlerOpen::~CGlxCommandHandlerOpen(void)
- ?NewL@CGlxCommandHandlerSlideshow@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 46 NONAME ; class CGlxCommandHandlerSlideshow * CGlxCommandHandlerSlideshow::NewL(class MGlxMediaListProvider *, int, int)
- ?IsPrivate@CGlxImageViewerManager@@QAEHXZ @ 47 NONAME ; int CGlxImageViewerManager::IsPrivate(void)
- ?NewL@CGlxCommandHandlerAiwShareOnOvi@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 48 NONAME ; class CGlxCommandHandlerAiwShareOnOvi * CGlxCommandHandlerAiwShareOnOvi::NewL(class MGlxMediaListProvider *, int)
- ?NewAddToAlbumCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 49 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToAlbumCommandHandlerL(class MGlxMediaListProvider *, int)
- ??1CGlxCommandHandlerRename@@UAE@XZ @ 50 NONAME ; CGlxCommandHandlerRename::~CGlxCommandHandlerRename(void)
- ??1CGlxCommandHandlerVideoPlayback@@UAE@XZ @ 51 NONAME ; CGlxCommandHandlerVideoPlayback::~CGlxCommandHandlerVideoPlayback(void)
- ?MdcaPoint@CGlxMediaListAdaptor@@UBE?AVTPtrC16@@H@Z @ 52 NONAME ; class TPtrC16 CGlxMediaListAdaptor::MdcaPoint(int) const
- ?NewL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 53 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewL(class MGlxMediaListProvider *, int, int)
- ?ImageFileHandle@CGlxImageViewerManager@@QBEAAVRFile64@@XZ @ 54 NONAME ; class RFile64 & CGlxImageViewerManager::ImageFileHandle(void) const
- ?NewL@CGlxCommandHandlerDownload@@SAPAV1@XZ @ 55 NONAME ; class CGlxCommandHandlerDownload * CGlxCommandHandlerDownload::NewL(void)
- ??1CGlxCommandHandlerHelp@@UAE@XZ @ 56 NONAME ; CGlxCommandHandlerHelp::~CGlxCommandHandlerHelp(void)
- ?BypassFiltersForExecute@CGlxCommandHandlerNewMedia@@UBEHXZ @ 57 NONAME ; int CGlxCommandHandlerNewMedia::BypassFiltersForExecute(void) const
- ?NewL@CGlxCommandHandlerRemoveFrom@@SAPAV1@PAVMGlxMediaListProvider@@W4TMPXGeneralCategory@@@Z @ 58 NONAME ; class CGlxCommandHandlerRemoveFrom * CGlxCommandHandlerRemoveFrom::NewL(class MGlxMediaListProvider *, enum TMPXGeneralCategory)
- ?NewL@CGlxCommandHandlerDetails@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 59 NONAME ; class CGlxCommandHandlerDetails * CGlxCommandHandlerDetails::NewL(class MGlxMediaListProvider *)
- ?NewL@CGlxCommandHandlerAiwPrintPreview@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 60 NONAME ; class CGlxCommandHandlerAiwPrintPreview * CGlxCommandHandlerAiwPrintPreview::NewL(class MGlxMediaListProvider *, int)
- ?NewL@CGlxCommandHandlerSortOrder@@SAPAV1@PAVMGlxMediaListProvider@@K@Z @ 61 NONAME ; class CGlxCommandHandlerSortOrder * CGlxCommandHandlerSortOrder::NewL(class MGlxMediaListProvider *, unsigned long)
- ?NewBackCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@XZ @ 62 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewBackCommandHandlerL(void)
- ?NewL@CGlxCommandHandlerAiwEdit@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 63 NONAME ; class CGlxCommandHandlerAiwEdit * CGlxCommandHandlerAiwEdit::NewL(class MGlxMediaListProvider *, int)
- ?NewContainerPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 64 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewContainerPreviousViewCommandHandlerL(class MGlxMediaListProvider *, int)
- ?NewAddToFavCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 65 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToFavCommandHandlerL(class MGlxMediaListProvider *, int)
+ ??1CGlxCommandHandlerFilterImagesOrVideos@@UAE@XZ @ 1 NONAME ; CGlxCommandHandlerFilterImagesOrVideos::~CGlxCommandHandlerFilterImagesOrVideos(void)
+ ?OfferKeyEventL@CGlxSingleGraphicPopupMenuStyleListBox@@UAE?AW4TKeyResponse@@ABUTKeyEvent@@W4TEventCode@@@Z @ 2 NONAME ; enum TKeyResponse CGlxSingleGraphicPopupMenuStyleListBox::OfferKeyEventL(struct TKeyEvent const &, enum TEventCode)
+ ??0CGlxMediaListAdaptor@@QAE@PBVMGlxMediaList@@H@Z @ 3 NONAME ; CGlxMediaListAdaptor::CGlxMediaListAdaptor(class MGlxMediaList const *, int)
+ ?NewL@CGlxCommandHandlerRename@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 4 NONAME ; class CGlxCommandHandlerRename * CGlxCommandHandlerRename::NewL(class MGlxMediaListProvider *, int)
+ ?NewL@CGlxCommandHandlerSend@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 5 NONAME ; class CGlxCommandHandlerSend * CGlxCommandHandlerSend::NewL(class MGlxMediaListProvider *, int)
+ ??1CGlxCommandHandlerNewMedia@@UAE@XZ @ 6 NONAME ; CGlxCommandHandlerNewMedia::~CGlxCommandHandlerNewMedia(void)
+ ??1CGlxCommandHandlerSave@@UAE@XZ @ 7 NONAME ; CGlxCommandHandlerSave::~CGlxCommandHandlerSave(void)
+ ?NewL@CGlxCommandHandlerDelete@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 8 NONAME ; class CGlxCommandHandlerDelete * CGlxCommandHandlerDelete::NewL(class MGlxMediaListProvider *, int, int)
+ ?NewL@CGlxCommandHandlerRotate@@SAPAV1@PAVMGlxMediaListProvider@@PAVMGlxLayoutOwner@@H@Z @ 9 NONAME ; class CGlxCommandHandlerRotate * CGlxCommandHandlerRotate::NewL(class MGlxMediaListProvider *, class MGlxLayoutOwner *, int)
+ ?ExecuteLD@CGlxMediaSelectionPopup@@QAEPAVCMPXCollectionPath@@AAV2@AAHHHPAVCMPXMedia@@@Z @ 10 NONAME ; class CMPXCollectionPath * CGlxMediaSelectionPopup::ExecuteLD(class CMPXCollectionPath &, int &, int, int, class CMPXMedia *)
+ ?OkToExit@CGlxCommandHandlerNewMedia@@UBEHXZ @ 11 NONAME ; int CGlxCommandHandlerNewMedia::OkToExit(void) const
+ ??1CGlxCommandHandlerBack@@UAE@XZ @ 12 NONAME ; CGlxCommandHandlerBack::~CGlxCommandHandlerBack(void)
+ ?NewPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 13 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewPreviousViewCommandHandlerL(class MGlxMediaListProvider *)
+ ?NewL@CGlxCommandHandlerVideoPlayback@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 14 NONAME ; class CGlxCommandHandlerVideoPlayback * CGlxCommandHandlerVideoPlayback::NewL(class MGlxMediaListProvider *)
+ ??0TGlxHelpContext@@QAE@XZ @ 15 NONAME ; TGlxHelpContext::TGlxHelpContext(void)
+ ??1CGlxCommandHandlerSortOrder@@UAE@XZ @ 16 NONAME ; CGlxCommandHandlerSortOrder::~CGlxCommandHandlerSortOrder(void)
+ ??1CGlxCommandHandlerRemoveFrom@@UAE@XZ @ 17 NONAME ; CGlxCommandHandlerRemoveFrom::~CGlxCommandHandlerRemoveFrom(void)
+ ?NewAddToAlbumSingleClickCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 18 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToAlbumSingleClickCommandHandlerL(class MGlxMediaListProvider *, int)
+ ?ImageUri@CGlxImageViewerManager@@QAEPAVHBufC16@@XZ @ 19 NONAME ; class HBufC16 * CGlxImageViewerManager::ImageUri(void)
+ ?NewL@CGlxCommandHandlerOpen@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 20 NONAME ; class CGlxCommandHandlerOpen * CGlxCommandHandlerOpen::NewL(class MGlxMediaListProvider *)
+ ??1CGlxCommandHandlerDelete@@UAE@XZ @ 21 NONAME ; CGlxCommandHandlerDelete::~CGlxCommandHandlerDelete(void)
+ ??1CGlxCommandHandlerDownload@@UAE@XZ @ 22 NONAME ; CGlxCommandHandlerDownload::~CGlxCommandHandlerDownload(void)
+ ?NewL@CGlxCommandHandlerSave@@SAPAV1@XZ @ 23 NONAME ; class CGlxCommandHandlerSave * CGlxCommandHandlerSave::NewL(void)
+ ??1CGlxCommandHandlerOpen@@UAE@XZ @ 24 NONAME ; CGlxCommandHandlerOpen::~CGlxCommandHandlerOpen(void)
+ ?NewL@CGlxCommandHandlerSlideshow@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 25 NONAME ; class CGlxCommandHandlerSlideshow * CGlxCommandHandlerSlideshow::NewL(class MGlxMediaListProvider *, int, int)
+ ?IsPrivate@CGlxImageViewerManager@@QAEHXZ @ 26 NONAME ; int CGlxImageViewerManager::IsPrivate(void)
+ ?NewL@CGlxCommandHandlerAiwShareOnOvi@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 27 NONAME ; class CGlxCommandHandlerAiwShareOnOvi * CGlxCommandHandlerAiwShareOnOvi::NewL(class MGlxMediaListProvider *, int)
+ ?NewAddToAlbumCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 28 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToAlbumCommandHandlerL(class MGlxMediaListProvider *, int)
+ ?MdcaPoint@CGlxMediaListAdaptor@@UBE?AVTPtrC16@@H@Z @ 29 NONAME ; class TPtrC16 CGlxMediaListAdaptor::MdcaPoint(int) const
+ ?NewL@CGlxCommandHandlerDownload@@SAPAV1@XZ @ 30 NONAME ; class CGlxCommandHandlerDownload * CGlxCommandHandlerDownload::NewL(void)
+ ??1CGlxCommandHandlerHelp@@UAE@XZ @ 31 NONAME ; CGlxCommandHandlerHelp::~CGlxCommandHandlerHelp(void)
+ ?BypassFiltersForExecute@CGlxCommandHandlerNewMedia@@UBEHXZ @ 32 NONAME ; int CGlxCommandHandlerNewMedia::BypassFiltersForExecute(void) const
+ ?NewL@CGlxCommandHandlerRemoveFrom@@SAPAV1@PAVMGlxMediaListProvider@@W4TMPXGeneralCategory@@@Z @ 33 NONAME ; class CGlxCommandHandlerRemoveFrom * CGlxCommandHandlerRemoveFrom::NewL(class MGlxMediaListProvider *, enum TMPXGeneralCategory)
+ ?NewL@CGlxCommandHandlerDetails@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 34 NONAME ; class CGlxCommandHandlerDetails * CGlxCommandHandlerDetails::NewL(class MGlxMediaListProvider *)
+ ?NewL@CGlxCommandHandlerHelp@@SAPAV1@VTGlxHelpContext@@@Z @ 35 NONAME ; class CGlxCommandHandlerHelp * CGlxCommandHandlerHelp::NewL(class TGlxHelpContext)
+ ?ExecuteLD@CGlxCommandHandlerNewMedia@@QAEHAAVTGlxMediaId@@@Z @ 36 NONAME ; int CGlxCommandHandlerNewMedia::ExecuteLD(class TGlxMediaId &)
+ ?HandleItemAddedL@CGlxCommandHandlerNewMedia@@MAEXHHPAVMGlxMediaList@@@Z @ 37 NONAME ; void CGlxCommandHandlerNewMedia::HandleItemAddedL(int, int, class MGlxMediaList *)
+ ?IncrementRefCount@CGlxImageViewerManager@@QAEXXZ @ 38 NONAME ; void CGlxImageViewerManager::IncrementRefCount(void)
+ ?NewL@CGlxCommandHandlerUpload@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 39 NONAME ; class CGlxCommandHandlerUpload * CGlxCommandHandlerUpload::NewL(class MGlxMediaListProvider *, int)
+ ??1CGlxCommandHandlerUpload@@UAE@XZ @ 40 NONAME ; CGlxCommandHandlerUpload::~CGlxCommandHandlerUpload(void)
+ ??1CGlxCommandHandlerSlideshow@@UAE@XZ @ 41 NONAME ; CGlxCommandHandlerSlideshow::~CGlxCommandHandlerSlideshow(void)
+ ?NewL@CGlxCommandHandlerAiwShowMap@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 42 NONAME ; class CGlxCommandHandlerAiwShowMap * CGlxCommandHandlerAiwShowMap::NewL(class MGlxMediaListProvider *, int)
+ ??1CGlxCommandHandlerAddToContainer@@UAE@XZ @ 43 NONAME ; CGlxCommandHandlerAddToContainer::~CGlxCommandHandlerAddToContainer(void)
+ ??0CGlxMediaSelectionPopup@@QAE@XZ @ 44 NONAME ; CGlxMediaSelectionPopup::CGlxMediaSelectionPopup(void)
+ ?NewL@CGlxCommandHandlerNewMedia@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 45 NONAME ; class CGlxCommandHandlerNewMedia * CGlxCommandHandlerNewMedia::NewL(class MGlxMediaListProvider *)
+ ?NewL@CGlxCommandHandlerCopyAndMove@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 46 NONAME ; class CGlxCommandHandlerCopyAndMove * CGlxCommandHandlerCopyAndMove::NewL(class MGlxMediaListProvider *, int)
+ ??1CGlxCommandHandlerCopyAndMove@@UAE@XZ @ 47 NONAME ; CGlxCommandHandlerCopyAndMove::~CGlxCommandHandlerCopyAndMove(void)
+ ?SetContainerId@CGlxCommandHandlerRemoveFrom@@QAEXVTGlxMediaId@@@Z @ 48 NONAME ; void CGlxCommandHandlerRemoveFrom::SetContainerId(class TGlxMediaId)
+ ?MdcaCount@CGlxMediaListAdaptor@@UBEHXZ @ 49 NONAME ; int CGlxMediaListAdaptor::MdcaCount(void) const
+ ?NewL@CGlxCommandHandlerFilterImagesOrVideos@@SAPAV1@PAVMGlxMediaListProvider@@@Z @ 50 NONAME ; class CGlxCommandHandlerFilterImagesOrVideos * CGlxCommandHandlerFilterImagesOrVideos::NewL(class MGlxMediaListProvider *)
+ ?NewL@CGlxCommandHandlerAiwShowMapHardKey@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 51 NONAME ; class CGlxCommandHandlerAiwShowMapHardKey * CGlxCommandHandlerAiwShowMapHardKey::NewL(class MGlxMediaListProvider *, int)
+ ?NewL@CGlxCommandHandlerHideUi@@SAPAV1@XZ @ 52 NONAME ; class CGlxCommandHandlerHideUi * CGlxCommandHandlerHideUi::NewL(void)
+ ??1CGlxCommandHandlerSend@@UAE@XZ @ 53 NONAME ; CGlxCommandHandlerSend::~CGlxCommandHandlerSend(void)
+ ?NewL@CGlxCommandHandlerAiwAssign@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 54 NONAME ; class CGlxCommandHandlerAiwAssign * CGlxCommandHandlerAiwAssign::NewL(class MGlxMediaListProvider *, int)
+ ?NewAddToTagCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 55 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToTagCommandHandlerL(class MGlxMediaListProvider *, int)
+ ??1CGlxCommandHandlerDetails@@UAE@XZ @ 56 NONAME ; CGlxCommandHandlerDetails::~CGlxCommandHandlerDetails(void)
+ ?NewAddToTagSingleClickCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 57 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToTagSingleClickCommandHandlerL(class MGlxMediaListProvider *, int)
+ ??1CGlxCommandHandlerVideoPlayback@@UAE@XZ @ 58 NONAME ; CGlxCommandHandlerVideoPlayback::~CGlxCommandHandlerVideoPlayback(void)
+ ??1CGlxCommandHandlerRename@@UAE@XZ @ 59 NONAME ; CGlxCommandHandlerRename::~CGlxCommandHandlerRename(void)
+ ?NewL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 60 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewL(class MGlxMediaListProvider *, int, int)
+ ?ImageFileHandle@CGlxImageViewerManager@@QBEAAVRFile64@@XZ @ 61 NONAME ; class RFile64 & CGlxImageViewerManager::ImageFileHandle(void) const
+ ?NewL@CGlxCommandHandlerAiwPrintPreview@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 62 NONAME ; class CGlxCommandHandlerAiwPrintPreview * CGlxCommandHandlerAiwPrintPreview::NewL(class MGlxMediaListProvider *, int)
+ ?NewL@CGlxCommandHandlerAiwEdit@@SAPAV1@PAVMGlxMediaListProvider@@HH@Z @ 63 NONAME ; class CGlxCommandHandlerAiwEdit * CGlxCommandHandlerAiwEdit::NewL(class MGlxMediaListProvider *, int, int)
+ ?NewL@CGlxCommandHandlerSortOrder@@SAPAV1@PAVMGlxMediaListProvider@@K@Z @ 64 NONAME ; class CGlxCommandHandlerSortOrder * CGlxCommandHandlerSortOrder::NewL(class MGlxMediaListProvider *, unsigned long)
+ ?NewBackCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@XZ @ 65 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewBackCommandHandlerL(void)
+ ?NewAddToFavCommandHandlerL@CGlxCommandHandlerAddToContainer@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 66 NONAME ; class CGlxCommandHandlerAddToContainer * CGlxCommandHandlerAddToContainer::NewAddToFavCommandHandlerL(class MGlxMediaListProvider *, int)
+ ?NewContainerPreviousViewCommandHandlerL@CGlxCommandHandlerBack@@SAPAV1@PAVMGlxMediaListProvider@@H@Z @ 67 NONAME ; class CGlxCommandHandlerBack * CGlxCommandHandlerBack::NewContainerPreviousViewCommandHandlerL(class MGlxMediaListProvider *, int)
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/eabi/glxcommoncommandhandlersu.def Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/eabi/glxcommoncommandhandlersu.def Tue Jan 26 11:58:28 2010 +0200
@@ -45,7 +45,7 @@
_ZN24CGlxCommandHandlerUploadD0Ev @ 44 NONAME
_ZN24CGlxCommandHandlerUploadD1Ev @ 45 NONAME
_ZN24CGlxCommandHandlerUploadD2Ev @ 46 NONAME
- _ZN25CGlxCommandHandlerAiwEdit4NewLEP21MGlxMediaListProvideri @ 47 NONAME
+ _ZN25CGlxCommandHandlerAiwEdit4NewLEP21MGlxMediaListProviderii @ 47 NONAME
_ZN25CGlxCommandHandlerDetails4NewLEP21MGlxMediaListProvider @ 48 NONAME
_ZN25CGlxCommandHandlerDetailsD0Ev @ 49 NONAME
_ZN25CGlxCommandHandlerDetailsD1Ev @ 50 NONAME
@@ -87,23 +87,25 @@
_ZN32CGlxCommandHandlerAddToContainer26NewAddToFavCommandHandlerLEP21MGlxMediaListProvideri @ 86 NONAME
_ZN32CGlxCommandHandlerAddToContainer26NewAddToTagCommandHandlerLEP21MGlxMediaListProvideri @ 87 NONAME
_ZN32CGlxCommandHandlerAddToContainer28NewAddToAlbumCommandHandlerLEP21MGlxMediaListProvideri @ 88 NONAME
- _ZN32CGlxCommandHandlerAddToContainer4NewLEP21MGlxMediaListProviderii @ 89 NONAME
- _ZN32CGlxCommandHandlerAddToContainerD0Ev @ 90 NONAME
- _ZN32CGlxCommandHandlerAddToContainerD1Ev @ 91 NONAME
- _ZN32CGlxCommandHandlerAddToContainerD2Ev @ 92 NONAME
- _ZN33CGlxCommandHandlerAiwPrintPreview4NewLEP21MGlxMediaListProvideri @ 93 NONAME
- _ZN35CGlxCommandHandlerAiwShowMapHardKey4NewLEP21MGlxMediaListProvideri @ 94 NONAME
- _ZN38CGlxCommandHandlerFilterImagesOrVideos4NewLEP21MGlxMediaListProvider @ 95 NONAME
- _ZN38CGlxCommandHandlerFilterImagesOrVideosD0Ev @ 96 NONAME
- _ZN38CGlxCommandHandlerFilterImagesOrVideosD1Ev @ 97 NONAME
- _ZN38CGlxCommandHandlerFilterImagesOrVideosD2Ev @ 98 NONAME
- _ZN38CGlxSingleGraphicPopupMenuStyleListBox14OfferKeyEventLERK9TKeyEvent10TEventCode @ 99 NONAME
- _ZNK20CGlxMediaListAdaptor9MdcaCountEv @ 100 NONAME
- _ZNK20CGlxMediaListAdaptor9MdcaPointEi @ 101 NONAME
- _ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 102 NONAME
- _ZNK26CGlxCommandHandlerNewMedia23BypassFiltersForExecuteEv @ 103 NONAME
- _ZNK26CGlxCommandHandlerNewMedia8OkToExitEv @ 104 NONAME
- _ZThn48_N26CGlxCommandHandlerNewMedia16HandleItemAddedLEiiP13MGlxMediaList @ 105 NONAME
- _ZThn4_NK20CGlxMediaListAdaptor9MdcaCountEv @ 106 NONAME
- _ZThn4_NK20CGlxMediaListAdaptor9MdcaPointEi @ 107 NONAME
+ _ZN32CGlxCommandHandlerAddToContainer37NewAddToTagSingleClickCommandHandlerLEP21MGlxMediaListProvideri @ 89 NONAME
+ _ZN32CGlxCommandHandlerAddToContainer39NewAddToAlbumSingleClickCommandHandlerLEP21MGlxMediaListProvideri @ 90 NONAME
+ _ZN32CGlxCommandHandlerAddToContainer4NewLEP21MGlxMediaListProviderii @ 91 NONAME
+ _ZN32CGlxCommandHandlerAddToContainerD0Ev @ 92 NONAME
+ _ZN32CGlxCommandHandlerAddToContainerD1Ev @ 93 NONAME
+ _ZN32CGlxCommandHandlerAddToContainerD2Ev @ 94 NONAME
+ _ZN33CGlxCommandHandlerAiwPrintPreview4NewLEP21MGlxMediaListProvideri @ 95 NONAME
+ _ZN35CGlxCommandHandlerAiwShowMapHardKey4NewLEP21MGlxMediaListProvideri @ 96 NONAME
+ _ZN38CGlxCommandHandlerFilterImagesOrVideos4NewLEP21MGlxMediaListProvider @ 97 NONAME
+ _ZN38CGlxCommandHandlerFilterImagesOrVideosD0Ev @ 98 NONAME
+ _ZN38CGlxCommandHandlerFilterImagesOrVideosD1Ev @ 99 NONAME
+ _ZN38CGlxCommandHandlerFilterImagesOrVideosD2Ev @ 100 NONAME
+ _ZN38CGlxSingleGraphicPopupMenuStyleListBox14OfferKeyEventLERK9TKeyEvent10TEventCode @ 101 NONAME
+ _ZNK20CGlxMediaListAdaptor9MdcaCountEv @ 102 NONAME
+ _ZNK20CGlxMediaListAdaptor9MdcaPointEi @ 103 NONAME
+ _ZNK22CGlxImageViewerManager15ImageFileHandleEv @ 104 NONAME
+ _ZNK26CGlxCommandHandlerNewMedia23BypassFiltersForExecuteEv @ 105 NONAME
+ _ZNK26CGlxCommandHandlerNewMedia8OkToExitEv @ 106 NONAME
+ _ZThn48_N26CGlxCommandHandlerNewMedia16HandleItemAddedLEiiP13MGlxMediaList @ 107 NONAME
+ _ZThn4_NK20CGlxMediaListAdaptor9MdcaCountEv @ 108 NONAME
+ _ZThn4_NK20CGlxMediaListAdaptor9MdcaPointEi @ 109 NONAME
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraddtocontainer.h Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraddtocontainer.h Tue Jan 26 11:58:28 2010 +0200
@@ -44,6 +44,13 @@
IMPORT_C static CGlxCommandHandlerAddToContainer* NewAddToAlbumCommandHandlerL(
MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem);
+ /**
+ * Create add to album command handler for singleclick
+ * @param aMediaListProvider object that provides the media list.
+ */
+ IMPORT_C static CGlxCommandHandlerAddToContainer* NewAddToAlbumSingleClickCommandHandlerL(
+ MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem);
+
/**
* Create add (to) tags command handler
* @param aMediaListProvider object that provides the media list.
@@ -51,6 +58,13 @@
IMPORT_C static CGlxCommandHandlerAddToContainer* NewAddToTagCommandHandlerL(
MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem);
+ /**
+ * Create add (to) tags command handler for singleclick
+ * @param aMediaListProvider object that provides the media list.
+ */
+ IMPORT_C static CGlxCommandHandlerAddToContainer* NewAddToTagSingleClickCommandHandlerL(
+ MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem);
+
/**
* Create add (to) Favourites command handler
* @param aMediaListProvider object that provides the media list.
@@ -90,8 +104,10 @@
void DoActivateL(TInt aViewId);
/** See @ref CGlxCommandHandler::PopulateToolbar*/
- void PopulateToolbarL();
-
+ void PopulateToolbarL();
+
+ /** See @ref CGlxCommandHandler::DoIsDisabled*/
+ TBool DoIsDisabled(TInt aCommandId, MGlxMediaList& aList) const;
private:
/**
* Second phase constructor
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraiwedit.h Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraiwedit.h Tue Jan 26 11:58:28 2010 +0200
@@ -45,13 +45,15 @@
* @param aMediaListProvider object that provides the media list
* @param aMenuResource The menu resource that the AIW command will be
* implented in
+ * @param aCommandSingleClick Flag to identify single click command
* @return Fully constructed command handler
* @warning ConstructL of base class is called. If ConstructL is
* implemented in this class, then care must be taken to call
* CGlxCommandHandlerAiwBase::ConstructL
*/
IMPORT_C static CGlxCommandHandlerAiwEdit* NewL(
- MGlxMediaListProvider* aMediaListProvider, TInt aMenuResource);
+ MGlxMediaListProvider* aMediaListProvider, TInt aMenuResource,
+ TBool aCommandSingleClick=EFalse);
protected: // From CGlxMediaListCommandHandler
/**
@@ -74,6 +76,15 @@
*/
CGlxCommandHandlerAiwEdit(MGlxMediaListProvider* aMediaListProvider,
TInt aMenuResource);
+
+ /**
+ * Second phase constructor
+ * @param aCommandSingleClick Flag to identify single click command
+ */
+ void ConstructL(TBool aCommandSingleClick);
+
+private:
+ TBool iCommandSingleClick;
};
#endif // C_GLXCOMMANDHANDLERAIWEDIT_H
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraiwshowmap.h Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandleraiwshowmap.h Tue Jan 26 11:58:28 2010 +0200
@@ -99,7 +99,11 @@
* @return ETrue if location information is there. EFalse if not
*/
TBool IsItemWithLocationInfoSelected(MGlxMediaList& aList);
-
+
+ /**
+ * Checks the viewing mode [FS/Grid]
+ */
+ TBool IsInFullScreenViewingModeL();
private:
RPointerArray<HBufC8> iBufferArray; // owned
};
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandlerremovefrom.h Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandlerremovefrom.h Tue Jan 26 11:58:28 2010 +0200
@@ -74,6 +74,9 @@
/** See @ref CGlxCommandHandler::DoActivateL */
void DoActivateL(TInt /*aViewId*/);
+ /** See @ref CGlxCommandHandler::DoIsDisabled*/
+ TBool DoIsDisabled(TInt aCommandId, MGlxMediaList& aList) const;
+
private:
/** Second phase constructor */
void ConstructL();
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandlersend.h Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandlersend.h Tue Jan 26 11:58:28 2010 +0200
@@ -66,10 +66,11 @@
IMPORT_C ~CGlxCommandHandlerSend();
protected:
- /*
- *
- */
- void PopulateToolbarL();
+ /** @ref CGlxCommandHandler::PopulateToolbar*/
+ void PopulateToolbarL();
+
+ /** @ref CGlxCommandHandler::DoIsDisabled*/
+ TBool DoIsDisabled(TInt aCommandId, MGlxMediaList& aList) const;
private:
/**
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraddtocontainer.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraddtocontainer.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -66,6 +66,19 @@
}
// ---------------------------------------------------------------------------
+// Return add to album command handler for singleclick options menu
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CGlxCommandHandlerAddToContainer*
+ CGlxCommandHandlerAddToContainer::NewAddToAlbumSingleClickCommandHandlerL(
+ MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem)
+ {
+ return CGlxCommandHandlerAddToContainer::NewL (aMediaListProvider,
+ EGlxCmdSingleClickAddToAlbum, aHasToolbarItem);
+ }
+
+
+// ---------------------------------------------------------------------------
// Return add (to) tags command handler
// ---------------------------------------------------------------------------
//
@@ -79,6 +92,19 @@
}
// ---------------------------------------------------------------------------
+// Return add (to) tags command handler for singleclick option menu
+// ---------------------------------------------------------------------------
+//
+EXPORT_C CGlxCommandHandlerAddToContainer*
+ CGlxCommandHandlerAddToContainer::NewAddToTagSingleClickCommandHandlerL(
+ MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem)
+ {
+ return CGlxCommandHandlerAddToContainer::NewL(aMediaListProvider,
+ EGlxCmdSingleClickAddTag, aHasToolbarItem);
+ }
+
+
+// ---------------------------------------------------------------------------
// Return add (to) Favourites command handler
// ---------------------------------------------------------------------------
//
@@ -194,6 +220,7 @@
break;
}
case EGlxCmdAddToAlbum:
+ case EGlxCmdSingleClickAddToAlbum:
{
enablePopup = ETrue;
targetCollection->AppendL(KGlxCollectionPluginAlbumsImplementationUid);
@@ -202,6 +229,7 @@
break;
}
case EGlxCmdAddTag:
+ case EGlxCmdSingleClickAddTag:
{
enableMultipleSelection = ETrue;
enablePopup = ETrue;
@@ -262,7 +290,8 @@
HBufC* CGlxCommandHandlerAddToContainer::CompletionTextL() const
{
TRACER("CGlxCommandHandlerAddToContainer::CompletionTextL()");
- if (iCommandId == EGlxCmdAddToAlbum)
+ if (iCommandId == EGlxCmdAddToAlbum ||
+ iCommandId == EGlxCmdSingleClickAddToAlbum )
{
if (iSelectionCount > 1)
{
@@ -270,7 +299,8 @@
}
return StringLoader::LoadL(R_GLX_COMPLETION_ADD_TO_CONTAINER_ONE_ITEM_ALBUM);
}
- else if (iCommandId == EGlxCmdAddTag)
+ else if (iCommandId == EGlxCmdAddTag ||
+ iCommandId == EGlxCmdSingleClickAddTag)
{
if (iSelectionCount > 1)
{
@@ -324,3 +354,26 @@
{
}
+
+// ---------------------------------------------------------------------------
+// CGlxCommandHandlerAddToContainer::DoIsDisabled
+// ---------------------------------------------------------------------------
+//
+TBool CGlxCommandHandlerAddToContainer::DoIsDisabled(TInt aCommandId,
+ MGlxMediaList& aList) const
+ {
+ TRACER("CGlxCommandHandlerAddToContainer::DoIsDisabled");
+ if ( (EGlxCmdSingleClickAddToAlbum==aCommandId ||
+ EGlxCmdSingleClickAddTag == aCommandId) &&
+ aList.SelectionCount() > 0 )
+ {
+ return EFalse;
+ }
+ else if (EGlxCmdAddToAlbum==aCommandId || EGlxCmdAddTag == aCommandId)
+ {
+ return EFalse;
+ }
+
+ return ETrue;
+ }
+
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraiwedit.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraiwedit.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -38,16 +38,28 @@
// -----------------------------------------------------------------------------
//
EXPORT_C CGlxCommandHandlerAiwEdit* CGlxCommandHandlerAiwEdit::NewL(
- MGlxMediaListProvider* aMediaListProvider, TInt aMenuResource)
+ MGlxMediaListProvider* aMediaListProvider, TInt aMenuResource,
+ TBool aCommandSingleClick)
{
CGlxCommandHandlerAiwEdit* self = new ( ELeave )
CGlxCommandHandlerAiwEdit(aMediaListProvider, aMenuResource);
CleanupStack::PushL( self );
- self->ConstructL();
+ self->ConstructL(aCommandSingleClick);
CleanupStack::Pop( self );
return self;
}
+// ---------------------------------------------------------------------------
+// Symbian 2nd phase constructor can leave.
+// ---------------------------------------------------------------------------
+//
+void CGlxCommandHandlerAiwEdit::ConstructL(TBool aCommandSingleClick)
+ {
+ TRACER("CGlxCommandHandlerAiwEdit::ConstructL");
+ CGlxCommandHandlerAiwBase::ConstructL();
+ iCommandSingleClick = aCommandSingleClick;
+ }
+
// -----------------------------------------------------------------------------
// CGlxCommandHandlerAiwEdit::DoGetRequiredAttributesL
// -----------------------------------------------------------------------------
@@ -79,6 +91,10 @@
//
TInt CGlxCommandHandlerAiwEdit::CommandId() const
{
+ if (iCommandSingleClick)
+ {
+ return EGlxCmdAiwSingleClickEdit;
+ }
return EGlxCmdAiwEdit;
}
@@ -97,6 +113,10 @@
//
TInt CGlxCommandHandlerAiwEdit::AiwInterestResource() const
{
+ if (iCommandSingleClick)
+ {
+ return R_GLX_AIW_SINGLE_CLICK_EDIT_INTEREST;
+ }
return R_GLX_AIW_EDIT_INTEREST;
}
@@ -134,11 +154,17 @@
HBufC* currentTitle = StringLoader::LoadLC( R_QTN_LGAL_OPTIONS_EDIT );
TInt cmdId = AiwMenuCmdIdL( *currentTitle,aMenuPane ) ;
CleanupStack::PopAndDestroy(currentTitle);
- if( KErrNotFound != cmdId )
+
+ if (KErrNotFound != cmdId)
{
- if ((MediaList().SelectionCount() > 1))
+ if (iCommandSingleClick && (MediaList().SelectionCount() > 1))
{
aMenuPane->SetItemDimmed(cmdId,ETrue);
}
+ else if ( MediaList().SelectionCount() != 1)
+ {
+ // Enable ONLY when a single item marked
+ aMenuPane->SetItemDimmed(cmdId,ETrue);
+ }
}
}
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraiwshowmap.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraiwshowmap.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -28,6 +28,9 @@
#include <glxmediageneraldefs.h>
#include <glxtracer.h>
#include <mglxmedialist.h>
+#include <glxnavigationalstate.h>
+#include <mpxcollectionpath.h>
+#include <glxcollectionpluginimageviewer.hrh>
// For LocationFW
@@ -110,7 +113,9 @@
TBool isDisabled = IsItemWithLocationInfoSelected(MediaList());
// Should it be disabled
- if ((isDisabled) || (MediaList().SelectionCount() > 1))
+ if ( (isDisabled) ||
+ (MediaList().SelectionCount() != 1 &&
+ !IsInFullScreenViewingModeL()) )
{
// if so delete it.
aMenuPane->DeleteMenuItem(EGlxCmdAiwShowMap);
@@ -248,3 +253,35 @@
{
CGlxCommandHandlerAiwBase::PreDynInitMenuPaneL(aResourceId);
}
+
+// -----------------------------------------------------------------------------
+// IsInFullScreenViewingModeL
+// -----------------------------------------------------------------------------
+//
+TBool CGlxCommandHandlerAiwShowMap::IsInFullScreenViewingModeL()
+ {
+ TBool fullscreenViewingMode = EFalse;
+ CGlxNavigationalState* aNavigationalState = CGlxNavigationalState::InstanceL();
+ CMPXCollectionPath* naviState = aNavigationalState->StateLC();
+
+ if ( naviState->Levels() >= 1)
+ {
+ if (aNavigationalState->ViewingMode() == NGlxNavigationalState::EBrowse)
+ {
+ // For image viewer collection, goto view mode
+ if (naviState->Id() == TMPXItemId(KGlxCollectionPluginImageViewerImplementationUid))
+ {
+ //it means we are in img viewer
+ fullscreenViewingMode = ETrue;
+ }
+ }
+ else
+ {
+ //it means we are in Fullscreen
+ fullscreenViewingMode = ETrue;
+ }
+ }
+ CleanupStack::PopAndDestroy( naviState );
+ aNavigationalState->Close();
+ return fullscreenViewingMode;
+ }
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlerdelete.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlerdelete.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -89,6 +89,11 @@
info.iMinSelectionLength = 1;
info.iDisallowSystemItems = aIsContainerList;
AddCommandL(info);
+
+ TCommandInfo singleclkinfo( EGlxCmdSingleClickDelete );
+ singleclkinfo.iMinSelectionLength = 1;
+ singleclkinfo.iDisallowSystemItems = aIsContainerList;
+ AddCommandL(singleclkinfo);
}
// ---------------------------------------------------------------------------
@@ -228,11 +233,6 @@
//it means we are in img viewer.
fullscreenViewingMode = ETrue;
}
- else
- {
- //it means we are in grid view.
- fullscreenViewingMode = EFalse;
- }
}
else
{
@@ -242,10 +242,17 @@
}
CleanupStack::PopAndDestroy( naviState );
aNavigationalState->Close();
- if(EGlxCmdDelete==aCommandId && (0 == aList.Count() ) && !fullscreenViewingMode)
+ if (EGlxCmdDelete==aCommandId && 0 == aList.Count() &&
+ !fullscreenViewingMode)
{
return ETrue;
}
+
+ if (EGlxCmdSingleClickDelete==aCommandId && 0 == aList.SelectionCount())
+ {
+ return ETrue;
+ }
+
return EFalse;
}
//end of file
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlerremovefrom.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlerremovefrom.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -81,6 +81,11 @@
info.iMinSelectionLength = 1;
info.iMaxSelectionLength = KMaxTInt;
AddCommandL(info);
+
+ TCommandInfo singleclickinfo(EGlxCmdSingleClickRemoveFrom);
+ singleclickinfo.iMinSelectionLength = 1;
+ singleclickinfo.iMaxSelectionLength = KMaxTInt;
+ AddCommandL(singleclickinfo);
}
// ---------------------------------------------------------------------------
@@ -171,3 +176,19 @@
{
}
+
+// ---------------------------------------------------------------------------
+// CGlxCommandHandlerRemoveFrom::DoIsDisabled
+// ---------------------------------------------------------------------------
+//
+TBool CGlxCommandHandlerRemoveFrom::DoIsDisabled(TInt aCommandId,
+ MGlxMediaList& aList) const
+ {
+ if (aCommandId == EGlxCmdSingleClickRemoveFrom &&
+ aList.SelectionCount()== 0)
+ {
+ return ETrue;
+ }
+
+ return EFalse;
+ }
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersend.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersend.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -101,6 +101,11 @@
info.iMinSelectionLength = 1;
info.iMaxSelectionLength = KMaxTInt;
AddCommandL(info);
+
+ TCommandInfo singleclickinfo(EGlxCmdSingleClickSend);
+ singleclickinfo.iMinSelectionLength = 1;
+ singleclickinfo.iMaxSelectionLength = KMaxTInt;
+ AddCommandL(singleclickinfo);
}
@@ -132,7 +137,7 @@
{
GLX_FUNC("CGlxCommandHandlerSend::DoExecuteL");
- if (aCommandId == EGlxCmdSend)
+ if (aCommandId == EGlxCmdSend || aCommandId == EGlxCmdSingleClickSend)
{
SendSelectedItemsL();
return ETrue;
@@ -393,4 +398,26 @@
iUiUtility->ScreenFurniture()->SetTooltipL( EGlxCmdSend, CAknButton::EPositionLeft );
}
+
+// ----------------------------------------------------------------------------
+// DoIsDisabled
+// ----------------------------------------------------------------------------
+//
+TBool CGlxCommandHandlerSend::DoIsDisabled(TInt aCommandId,
+ MGlxMediaList& aList) const
+ {
+ GLX_FUNC("CGlxCommandHandlerSend::DoIsDisabled");
+ if ( (EGlxCmdSingleClickSend == aCommandId || EGlxCmdSend==aCommandId) &&
+ aList.SelectionCount() )
+ {
+ return EFalse;
+ }
+
+ if (EGlxCmdSend == aCommandId && aList.Count())
+ {
+ return EFalse;
+ }
+
+ return ETrue;
+ }
// End of file
--- a/photosgallery/viewframework/commandhandlers/inc/glxcommandhandlers.hrh Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/commandhandlers/inc/glxcommandhandlers.hrh Tue Jan 26 11:58:28 2010 +0200
@@ -92,6 +92,12 @@
EGlxCmdRemoveFromFavourites,
KGlxCmdMnShowMap,
EGlxCmdSave,
+ EGlxCmdSingleClickAddToAlbum,
+ EGlxCmdSingleClickAddTag,
+ EGlxCmdSingleClickDelete,
+ EGlxCmdSingleClickSend,
+ EGlxCmdAiwSingleClickEdit,
+ EGlxCmdSingleClickRemoveFrom,
EGlxCmdAiwBase = 0x6000
};
--- a/photosgallery/viewframework/dataprovider/src/glxthumbnailvarianttype.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/dataprovider/src/glxthumbnailvarianttype.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -152,12 +152,6 @@
{
TRAP( err, mTextureId = iUiUtility->GlxTextureManager().CreateIconTextureL(
EMbmGlxiconsQgn_prop_image_notcreated, resFile, defaultSize ).Id() );
- // check if rights have expired
- // show expiry note
- if( aSize.iWidth > 200 && aIsFocused )
- {
- iDrmUtility->ShowRightsInfoL(uri);
- }
}
}
else
--- a/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/plugins/gridviewplugin/data/glxgridviewdata.rss Tue Jan 26 11:58:28 2010 +0200
@@ -134,13 +134,17 @@
txt = qtn_lgal_options_play; },
MENU_ITEM { command = EGlxCmdSend;
txt = qtn_options_send_via;
- flags = EEikMenuItemSpecific; },
+ flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickSend;
+ txt = qtn_options_send_via;},
MENU_ITEM { command = EGlxCmdAiwShareOnOvi;
/* txt comes from ShareOnline 4.3 */
flags = EEikMenuItemSpecific;},
MENU_ITEM { command = EGlxCmdDelete;
txt = qtn_lgal_options_delete;
flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickDelete;
+ txt = qtn_lgal_options_delete;},
MENU_ITEM { command = EGlxCmdSlideshowPlay;
txt = qtn_lgal_options_slideshow;
flags = EEikMenuItemSpecific;},
@@ -149,19 +153,27 @@
cascade = r_grid_shw_menu; },
MENU_ITEM { command = EGlxCmdAiwEdit;
txt = qtn_lgal_options_edit;
+ cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;},
+ MENU_ITEM { command = EGlxCmdAiwSingleClickEdit;
+ txt = qtn_lgal_options_edit;
cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
flags = EEikMenuItemSpecificListQuery;},
MENU_ITEM { command = EGlxCmdDetails;
txt = qtn_lgal_options_details; },
- MENU_ITEM { command = EGlxCmdMarkingSubmenu;
- txt = qtn_options_list;
- cascade = r_viu_editlist_menu; },
+ MENU_ITEM { command = EAknMarkAll;
+ txt = qtn_options_list_mark_all;},
+ MENU_ITEM { command = EAknUnmarkAll;
+ txt = qtn_options_list_unmark_all;},
MENU_ITEM { command = EGlxCmdAddToAlbum;
txt = qtn_lgal_options_add_to_album;
flags = EEikMenuItemSpecific; },
MENU_ITEM { command = EGlxCmdAddTag;
txt = qtn_lgal_options_properties_add_tag;
flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickAddToAlbum;
+ txt = qtn_lgal_options_add_to_album;},
+ MENU_ITEM { command = EGlxCmdSingleClickAddTag;
+ txt = qtn_lgal_options_properties_add_tag;},
MENU_ITEM { command = EGlxCmdAiwAssign;
txt = qtn_lgal_options_use_items;
cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE; },
@@ -195,15 +207,21 @@
MENU_ITEM { command = EGlxCmdSend;
txt = qtn_options_send_via;
flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickSend;
+ txt = qtn_options_send_via;},
MENU_ITEM { command = EGlxCmdAiwShareOnOvi;
/* txt comes from ShareOnline 4.3 */
flags = EEikMenuItemSpecific;},
MENU_ITEM { command = EGlxCmdRemoveFrom;
txt = qtn_lgal_options_remove_from_album;
flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickRemoveFrom;
+ txt = qtn_lgal_options_remove_from_album;},
MENU_ITEM { command = EGlxCmdDelete;
txt = qtn_lgal_options_delete;
- flags = EEikMenuItemSpecific; },
+ flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickDelete;
+ txt = qtn_lgal_options_delete;},
MENU_ITEM { command = EGlxCmdSlideshowPlay;
txt = qtn_lgal_options_slideshow;
flags = EEikMenuItemSpecific;},
@@ -212,19 +230,24 @@
cascade = r_grid_shw_menu; },
MENU_ITEM { command = EGlxCmdAiwEdit;
txt = qtn_lgal_options_edit;
+ cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;},
+ MENU_ITEM { command = EGlxCmdAiwSingleClickEdit;
+ txt = qtn_lgal_options_edit;
cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
flags = EEikMenuItemSpecificListQuery;},
MENU_ITEM { command = EGlxCmdDetails;
txt = qtn_lgal_options_details; },
- MENU_ITEM { command = EGlxCmdMarkingSubmenu;
- txt = qtn_options_list;
- cascade = r_viu_editlist_menu; },
+ MENU_ITEM { command = EAknMarkAll;
+ txt = qtn_options_list_mark_all;},
+ MENU_ITEM { command = EAknUnmarkAll;
+ txt = qtn_options_list_unmark_all;},
MENU_ITEM { command = EGlxCmdAddToAlbum;
txt = qtn_lgal_options_add_to_album;
- flags = EEikMenuItemSpecific; },
- MENU_ITEM { command = EGlxCmdAddTag;
- txt = qtn_lgal_options_properties_add_tag;
- flags = EEikMenuItemSpecific;},
+ flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickAddToAlbum;
+ txt = qtn_lgal_options_add_to_album;},
+ MENU_ITEM { command = EGlxCmdSingleClickAddTag;
+ txt = qtn_lgal_options_properties_add_tag;},
MENU_ITEM { command = EGlxCmdAiwAssign;
txt = qtn_lgal_options_use_items;
cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE; },
@@ -257,34 +280,48 @@
txt = qtn_lgal_options_play; },
MENU_ITEM { command = EGlxCmdSend;
txt = qtn_options_send_via;
- flags = EEikMenuItemSpecific; },
+ flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickSend;
+ txt = qtn_options_send_via;},
MENU_ITEM { command = EGlxCmdAiwShareOnOvi;
/* txt comes from ShareOnline 4.3 */
flags = EEikMenuItemSpecific;},
MENU_ITEM { command=EGlxCmdRemoveFrom;
txt = qtn_lgal_options_remove_from_tag;
- flags = EEikMenuItemSpecific; },
+ flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command=EGlxCmdSingleClickRemoveFrom;
+ txt = qtn_lgal_options_remove_from_tag;},
MENU_ITEM { command = EGlxCmdDelete;
txt = qtn_lgal_options_delete;
flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickDelete;
+ txt = qtn_lgal_options_delete;},
MENU_ITEM { command = EGlxCmdSlideshowPlay;
txt = qtn_lgal_options_slideshow;
- flags = EEikMenuItemSpecific;},
+ flags = EEikMenuItemSpecific;},
+ MENU_ITEM { command = EGlxCmdSlideshow;
+ txt = qtn_lgal_options_slideshow;
+ cascade = r_grid_shw_menu; },
MENU_ITEM { command = EGlxCmdAiwEdit;
txt = qtn_lgal_options_edit;
- cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
- flags = EEikMenuItemSpecificListQuery;},
+ cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;},
+ MENU_ITEM { command = EGlxCmdAiwSingleClickEdit;
+ txt = qtn_lgal_options_edit;
+ cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE;
+ flags = EEikMenuItemSpecificListQuery;},
MENU_ITEM { command = EGlxCmdDetails;
txt = qtn_lgal_options_details; },
- MENU_ITEM { command = EGlxCmdMarkingSubmenu;
- txt = qtn_options_list;
- cascade = r_viu_editlist_menu; },
- MENU_ITEM { command = EGlxCmdAddToAlbum;
- txt = qtn_lgal_options_add_to_album;
- flags = EEikMenuItemSpecific;},
+ MENU_ITEM { command = EAknMarkAll;
+ txt = qtn_options_list_mark_all;},
+ MENU_ITEM { command = EAknUnmarkAll;
+ txt = qtn_options_list_unmark_all;},
+ MENU_ITEM { command = EGlxCmdSingleClickAddToAlbum;
+ txt = qtn_lgal_options_add_to_album;},
MENU_ITEM { command = EGlxCmdAddTag;
txt = qtn_lgal_options_properties_add_tag;
- flags = EEikMenuItemSpecific; },
+ flags = EEikMenuItemSpecific; },
+ MENU_ITEM { command = EGlxCmdSingleClickAddTag;
+ txt = qtn_lgal_options_properties_add_tag;},
MENU_ITEM { command = EGlxCmdAiwAssign;
txt = qtn_lgal_options_use_items;
cascade = AIW_INTELLIGENT_CASCADE_ID|AIW_LOCK_SUBMENU_TITLE; },
--- a/photosgallery/viewframework/plugins/gridviewpluginbase/eabi/glxgridviewpluginbaseu.def Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/plugins/gridviewpluginbase/eabi/glxgridviewpluginbaseu.def Tue Jan 26 11:58:28 2010 +0200
@@ -7,6 +7,6 @@
_ZN22CGlxGridViewPluginBaseD0Ev @ 6 NONAME
_ZN22CGlxGridViewPluginBaseD1Ev @ 7 NONAME
_ZN22CGlxGridViewPluginBaseD2Ev @ 8 NONAME
- _ZTI22CGlxGridViewPluginBase @ 9 NONAME ; #<TI>#
- _ZTV22CGlxGridViewPluginBase @ 10 NONAME ; #<VT>#
+ _ZTI22CGlxGridViewPluginBase @ 9 NONAME
+ _ZTV22CGlxGridViewPluginBase @ 10 NONAME
--- a/photosgallery/viewframework/plugins/gridviewpluginbase/src/glxgridviewpluginbase.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/plugins/gridviewpluginbase/src/glxgridviewpluginbase.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -114,20 +114,26 @@
EXPORT_C void CGlxGridViewPluginBase::AddCommandHandlersL()
{
TRACER("CGlxGridViewPluginBase::AddCommandHandlersL()");
+#ifdef _DEBUG
+ TTime startTime;
+ GLX_LOG_INFO("CGlxGridViewPluginBase::AddCommandHandlersL()");
+ startTime.HomeTime();
+#endif
GLX_LOG_INFO( "Adding CGlxCommandHandlerSlideshow" );
-
iGridView->AddCommandHandlerL(
CGlxCommandHandlerSlideshow::NewL( iGridView, ETrue , EFalse ) );
-
GLX_LOG_INFO("Adding CGlxCommandHandlerSend");
iGridView->AddCommandHandlerL(CGlxCommandHandlerSend::NewL(iGridView, ETrue));
-
- GLX_LOG_INFO("Adding CGlxCommandHandlerAddToContainer");
+ GLX_LOG_INFO("Adding CGlxCommandHandlerAddToContainer-Album");
iGridView->AddCommandHandlerL(CGlxCommandHandlerAddToContainer::
- NewAddToAlbumCommandHandlerL(iGridView, EFalse));
+ NewAddToAlbumCommandHandlerL(iGridView, EFalse));
+
+ GLX_LOG_INFO("Adding CGlxCommandHandlerAddToContainer-Album SingleClick");
+ iGridView->AddCommandHandlerL(CGlxCommandHandlerAddToContainer::
+ NewAddToAlbumSingleClickCommandHandlerL(iGridView, EFalse));
GLX_LOG_INFO("Adding CGlxCommandHandlerDetails");
iGridView->AddCommandHandlerL(CGlxCommandHandlerDetails::
NewL(iGridView));
@@ -140,9 +146,13 @@
iGridView->AddCommandHandlerL(CGlxCommandHandlerDelete::
NewL(iGridView, EFalse, EFalse));
- GLX_LOG_INFO("Adding CGlxCommandHandlerAddToContainer");
+ GLX_LOG_INFO("Adding CGlxCommandHandlerAddToContainer-Tag");
iGridView->AddCommandHandlerL(CGlxCommandHandlerAddToContainer::
NewAddToTagCommandHandlerL(iGridView, EFalse));
+
+ GLX_LOG_INFO("Adding CGlxCommandHandlerAddToContainer-Tag Single Click");
+ iGridView->AddCommandHandlerL(CGlxCommandHandlerAddToContainer::
+ NewAddToTagSingleClickCommandHandlerL(iGridView, EFalse));
// The AIW service handlers
// ShowMap must be the first one
GLX_LOG_INFO("Adding CGlxCommandHandlerAiwShowMap");
@@ -155,6 +165,10 @@
GLX_LOG_INFO("Adding CGlxCommandHandlerAiwEdit");
iGridView->AddCommandHandlerL(CGlxCommandHandlerAiwEdit::
NewL(iGridView, iResourceIds.iMenuId));
+
+ GLX_LOG_INFO("Adding CGlxCommandHandlerAiwEdit-Single Click");
+ iGridView->AddCommandHandlerL(CGlxCommandHandlerAiwEdit::
+ NewL(iGridView, iResourceIds.iMenuId, ETrue));
GLX_LOG_INFO("Adding CGlxCommandHandlerAiwPrintPreview");
iGridView->AddCommandHandlerL(CGlxCommandHandlerAiwPrintPreview::
NewL(iGridView, iResourceIds.iMenuId));
@@ -203,6 +217,12 @@
GLX_LOG_INFO("Adding CGlxCommandHandlerShowVisUpnp");
iGridView->AddCommandHandlerL(CGlxCommandHandlerShowViaUpnp::NewL(iGridView, ETrue));
+#ifdef _DEBUG
+ TTime stopTime;
+ stopTime.HomeTime();
+ GLX_DEBUG2("CGlxGridViewPluginBase::AddCommandHandlersL() took <%d> us",
+ (TInt)stopTime.MicroSecondsFrom(startTime).Int64());
+#endif
}
// ---------------------------------------------------------------------------
--- a/photosgallery/viewframework/tvout/src/glxhdmicontroller.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/tvout/src/glxhdmicontroller.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -215,6 +215,11 @@
TSize aImageDimensions, TInt aFrameCount)
{
TRACER("CGlxHdmiController::StoreImageInfoL()");
+ if(iStoredImagePath)
+ {
+ delete iStoredImagePath;
+ iStoredImagePath = NULL;
+ }
iStoredImagePath = aImageFile.AllocL();
iImageDimensions = aImageDimensions;
iFrameCount = aFrameCount;
--- a/photosgallery/viewframework/tvout/src/glxtvconnectionmonitor.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/tvout/src/glxtvconnectionmonitor.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -86,8 +86,8 @@
User::LeaveIfError( iTvAccServer.Connect() );
User::LeaveIfError( iTvAccMode.CreateSubSession( iTvAccServer ) );
User::LeaveIfError( iTvAccMode.GetAccessoryMode( iCurrentAccMode ) );
- iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut );
-
+ iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut
+ || iCurrentAccMode.iAccessoryMode == EAccModeHDMI);
IssueRequest();
}
@@ -166,7 +166,8 @@
void CGlxTvConnectionMonitor::IssueNotificationL()
{
GLX_LOG_INFO("CGlxTvConnectionMonitor::IssueNotificationL");
- iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut );
+ iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut ||
+ iCurrentAccMode.iAccessoryMode == EAccModeHDMI );
iConnectionObserver.HandleTvConnectionStatusChangedL();
}
--- a/photosgallery/viewframework/uiutilities/data/glxuiutilities.rss Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/uiutilities/data/glxuiutilities.rss Tue Jan 26 11:58:28 2010 +0200
@@ -488,6 +488,26 @@
// -----------------------------------------------------------------------------
//
+// r_glx_aiw_single_click_edit_interest
+// AIW interest structure for edit
+//
+// -----------------------------------------------------------------------------
+RESOURCE AIW_INTEREST r_glx_aiw_single_click_edit_interest
+ {
+ items=
+ {
+ AIW_CRITERIA_ITEM
+ {
+ id = EGlxCmdAiwSingleClickEdit;
+ serviceCmd = KAiwCmdEdit;
+ contentType = "*";
+ serviceClass = KAiwClassMenu;
+ }
+ };
+ }
+
+// -----------------------------------------------------------------------------
+//
// r_glx_aiw_print_interest
// AIW interest structure for print preview
//
--- a/photosgallery/viewframework/views/fullscreenview/src/glxfullscreenviewimp.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/views/fullscreenview/src/glxfullscreenviewimp.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -834,7 +834,6 @@
//when the timer activates while launching the zoom
//it causes the crash.
ShowUiL(EFalse);
- SetSliderLevel();
TRAP_IGNORE( ActivateZoomControlL(EZoomStartKey));
return EEventConsumed;
}
@@ -1014,7 +1013,6 @@
// of fullscreenlevel.
iTimer->Cancel();
iSliderWidget->ShowWidget( ETrue, 0 );
- SetSliderLevel();
TRAP_IGNORE( ActivateZoomControlL(EZoomStartSlider));
}
return EEventConsumed;
--- a/photosgallery/viewframework/views/gridview/src/glxgridviewcontainer.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/views/gridview/src/glxgridviewcontainer.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -787,6 +787,8 @@
{
iHgGrid->ClearFlags( CHgScroller::EHgScrollerSelectionMode );
}
+ iGlxGridViewObserver.HandleLatchToolbar();
+ iGlxGridViewObserver.HandleGridEventsL(EGlxCmdEndMultipleMarking);
}
break;
}
--- a/photosgallery/viewframework/views/listview/src/glxlistviewimp.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/views/listview/src/glxlistviewimp.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -43,6 +43,7 @@
#include <StringLoader.h> //StringLoader
#include <glxsetappstate.h>
#include <glxthumbnailattributeinfo.h>
+#include <glxcollectionpluginalbums.hrh>
const TInt KListDataWindowSize(25);
const TInt KNoOfPages(2);
@@ -574,6 +575,14 @@
//Fix for ESLM-7SAHPT::Clear Flag to Disable QWERTY search input in list view
iList->ClearFlags(CHgScroller::EHgScrollerSearchWithQWERTY );
+ // Set the scrollbar type for albums list
+ CMPXCollectionPath* path = iMediaList->PathLC( NGlxListDefs::EPathParent );
+ if (path->Id() == KGlxCollectionPluginAlbumsImplementationUid)
+ {
+ iList->SetScrollBarTypeL(CHgScroller::EHgScrollerLetterStripLite );
+ }
+ CleanupStack::PopAndDestroy(path);
+
AppUi()->AddToStackL(iList);
}
--- a/photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatacontainer.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/views/metadatadialog/src/glximgvwrmetadatacontainer.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -670,7 +670,11 @@
//Launch the text entry editor.
CGlxTextEntryPopup* popup = CGlxTextEntryPopup::NewL( *buf, textPtr );
CleanupStack::PopAndDestroy(buf);
-
+ if(aItem == EImgVwrDescriptionItem)
+ {
+ popup->SetLeftSoftKeyL(ETrue);
+ }
+
//action upon selecting ok from the editor
if ( popup->ExecuteLD() == EEikBidOk )
{
--- a/photosgallery/viewframework/views/metadatadialog/src/glxmetadatacontainer.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/views/metadatadialog/src/glxmetadatacontainer.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -782,6 +782,10 @@
//Launch the text entry editor.
CGlxTextEntryPopup* popup = CGlxTextEntryPopup::NewL( *buf, textPtr );
CleanupStack::PopAndDestroy(buf);
+ if(aItem == EDescriptionItem)
+ {
+ popup->SetLeftSoftKeyL(ETrue);
+ }
//action upon selecting ok from the editor
if ( popup->ExecuteLD() == EEikBidOk )
--- a/photosgallery/viewframework/views/zoomview/src/glxzoomeventhandler.cpp Mon Jan 18 20:19:20 2010 +0200
+++ b/photosgallery/viewframework/views/zoomview/src/glxzoomeventhandler.cpp Tue Jan 26 11:58:28 2010 +0200
@@ -972,13 +972,8 @@
TInt(center.iY)
);
- // A zoom ratio is calculated by multiplying the the new virtual size with 100 and dividing it with the original size.
- // this division using integers might cause truncation. The +1 is added to make sure that every such truncation
- // is pegged to the next higher integer than the next lower, thus ensuring that the zoom ratio in the zoom mode will always
- // be greater than that in the full screen mode.
- //
- // The only other solution is to introduce a real number for this calculation. But do we really need such a deep level of accuracy?
- iMinZoomRatio = iZoomRatio = aMinSliderRange + 1;
+ // Minimum and Maximum Zoom Ratio
+ iMinZoomRatio = iZoomRatio = aMinSliderRange;
iMaxZoomRatio = aMaxSliderRange ;
iMathsEngine.Initialize(center,