# HG changeset patch # User hgs # Date 1279897864 -19800 # Node ID a3a4c0de738e4bf229afea566a95b420d1cb7ab4 # Parent a0f57508af73693881d696c33d5bc16f5b83480b 201029 diff -r a0f57508af73 -r a3a4c0de738e data/detailsview.docml --- a/data/detailsview.docml Sat Jul 10 00:59:39 2010 +0530 +++ b/data/detailsview.docml Fri Jul 23 20:41:04 2010 +0530 @@ -2,323 +2,214 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + - - + + + + + + + + +
- - - - - - - - - - - - - - + + - - - - - + + + + + + + - - - + + - - - - - - - + + + - + - - - - - - - + + + - - - - - - - - - - - + + + - - - - + + + - - - - + + + - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - + + + - - - - - - - - - + + + + + -
-
- - - - - - + + - - - + + + + - - + + + + + + + + - - - - - - - + - - + + + - - - - +
+
+ + + + + + + + + - - + + + + + + + + + + - - - - - - - - - - - + + + - + + + - - - - - - - - - - - - - - - + + + - - - + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + - - - - - - - + + + + +
- + diff -r a0f57508af73 -r a3a4c0de738e data/fullscreen.docml --- a/data/fullscreen.docml Sat Jul 10 00:59:39 2010 +0530 +++ b/data/fullscreen.docml Fri Jul 23 20:41:04 2010 +0530 @@ -4,9 +4,6 @@ - - - @@ -22,9 +19,10 @@ - + + @@ -52,7 +50,6 @@ -
diff -r a0f57508af73 -r a3a4c0de738e data/grid.docml --- a/data/grid.docml Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - -
- - - - - - diff -r a0f57508af73 -r a3a4c0de738e data/photos.docml --- a/data/photos.docml Sat Jul 10 00:59:39 2010 +0530 +++ b/data/photos.docml Fri Jul 23 20:41:04 2010 +0530 @@ -35,28 +35,17 @@ -
+ + + + - - - - - - - - - - - - - - - +
diff -r a0f57508af73 -r a3a4c0de738e data/transitiondown.fxml --- a/data/transitiondown.fxml Sat Jul 10 00:59:39 2010 +0530 +++ b/data/transitiondown.fxml Fri Jul 23 20:41:04 2010 +0530 @@ -2,7 +2,7 @@ -0.4 +0.3 0 1 diff -r a0f57508af73 -r a3a4c0de738e data/transitionup.fxml --- a/data/transitionup.fxml Sat Jul 10 00:59:39 2010 +0530 +++ b/data/transitionup.fxml Fri Jul 23 20:41:04 2010 +0530 @@ -2,7 +2,7 @@ -0.4 +0.3 0 1 diff -r a0f57508af73 -r a3a4c0de738e gallery/sis/photos.pkg --- a/gallery/sis/photos.pkg Sat Jul 10 00:59:39 2010 +0530 +++ b/gallery/sis/photos.pkg Fri Jul 23 20:41:04 2010 +0530 @@ -43,7 +43,6 @@ "\epoc32\release\armv5\urel\photos.exe" - "!:\sys\bin\photos.exe" "\epoc32\data\z\resource\apps\photos.rsc" - "!:\resource\apps\photos.rsc" "\epoc32\data\z\private\10003a3f\import\apps\photos_reg.rsc" - "!:\private\10003a3f\import\apps\photos_reg.rsc" -"\epoc32\data\z\resource\apps\photos.mif" - "!:\resource\apps\photos.mif" ; -------- files -------- "\epoc32\release\armv5\urel\glxcommonui.dll" -"!:\sys\bin\glxcommonui.dll" @@ -112,10 +111,9 @@ "\epoc32\release\armv5\urel\glxviews.dll" -"!:\sys\bin\glxviews.dll" "\epoc32\release\armv5\urel\glxviewutilities.dll" -"!:\sys\bin\glxviewutilities.dll" "\epoc32\release\armv5\urel\glxzoomwidget.dll" -"!:\sys\bin\glxzoomwidget.dll" -"\epoc32\release\armv5\urel\detailsnamelabel.dll" -"!:\sys\bin\detailsnamelabel.dll" -"\epoc32\release\armv5\urel\detailsnamelabelplugin.dll" -"!:\sys\bin\detailsnamelabelplugin.dll" -"\epoc32\release\armv5\urel\detailsdescriptionedit.dll" -"!:\sys\bin\detailsdescriptionedit.dll" -"\epoc32\release\armv5\urel\detailsdescriptioneditplugin.dll" -"!:\sys\bin\detailsdescriptioneditplugin.dll" +"\epoc32\release\armv5\urel\glxdetailscustomwidgets.dll" -"!:\sys\bin\glxdetailscustomwidgets.dll" +"\epoc32\release\armv5\urel\glxdetailscustomplugin.dll" -"!:\sys\bin\glxdetailscustomplugin.dll" + ;translations "\epoc32\data\z\resource\qt\translations\photos_en.qm" -"!:\resource\qt\translations\photos.qm" diff -r a0f57508af73 -r a3a4c0de738e gallery/sis/photos_stub.pkg --- a/gallery/sis/photos_stub.pkg Sat Jul 10 00:59:39 2010 +0530 +++ b/gallery/sis/photos_stub.pkg Fri Jul 23 20:41:04 2010 +0530 @@ -31,7 +31,6 @@ "" - "z:\sys\bin\photos.exe" "" - "z:\private\10003a3f\import\apps\photos_reg.rsc" "" - "z:\resource\apps\photos.rsc" -"" - "z:\resource\apps\photos.mif" ; -------- files -------- ; engines @@ -101,10 +100,9 @@ "" - "z:\sys\bin\glxviews.dll" "" - "z:\sys\bin\glxviewutilities.dll" "" - "z:\sys\bin\glxzoomwidget.dll" -"" - "z:\sys\bin\detailsnamelabel.dll" -"" - "z:\sys\bin\detailsnamelabelplugin.dll" -"" - "z:\sys\bin\detailsdescriptionedit.dll" -"" - "z:\sys\bin\detailsdescriptioneditplugin.dll" +"" - "z:\sys\bin\glxdetailscustomwidgets.dll" +"" - "z:\sys\bin\glxdetailscustomplugin.dll" + "" - "z:\private\10202BE9\20007194.txt" "" - "z:\private\10202BE9\20007193.txt" diff -r a0f57508af73 -r a3a4c0de738e gallery/sis/photos_stub.sis Binary file gallery/sis/photos_stub.sis has changed diff -r a0f57508af73 -r a3a4c0de738e inc/glxlog.h --- a/inc/glxlog.h Sat Jul 10 00:59:39 2010 +0530 +++ b/inc/glxlog.h Fri Jul 23 20:41:04 2010 +0530 @@ -70,7 +70,7 @@ #else // put full file paths off for __FILE__ macro to make the log entries shorter #pragma fullpath_file off*/ - #define GLX_DEBUG_STR( cat, str ) __FILE__ "(%d) : " ##cat " : " ##str + #define GLX_DEBUG_STR( cat, str ) __FILE__ "(%d) : " cat " : " str // #endif /** diff -r a0f57508af73 -r a3a4c0de738e photos.qrc --- a/photos.qrc Sat Jul 10 00:59:39 2010 +0530 +++ b/photos.qrc Fri Jul 23 20:41:04 2010 +0530 @@ -23,7 +23,6 @@ data/albumlisttogrid.fxml data/albumlisttogridshow.fxml data/photos.css - data/grid.docml data/listview.docml data/fullscreen.docml data/slideshow.docml diff -r a0f57508af73 -r a3a4c0de738e rom/photos.iby --- a/rom/photos.iby Sat Jul 10 00:59:39 2010 +0530 +++ b/rom/photos.iby Fri Jul 23 20:41:04 2010 +0530 @@ -79,15 +79,13 @@ file=ABI_DIR/BUILD_DIR/glxviews.dll SHARED_LIB_DIR/glxviews.dll file=ABI_DIR/BUILD_DIR/glxviewutilities.dll SHARED_LIB_DIR/glxviewutilities.dll file=ABI_DIR/BUILD_DIR/glxzoomwidget.dll SHARED_LIB_DIR/glxzoomwidget.dll -file=ABI_DIR/BUILD_DIR/detailsnamelabel.dll SHARED_LIB_DIR/detailsnamelabel.dll -file=ABI_DIR/BUILD_DIR/detailsnamelabelplugin.dll SHARED_LIB_DIR/detailsnamelabelplugin.dll -file=ABI_DIR/BUILD_DIR/detailsdescriptionedit.dll SHARED_LIB_DIR/detailsdescriptionedit.dll -file=ABI_DIR/BUILD_DIR/detailsdescriptioneditplugin.dll SHARED_LIB_DIR/detailsdescriptioneditplugin.dll +file=ABI_DIR/BUILD_DIR/glxdetailscustomwidgets.dll SHARED_LIB_DIR/glxdetailscustomwidgets.dll +file=ABI_DIR/BUILD_DIR/glxdetailscustomplugin.dll SHARED_LIB_DIR/glxdetailscustomplugin.dll + S60_APP_EXE(photos) data=/epoc32/data/z/private/10003a3f/import/apps/photos_reg.rsc private/10003a3f/import/apps/photos_reg.rsc -data=DATAZ_/APP_RESOURCE_DIR/photos.mif APP_RESOURCE_DIR/photos.mif data=/epoc32/data/Z/private/10202BE9/20007194.txt private/10202BE9/20007194.txt data=/epoc32/data/Z/private/10202BE9/20007193.txt private/10202BE9/20007193.txt data=/epoc32/data/z/system/install/photos_stub.sis /system/install/photos_stub.sis diff -r a0f57508af73 -r a3a4c0de738e tvout/bwins/glxtvoutwrapperu.def --- a/tvout/bwins/glxtvoutwrapperu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/bwins/glxtvoutwrapperu.def Fri Jul 23 20:41:04 2010 +0530 @@ -5,8 +5,8 @@ ??0GlxTvOutWrapper@@QAE@XZ @ 4 NONAME ; GlxTvOutWrapper::GlxTvOutWrapper(void) ?deactivateZoom@GlxTvOutWrapper@@QAEXXZ @ 5 NONAME ; void GlxTvOutWrapper::deactivateZoom(void) ?fadeSurface@GlxTvOutWrapper@@QAEX_N@Z @ 6 NONAME ; void GlxTvOutWrapper::fadeSurface(bool) - ?setModel@GlxTvOutWrapper@@QAEXPAVQAbstractItemModel@@_N@Z @ 7 NONAME ; void GlxTvOutWrapper::setModel(class QAbstractItemModel *, bool) - ?setToCloningMode@GlxTvOutWrapper@@QAEXXZ @ 8 NONAME ; void GlxTvOutWrapper::setToCloningMode(void) - ?setImagetoHDMI@GlxTvOutWrapper@@QAEXXZ @ 9 NONAME ; void GlxTvOutWrapper::setImagetoHDMI(void) - ?setToNativeMode@GlxTvOutWrapper@@QAEXXZ @ 10 NONAME ; void GlxTvOutWrapper::setToNativeMode(void) + ?setToCloningMode@GlxTvOutWrapper@@QAEXXZ @ 7 NONAME ; void GlxTvOutWrapper::setToCloningMode(void) + ?setImagetoHDMI@GlxTvOutWrapper@@QAEXXZ @ 8 NONAME ; void GlxTvOutWrapper::setImagetoHDMI(void) + ?setToNativeMode@GlxTvOutWrapper@@QAEXXZ @ 9 NONAME ; void GlxTvOutWrapper::setToNativeMode(void) + ?setModel@GlxTvOutWrapper@@QAEXPAVQAbstractItemModel@@VQSize@@_N@Z @ 10 NONAME ; void GlxTvOutWrapper::setModel(class QAbstractItemModel *, class QSize, bool) diff -r a0f57508af73 -r a3a4c0de738e tvout/eabi/glxtvoutwrapperu.def --- a/tvout/eabi/glxtvoutwrapperu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/eabi/glxtvoutwrapperu.def Fri Jul 23 20:41:04 2010 +0530 @@ -6,7 +6,7 @@ _ZN15GlxTvOutWrapper15setToNativeModeEv @ 5 NONAME _ZN15GlxTvOutWrapper16itemNotSupportedEv @ 6 NONAME _ZN15GlxTvOutWrapper16setToCloningModeEv @ 7 NONAME - _ZN15GlxTvOutWrapper8setModelEP18QAbstractItemModelb @ 8 NONAME + _ZN15GlxTvOutWrapper8setModelEP18QAbstractItemModel5QSizeb @ 8 NONAME _ZN15GlxTvOutWrapperC1Ev @ 9 NONAME _ZN15GlxTvOutWrapperC2Ev @ 10 NONAME _ZN15GlxTvOutWrapperD1Ev @ 11 NONAME diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/bwins/glxtvoutu.def --- a/tvout/tvoutengine/bwins/glxtvoutu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/bwins/glxtvoutu.def Fri Jul 23 20:41:04 2010 +0530 @@ -1,16 +1,16 @@ EXPORTS ?ActivateZoom@CGlxHdmiController@@QAEXH@Z @ 1 NONAME ; void CGlxHdmiController::ActivateZoom(int) ?ScreenSizeL@CGlxTv@@QBE?AVTSize@@XZ @ 2 NONAME ; class TSize CGlxTv::ScreenSizeL(void) const - ?NewL@CGlxHdmiController@@SAPAV1@H@Z @ 3 NONAME ; class CGlxHdmiController * CGlxHdmiController::NewL(int) + ?NewL@CGlxHdmiController@@SAPAV1@VTRect@@H@Z @ 3 NONAME ; class CGlxHdmiController * CGlxHdmiController::NewL(class TRect, int) ?SetImageL@CGlxHdmiController@@QAEXABVTDesC16@@PAVCFbsBitmap@@H@Z @ 4 NONAME ; void CGlxHdmiController::SetImageL(class TDesC16 const &, class CFbsBitmap *, int) ??1CGlxTv@@UAE@XZ @ 5 NONAME ; CGlxTv::~CGlxTv(void) ??1CGlxHdmiController@@UAE@XZ @ 6 NONAME ; CGlxHdmiController::~CGlxHdmiController(void) ?IsWidescreen@CGlxTv@@QBEHXZ @ 7 NONAME ; int CGlxTv::IsWidescreen(void) const ?ShiftToPostingMode@CGlxHdmiController@@QAEXXZ @ 8 NONAME ; void CGlxHdmiController::ShiftToPostingMode(void) ?ShiftToCloningMode@CGlxHdmiController@@QAEXXZ @ 9 NONAME ; void CGlxHdmiController::ShiftToCloningMode(void) - ?IsConnected@CGlxTv@@QBEHXZ @ 10 NONAME ; int CGlxTv::IsConnected(void) const - ?ItemNotSupported@CGlxHdmiController@@QAEXXZ @ 11 NONAME ; void CGlxHdmiController::ItemNotSupported(void) - ?NewL@CGlxTv@@SAPAV1@AAVMGlxTvObserver@@@Z @ 12 NONAME ; class CGlxTv * CGlxTv::NewL(class MGlxTvObserver &) + ?NewL@CGlxTv@@SAPAV1@AAVMGlxTvObserver@@@Z @ 10 NONAME ; class CGlxTv * CGlxTv::NewL(class MGlxTvObserver &) + ?IsConnected@CGlxTv@@QBEHXZ @ 11 NONAME ; int CGlxTv::IsConnected(void) const + ?ItemNotSupported@CGlxHdmiController@@QAEXXZ @ 12 NONAME ; void CGlxHdmiController::ItemNotSupported(void) ?FadeSurface@CGlxHdmiController@@QAEXH@Z @ 13 NONAME ; void CGlxHdmiController::FadeSurface(int) ?IsHDMIConnected@CGlxTv@@QBEHXZ @ 14 NONAME ; int CGlxTv::IsHDMIConnected(void) const ?DeactivateZoom@CGlxHdmiController@@QAEXXZ @ 15 NONAME ; void CGlxHdmiController::DeactivateZoom(void) diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/eabi/glxtvoutu.def --- a/tvout/tvoutengine/eabi/glxtvoutu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/eabi/glxtvoutu.def Fri Jul 23 20:41:04 2010 +0530 @@ -5,7 +5,7 @@ _ZN18CGlxHdmiController16ItemNotSupportedEv @ 4 NONAME _ZN18CGlxHdmiController18ShiftToCloningModeEv @ 5 NONAME _ZN18CGlxHdmiController18ShiftToPostingModeEv @ 6 NONAME - _ZN18CGlxHdmiController4NewLEi @ 7 NONAME + _ZN18CGlxHdmiController4NewLE5TRecti @ 7 NONAME _ZN18CGlxHdmiController9SetImageLERK7TDesC16P10CFbsBitmapi @ 8 NONAME _ZN18CGlxHdmiControllerD0Ev @ 9 NONAME _ZN18CGlxHdmiControllerD1Ev @ 10 NONAME diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/group/glxtvout.mmp --- a/tvout/tvoutengine/group/glxtvout.mmp Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/group/glxtvout.mmp Fri Jul 23 20:41:04 2010 +0530 @@ -53,7 +53,6 @@ LIBRARY cone.lib // for CCoeEnv LIBRARY centralrepository.lib // for Central Repository LIBRARY accclient.lib // for RAccessoryServer -LIBRARY alfclient.lib // For Alfred Hitchcock framework LIBRARY fbscli.lib LIBRARY gdi.lib LIBRARY surfaceupdateclient.lib // surface update client @@ -61,11 +60,12 @@ LIBRARY imageconversion.lib // ICL LIBRARY efsrv.lib LIBRARY bitgdi.lib -LIBRARY apgrfx.lib // +LIBRARY apgrfx.lib // LIBRARY apmime.lib // For ImageViewer mime type extraction LIBRARY glxlogging.lib -LIBRARY alfdecoderserverclient.lib -LIBRARY AccPolicy.lib //For RAccessoryConnection status ID's +LIBRARY alfdecoderserverclient.lib +LIBRARY AccPolicy.lib //For RAccessoryConnection status ID's + // Other Dependency Libraries #ifdef __MARM LIBRARY GSServerEngine.lib // FOr AspectRatio diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxactivecallback.h --- a/tvout/tvoutengine/inc/glxactivecallback.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxactivecallback.h Fri Jul 23 20:41:04 2010 +0530 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: Handles & propogates UI state change notifications. +* Description: * */ @@ -31,12 +31,12 @@ iCallBack(aCallBack) {}; CGlxActiveCallBack(); - public: // Functions from base classes + public: /// Functions CActive void SetActive() { CActive::SetActive();}; void RunL() { iCallBack.CallBack();}; void DoCancel() {}; - private: // Data + private: /// Data TCallBack iCallBack; }; diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxactivedecoder.h --- a/tvout/tvoutengine/inc/glxactivedecoder.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxactivedecoder.h Fri Jul 23 20:41:04 2010 +0530 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: This is the decoder class used to decode Images to HDMI quality. * */ @@ -24,44 +24,55 @@ #include #include "glxhdmisurfaceupdater.h" +// Fwd decleration class CImageDecoder; -// CLASS DECLARATION + +/** + * Class Description + * This is the decoder class used to decode Images to HDMI quality. + * + * Clients should create an instance of this class from CGlxHdmiSurfaceUpdater , with an + * instance of it and call ConvertImageL() with approprriate parameters + */ class CGlxHdmiDecoderAO : public CActive { public: - /* + + /** * NewL() - * @Param1 CGlxHdmiSurfaceUpdater + * @param CGlxHdmiSurfaceUpdater + * @return CGlxHdmiDecoderAO object */ static CGlxHdmiDecoderAO* NewL(CGlxHdmiSurfaceUpdater* aHdmiSurfaceUpdater); - /* + /** * Destructor */ ~CGlxHdmiDecoderAO(); - /* + /** * ConvertImageL() * This calls the asyncronous service request to ICL convert - * @param1 - Destination Bitmap - * @param2 - Image decoder + * @param - Destination Bitmap + * @param - Image decoder */ void ConvertImageL(CFbsBitmap& iBitmap,CImageDecoder* aDecoder); -protected: - // from CActive +protected:/// from CActive void RunL(); void DoCancel(); private: - /* + /** * Constructor */ CGlxHdmiDecoderAO(CGlxHdmiSurfaceUpdater* aHdmiSurfaceUpdater); private: - CGlxHdmiSurfaceUpdater* iHdmiSurfaceUpdater; // not owned + /// not owned + CGlxHdmiSurfaceUpdater* iHdmiSurfaceUpdater; + /// Image decoder instance CImageDecoder* iDecoder; }; diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxhdmicontainer.h --- a/tvout/tvoutengine/inc/glxhdmicontainer.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxhdmicontainer.h Fri Jul 23 20:41:04 2010 +0530 @@ -21,6 +21,12 @@ #include #include "glxhdmisurfaceupdater.h" +/** + * Class Description + * A class that creates a CCoeControl window for Screen 1 with screendevice + * used + * @author tapadar + */ class CGlxHdmiContainer : public CCoeControl, public MGlxGenCallback { public: diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxhdmicontroller.h --- a/tvout/tvoutengine/inc/glxhdmicontroller.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxhdmicontroller.h Fri Jul 23 20:41:04 2010 +0530 @@ -1,4 +1,4 @@ -/* +/** * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available @@ -11,119 +11,157 @@ * * Contributors: * -* Description: Handles & propogates UI state change notifications. +* Description: Creates the HDMI engine and provides functionality +* for all its usage and needs through simple API's * */ + #ifndef GLXHDMICONTROLLER_H_ #define GLXHDMICONTROLLER_H_ // Internal includes - class CGlxHdmiContainer; class CGlxHdmiSurfaceUpdater; -/* - * This class will be called from FS and Slideshow for its requirements - */ +/** + * Class Description + * This is the entry point of the HDMI engine. + * It Promisses to provide all HDMI functionality with simple API calls. + * + * To Show an image on TV, create an instance of this object and call + * CGlxHdmiController::SetImageL() with appropriate parameters. + * + * To Shift from native to clone and vice versa, use ShiftToPostingMode() and + * ShiftToCloningMode() respectively + * + * For Not supported items, make sure to call ItemNotSupported() API + */ + class CGlxHdmiController : public CBase { public: - /* + /** * NewLC - * @param1 - Image file path default to NULL + * @param aRect rect in which the CCoecontrol actually needs to be constructed + * @param EffectsOn - if the effect should be on, by default it is OFF, + * used only for SLIDESHOW + * + * @return CGlxHdmiController object. */ - IMPORT_C static CGlxHdmiController* NewL(TBool aEfectsOn = EFalse); + IMPORT_C static CGlxHdmiController* NewL(TRect aRect ,TBool aEfectsOn = EFalse); - /* + /** * Destructor */ IMPORT_C ~CGlxHdmiController(); - /* + /** * Update Image - * @param1 - Image file path + * @param aImageFile file path + * @param aFsBitmap Fullscreen bitmap, make sure to send a grid bitmap if FS bitmap not present + * @param aStore An internal parameter to store the image path or not, clients neednot use this. */ IMPORT_C void SetImageL(const TDesC& aImageFile, CFbsBitmap* aFsBitmap = NULL, TBool aStore = ETrue); - /* + /** * To intimate that the item is not supported. */ IMPORT_C void ItemNotSupported(); - /* + /** * Activating zoom in posting mode + * @param aAutoZoomOut if it should auto zoom out */ IMPORT_C void ActivateZoom(TBool aAutoZoomOut); - /* + + /** * Deactivating zoom in posting mode */ IMPORT_C void DeactivateZoom(); - /* + /** * ShiftToCloningMode + * Shifts the TV UI to cloning mode if it is posting + * else does nothing */ IMPORT_C void ShiftToCloningMode(); - /* + /** * ShiftToPostingMode + * Shifts the TV UI to posting mode if cloning mode, + * else does nothing */ IMPORT_C void ShiftToPostingMode(); - /* + /** * Fadeing of the Surface - * @param1 ETrue - FadeIn ( as in gaining brightness ) - * EFalse - FadeOut ( as in loosing brightness ) + * @param aFadeInOut ETrue - FadeIn ( as in gaining brightness ) + * EFalse - FadeOut ( as in loosing brightness ) */ IMPORT_C void FadeSurface(TBool aFadeInOut); -private: - /* +private:/// class private method + /** * Constructor + * @param aRect Rect size + * @param aEfectsOn if effects needs to be on(used in Slideshow only) */ - CGlxHdmiController(TBool aEfectsOn); + CGlxHdmiController(TRect aRect ,TBool aEfectsOn); - /* + /** * ConstructL */ void ConstructL(); - /* + /** * Create the Hdmi Container */ void CreateHdmiContainerL(); - /* + /** * Create surface updater and update background surface - * @param1 - Image file + * @param aImageFile Image file */ void CreateSurfaceUpdaterL(const TDesC& aImageFile); - /* + /** * To Destroy the surface updater if present */ void DestroySurfaceUpdater(); - /* + /** * Detroy the container */ void DestroyContainer(); - /* + /** * Stores the Image File name - * @param1 - Image file + * @param aImageFile Image file path + * @param aFsBitmap Fullscreen Bitmap */ void StoreImageInfoL(const TDesC& aImageFile, CFbsBitmap* aFsBitmap); private: - CFbsBitmap* iFsBitmap; - HBufC* iStoredImagePath; - + /// Fullscreen Bitmap + CFbsBitmap* iFsBitmap; + /** + * Stored image path + */ + HBufC* iStoredImagePath; + /** + * Hdmi container + */ CGlxHdmiContainer* iHdmiContainer; + /// Surface updater instance CGlxHdmiSurfaceUpdater* iSurfaceUpdater; - TBool iIsImageSupported; // Flag to see if Image is supported - TBool iEffectsOn; + /// Rect + TRect iRect; + /// Flag to see if Image is supported + TBool iIsImageSupported; + /// Flag to set if effects should be on + TBool iEffectsOn; }; #endif /* GLXHDMICONTROLLER_H_ */ diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxhdmisurfaceupdater.h --- a/tvout/tvoutengine/inc/glxhdmisurfaceupdater.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxhdmisurfaceupdater.h Fri Jul 23 20:41:04 2010 +0530 @@ -39,229 +39,288 @@ virtual void DoGenCallback() = 0; }; +/** + * Class Description + * This is the main class which processes images to the surface + * + */ + class CGlxHdmiSurfaceUpdater: public CBase { public: - /* + /** * NewL + * @param aWindow RWindow + * @param aImageFile Image File path + * @param aFsBitmap Fullscreen bitmap (if FS not available,make sure to send grid or default bitmap + * else it would appear white screen on TV ) + * @param aCallBack MGlxGenCallback instance + * @param aEffectsOn If Effects should be on */ static CGlxHdmiSurfaceUpdater* NewL(RWindow* aWindow, const TDesC& aImageFile, CFbsBitmap* aFsBitmap, MGlxGenCallback* aCallBack,TBool aEffectsOn); - /* + /** * Destructor */ ~CGlxHdmiSurfaceUpdater(); public: - /* + /** * This is to cancel the active object from decoding */ void HandleRunL(TRequestStatus& aStatus); - /* + /** * This updates the new image. + * @param aImageFile image path + * @param aFsBitmap Fullscreen Bitmap + * + * NOTE : if FS not available,make sure to send grid or default bitmap + * else it would appear white screen on TV */ void UpdateNewImageL(const TDesC& aImageFile,CFbsBitmap* aFsBitmap); - /* + /** * Activate Zoom + * @param aAutoZoomOut if it should auto zoom out */ void ActivateZoom(TBool aAutoZoomOut); - /* + + /** * Deactivate Zoom */ void DeactivateZoom(); - /* - ShiftToCloningMOde + /** + * ShiftToCloningMOde */ void ShiftToCloningMode(); - /* - ShiftToPostingMode + /** + * ShiftToPostingMode */ void ShiftToPostingMode(); - /* + /** * Fadeing of the Surface - * @param1 ETrue - FadeIn ( as in gaining brightness ) - * EFalse - FadeOut ( as in loosing brightness ) + * @param aFadeInOut ETrue - FadeIn ( as in gaining brightness ) + * EFalse - FadeOut ( as in loosing brightness ) */ void FadeTheSurface(TBool aFadeInOut); private: - /* + /** * Constructor + * @param aWindow RWindow + * @param aCallBack MGlxGenCallback instance + * @param aEffectsOn if effects should be on */ CGlxHdmiSurfaceUpdater(RWindow* aWindow, MGlxGenCallback* aCallBack,TBool aEffectsOn); - /* - * ConstructL() + /** + * ConstructL + * @param aFsBitmap Fullscreen Bitmap + * @param aImageFile image file path */ void ConstructL(CFbsBitmap* aFsBitmap,const TDesC& aImageFile); - /* + /** * Create a New surface with given size */ void CreateSurfaceL(); - /* - * @param1 size + + /** + * MapSurfaceL */ void MapSurfaceL(); - /* + /** * This fundtion wont be called , could be used if double buffering is planned in future * to start the second decoder AO and update the surface with a new session. */ static TInt SurfBuffer0Ready(TAny* aObject); - /* + /** * Call a refresh on the screen */ void Refresh(); - /* + /** * Dump the buffer on to the surface stride */ void SwapBuffers(); - /* + /** * Release contents */ void ReleaseContent(); - /* + /** * Create bitmap */ void CreateBitmapL(); - /* + /** * Create an image decoder with given file - * @param1 - Image file */ void CreateImageDecoderL(); - /* + /** * Creating all enablers for HDMI - * @param1 if creating a surface is required, - * by default it is not required + * @param aCreateSurface if creating a surface is required, + * by default it is not required */ void CreateHdmiL(TBool aCreateSurface = ETrue); - /* + /** * Zoom in our out depending on parameter + * @param aZoom if should be zoomed */ void Zoom(TBool aZoom); - /* + /** * This if for zoom timer timeout */ static TInt TimeOut(TAny* aSelf); - /* + /** * Animation time out timer */ static TInt AnimationTimeOut(TAny* aSelf); - /* + /** * ModifySurface positions of the surface to be displayed on screen */ void ModifySurfacePostion(); - /* + /** * Process the image for TV */ void ProcessTvImage(); - /* + /** * Shows the FS thumbnail first before showing * Decoded HD image */ void ShowFsThumbnailL(); - /* + /** * Recalculate the size for png/bmp as decoder fails to * decode for desired size + * @return the Size of the desired image supported by the decoder */ TSize ReCalculateSizeL(); - /* + /** * If the image format is non jpeg, then we need to calculate as per * reduction factor and reduced size as what the decoder is going to return us * This function returns if that needs to be done. + * + * @return check the image mime type and return True if the recaulation of size needs + * to be done else return false */ TBool DoesMimeTypeNeedsRecalculateL(); - /* + /** * If the image format is non jpeg, then we need to scale the bitmap after it is - * decoded, as the return value would not fit the screen + * decoded, as the return value would not fit the screen + * @param */ void ScaleDecodedBitmapL(TInt aBitmapIndex); - /* + /** * InitiateHDMI + * @param aFsBitmap Fullscreen Bitmap + * @param aImageFile Image path */ void InitiateHdmiL(CFbsBitmap* aFsBitmap,const TDesC& aImageFile); - /* + /** * Animate untill loop is complete */ void Animate(); private: - RWindow* iWindow; // window object - CFbsBitmap* iFsBitmap; // FS bitmap - MGlxGenCallback* iCallBack; // callback to the HdmiContainer window - HBufC* iImagePath; // To store the image uri path + /// window object + RWindow* iWindow; + /// FS bitmap + CFbsBitmap* iFsBitmap; + /// callback to the HdmiContainer window + MGlxGenCallback* iCallBack; + /// To store the image uri path + HBufC* iImagePath; TBool iEffectsOn; - TBool iShwFsThumbnail; // If the Fs thumbnail is to be shown before decoding HD images - TBool iIsNonJpeg; // If the item is non jpeg - TBool iFadeIn; // If FadeIn or Out for only SLideshow animation + /// If the Fs thumbnail is to be shown before decoding HD images + TBool iShwFsThumbnail; + /// If the item is non jpeg + TBool iIsNonJpeg; + /// If FadeIn or Out for only SLideshow animation + TBool iFadeIn; - // GCE Surface + /// GCE Surface RSurfaceUpdateSession iSurfUpdateSession; - TSurfaceId iSurfId; // TSurfaceId - RSurfaceManager* iSurfManager; // RSurfaceManager - RChunk* iSurfChunk; // RChunk - TInt iSurfaceStride; // surface stride - TSurfaceConfiguration iConfig; // surface configuration for zoom + /// TSurfaceId + TSurfaceId iSurfId; + /// RSurfaceManager + RSurfaceManager* iSurfManager; + /// RChunk + RChunk* iSurfChunk; + /// surface stride + TInt iSurfaceStride; + /// surface configuration for zoom + TSurfaceConfiguration iConfig; - CFbsBitmap* iDecodedBitmap[3]; // Array of Decoded bitmaps of the focussed image - // 1 - contains FS/Grid Thumbnail, 2- HD image, - // (optional)3-Scaled png/bmp images + /** Array of Decoded bitmaps of the focussed image + * 1 - contains FS/Grid Thumbnail, 2- HD image, + * (optional)3-Scaled png/bmp images + */ + CFbsBitmap* iDecodedBitmap[3]; - void* iSurfBuffer; // Surface buffer - CGlxActiveCallBack* iSurfBufferAO; // Surface buffer AO + /// Surface buffer + void* iSurfBuffer; + /// Surface buffer AO + CGlxActiveCallBack* iSurfBufferAO; CAlfCompositionSource* ialfCompositionSurface; - //ICL - CGlxHdmiDecoderAO* iGlxDecoderAO; // Internal Image decoder AO - CImageDecoder* iImageDecoder; // Image Decoder - RFs iFsSession; // RFs + /// Internal Image decoder AO + CGlxHdmiDecoderAO* iGlxDecoderAO; + /// Image Decoder + CImageDecoder* iImageDecoder; + /// RFs + RFs iFsSession; - TPoint iLeftCornerForZoom; // - CPeriodic* iTimer; // Timer for Zoom - CPeriodic* iAnimTimer; // Timer for Animation + TPoint iLeftCornerForZoom; + /// Timer for Zoom + CPeriodic* iTimer; + /// Timer for Animation + CPeriodic* iAnimTimer; TInt iAnimCounter; - // Various objects to store sizes and count - TSize iTvScreenSize; // to store the Tv screen size - TSize iTargetBitmapSize; // To Store the target bitmap size to display(as per Aspect Ratio) + /// Various objects to store sizes and count + /// to store the Tv screen size + TSize iTvScreenSize; + /// To Store the target bitmap size to display(as per Aspect Ratio) + TSize iTargetBitmapSize; - // Various flags to store values - TBool iZoom; // Is zoomed - TBool iBitmapReady; // If the bitmap is decoded and ready - TBool iAutoZoomOut; // If the UI has asked for auto zoomout - TBool iSurfSessionConnected; // If surface session is connected + /// Various flags to store values + /// Is zoomed + TBool iZoom; + /// If the bitmap is decoded and ready + TBool iBitmapReady; + /// If the UI has asked for auto zoomout + TBool iAutoZoomOut; + /// If surface session is connected + TBool iSurfSessionConnected; + /// If it is set to shift to cloning mode TBool iShiftToCloning; #ifdef _DEBUG TTime iStartTime; TTime iStopTime; #endif - // The bitmap index in the array of bitmaps + /// The bitmap index in the array of bitmaps enum { EFSBitmapIndex = 0, EJpgDecodedBitmapIndex, diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxtv.h --- a/tvout/tvoutengine/inc/glxtv.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxtv.h Fri Jul 23 20:41:04 2010 +0530 @@ -68,7 +68,6 @@ /** * Class Description * A class that handles and propagates UI change notifications - * @author Loughlin */ NONSHARABLE_CLASS (CGlxTv) : public CBase, public MGlxWindowVisibilityObserver, @@ -94,12 +93,12 @@ */ CGlxTv(MGlxTvObserver& aTvObserver); - /* + /** * Symbian second stage construction */ void ConstructL(); -public: // class public method +public: /// class public method /** * Get the current screen size @@ -158,30 +157,30 @@ void StopMonitoringEnvironment(); private: // class member data - // Not Owned: The TV out observer + /// Not Owned: The TV out observer MGlxTvObserver& iTvObserver; - // Owned: The Window visibility monitor + /// Owned: The Window visibility monitor CGlxWindowVisibilityMonitor* iWindowVisibilityMonitor; - // Owned: The TV connection monitor + /// Owned: The TV connection monitor CGlxTvConnectionMonitor* iTvConnectionMonitor; - // Size of the TV Out display size + /// Size of the TV Out display size TSize iSzInPixels; - // Owned: The central repository where TV display ratio is held. + /// Owned: The central repository where TV display ratio is held. CRepository* iCenRep; - // The implementation of the class, hidden from clients + /// The implementation of the class, hidden from clients class CGlxTvOutCenRepMonitor; - // Owned: Monitoring class for Tv Ratio Values + /// Owned: Monitoring class for Tv Ratio Values CGlxTvOutCenRepMonitor* iTvDisplayAspectRatioMonitor; - // The TV aspect ratio + /// The TV aspect ratio TInt iAspectRatio; }; -#endif // __GLXTV_H__ \ No newline at end of file +#endif // __GLXTV_H__ diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxtvconnectionmonitor.h --- a/tvout/tvoutengine/inc/glxtvconnectionmonitor.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxtvconnectionmonitor.h Fri Jul 23 20:41:04 2010 +0530 @@ -16,11 +16,6 @@ */ - -/** - * @internal reviewed 24/08/2007 by D Holland - */ - #ifndef __GLX_WNDWCONNECTION_MONITOR_H__ #define __GLX_WNDWCONNECTION_MONITOR_H__ @@ -40,7 +35,6 @@ /** * Class Description * An Active object derived class is used to monitor the TV out connection - * @author Loughlin */ NONSHARABLE_CLASS(CGlxTvConnectionMonitor) : public CActive { @@ -65,20 +59,20 @@ CGlxTvConnectionMonitor( MGlxTvConnectionObserver& aConnectionObserver); - /* + /** * Symbian second stage construction */ void ConstructL(); public: // class member functions - /* + /** * Provides the caller with the current TV connetion state * @return The TV connection state */ TBool IsConnected() const; - /* + /** * Provides the caller with the current HDMI connetion state * @return The HDMI connection state */ @@ -120,30 +114,30 @@ private: // class member data - // Not owned: TV connection observer + /// Not owned: TV connection observer MGlxTvConnectionObserver& iConnectionObserver; - // TVout The Connection state + /// TVout The Connection state TBool iIsTvOutConnected; - // TVout The Connection state + /// TVout The Connection state TBool iIsHDMIConnected; - // Headset The Connection state + /// Headset The Connection state TBool iIsHeadSetConnected; - // The (external device) Accessory Server + /// The (external device) Accessory Server RAccessoryServer iTvAccServer; - // Accessory mode + /// Accessory mode RAccessoryMode iTvAccMode; - // Accessory Connection - details the type of accessory + /// Accessory Connection - details the type of accessory RAccessoryConnection iTvAccCon; - //Class gives Generic ID + ///Class gives Generic ID TAccPolGenericIDArray iCurrentAccArray; }; -#endif // __GLX_WNDWCONNECTION_MONITOR_H__ \ No newline at end of file +#endif // __GLX_WNDWCONNECTION_MONITOR_H__ diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/inc/glxwindowvisibilitymonitor.h --- a/tvout/tvoutengine/inc/glxwindowvisibilitymonitor.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/inc/glxwindowvisibilitymonitor.h Fri Jul 23 20:41:04 2010 +0530 @@ -16,11 +16,6 @@ */ - -/** - * @internal reviewed 24/08/2007 by D Holland - */ - #ifndef __GLXWINVISIBILITYMONITOR_H__ #define __GLXWINVISIBILITYMONITOR_H__ @@ -33,12 +28,10 @@ class MGlxWindowVisibilityObserver; - /** * Class Description * An Active object derived class is used to monitor the visibility of the * TV out window. - * @author Loughlin */ NONSHARABLE_CLASS(CGlxWindowVisibilityMonitor) : public CBase, public MAknWsEventObserver @@ -74,9 +67,9 @@ */ void ConstructL(); -public: // class member functions +public: /// class member functions - /* + /** * Provides the caller with the current visible state * @return ETrue if the window is visible or false otherwise */ @@ -86,14 +79,14 @@ void HandleWsEventL( const TWsEvent& aEvent, CCoeControl* aDestination ); -private: // class member data - // Not ownded: The Akn event monitor +private: /// class member data + /// Not ownded: The Akn event monitor CAknWsEventMonitor* iAknEventMonitor; - // Not owned: Window visibility observer + /// Not owned: Window visibility observer MGlxWindowVisibilityObserver& iVisibilityObserver; - // The visible state + /// The visible state TBool iIsVisible; }; diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/src/glxhdmicontroller.cpp --- a/tvout/tvoutengine/src/glxhdmicontroller.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/src/glxhdmicontroller.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -16,7 +16,6 @@ */ #include -#include #include #include @@ -28,10 +27,10 @@ // ----------------------------------------------------------------------------- // NewLC // ----------------------------------------------------------------------------- -EXPORT_C CGlxHdmiController* CGlxHdmiController::NewL(TBool aEfectsOn) +EXPORT_C CGlxHdmiController* CGlxHdmiController::NewL(TRect aRect ,TBool aEfectsOn) { TRACER("CGlxHdmiController* CGlxHdmiController::NewL()"); - CGlxHdmiController* self = new (ELeave) CGlxHdmiController(aEfectsOn); + CGlxHdmiController* self = new (ELeave) CGlxHdmiController(aRect,aEfectsOn); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); @@ -183,9 +182,10 @@ // ----------------------------------------------------------------------------- // Constructor // ----------------------------------------------------------------------------- -CGlxHdmiController::CGlxHdmiController(TBool aEffectsOn): +CGlxHdmiController::CGlxHdmiController(TRect aRect,TBool aEffectsOn): iFsBitmap(NULL), iStoredImagePath(NULL), + iRect(aRect), iEffectsOn(aEffectsOn) { TRACER("CGlxHdmiController::CGlxHdmiController()"); @@ -233,8 +233,7 @@ void CGlxHdmiController::CreateHdmiContainerL() { TRACER("CGlxHdmiController::CreateHdmiContainer()"); - TRect rect = AlfUtil::ScreenSize(); - iHdmiContainer = CGlxHdmiContainer::NewL(rect); + iHdmiContainer = CGlxHdmiContainer::NewL(iRect); } // ----------------------------------------------------------------------------- diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/src/glxhdmisurfaceupdater.cpp --- a/tvout/tvoutengine/src/glxhdmisurfaceupdater.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/src/glxhdmisurfaceupdater.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -595,7 +595,7 @@ TRACER("CGlxHdmiController::CreateImageDecoderL()"); // Create a decoder for the image in the named file TRAPD(error,iImageDecoder = CImageDecoder::FileNewL(iFsSession, - iImagePath->Des(), CImageDecoder::EOptionNone, KNullUid)); + iImagePath->Des(), CImageDecoder::EOptionAlwaysThread, KNullUid)); GLX_LOG_INFO1("CreateImageDecoderL CImageDecoder:FileNewL error %d",error); User::LeaveIfError(error); } diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/src/glxtvconnectionmonitor.cpp --- a/tvout/tvoutengine/src/glxtvconnectionmonitor.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/src/glxtvconnectionmonitor.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -21,16 +21,15 @@ #include "glxtvconnectionmonitor.h" // EXTERNAL INCLUDES +#include +#include // INTERNAL INCLUDES - #include #include - #include #include "glxtv.h" -#include -#include + //----------------------------------------------------------------------------- // Return new object //----------------------------------------------------------------------------- diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutengine/src/glxwindowvisibilitymonitor.cpp --- a/tvout/tvoutengine/src/glxwindowvisibilitymonitor.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutengine/src/glxwindowvisibilitymonitor.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -17,10 +17,6 @@ -/** - * @internal reviewed 24/08/2007 by D Holland - */ - // CLASS HEADER #include "glxwindowvisibilitymonitor.h" diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutwrapper/inc/glxtvconnectionobserver.h --- a/tvout/tvoutwrapper/inc/glxtvconnectionobserver.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutwrapper/inc/glxtvconnectionobserver.h Fri Jul 23 20:41:04 2010 +0530 @@ -25,41 +25,52 @@ class CGlxTv; class GlxTvOutWrapperPrivate; +/** + * Class Description This class basically obseves the connection changes + * + * Client shouldnt access this directly, meant to be used from GlxTvOutWrapperPrivate only + * + */ + class CGlxConnectionObserver : public CBase, public MGlxTvObserver { public: - /* + /** * NewL() + * @param aTvWrapperPrivate GlxTvOutWrapperPrivate instance */ static CGlxConnectionObserver* NewL(GlxTvOutWrapperPrivate* aTvWrapperPrivate); - /* + /** * destructor */ ~CGlxConnectionObserver(); - /* + /** * IsHdmiConnected() */ TBool IsHdmiConnected(); private: - /* + /** * ConstructL */ void ConstructL(); - /* + /** * constructor + * @param aTvWrapperPrivate GlxTvOutWrapperPrivate Instance */ CGlxConnectionObserver(GlxTvOutWrapperPrivate* aTvWrapperPrivate); -private:// From MGlxTvObserver +private:/// @see MGlxTvObserver void HandleTvStatusChangedL ( TTvChangeType aChangeType ); private: + /// TvOut instance CGlxTv* iGlxTvOut; + /// wrapper private instance GlxTvOutWrapperPrivate* iTvWrapperPrivate; }; #endif // GLXTVCONNECTIONOBSERVER_H diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutwrapper/inc/glxtvoutwrapper.h --- a/tvout/tvoutwrapper/inc/glxtvoutwrapper.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutwrapper/inc/glxtvoutwrapper.h Fri Jul 23 20:41:04 2010 +0530 @@ -19,6 +19,7 @@ #define GLXTVOUTWRAPPER_H #include +#include // forward decleration class GlxTvOutWrapperPrivate; @@ -29,70 +30,85 @@ #define GLX_TVOUTWRAPPER_EXPORT Q_DECL_IMPORT #endif +/** + * Class Description This is Wrapper entry point for Qt based classes for HDMI + * + * Client needs to create an instance of this class and setModel() + * + * To Shift from native to clone and vice versa, use setToNativeMode() and + * setToCloningMode() respectively + * + * For Not supported items, make sure to call itemNotSupported() API + */ + class GLX_TVOUTWRAPPER_EXPORT GlxTvOutWrapper { public: - /* + /** * Constructor */ GlxTvOutWrapper(); - /* + /** * Destructor */ ~GlxTvOutWrapper(); - /* + /** * Setting the model * This also creates the private instance of the wrapper * to pass the model + * @param Model datamodel + * @param screensize the size of the phone screen + * @param aEfectsOn if slideshow effects on tv needs to be on, off by default */ - void setModel(QAbstractItemModel* aModel,bool aEfectsOn = false); + void setModel(QAbstractItemModel* aModel,QSize aScreenSize,bool aEfectsOn = false); - /* + /** * Set the image on to HDMI */ void setImagetoHDMI(); - /* + /** * Sets HDMI to cloning mode */ void setToCloningMode(); - /* + /** * Sets HDMI to Native posting mode */ void setToNativeMode(); - /* + /** * views should call this if for any item it doesnt want to move to * HDMI posting mode */ void itemNotSupported(); - /* + /** * Activate zoom in posting mode * This can be called if the zoom animation in HDMI(bounce back effect) * needs to be shown - * @param1 - send true if want to auto zoom out on animation effect + * @param autoZoomOut send true if want to auto zoom out on animation effect */ void activateZoom(bool autoZoomOut); - /* + /** * Deactivate zoom in posting mode. * This can be called when zoom animation needs to bounce back. * Note : This function is not required if bounce back effect finishes automatically */ void deactivateZoom(); - /* + /** * Fadeing of the Surface - * @param1 ETrue - FadeIn ( as in gaining brightness ) - * EFalse - FadeOut ( as in loosing brightness ) + * @param aFadeInOut ETrue - FadeIn ( as in gaining brightness ) + * EFalse - FadeOut ( as in loosing brightness ) */ void fadeSurface(bool aFadeInOut); private: + /// Private wrapper handler according to PIMPL pattern GlxTvOutWrapperPrivate* mTvOutWrapperPrivate; }; diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutwrapper/inc/glxtvoutwrapper_p.h --- a/tvout/tvoutwrapper/inc/glxtvoutwrapper_p.h Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutwrapper/inc/glxtvoutwrapper_p.h Fri Jul 23 20:41:04 2010 +0530 @@ -21,6 +21,7 @@ #include #include #include +#include class GlxTvOutWrapper; class CGlxConnectionObserver; @@ -29,88 +30,104 @@ // Converting the QVariant to CFbsBitmap* Q_DECLARE_METATYPE(CFbsBitmap*) +/** + * Class Description This is Private Wrapper class for HDMI + * + * Client shouldnt access this directly, instead access through GlxTvOutWrapper + * + */ + class GlxTvOutWrapperPrivate { public: - /* + /** * Static method to create an instance - * @param3 - to On the Effects of Slideshow - currently only fade in fade out + * @param aTvOutWrapper GlxTvOutWrapper Instance + * @param aModel item model + * @param aScreenSize screensize of the phone + * @param aEfectsOn to ON the Effects for Slideshow on TV- currently only + * fade in fade out is supported + * + * @return GlxTvOutWrapperPrivate Instance */ static GlxTvOutWrapperPrivate* Instance(GlxTvOutWrapper* aTvOutWrapper, - QAbstractItemModel* aModel,bool aEfectsOn); + QAbstractItemModel* aModel,QSize aScreenSize,bool aEfectsOn); - /* + /** * destructor */ ~GlxTvOutWrapperPrivate(); - /* + /** * HandleConnectionChange - * @param1 true if connected, false if disconnected + * @param aConnected true if connected, false if disconnected * Note this is only being done for HDMI as there is no * implementation for Analog TV. */ void HandleConnectionChange(bool aConnected); - /* - * SetImagetoHDMI() + /** + * SetImagetoHDMI */ void SetImagetoHDMI(); - /* + /** * Sets HDMI to cloning mode */ void SetToCloningMode(); - /* + /** * Sets HDMI to Native posting mode */ void SetToNativeMode(); - /* + /** * views should call this if for any item it doesnt want to move to * HDMI posting mode */ void ItemNotSupported(); - /* + /** * Activate zoom in posting mode */ void ActivateZoom(bool autoZoomOut); - /* + /** * Deactivate zoom in posting mode. */ void DeactivateZoom(); - /* + /** * Fadeing of the Surface - * @param1 ETrue - FadeIn ( as in gaining brightness ) - * EFalse - FadeOut ( as in loosing brightness ) + * @param aFadeInOut - ETrue - FadeIn ( as in gaining brightness ) + * EFalse - FadeOut ( as in loosing brightness ) */ void FadeSurface(bool aFadeInOut); private: - /* + /** * constructor + * @param tvoutwrapper GlxTvOutWrapper instance + * @param model QAbstractItemModel instance */ GlxTvOutWrapperPrivate(GlxTvOutWrapper* aTvOutWrapper, QAbstractItemModel* aModel); - /* + /** * constructL() - * @param1 - to On the Effects of Slideshow - currently only fade in fade out + * @param aScreenSize screensize + * @param aEffectsOn to On the Effects of Slideshow - currently only fade in fade out */ - void ConstructL(bool aEfectsOn); + void ConstructL(QSize aScreenSize,bool aEfectsOn); - /* + /** * SetNewImage * Get the uri and bmp from the media model * and pass it to HDMI controller */ void SetNewImage(); - /* + /** * getsubstate */ int getSubState(); diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutwrapper/src/glxtvoutwrapper.cpp --- a/tvout/tvoutwrapper/src/glxtvoutwrapper.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutwrapper/src/glxtvoutwrapper.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -43,11 +43,11 @@ // setModel // and Create the private instance to pass the model // ----------------------------------------------------------------------------- -void GlxTvOutWrapper::setModel(QAbstractItemModel* aModel,bool aEfectsOn) +void GlxTvOutWrapper::setModel(QAbstractItemModel* aModel,QSize aScreenSize,bool aEfectsOn) { if (!mTvOutWrapperPrivate) { - mTvOutWrapperPrivate = GlxTvOutWrapperPrivate::Instance(this,aModel,aEfectsOn); + mTvOutWrapperPrivate = GlxTvOutWrapperPrivate::Instance(this,aModel,aScreenSize,aEfectsOn); } else { diff -r a0f57508af73 -r a3a4c0de738e tvout/tvoutwrapper/src/glxtvoutwrapper_p.cpp --- a/tvout/tvoutwrapper/src/glxtvoutwrapper_p.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/tvout/tvoutwrapper/src/glxtvoutwrapper_p.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -29,12 +29,12 @@ // Static method to create the private wrapper instance // ----------------------------------------------------------------------------- GlxTvOutWrapperPrivate* GlxTvOutWrapperPrivate::Instance(GlxTvOutWrapper* aTvOutWrapper, - QAbstractItemModel* aModel,bool aEfectsOn) + QAbstractItemModel* aModel,QSize aScreenSize,bool aEfectsOn) { TRACER("GlxTvOutWrapperPrivate::Instance()"); GlxTvOutWrapperPrivate* self = new GlxTvOutWrapperPrivate(aTvOutWrapper,aModel); if (self){ - TRAPD(err,self->ConstructL(aEfectsOn)); + TRAPD(err,self->ConstructL(aScreenSize,aEfectsOn)); if(err != KErrNone){ delete self; self = NULL; @@ -47,12 +47,14 @@ // ConstructL // This creates the Connection observer and the Hdmi Controller // ----------------------------------------------------------------------------- -void GlxTvOutWrapperPrivate::ConstructL(bool aEfectsOn) +void GlxTvOutWrapperPrivate::ConstructL(QSize aScreenSize,bool aEfectsOn) { TRACER("GlxTvOutWrapperPrivate::ConstructL()"); iConnectionObserver = CGlxConnectionObserver::NewL(this); if (!iHdmiController) { - iHdmiController = CGlxHdmiController::NewL(aEfectsOn); + TRect rect(0,0,aScreenSize.width(),aScreenSize.height()); + iHdmiController = CGlxHdmiController::NewL(rect, + aEfectsOn); iHdmiConnected = iConnectionObserver->IsHdmiConnected(); } } diff -r a0f57508af73 -r a3a4c0de738e ui/commandhandlers/commandhandlerbase/inc/glxcommandhandler.h --- a/ui/commandhandlers/commandhandlerbase/inc/glxcommandhandler.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/commandhandlers/commandhandlerbase/inc/glxcommandhandler.h Fri Jul 23 20:41:04 2010 +0530 @@ -19,6 +19,7 @@ #define GLXCOMMANDHANDLER_H #include +#include #ifdef BUILD_COMMANDHANDLERBASE #define GLX_COMMANDHANDLERBASE_EXPORT Q_DECL_EXPORT @@ -26,7 +27,6 @@ #define GLX_COMMANDHANDLERBASE_EXPORT Q_DECL_IMPORT #endif -class QModelIndex; class GLX_COMMANDHANDLERBASE_EXPORT GlxCommandHandler : public QObject { public: diff -r a0f57508af73 -r a3a4c0de738e ui/commandhandlers/commoncommandhandlers/src/glxcommandhandlereditimage.cpp --- a/ui/commandhandlers/commoncommandhandlers/src/glxcommandhandlereditimage.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/commandhandlers/commoncommandhandlers/src/glxcommandhandlereditimage.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -19,7 +19,12 @@ #include -#include + + +#ifdef FF_IMAGE_EDITOR + #include +#endif //FF_IMAGE_EDITOR + #include "glxcommandhandlereditimage.h" #include #include @@ -66,6 +71,7 @@ QList args; args << imagePath; +#ifdef FF_IMAGE_EDITOR if(EGlxCmdSetWallpaper == commandId) { args << EEditorHighwayWallpaperCrop; @@ -83,6 +89,7 @@ args << EEditorHighwayRotateCCW; } mReq->setArguments(args); +#endif //FF_IMAGE_EDITOR // Send the request bool res = mReq->send(); diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/bwins/detailsdescriptioneditu.def --- a/ui/detailscustomwidget/bwins/detailsdescriptioneditu.def Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -EXPORTS - ?qt_metacall@GlxDetailsDescriptionEdit@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1 NONAME ; int GlxDetailsDescriptionEdit::qt_metacall(enum QMetaObject::Call, int, void * *) - ?qt_metacast@GlxDetailsDescriptionEdit@@UAEPAXPBD@Z @ 2 NONAME ; void * GlxDetailsDescriptionEdit::qt_metacast(char const *) - ??1GlxDetailsDescriptionEdit@@UAE@XZ @ 3 NONAME ; GlxDetailsDescriptionEdit::~GlxDetailsDescriptionEdit(void) - ?staticMetaObject@GlxDetailsDescriptionEdit@@2UQMetaObject@@B @ 4 NONAME ; struct QMetaObject const GlxDetailsDescriptionEdit::staticMetaObject - ??0GlxDetailsDescriptionEdit@@QAE@PAVQGraphicsItem@@@Z @ 5 NONAME ; GlxDetailsDescriptionEdit::GlxDetailsDescriptionEdit(class QGraphicsItem *) - ?tr@GlxDetailsDescriptionEdit@@SA?AVQString@@PBD0H@Z @ 6 NONAME ; class QString GlxDetailsDescriptionEdit::tr(char const *, char const *, int) - ??_EGlxDetailsDescriptionEdit@@UAE@I@Z @ 7 NONAME ; GlxDetailsDescriptionEdit::~GlxDetailsDescriptionEdit(unsigned int) - ?labelPressed@GlxDetailsDescriptionEdit@@IAEXXZ @ 8 NONAME ; void GlxDetailsDescriptionEdit::labelPressed(void) - ?metaObject@GlxDetailsDescriptionEdit@@UBEPBUQMetaObject@@XZ @ 9 NONAME ; struct QMetaObject const * GlxDetailsDescriptionEdit::metaObject(void) const - ?focusInEvent@GlxDetailsDescriptionEdit@@MAEXPAVQFocusEvent@@@Z @ 10 NONAME ; void GlxDetailsDescriptionEdit::focusInEvent(class QFocusEvent *) - ?trUtf8@GlxDetailsDescriptionEdit@@SA?AVQString@@PBD0H@Z @ 11 NONAME ; class QString GlxDetailsDescriptionEdit::trUtf8(char const *, char const *, int) - ?focusOutEvent@GlxDetailsDescriptionEdit@@MAEXPAVQFocusEvent@@@Z @ 12 NONAME ; void GlxDetailsDescriptionEdit::focusOutEvent(class QFocusEvent *) - ?tr@GlxDetailsDescriptionEdit@@SA?AVQString@@PBD0@Z @ 13 NONAME ; class QString GlxDetailsDescriptionEdit::tr(char const *, char const *) - ?getStaticMetaObject@GlxDetailsDescriptionEdit@@SAABUQMetaObject@@XZ @ 14 NONAME ; struct QMetaObject const & GlxDetailsDescriptionEdit::getStaticMetaObject(void) - ?setItemText@GlxDetailsDescriptionEdit@@QAEXABVQString@@@Z @ 15 NONAME ; void GlxDetailsDescriptionEdit::setItemText(class QString const &) - ?trUtf8@GlxDetailsDescriptionEdit@@SA?AVQString@@PBD0@Z @ 16 NONAME ; class QString GlxDetailsDescriptionEdit::trUtf8(char const *, char const *) - diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/bwins/detailsnamelabelu.def --- a/ui/detailscustomwidget/bwins/detailsnamelabelu.def Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -EXPORTS - ??_EGlxDetailsNameLabel@@UAE@I@Z @ 1 NONAME ; GlxDetailsNameLabel::~GlxDetailsNameLabel(unsigned int) - ??1GlxDetailsNameLabel@@UAE@XZ @ 2 NONAME ; GlxDetailsNameLabel::~GlxDetailsNameLabel(void) - ?tr@GlxDetailsNameLabel@@SA?AVQString@@PBD0@Z @ 3 NONAME ; class QString GlxDetailsNameLabel::tr(char const *, char const *) - ?mousePressEvent@GlxDetailsNameLabel@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 4 NONAME ; void GlxDetailsNameLabel::mousePressEvent(class QGraphicsSceneMouseEvent *) - ?metaObject@GlxDetailsNameLabel@@UBEPBUQMetaObject@@XZ @ 5 NONAME ; struct QMetaObject const * GlxDetailsNameLabel::metaObject(void) const - ?getStaticMetaObject@GlxDetailsNameLabel@@SAABUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const & GlxDetailsNameLabel::getStaticMetaObject(void) - ?staticMetaObject@GlxDetailsNameLabel@@2UQMetaObject@@B @ 7 NONAME ; struct QMetaObject const GlxDetailsNameLabel::staticMetaObject - ?qt_metacall@GlxDetailsNameLabel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 8 NONAME ; int GlxDetailsNameLabel::qt_metacall(enum QMetaObject::Call, int, void * *) - ??0GlxDetailsNameLabel@@QAE@PAVQGraphicsItem@@@Z @ 9 NONAME ; GlxDetailsNameLabel::GlxDetailsNameLabel(class QGraphicsItem *) - ?labelPressed@GlxDetailsNameLabel@@IAEXXZ @ 10 NONAME ; void GlxDetailsNameLabel::labelPressed(void) - ?setItemText@GlxDetailsNameLabel@@QAEXABVQString@@@Z @ 11 NONAME ; void GlxDetailsNameLabel::setItemText(class QString const &) - ?mouseReleaseEvent@GlxDetailsNameLabel@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 12 NONAME ; void GlxDetailsNameLabel::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) - ?trUtf8@GlxDetailsNameLabel@@SA?AVQString@@PBD0H@Z @ 13 NONAME ; class QString GlxDetailsNameLabel::trUtf8(char const *, char const *, int) - ?trUtf8@GlxDetailsNameLabel@@SA?AVQString@@PBD0@Z @ 14 NONAME ; class QString GlxDetailsNameLabel::trUtf8(char const *, char const *) - ?tr@GlxDetailsNameLabel@@SA?AVQString@@PBD0H@Z @ 15 NONAME ; class QString GlxDetailsNameLabel::tr(char const *, char const *, int) - ?qt_metacast@GlxDetailsNameLabel@@UAEPAXPBD@Z @ 16 NONAME ; void * GlxDetailsNameLabel::qt_metacast(char const *) - diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/bwins/glxdetailscustomwidgetsu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/bwins/glxdetailscustomwidgetsu.def Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,34 @@ +EXPORTS + ?focusInEvent@GlxDetailsTextEdit@@MAEXPAVQFocusEvent@@@Z @ 1 NONAME ; void GlxDetailsTextEdit::focusInEvent(class QFocusEvent *) + ??1GlxDetailsIcon@@UAE@XZ @ 2 NONAME ; GlxDetailsIcon::~GlxDetailsIcon(void) + ??1GlxDetailsTextEdit@@UAE@XZ @ 3 NONAME ; GlxDetailsTextEdit::~GlxDetailsTextEdit(void) + ?trUtf8@GlxDetailsIcon@@SA?AVQString@@PBD0H@Z @ 4 NONAME ; class QString GlxDetailsIcon::trUtf8(char const *, char const *, int) + ?labelPressed@GlxDetailsTextEdit@@IAEXXZ @ 5 NONAME ; void GlxDetailsTextEdit::labelPressed(void) + ?qt_metacall@GlxDetailsIcon@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 6 NONAME ; int GlxDetailsIcon::qt_metacall(enum QMetaObject::Call, int, void * *) + ?metaObject@GlxDetailsIcon@@UBEPBUQMetaObject@@XZ @ 7 NONAME ; struct QMetaObject const * GlxDetailsIcon::metaObject(void) const + ?tr@GlxDetailsIcon@@SA?AVQString@@PBD0H@Z @ 8 NONAME ; class QString GlxDetailsIcon::tr(char const *, char const *, int) + ?staticMetaObject@GlxDetailsIcon@@2UQMetaObject@@B @ 9 NONAME ; struct QMetaObject const GlxDetailsIcon::staticMetaObject + ??_EGlxDetailsTextEdit@@UAE@I@Z @ 10 NONAME ; GlxDetailsTextEdit::~GlxDetailsTextEdit(unsigned int) + ?tr@GlxDetailsTextEdit@@SA?AVQString@@PBD0@Z @ 11 NONAME ; class QString GlxDetailsTextEdit::tr(char const *, char const *) + ?trUtf8@GlxDetailsIcon@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString GlxDetailsIcon::trUtf8(char const *, char const *) + ?getStaticMetaObject@GlxDetailsTextEdit@@SAABUQMetaObject@@XZ @ 13 NONAME ; struct QMetaObject const & GlxDetailsTextEdit::getStaticMetaObject(void) + ?updateFavourites@GlxDetailsIcon@@IAEXXZ @ 14 NONAME ; void GlxDetailsIcon::updateFavourites(void) + ?mousePressEvent@GlxDetailsIcon@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 15 NONAME ; void GlxDetailsIcon::mousePressEvent(class QGraphicsSceneMouseEvent *) + ?staticMetaObject@GlxDetailsTextEdit@@2UQMetaObject@@B @ 16 NONAME ; struct QMetaObject const GlxDetailsTextEdit::staticMetaObject + ?setItemText@GlxDetailsTextEdit@@QAEXABVQString@@@Z @ 17 NONAME ; void GlxDetailsTextEdit::setItemText(class QString const &) + ?tr@GlxDetailsIcon@@SA?AVQString@@PBD0@Z @ 18 NONAME ; class QString GlxDetailsIcon::tr(char const *, char const *) + ?getStaticMetaObject@GlxDetailsIcon@@SAABUQMetaObject@@XZ @ 19 NONAME ; struct QMetaObject const & GlxDetailsIcon::getStaticMetaObject(void) + ?qt_metacall@GlxDetailsTextEdit@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 20 NONAME ; int GlxDetailsTextEdit::qt_metacall(enum QMetaObject::Call, int, void * *) + ?trUtf8@GlxDetailsTextEdit@@SA?AVQString@@PBD0H@Z @ 21 NONAME ; class QString GlxDetailsTextEdit::trUtf8(char const *, char const *, int) + ?mouseReleaseEvent@GlxDetailsIcon@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 22 NONAME ; void GlxDetailsIcon::mouseReleaseEvent(class QGraphicsSceneMouseEvent *) + ?qt_metacast@GlxDetailsIcon@@UAEPAXPBD@Z @ 23 NONAME ; void * GlxDetailsIcon::qt_metacast(char const *) + ??_EGlxDetailsIcon@@UAE@I@Z @ 24 NONAME ; GlxDetailsIcon::~GlxDetailsIcon(unsigned int) + ?trUtf8@GlxDetailsTextEdit@@SA?AVQString@@PBD0@Z @ 25 NONAME ; class QString GlxDetailsTextEdit::trUtf8(char const *, char const *) + ?metaObject@GlxDetailsTextEdit@@UBEPBUQMetaObject@@XZ @ 26 NONAME ; struct QMetaObject const * GlxDetailsTextEdit::metaObject(void) const + ?qt_metacast@GlxDetailsTextEdit@@UAEPAXPBD@Z @ 27 NONAME ; void * GlxDetailsTextEdit::qt_metacast(char const *) + ?tr@GlxDetailsTextEdit@@SA?AVQString@@PBD0H@Z @ 28 NONAME ; class QString GlxDetailsTextEdit::tr(char const *, char const *, int) + ??0GlxDetailsIcon@@QAE@PAVQGraphicsItem@@@Z @ 29 NONAME ; GlxDetailsIcon::GlxDetailsIcon(class QGraphicsItem *) + ?focusOutEvent@GlxDetailsTextEdit@@MAEXPAVQFocusEvent@@@Z @ 30 NONAME ; void GlxDetailsTextEdit::focusOutEvent(class QFocusEvent *) + ??0GlxDetailsTextEdit@@QAE@PAVQGraphicsItem@@@Z @ 31 NONAME ; GlxDetailsTextEdit::GlxDetailsTextEdit(class QGraphicsItem *) + ?setItemIcon@GlxDetailsIcon@@QAEXABVHbIcon@@@Z @ 32 NONAME ; void GlxDetailsIcon::setItemIcon(class HbIcon const &) + diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomplugin/detailscustomplugin.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/detailscustomplugin/detailscustomplugin.pro Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,68 @@ +#/* +#* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +#* All rights reserved. +#* This component and the accompanying materials are made available +#* under the terms of "Eclipse Public License v1.0" +#* which accompanies this distribution, and is available +#* at the URL "http://www.eclipse.org/legal/epl-v10.html". +#* +#* Initial Contributors: +#* Nokia Corporation - initial contribution. +#* +#* Contributors: +#* +#* Description: +#* +#*/ + +TEMPLATE = lib +TARGET = glxdetailscustomplugin + +win32{ +CONFIG(release, debug|release){ + TARGET = glxdetailscustomplugin + } else { + TARGET = glxdetailscustomplugind + } +} + +CONFIG += hb plugin + +win32{ +CONFIG(release, debug|release){ + DESTDIR = ../release # for easy plugin loading + LIBS += -L../release -lglxdetailscustomwidgets + } else { + DESTDIR = ../debug # for easy plugin loading + LIBS += -L../debug -lglxdetailscustomwidgetsd + } +} + +SOURCES += \ + main.cpp + +INCLUDEPATH += \ + ../detailscustomwidgets + +symbian: { + TARGET.UID3 = 0x200071B7 + TARGET.EPOCALLOWDLLDATA=1 + TARGET.CAPABILITY = CAP_GENERAL_DLL + MMP_RULES += SMPSAFE + + + LIBS += \ + -lglxdetailscustomwidgets.dll + + pluginstub.sources = glxdetailscustomplugin.dll + pluginstub.path = /resource/plugins + DEPLOYMENT += pluginstub + DESTDIR = $$HB_PLUGINS_DIR +} + +!local { + target.path = $$HB_PLUGINS_DIR + INSTALLS += target +} + +# End of file --Don't remove this. diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomplugin/main.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/detailscustomplugin/main.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html". + * + * Initial Contributors: + * Nokia Corporation - initial contribution. + * + * Contributors: + * + * Description: Details custom widgets plugin + * + */ + +#include "glxdetailstextedit.h" +#include "glxdetailsicon.h" + +#include +#include + +class GlxDetailsCustomPlugin : public HbDocumentLoaderPlugin +{ +public: + QObject *createObject(const QString& type, const QString &name); + QList supportedObjects(); +}; +Q_EXPORT_PLUGIN(GlxDetailsCustomPlugin) + +QObject *GlxDetailsCustomPlugin::createObject(const QString& type, const QString &name ) +{ + + if( type == GlxDetailsTextEdit::staticMetaObject.className() ) { + QObject *object = new GlxDetailsTextEdit(); + object->setObjectName(name); + return object; + } + + if( type == GlxDetailsIcon::staticMetaObject.className() ) { + QObject *object = new GlxDetailsIcon(); + object->setObjectName(name); + return object; + } + + return 0; +} + +QList GlxDetailsCustomPlugin::supportedObjects() +{ + QList result; + result.append( &GlxDetailsTextEdit::staticMetaObject ); + result.append( &GlxDetailsIcon::staticMetaObject ); + return result; +} + +// end of file + diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomwidget.pro --- a/ui/detailscustomwidget/detailscustomwidget.pro Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/detailscustomwidget/detailscustomwidget.pro Fri Jul 23 20:41:04 2010 +0530 @@ -17,8 +17,7 @@ TEMPLATE = subdirs -SUBDIRS += detailsnamelabel -SUBDIRS += detailsnamelabelplugin -SUBDIRS += detailsdescriptionedit -SUBDIRS += detailsdescriptioneditplugin + +SUBDIRS += detailscustomwidgets +SUBDIRS += detailscustomplugin CONFIG += ordered \ No newline at end of file diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomwidgets/detailscustomwidgets.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/detailscustomwidgets/detailscustomwidgets.pro Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,65 @@ +#/* +#* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +#* All rights reserved. +#* This component and the accompanying materials are made available +#* under the terms of "Eclipse Public License v1.0" +#* which accompanies this distribution, and is available +#* at the URL "http://www.eclipse.org/legal/epl-v10.html". +#* +#* Initial Contributors: +#* Nokia Corporation - initial contribution. +#* +#* Contributors: +#* +#* Description: +#* +#*/ + +TEMPLATE = lib +TARGET = glxdetailscustomwidgets +CONFIG += hb +DEFINES += BUILD_DETAILSCUSTOM + +win32{ +CONFIG(release, debug|release){ + TARGET = glxdetailscustomwidgets + DESTDIR = ../release # for easy plugin loading +}else{ + TARGET = glxdetailscustomwidgetsd + DESTDIR = ../debug # for easy plugin loading + } +} + +DEPENDPATH += ./inc \ + ./src + +INCLUDEPATH += ./inc + +SOURCES += \ + glxdetailsicon.cpp \ + glxdetailstextedit.cpp + +HEADERS += \ + glxdetailsicon.h \ + glxdetailstextedit.h + + +symbian { + TARGET.UID3 = 0x2000A7BC + TARGET.EPOCALLOWDLLDATA = 1 + TARGET.CAPABILITY = CAP_GENERAL_DLL + MMP_RULES += SMPSAFE + + LIBS += -lbafl +} + +defBlock = \ +"$${LITERAL_HASH}if defined(EABI)" \ +"DEFFILE ../eabi/glxdetailscustomwidgets.def" \ + "$${LITERAL_HASH}else" \ + "DEFFILE ../bwins/glxdetailscustomwidgets.def" \ + "$${LITERAL_HASH}endif" + +MMP_RULES += defBlock + +# End of file --Don't remove this diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomwidgets/glxdetailsicon.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/detailscustomwidgets/glxdetailsicon.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,75 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: ?Description +* +*/ + + +#include +#include +#include "glxdetailsicon.h" +#include +#include + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//mousePressEvent +//-------------------------------------------------------------------------------------------------------------------------------------------- +void GlxDetailsIcon::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ + Q_UNUSED(event) +} + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//clearCurrentModel +//-------------------------------------------------------------------------------------------------------------------------------------------- +void GlxDetailsIcon::mouseReleaseEvent (QGraphicsSceneMouseEvent *event) +{ + Q_UNUSED(event) + emit updateFavourites(); +} + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//GlxDetailsIcon +//-------------------------------------------------------------------------------------------------------------------------------------------- +GlxDetailsIcon::GlxDetailsIcon(QGraphicsItem *parent) : HbWidget(parent) +{ + mFavIcon = new HbIconItem(this); + //add the layout to the icon or else the icon is not showed. + HbStackedLayout *stackedLayout = new HbStackedLayout; + stackedLayout->addItem( mFavIcon ); + setLayout( stackedLayout ); + + mFavIcon->setOpacity(0.7); + HbFrameItem* frame = new HbFrameItem(this); + frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); + frame->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans"); + frame->graphicsItem()->setOpacity(0.1); + setBackgroundItem(frame->graphicsItem(),-1); +} + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//~GlxDetailsIcon +//-------------------------------------------------------------------------------------------------------------------------------------------- +GlxDetailsIcon::~GlxDetailsIcon() +{ + delete mFavIcon; + mFavIcon = NULL; +} +//-------------------------------------------------------------------------------------------------------------------------------------------- +//setItemIcon +//-------------------------------------------------------------------------------------------------------------------------------------------- +void GlxDetailsIcon::setItemIcon(const HbIcon &icon) +{ + mFavIcon->setIcon(icon); +} diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomwidgets/glxdetailsicon.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/detailscustomwidgets/glxdetailsicon.h Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,57 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: ?Description +* +*/ + +#ifndef GLXDETAILSICON_H +#define GLXDETAILSICON_H + +#include + + +#ifdef BUILD_DETAILSCUSTOM +#define MY_EXPORT Q_DECL_EXPORT +#else +#define MY_EXPORT Q_DECL_IMPORT +#endif + +class HbIconItem; +class HbIcon; + +class MY_EXPORT GlxDetailsIcon : public HbWidget +{ + Q_OBJECT + +public: + GlxDetailsIcon(QGraphicsItem *parent = NULL); + ~GlxDetailsIcon(); + + /* + * Sets the Icon of Favourite IconItem. + */ + void setItemIcon(const HbIcon &icon); + +protected: + void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); + +signals : + void updateFavourites(); + +private: + HbIconItem *mFavIcon; +}; + +#endif // GLXDETAILSICON_H diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomwidgets/glxdetailstextedit.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/detailscustomwidgets/glxdetailstextedit.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,74 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: This is custom widget for details view in photos for displaying the description of image . +* +*/ + + + +#include "glxdetailstextedit.h" +#include +#include + + + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//focusInEvent +//-------------------------------------------------------------------------------------------------------------------------------------------- +void GlxDetailsTextEdit::focusInEvent (QFocusEvent *event) + { + if(event->reason() == Qt::MouseFocusReason ) + { + event->setAccepted(TRUE); + emit labelPressed(); + } + + } + + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//focusOutEvent +//-------------------------------------------------------------------------------------------------------------------------------------------- +void GlxDetailsTextEdit::focusOutEvent (QFocusEvent *event) + { + event->setAccepted(TRUE); + } + + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//GlxDetailsTextEdit +//-------------------------------------------------------------------------------------------------------------------------------------------- +GlxDetailsTextEdit::GlxDetailsTextEdit(QGraphicsItem *parent) : HbTextEdit( parent ) +{ + setAlignment(Qt::AlignLeft); + mDesc = new HbEditorInterface(this); + mDesc->setInputConstraints (HbEditorConstraintIgnoreFocus); +} + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//~GlxDetailsTextEdit +//-------------------------------------------------------------------------------------------------------------------------------------------- +GlxDetailsTextEdit::~GlxDetailsTextEdit() +{ + delete mDesc; + mDesc = NULL; +} + +//-------------------------------------------------------------------------------------------------------------------------------------------- +//setItemText +//-------------------------------------------------------------------------------------------------------------------------------------------- +void GlxDetailsTextEdit::setItemText( const QString &text ) +{ + setPlainText( text ); +} diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailscustomwidgets/glxdetailstextedit.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/detailscustomwidgets/glxdetailstextedit.h Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,50 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: This is custom widget for details view in photos for displaying the description of image . +* +*/ + +#ifndef GlXDETAILSDESCEDIT_H +#define GlXDETAILSDESCEDIT_H + +#include + +#ifdef BUILD_DETAILSCUSTOM +#define MY_EXPORT Q_DECL_EXPORT +#else +#define MY_EXPORT Q_DECL_IMPORT +#endif + +class HbEditorInterface; +class MY_EXPORT GlxDetailsTextEdit : public HbTextEdit +{ + Q_OBJECT + +public: + GlxDetailsTextEdit(QGraphicsItem *parent = NULL); + ~GlxDetailsTextEdit(); + void setItemText( const QString &text ); + +protected: + void focusInEvent (QFocusEvent *event) ; + void focusOutEvent (QFocusEvent *event) ; + + +signals : + void labelPressed(); +private: + HbEditorInterface *mDesc; +}; + +#endif // GlXDETAILSDESCEDIT_H diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsdescriptionedit/detailsdescriptionedit.pro --- a/ui/detailscustomwidget/detailsdescriptionedit/detailsdescriptionedit.pro Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -#/* -#* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -#* All rights reserved. -#* This component and the accompanying materials are made available -#* under the terms of "Eclipse Public License v1.0" -#* which accompanies this distribution, and is available -#* at the URL "http://www.eclipse.org/legal/epl-v10.html". -#* -#* Initial Contributors: -#* Nokia Corporation - initial contribution. -#* -#* Contributors: -#* -#* Description: -#* -#*/ - - -TEMPLATE = lib -TARGET = detailsdescriptionedit -CONFIG += hb -DEFINES += BUILD_DESCEDIT - -win32{ -CONFIG(release, debug|release){ - TARGET = detailsdescriptionedit - DESTDIR = ../release # for easy plugin loading -}else{ - TARGET = detailsdescriptioneditd - DESTDIR = ../debug # for easy plugin loading - } -} - -DEPENDPATH += ./inc \ - ./src - -INCLUDEPATH += ./inc - -SOURCES += \ - glxdetailsdescriptionedit.cpp - -HEADERS += \ - glxdetailsdescriptionedit.h - -symbian { - TARGET.UID3 = 0x200071B9 - TARGET.EPOCALLOWDLLDATA = 1 - TARGET.CAPABILITY = CAP_GENERAL_DLL - MMP_RULES += SMPSAFE - LIBS += -lbafl -} - -defBlock = \ -"$${LITERAL_HASH}if defined(EABI)" \ -"DEFFILE ../eabi/detailsdescriptionedit.def" \ - "$${LITERAL_HASH}else" \ - "DEFFILE ../bwins/detailsdescriptionedit.def" \ - "$${LITERAL_HASH}endif" - -MMP_RULES += defBlock -# End of file --Don't remove this diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsdescriptionedit/inc/glxdetailsdescriptionedit.h --- a/ui/detailscustomwidget/detailsdescriptionedit/inc/glxdetailsdescriptionedit.h Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is custom widget for details view in photos for displaying the description of image . -* -*/ - -#ifndef GlXDETAILSDESCEDIT_H -#define GlXDETAILSDESCEDIT_H - -#include - -#ifdef BUILD_DESCEDIT -#define MY_EXPORT Q_DECL_EXPORT -#else -#define MY_EXPORT Q_DECL_IMPORT -#endif - -class HbEditorInterface; -class MY_EXPORT GlxDetailsDescriptionEdit : public HbTextEdit -{ - Q_OBJECT - -public: - GlxDetailsDescriptionEdit(QGraphicsItem *parent = NULL); - ~GlxDetailsDescriptionEdit(); - void setItemText( const QString &text ); - -protected: - void focusInEvent (QFocusEvent *event) ; - void focusOutEvent (QFocusEvent *event) ; - - -signals : - void labelPressed(); -private: - HbEditorInterface *mDesc; -}; - -#endif // GlXDETAILSDESCEDIT_H diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsdescriptionedit/src/glxdetailsdescriptionedit.cpp --- a/ui/detailscustomwidget/detailsdescriptionedit/src/glxdetailsdescriptionedit.cpp Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is custom widget for details view in photos for displaying the description of image . -* -*/ - - - -#include "glxdetailsdescriptionedit.h" -#include -#include - - - -void GlxDetailsDescriptionEdit::focusInEvent (QFocusEvent *event) - { - if(event->reason() == Qt::MouseFocusReason ) - { - event->setAccepted(TRUE); - emit labelPressed(); - } - - } -void GlxDetailsDescriptionEdit::focusOutEvent (QFocusEvent *event) - { - event->setAccepted(TRUE); - } - - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//GlxDetailsDescLabel -//-------------------------------------------------------------------------------------------------------------------------------------------- -GlxDetailsDescriptionEdit::GlxDetailsDescriptionEdit(QGraphicsItem *parent) : HbTextEdit( parent ) -{ - setAlignment(Qt::AlignLeft); - mDesc = new HbEditorInterface(this); - mDesc->setInputConstraints (HbEditorConstraintIgnoreFocus); -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//~GlxDetailsDescLabel -//-------------------------------------------------------------------------------------------------------------------------------------------- -GlxDetailsDescriptionEdit::~GlxDetailsDescriptionEdit() -{ - delete mDesc; - mDesc = NULL; -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//setItemText -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsDescriptionEdit::setItemText( const QString &text ) -{ - setPlainText( text ); -} diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsdescriptioneditplugin/detailsdescriptioneditplugin.pro --- a/ui/detailscustomwidget/detailsdescriptioneditplugin/detailsdescriptioneditplugin.pro Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -#/* -#* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -#* All rights reserved. -#* This component and the accompanying materials are made available -#* under the terms of "Eclipse Public License v1.0" -#* which accompanies this distribution, and is available -#* at the URL "http://www.eclipse.org/legal/epl-v10.html". -#* -#* Initial Contributors: -#* Nokia Corporation - initial contribution. -#* -#* Contributors: -#* -#* Description: -#* -#*/ - -TEMPLATE = lib -TARGET = detailsdescriptioneditplugin - -win32{ -CONFIG(release, debug|release){ - TARGET = detailsdescriptioneditplugin - } else { - TARGET = detailsdescriptioneditplugind - } -} - -CONFIG += hb plugin - -win32{ -CONFIG(release, debug|release){ - DESTDIR = ../release # for easy plugin loading - LIBS += -L../release -ldetailsdescriptionedit - } else { - DESTDIR = ../debug # for easy plugin loading - LIBS += -L../debug -ldetailsdescriptioneditd - } -} - -SOURCES += \ - main.cpp - -INCLUDEPATH += \ - ../detailsdescriptionedit \ - ../detailsdescriptionedit/inc - -symbian: { - TARGET.UID3 = 0x2000A774 - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = CAP_GENERAL_DLL - MMP_RULES += SMPSAFE - - - LIBS += \ - -ldetailsdescriptionedit.dll - - pluginstub.sources = detailsdescriptioneditplugin.dll - pluginstub.path = /resource/plugins - DEPLOYMENT += pluginstub - DESTDIR = $$HB_PLUGINS_DIR -} - -!local { - target.path = $$HB_PLUGINS_DIR - INSTALLS += target -} - -# End of file --Don't remove this. diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsdescriptioneditplugin/main.cpp --- a/ui/detailscustomwidget/detailsdescriptioneditplugin/main.cpp Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: ?? -* -*/ - - -#include "glxdetailsdescriptionedit.h" -#include -#include - -class GlxDetailsDescriptionEditPlugin : public HbDocumentLoaderPlugin -{ -public: - QObject *createObject(const QString& type, const QString &name); - QList supportedObjects(); -}; -Q_EXPORT_PLUGIN(GlxDetailsDescriptionEditPlugin) - -QObject *GlxDetailsDescriptionEditPlugin::createObject(const QString& type, const QString &name ) -{ - if( type == GlxDetailsDescriptionEdit::staticMetaObject.className() ) { - QObject *object = new GlxDetailsDescriptionEdit(); - object->setObjectName(name); - return object; - } - return 0; -} - -QList GlxDetailsDescriptionEditPlugin::supportedObjects() -{ - QList result; - result.append( &GlxDetailsDescriptionEdit::staticMetaObject ); - return result; -} - -// end of file - diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsnamelabel/detailsnamelabel.pro --- a/ui/detailscustomwidget/detailsnamelabel/detailsnamelabel.pro Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ -#/* -#* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -#* All rights reserved. -#* This component and the accompanying materials are made available -#* under the terms of "Eclipse Public License v1.0" -#* which accompanies this distribution, and is available -#* at the URL "http://www.eclipse.org/legal/epl-v10.html". -#* -#* Initial Contributors: -#* Nokia Corporation - initial contribution. -#* -#* Contributors: -#* -#* Description: -#* -#*/ - -TEMPLATE = lib -TARGET = detailsnamelabel -CONFIG += hb -DEFINES += BUILD_NAMELABEL - -win32{ -CONFIG(release, debug|release){ - TARGET = detailsnamelabel - DESTDIR = ../release # for easy plugin loading -}else{ - TARGET = detailsnamelabeld - DESTDIR = ../debug # for easy plugin loading - } -} - -DEPENDPATH += ./inc \ - ./src - -INCLUDEPATH += ./inc - -SOURCES += \ - glxdetailsnamelabel.cpp - -HEADERS += \ - glxdetailsnamelabel.h - -symbian { - TARGET.UID3 = 0x2000A7BC - TARGET.EPOCALLOWDLLDATA = 1 - TARGET.CAPABILITY = CAP_GENERAL_DLL - MMP_RULES += SMPSAFE - - LIBS += -lbafl -} - -defBlock = \ -"$${LITERAL_HASH}if defined(EABI)" \ -"DEFFILE ../eabi/detailsnamelabel.def" \ - "$${LITERAL_HASH}else" \ - "DEFFILE ../bwins/detailsnamelabel.def" \ - "$${LITERAL_HASH}endif" - -MMP_RULES += defBlock - -# End of file --Don't remove this diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsnamelabel/inc/glxdetailsnamelabel.h --- a/ui/detailscustomwidget/detailsnamelabel/inc/glxdetailsnamelabel.h Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: ?Description -* -*/ - -#ifndef GlXDETAILSNAMELABEL_H -#define GlXDETAILSNAMELABEL_H - -#include - -#ifdef BUILD_NAMELABEL -#define MY_EXPORT Q_DECL_EXPORT -#else -#define MY_EXPORT Q_DECL_IMPORT -#endif - - -class MY_EXPORT GlxDetailsNameLabel : public HbLabel -{ - Q_OBJECT - -public: - GlxDetailsNameLabel(QGraphicsItem *parent = NULL); - ~GlxDetailsNameLabel(); - void setItemText( const QString &text ); - -protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - -signals : - void labelPressed(); - -}; - -#endif // GlXDETAILSNAMELABEL_H diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsnamelabel/src/glxdetailsnamelabel.cpp --- a/ui/detailscustomwidget/detailsnamelabel/src/glxdetailsnamelabel.cpp Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: ?Description -* -*/ - - -#include -#include "glxdetailsnamelabel.h" -#include -#include - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//mousePressEvent -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsNameLabel::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - Q_UNUSED(event) -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//mouseReleaseEvent -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsNameLabel::mouseReleaseEvent (QGraphicsSceneMouseEvent *event) -{ - qDebug("GlxDetailsNameLabel::mouseReleaseEvent"); - Q_UNUSED(event) - emit labelPressed(); -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//GlxDetailsNameLabel -//-------------------------------------------------------------------------------------------------------------------------------------------- -GlxDetailsNameLabel::GlxDetailsNameLabel(QGraphicsItem *parent) : HbLabel( parent ) -{ - qDebug("GlxDetailsNameLabel::GlxDetailsNameLabel"); - setTextWrapping(Hb::TextWordWrap); - setAlignment(Qt::AlignHCenter); -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//~GlxDetailsCustomLabel -//-------------------------------------------------------------------------------------------------------------------------------------------- -GlxDetailsNameLabel::~GlxDetailsNameLabel() -{ - -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//setItemText -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsNameLabel::setItemText( const QString &text ) -{ - qDebug("GlxDetailsNameLabel::setItemText"); - setHtml(text); -} diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsnamelabelplugin/detailsnamelabelplugin.pro --- a/ui/detailscustomwidget/detailsnamelabelplugin/detailsnamelabelplugin.pro Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -#/* -#* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -#* All rights reserved. -#* This component and the accompanying materials are made available -#* under the terms of "Eclipse Public License v1.0" -#* which accompanies this distribution, and is available -#* at the URL "http://www.eclipse.org/legal/epl-v10.html". -#* -#* Initial Contributors: -#* Nokia Corporation - initial contribution. -#* -#* Contributors: -#* -#* Description: -#* -#*/ - -TEMPLATE = lib -TARGET = detailsnamelabelplugin - -win32{ -CONFIG(release, debug|release){ - TARGET = detailsnamelabelplugin - } else { - TARGET = detailsnamelabelplugind - } -} - -CONFIG += hb plugin - -win32{ -CONFIG(release, debug|release){ - DESTDIR = ../release # for easy plugin loading - LIBS += -L../release -ldetailsnamelabel - } else { - DESTDIR = ../debug # for easy plugin loading - LIBS += -L../debug -ldetailsnamelabeld - } -} - -SOURCES += \ - main.cpp - -INCLUDEPATH += \ - ../detailsnamelabel \ - ../detailsnamelabel/inc - -symbian: { - TARGET.UID3 = 0x200071B7 - TARGET.EPOCALLOWDLLDATA=1 - TARGET.CAPABILITY = CAP_GENERAL_DLL - MMP_RULES += SMPSAFE - - - LIBS += \ - -ldetailsnamelabel.dll - - pluginstub.sources = detailsnamelabelplugin.dll - pluginstub.path = /resource/plugins - DEPLOYMENT += pluginstub - DESTDIR = $$HB_PLUGINS_DIR -} - -!local { - target.path = $$HB_PLUGINS_DIR - INSTALLS += target -} - -# End of file --Don't remove this. diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/detailsnamelabelplugin/main.cpp --- a/ui/detailscustomwidget/detailsnamelabelplugin/main.cpp Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: ?Description -* -*/ - - -#include "glxdetailsnamelabel.h" -#include -#include -#include - -class GlxDetailsNameLabelPlugin : public HbDocumentLoaderPlugin -{ -public: - QObject *createObject(const QString& type, const QString &name); - QList supportedObjects(); -}; -Q_EXPORT_PLUGIN(GlxDetailsNameLabelPlugin) - -QObject *GlxDetailsNameLabelPlugin::createObject(const QString& type, const QString &name ) -{ - qDebug("GlxDetailsNameLabelPlugin::createObject"); - if( type == GlxDetailsNameLabel::staticMetaObject.className() ) { - - qDebug("GlxDetailsNameLabelPlugin::createObject created"); - QObject *object = new GlxDetailsNameLabel(); - object->setObjectName(name); - return object; - } - return 0; -} - -QList GlxDetailsNameLabelPlugin::supportedObjects() -{ - qDebug("GlxDetailsNameLabelPlugin::supportedObjects"); - QList result; - result.append( &GlxDetailsNameLabel::staticMetaObject ); - return result; -} - -// end of file - diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/eabi/detailsdescriptioneditu.def --- a/ui/detailscustomwidget/eabi/detailsdescriptioneditu.def Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -EXPORTS - _ZN25GlxDetailsDescriptionEdit11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME - _ZN25GlxDetailsDescriptionEdit11qt_metacastEPKc @ 2 NONAME - _ZN25GlxDetailsDescriptionEdit11setItemTextERK7QString @ 3 NONAME - _ZN25GlxDetailsDescriptionEdit12focusInEventEP11QFocusEvent @ 4 NONAME - _ZN25GlxDetailsDescriptionEdit12labelPressedEv @ 5 NONAME - _ZN25GlxDetailsDescriptionEdit13focusOutEventEP11QFocusEvent @ 6 NONAME - _ZN25GlxDetailsDescriptionEdit16staticMetaObjectE @ 7 NONAME DATA 16 - _ZN25GlxDetailsDescriptionEdit19getStaticMetaObjectEv @ 8 NONAME - _ZN25GlxDetailsDescriptionEditC1EP13QGraphicsItem @ 9 NONAME - _ZN25GlxDetailsDescriptionEditC2EP13QGraphicsItem @ 10 NONAME - _ZN25GlxDetailsDescriptionEditD0Ev @ 11 NONAME - _ZN25GlxDetailsDescriptionEditD1Ev @ 12 NONAME - _ZN25GlxDetailsDescriptionEditD2Ev @ 13 NONAME - _ZNK25GlxDetailsDescriptionEdit10metaObjectEv @ 14 NONAME - _ZTI25GlxDetailsDescriptionEdit @ 15 NONAME - _ZTV25GlxDetailsDescriptionEdit @ 16 NONAME - _ZThn16_N25GlxDetailsDescriptionEditD0Ev @ 17 NONAME - _ZThn16_N25GlxDetailsDescriptionEditD1Ev @ 18 NONAME - _ZThn8_N25GlxDetailsDescriptionEdit12focusInEventEP11QFocusEvent @ 19 NONAME - _ZThn8_N25GlxDetailsDescriptionEdit13focusOutEventEP11QFocusEvent @ 20 NONAME - _ZThn8_N25GlxDetailsDescriptionEditD0Ev @ 21 NONAME - _ZThn8_N25GlxDetailsDescriptionEditD1Ev @ 22 NONAME - diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/eabi/detailsnamelabelu.def --- a/ui/detailscustomwidget/eabi/detailsnamelabelu.def Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -EXPORTS - _ZN19GlxDetailsNameLabel11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME - _ZN19GlxDetailsNameLabel11qt_metacastEPKc @ 2 NONAME - _ZN19GlxDetailsNameLabel11setItemTextERK7QString @ 3 NONAME - _ZN19GlxDetailsNameLabel12labelPressedEv @ 4 NONAME - _ZN19GlxDetailsNameLabel15mousePressEventEP24QGraphicsSceneMouseEvent @ 5 NONAME - _ZN19GlxDetailsNameLabel16staticMetaObjectE @ 6 NONAME DATA 16 - _ZN19GlxDetailsNameLabel17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 7 NONAME - _ZN19GlxDetailsNameLabel19getStaticMetaObjectEv @ 8 NONAME - _ZN19GlxDetailsNameLabelC1EP13QGraphicsItem @ 9 NONAME - _ZN19GlxDetailsNameLabelC2EP13QGraphicsItem @ 10 NONAME - _ZN19GlxDetailsNameLabelD0Ev @ 11 NONAME - _ZN19GlxDetailsNameLabelD1Ev @ 12 NONAME - _ZN19GlxDetailsNameLabelD2Ev @ 13 NONAME - _ZNK19GlxDetailsNameLabel10metaObjectEv @ 14 NONAME - _ZTI19GlxDetailsNameLabel @ 15 NONAME - _ZTV19GlxDetailsNameLabel @ 16 NONAME - _ZThn16_N19GlxDetailsNameLabelD0Ev @ 17 NONAME - _ZThn16_N19GlxDetailsNameLabelD1Ev @ 18 NONAME - _ZThn8_N19GlxDetailsNameLabel15mousePressEventEP24QGraphicsSceneMouseEvent @ 19 NONAME - _ZThn8_N19GlxDetailsNameLabel17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 20 NONAME - _ZThn8_N19GlxDetailsNameLabelD0Ev @ 21 NONAME - _ZThn8_N19GlxDetailsNameLabelD1Ev @ 22 NONAME - diff -r a0f57508af73 -r a3a4c0de738e ui/detailscustomwidget/eabi/glxdetailscustomwidgetsu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/detailscustomwidget/eabi/glxdetailscustomwidgetsu.def Fri Jul 23 20:41:04 2010 +0530 @@ -0,0 +1,46 @@ +EXPORTS + _ZN14GlxDetailsIcon11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME + _ZN14GlxDetailsIcon11qt_metacastEPKc @ 2 NONAME + _ZN14GlxDetailsIcon11setItemIconERK6HbIcon @ 3 NONAME + _ZN14GlxDetailsIcon15mousePressEventEP24QGraphicsSceneMouseEvent @ 4 NONAME + _ZN14GlxDetailsIcon16staticMetaObjectE @ 5 NONAME DATA 16 + _ZN14GlxDetailsIcon16updateFavouritesEv @ 6 NONAME + _ZN14GlxDetailsIcon17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 7 NONAME + _ZN14GlxDetailsIcon19getStaticMetaObjectEv @ 8 NONAME + _ZN14GlxDetailsIconC1EP13QGraphicsItem @ 9 NONAME + _ZN14GlxDetailsIconC2EP13QGraphicsItem @ 10 NONAME + _ZN14GlxDetailsIconD0Ev @ 11 NONAME + _ZN14GlxDetailsIconD1Ev @ 12 NONAME + _ZN14GlxDetailsIconD2Ev @ 13 NONAME + _ZN18GlxDetailsTextEdit11qt_metacallEN11QMetaObject4CallEiPPv @ 14 NONAME + _ZN18GlxDetailsTextEdit11qt_metacastEPKc @ 15 NONAME + _ZN18GlxDetailsTextEdit11setItemTextERK7QString @ 16 NONAME + _ZN18GlxDetailsTextEdit12focusInEventEP11QFocusEvent @ 17 NONAME + _ZN18GlxDetailsTextEdit12labelPressedEv @ 18 NONAME + _ZN18GlxDetailsTextEdit13focusOutEventEP11QFocusEvent @ 19 NONAME + _ZN18GlxDetailsTextEdit16staticMetaObjectE @ 20 NONAME DATA 16 + _ZN18GlxDetailsTextEdit19getStaticMetaObjectEv @ 21 NONAME + _ZN18GlxDetailsTextEditC1EP13QGraphicsItem @ 22 NONAME + _ZN18GlxDetailsTextEditC2EP13QGraphicsItem @ 23 NONAME + _ZN18GlxDetailsTextEditD0Ev @ 24 NONAME + _ZN18GlxDetailsTextEditD1Ev @ 25 NONAME + _ZN18GlxDetailsTextEditD2Ev @ 26 NONAME + _ZNK14GlxDetailsIcon10metaObjectEv @ 27 NONAME + _ZNK18GlxDetailsTextEdit10metaObjectEv @ 28 NONAME + _ZTI14GlxDetailsIcon @ 29 NONAME + _ZTI18GlxDetailsTextEdit @ 30 NONAME + _ZTV14GlxDetailsIcon @ 31 NONAME + _ZTV18GlxDetailsTextEdit @ 32 NONAME + _ZThn16_N14GlxDetailsIconD0Ev @ 33 NONAME + _ZThn16_N14GlxDetailsIconD1Ev @ 34 NONAME + _ZThn16_N18GlxDetailsTextEditD0Ev @ 35 NONAME + _ZThn16_N18GlxDetailsTextEditD1Ev @ 36 NONAME + _ZThn8_N14GlxDetailsIcon15mousePressEventEP24QGraphicsSceneMouseEvent @ 37 NONAME + _ZThn8_N14GlxDetailsIcon17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 38 NONAME + _ZThn8_N14GlxDetailsIconD0Ev @ 39 NONAME + _ZThn8_N14GlxDetailsIconD1Ev @ 40 NONAME + _ZThn8_N18GlxDetailsTextEdit12focusInEventEP11QFocusEvent @ 41 NONAME + _ZThn8_N18GlxDetailsTextEdit13focusOutEventEP11QFocusEvent @ 42 NONAME + _ZThn8_N18GlxDetailsTextEditD0Ev @ 43 NONAME + _ZThn8_N18GlxDetailsTextEditD1Ev @ 44 NONAME + diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/bwins/glxmedialistwrapperu.def --- a/ui/uiengine/bwins/glxmedialistwrapperu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/bwins/glxmedialistwrapperu.def Fri Jul 23 20:41:04 2010 +0530 @@ -1,61 +1,61 @@ EXPORTS ?retrieveItemUri@GlxMLWrapper@@QAE?AVQString@@H@Z @ 1 NONAME ; class QString GlxMLWrapper::retrieveItemUri(int) ?handlepopulated@GlxMLWrapper@@QAEXXZ @ 2 NONAME ; void GlxMLWrapper::handlepopulated(void) - ?itemCorrupted@GlxMLWrapper@@IAEXH@Z @ 3 NONAME ; void GlxMLWrapper::itemCorrupted(int) - ?populated@GlxMLWrapper@@IAEXXZ @ 4 NONAME ; void GlxMLWrapper::populated(void) - ?trUtf8@GlxMLWrapper@@SA?AVQString@@PBD0H@Z @ 5 NONAME ; class QString GlxMLWrapper::trUtf8(char const *, char const *, int) - ?handleGeneralError@GlxMLWrapper@@QAEXH@Z @ 6 NONAME ; void GlxMLWrapper::handleGeneralError(int) - ?updateItem@GlxMLWrapper@@IAEXHW4GlxTBContextType@@@Z @ 7 NONAME ; void GlxMLWrapper::updateItem(int, enum GlxTBContextType) - ?removeItems@GlxMLWrapper@@IAEXHH@Z @ 8 NONAME ; void GlxMLWrapper::removeItems(int, int) - ?IsPopulated@GlxMLWrapper@@QAE_NXZ @ 9 NONAME ; bool GlxMLWrapper::IsPopulated(void) - ?getItemCount@GlxMLWrapper@@QAEHXZ @ 10 NONAME ; int GlxMLWrapper::getItemCount(void) - ?getVisibleWindowIndex@GlxMLWrapper@@QAEHXZ @ 11 NONAME ; int GlxMLWrapper::getVisibleWindowIndex(void) - ?setFocusIndex@GlxMLWrapper@@QAEXH@Z @ 12 NONAME ; void GlxMLWrapper::setFocusIndex(int) - ?retrieveItemDate@GlxMLWrapper@@QAE?AVQDate@@H@Z @ 13 NONAME ; class QDate GlxMLWrapper::retrieveItemDate(int) - ?qt_metacall@GlxMLWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 14 NONAME ; int GlxMLWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) - ?retrieveItemFrameCount@GlxMLWrapper@@QAEHH@Z @ 15 NONAME ; int GlxMLWrapper::retrieveItemFrameCount(int) - ?retrieveListTitle@GlxMLWrapper@@QAE?AVQString@@H@Z @ 16 NONAME ; class QString GlxMLWrapper::retrieveListTitle(int) - ?retrieveListItemCount@GlxMLWrapper@@QAEHH@Z @ 17 NONAME ; int GlxMLWrapper::retrieveListItemCount(int) - ?tr@GlxMLWrapper@@SA?AVQString@@PBD0@Z @ 18 NONAME ; class QString GlxMLWrapper::tr(char const *, char const *) - ?setVisibleWindowIndex@GlxMLWrapper@@QAEXH@Z @ 19 NONAME ; void GlxMLWrapper::setVisibleWindowIndex(int) - ?getStaticMetaObject@GlxMLWrapper@@SAABUQMetaObject@@XZ @ 20 NONAME ; struct QMetaObject const & GlxMLWrapper::getStaticMetaObject(void) - ?retrieveListSubTitle@GlxMLWrapper@@QAE?AVQString@@H@Z @ 21 NONAME ; class QString GlxMLWrapper::retrieveListSubTitle(int) - ?updateAlbumTitle@GlxMLWrapper@@IAEXVQString@@@Z @ 22 NONAME ; void GlxMLWrapper::updateAlbumTitle(class QString) - ?staticMetaObject@GlxMLWrapper@@2UQMetaObject@@B @ 23 NONAME ; struct QMetaObject const GlxMLWrapper::staticMetaObject - ?handleListItemAvailable@GlxMLWrapper@@QAEXH@Z @ 24 NONAME ; void GlxMLWrapper::handleListItemAvailable(int) - ?trUtf8@GlxMLWrapper@@SA?AVQString@@PBD0@Z @ 25 NONAME ; class QString GlxMLWrapper::trUtf8(char const *, char const *) - ?itemsRemoved@GlxMLWrapper@@QAEXHH@Z @ 26 NONAME ; void GlxMLWrapper::itemsRemoved(int, int) - ?handleTitleAvailable@GlxMLWrapper@@QAEXVQString@@@Z @ 27 NONAME ; void GlxMLWrapper::handleTitleAvailable(class QString) - ?metaObject@GlxMLWrapper@@UBEPBUQMetaObject@@XZ @ 28 NONAME ; struct QMetaObject const * GlxMLWrapper::metaObject(void) const - ?insertItems@GlxMLWrapper@@IAEXHH@Z @ 29 NONAME ; void GlxMLWrapper::insertItems(int, int) - ?isSystemItem@GlxMLWrapper@@QAE_NH@Z @ 30 NONAME ; bool GlxMLWrapper::isSystemItem(int) - ?getFocusIndex@GlxMLWrapper@@QBEHXZ @ 31 NONAME ; int GlxMLWrapper::getFocusIndex(void) const - ?handleIconCorrupt@GlxMLWrapper@@QAEXH@Z @ 32 NONAME ; void GlxMLWrapper::handleIconCorrupt(int) - ?retrieveItemDimension@GlxMLWrapper@@QAE?AVQSize@@H@Z @ 33 NONAME ; class QSize GlxMLWrapper::retrieveItemDimension(int) - ?RetrieveL@GlxAttributeRetriever@@SAHABVMGlxFetchContext@@AAVMGlxMediaList@@H@Z @ 34 NONAME ; int GlxAttributeRetriever::RetrieveL(class MGlxFetchContext const &, class MGlxMediaList &, int) - ?handleReceivedIcon@GlxMLWrapper@@QAEXHW4GlxTBContextType@@@Z @ 35 NONAME ; void GlxMLWrapper::handleReceivedIcon(int, enum GlxTBContextType) - ?retrieveViewTitle@GlxMLWrapper@@QAE?AVQString@@XZ @ 36 NONAME ; class QString GlxMLWrapper::retrieveViewTitle(void) - ?tr@GlxMLWrapper@@SA?AVQString@@PBD0H@Z @ 37 NONAME ; class QString GlxMLWrapper::tr(char const *, char const *, int) - ?setContextMode@GlxMLWrapper@@QAEXW4GlxContextMode@@@Z @ 38 NONAME ; void GlxMLWrapper::setContextMode(enum GlxContextMode) - ??_EGlxMLWrapper@@UAE@I@Z @ 39 NONAME ; GlxMLWrapper::~GlxMLWrapper(unsigned int) - ??1GlxMLWrapper@@UAE@XZ @ 40 NONAME ; GlxMLWrapper::~GlxMLWrapper(void) - ?RetrieveBitmap@GlxMLWrapper@@QAE?AVQVariant@@H@Z @ 41 NONAME ; class QVariant GlxMLWrapper::RetrieveBitmap(int) - ??1CGlxTitleFetcher@@UAE@XZ @ 42 NONAME ; CGlxTitleFetcher::~CGlxTitleFetcher(void) - ?HandleTitleAvailableL@GlxMLWrapperPrivate@@UAEXABVTDesC16@@@Z @ 43 NONAME ; void GlxMLWrapperPrivate::HandleTitleAvailableL(class TDesC16 const &) - ?qt_metacast@GlxMLWrapper@@UAEPAXPBD@Z @ 44 NONAME ; void * GlxMLWrapper::qt_metacast(char const *) - ?retrieveItemImage@GlxMLWrapper@@QAE?AVQImage@@HW4GlxTBContextType@@@Z @ 45 NONAME ; class QImage GlxMLWrapper::retrieveItemImage(int, enum GlxTBContextType) - ?setSelectedIndex@GlxMLWrapper@@QAEXH@Z @ 46 NONAME ; void GlxMLWrapper::setSelectedIndex(int) - ??0GlxMLWrapper@@QAE@HHW4TGlxFilterItemType@@VQString@@@Z @ 47 NONAME ; GlxMLWrapper::GlxMLWrapper(int, int, enum TGlxFilterItemType, class QString) - ?itemsAdded@GlxMLWrapper@@QAEXHH@Z @ 48 NONAME ; void GlxMLWrapper::itemsAdded(int, int) - ?retrieveItemIcon@GlxMLWrapper@@QAEPAVHbIcon@@HW4GlxTBContextType@@@Z @ 49 NONAME ; class HbIcon * GlxMLWrapper::retrieveItemIcon(int, enum GlxTBContextType) - ?retrieveItemSize@GlxMLWrapper@@QAEHH@Z @ 50 NONAME ; int GlxMLWrapper::retrieveItemSize(int) - ?retrieveItemTime@GlxMLWrapper@@QAE?AVQTime@@H@Z @ 51 NONAME ; class QTime GlxMLWrapper::retrieveItemTime(int) - ?retrieveListDesc@GlxMLWrapper@@QAE?AVQString@@H@Z @ 52 NONAME ; class QString GlxMLWrapper::retrieveListDesc(int) - ?removeContextMode@GlxMLWrapper@@QAEXW4GlxContextMode@@@Z @ 53 NONAME ; void GlxMLWrapper::removeContextMode(enum GlxContextMode) - ?updateDetails@GlxMLWrapper@@IAEXXZ @ 54 NONAME ; void GlxMLWrapper::updateDetails(void) - ?handleDetailsItemAvailable@GlxMLWrapper@@QAEXH@Z @ 55 NONAME ; void GlxMLWrapper::handleDetailsItemAvailable(int) - ?setDrmValid@GlxMLWrapper@@QAEXH_N@Z @ 56 NONAME ; void GlxMLWrapper::setDrmValid(int, bool) - ?IsDrmProtected@GlxMLWrapper@@QAE_NH@Z @ 57 NONAME ; bool GlxMLWrapper::IsDrmProtected(int) - ?IsDrmValid@GlxMLWrapper@@QAE_NH@Z @ 58 NONAME ; bool GlxMLWrapper::IsDrmValid(int) - ?isCorruptedImage@GlxMLWrapper@@QAE_NH@Z @ 59 NONAME ; bool GlxMLWrapper::isCorruptedImage(int) + ?removeContextMode@GlxMLWrapper@@QAEXW4GlxContextMode@@@Z @ 3 NONAME ; void GlxMLWrapper::removeContextMode(enum GlxContextMode) + ?itemCorrupted@GlxMLWrapper@@IAEXH@Z @ 4 NONAME ; void GlxMLWrapper::itemCorrupted(int) + ?populated@GlxMLWrapper@@IAEXXZ @ 5 NONAME ; void GlxMLWrapper::populated(void) + ?trUtf8@GlxMLWrapper@@SA?AVQString@@PBD0H@Z @ 6 NONAME ; class QString GlxMLWrapper::trUtf8(char const *, char const *, int) + ?retrieveItemSize@GlxMLWrapper@@QAEHH@Z @ 7 NONAME ; int GlxMLWrapper::retrieveItemSize(int) + ?handleGeneralError@GlxMLWrapper@@QAEXH@Z @ 8 NONAME ; void GlxMLWrapper::handleGeneralError(int) + ?setDrmValid@GlxMLWrapper@@QAEXH_N@Z @ 9 NONAME ; void GlxMLWrapper::setDrmValid(int, bool) + ?updateItem@GlxMLWrapper@@IAEXHW4GlxTBContextType@@@Z @ 10 NONAME ; void GlxMLWrapper::updateItem(int, enum GlxTBContextType) + ?removeItems@GlxMLWrapper@@IAEXHH@Z @ 11 NONAME ; void GlxMLWrapper::removeItems(int, int) + ?IsPopulated@GlxMLWrapper@@QAE_NXZ @ 12 NONAME ; bool GlxMLWrapper::IsPopulated(void) + ?getItemCount@GlxMLWrapper@@QAEHXZ @ 13 NONAME ; int GlxMLWrapper::getItemCount(void) + ?getVisibleWindowIndex@GlxMLWrapper@@QAEHXZ @ 14 NONAME ; int GlxMLWrapper::getVisibleWindowIndex(void) + ?setFocusIndex@GlxMLWrapper@@QAEXH@Z @ 15 NONAME ; void GlxMLWrapper::setFocusIndex(int) + ?retrieveItemDate@GlxMLWrapper@@QAE?AVQDate@@H@Z @ 16 NONAME ; class QDate GlxMLWrapper::retrieveItemDate(int) + ?qt_metacall@GlxMLWrapper@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 17 NONAME ; int GlxMLWrapper::qt_metacall(enum QMetaObject::Call, int, void * *) + ?updateDetails@GlxMLWrapper@@IAEXXZ @ 18 NONAME ; void GlxMLWrapper::updateDetails(void) + ?retrieveItemFrameCount@GlxMLWrapper@@QAEHH@Z @ 19 NONAME ; int GlxMLWrapper::retrieveItemFrameCount(int) + ?retrieveListTitle@GlxMLWrapper@@QAE?AVQString@@H@Z @ 20 NONAME ; class QString GlxMLWrapper::retrieveListTitle(int) + ?IsDrmProtected@GlxMLWrapper@@QAE_NH@Z @ 21 NONAME ; bool GlxMLWrapper::IsDrmProtected(int) + ?retrieveListItemCount@GlxMLWrapper@@QAEHH@Z @ 22 NONAME ; int GlxMLWrapper::retrieveListItemCount(int) + ?tr@GlxMLWrapper@@SA?AVQString@@PBD0@Z @ 23 NONAME ; class QString GlxMLWrapper::tr(char const *, char const *) + ?setVisibleWindowIndex@GlxMLWrapper@@QAEXH@Z @ 24 NONAME ; void GlxMLWrapper::setVisibleWindowIndex(int) + ?getStaticMetaObject@GlxMLWrapper@@SAABUQMetaObject@@XZ @ 25 NONAME ; struct QMetaObject const & GlxMLWrapper::getStaticMetaObject(void) + ?retrieveListSubTitle@GlxMLWrapper@@QAE?AVQString@@H@Z @ 26 NONAME ; class QString GlxMLWrapper::retrieveListSubTitle(int) + ?updateAlbumTitle@GlxMLWrapper@@IAEXVQString@@@Z @ 27 NONAME ; void GlxMLWrapper::updateAlbumTitle(class QString) + ?staticMetaObject@GlxMLWrapper@@2UQMetaObject@@B @ 28 NONAME ; struct QMetaObject const GlxMLWrapper::staticMetaObject + ?handleListItemAvailable@GlxMLWrapper@@QAEXH@Z @ 29 NONAME ; void GlxMLWrapper::handleListItemAvailable(int) + ?trUtf8@GlxMLWrapper@@SA?AVQString@@PBD0@Z @ 30 NONAME ; class QString GlxMLWrapper::trUtf8(char const *, char const *) + ?itemsRemoved@GlxMLWrapper@@QAEXHH@Z @ 31 NONAME ; void GlxMLWrapper::itemsRemoved(int, int) + ?handleTitleAvailable@GlxMLWrapper@@QAEXVQString@@@Z @ 32 NONAME ; void GlxMLWrapper::handleTitleAvailable(class QString) + ?retrieveItemTime@GlxMLWrapper@@QAE?AVQTime@@H@Z @ 33 NONAME ; class QTime GlxMLWrapper::retrieveItemTime(int) + ?metaObject@GlxMLWrapper@@UBEPBUQMetaObject@@XZ @ 34 NONAME ; struct QMetaObject const * GlxMLWrapper::metaObject(void) const + ?insertItems@GlxMLWrapper@@IAEXHH@Z @ 35 NONAME ; void GlxMLWrapper::insertItems(int, int) + ?isCorruptedImage@GlxMLWrapper@@QAE_NH@Z @ 36 NONAME ; bool GlxMLWrapper::isCorruptedImage(int) + ?isSystemItem@GlxMLWrapper@@QAE_NH@Z @ 37 NONAME ; bool GlxMLWrapper::isSystemItem(int) + ?getFocusIndex@GlxMLWrapper@@QBEHXZ @ 38 NONAME ; int GlxMLWrapper::getFocusIndex(void) const + ?handleIconCorrupt@GlxMLWrapper@@QAEXH@Z @ 39 NONAME ; void GlxMLWrapper::handleIconCorrupt(int) + ?retrieveItemDimension@GlxMLWrapper@@QAE?AVQSize@@H@Z @ 40 NONAME ; class QSize GlxMLWrapper::retrieveItemDimension(int) + ?RetrieveL@GlxAttributeRetriever@@SAHABVMGlxFetchContext@@AAVMGlxMediaList@@H@Z @ 41 NONAME ; int GlxAttributeRetriever::RetrieveL(class MGlxFetchContext const &, class MGlxMediaList &, int) + ?handleDetailsItemAvailable@GlxMLWrapper@@QAEXH@Z @ 42 NONAME ; void GlxMLWrapper::handleDetailsItemAvailable(int) + ?retrieveListDesc@GlxMLWrapper@@QAE?AVQString@@H@Z @ 43 NONAME ; class QString GlxMLWrapper::retrieveListDesc(int) + ?IsDrmValid@GlxMLWrapper@@QAE_NH@Z @ 44 NONAME ; bool GlxMLWrapper::IsDrmValid(int) + ?handleReceivedIcon@GlxMLWrapper@@QAEXHW4GlxTBContextType@@@Z @ 45 NONAME ; void GlxMLWrapper::handleReceivedIcon(int, enum GlxTBContextType) + ?retrieveViewTitle@GlxMLWrapper@@QAE?AVQString@@XZ @ 46 NONAME ; class QString GlxMLWrapper::retrieveViewTitle(void) + ?tr@GlxMLWrapper@@SA?AVQString@@PBD0H@Z @ 47 NONAME ; class QString GlxMLWrapper::tr(char const *, char const *, int) + ?setContextMode@GlxMLWrapper@@QAEXW4GlxContextMode@@@Z @ 48 NONAME ; void GlxMLWrapper::setContextMode(enum GlxContextMode) + ??_EGlxMLWrapper@@UAE@I@Z @ 49 NONAME ; GlxMLWrapper::~GlxMLWrapper(unsigned int) + ??1GlxMLWrapper@@UAE@XZ @ 50 NONAME ; GlxMLWrapper::~GlxMLWrapper(void) + ?RetrieveBitmap@GlxMLWrapper@@QAE?AVQVariant@@H@Z @ 51 NONAME ; class QVariant GlxMLWrapper::RetrieveBitmap(int) + ??1CGlxTitleFetcher@@UAE@XZ @ 52 NONAME ; CGlxTitleFetcher::~CGlxTitleFetcher(void) + ?HandleTitleAvailableL@GlxMLWrapperPrivate@@UAEXABVTDesC16@@@Z @ 53 NONAME ; void GlxMLWrapperPrivate::HandleTitleAvailableL(class TDesC16 const &) + ?qt_metacast@GlxMLWrapper@@UAEPAXPBD@Z @ 54 NONAME ; void * GlxMLWrapper::qt_metacast(char const *) + ?retrieveItemImage@GlxMLWrapper@@QAE?AVQImage@@HW4GlxTBContextType@@@Z @ 55 NONAME ; class QImage GlxMLWrapper::retrieveItemImage(int, enum GlxTBContextType) + ?setSelectedIndex@GlxMLWrapper@@QAEXH@Z @ 56 NONAME ; void GlxMLWrapper::setSelectedIndex(int) + ??0GlxMLWrapper@@QAE@HHW4TGlxFilterItemType@@VQString@@@Z @ 57 NONAME ; GlxMLWrapper::GlxMLWrapper(int, int, enum TGlxFilterItemType, class QString) + ?retrieveItemIcon@GlxMLWrapper@@QAEPAVHbIcon@@HW4GlxTBContextType@@@Z @ 58 NONAME ; class HbIcon * GlxMLWrapper::retrieveItemIcon(int, enum GlxTBContextType) + ?itemsAdded@GlxMLWrapper@@QAEXHH@Z @ 59 NONAME ; void GlxMLWrapper::itemsAdded(int, int) diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/eabi/glxmedialistwrapperu.def --- a/ui/uiengine/eabi/glxmedialistwrapperu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/eabi/glxmedialistwrapperu.def Fri Jul 23 20:41:04 2010 +0530 @@ -1,58 +1,58 @@ EXPORTS - _ZN12GlxMLWrapper10itemsAddedEii @ 1 NONAME - _ZN12GlxMLWrapper10updateItemEi16GlxTBContextType @ 2 NONAME - _ZN12GlxMLWrapper11IsPopulatedEv @ 3 NONAME - _ZN12GlxMLWrapper11insertItemsEii @ 4 NONAME - _ZN12GlxMLWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME - _ZN12GlxMLWrapper11qt_metacastEPKc @ 6 NONAME - _ZN12GlxMLWrapper11removeItemsEii @ 7 NONAME - _ZN12GlxMLWrapper12getItemCountEv @ 8 NONAME - _ZN12GlxMLWrapper12isSystemItemEi @ 9 NONAME - _ZN12GlxMLWrapper12itemsRemovedEii @ 10 NONAME - _ZN12GlxMLWrapper13itemCorruptedEi @ 11 NONAME - _ZN12GlxMLWrapper13setFocusIndexEi @ 12 NONAME - _ZN12GlxMLWrapper14RetrieveBitmapEi @ 13 NONAME - _ZN12GlxMLWrapper14setContextModeE14GlxContextMode @ 14 NONAME - _ZN12GlxMLWrapper15handlepopulatedEv @ 15 NONAME - _ZN12GlxMLWrapper15retrieveItemUriEi @ 16 NONAME - _ZN12GlxMLWrapper16retrieveItemDateEi @ 17 NONAME - _ZN12GlxMLWrapper16retrieveItemIconEi16GlxTBContextType @ 18 NONAME - _ZN12GlxMLWrapper16setSelectedIndexEi @ 19 NONAME - _ZN12GlxMLWrapper16staticMetaObjectE @ 20 NONAME DATA 16 - _ZN12GlxMLWrapper16updateAlbumTitleE7QString @ 21 NONAME - _ZN12GlxMLWrapper17handleIconCorruptEi @ 22 NONAME - _ZN12GlxMLWrapper17retrieveItemImageEi16GlxTBContextType @ 23 NONAME - _ZN12GlxMLWrapper17retrieveListTitleEi @ 24 NONAME - _ZN12GlxMLWrapper17retrieveViewTitleEv @ 25 NONAME - _ZN12GlxMLWrapper18handleGeneralErrorEi @ 26 NONAME - _ZN12GlxMLWrapper18handleReceivedIconEi16GlxTBContextType @ 27 NONAME - _ZN12GlxMLWrapper19getStaticMetaObjectEv @ 28 NONAME - _ZN12GlxMLWrapper20handleTitleAvailableE7QString @ 29 NONAME - _ZN12GlxMLWrapper20retrieveListSubTitleEi @ 30 NONAME - _ZN12GlxMLWrapper21getVisibleWindowIndexEv @ 31 NONAME - _ZN12GlxMLWrapper21retrieveItemDimensionEi @ 32 NONAME - _ZN12GlxMLWrapper21retrieveListItemCountEi @ 33 NONAME - _ZN12GlxMLWrapper21setVisibleWindowIndexEi @ 34 NONAME - _ZN12GlxMLWrapper22retrieveItemFrameCountEi @ 35 NONAME - _ZN12GlxMLWrapper23handleListItemAvailableEi @ 36 NONAME - _ZN12GlxMLWrapper9populatedEv @ 37 NONAME - _ZN12GlxMLWrapperC1Eii18TGlxFilterItemType7QString @ 38 NONAME - _ZN12GlxMLWrapperC2Eii18TGlxFilterItemType7QString @ 39 NONAME - _ZN12GlxMLWrapperD0Ev @ 40 NONAME - _ZN12GlxMLWrapperD1Ev @ 41 NONAME - _ZN12GlxMLWrapperD2Ev @ 42 NONAME - _ZNK12GlxMLWrapper10metaObjectEv @ 43 NONAME - _ZNK12GlxMLWrapper13getFocusIndexEv @ 44 NONAME - _ZTI12GlxMLWrapper @ 45 NONAME - _ZTV12GlxMLWrapper @ 46 NONAME - _ZN12GlxMLWrapper16retrieveItemSizeEi @ 47 NONAME - _ZN12GlxMLWrapper16retrieveItemTimeEi @ 48 NONAME - _ZN12GlxMLWrapper16retrieveListDescEi @ 49 NONAME - _ZN12GlxMLWrapper17removeContextModeE14GlxContextMode @ 50 NONAME - _ZN12GlxMLWrapper13updateDetailsEv @ 51 NONAME - _ZN12GlxMLWrapper26handleDetailsItemAvailableEi @ 52 NONAME - _ZN12GlxMLWrapper10IsDrmValidEi @ 53 NONAME - _ZN12GlxMLWrapper11setDrmValidEib @ 54 NONAME - _ZN12GlxMLWrapper14IsDrmProtectedEi @ 55 NONAME - _ZN12GlxMLWrapper16isCorruptedImageEi @ 56 NONAME + _ZN12GlxMLWrapper10IsDrmValidEi @ 1 NONAME + _ZN12GlxMLWrapper10itemsAddedEii @ 2 NONAME + _ZN12GlxMLWrapper10updateItemEi16GlxTBContextType @ 3 NONAME + _ZN12GlxMLWrapper11IsPopulatedEv @ 4 NONAME + _ZN12GlxMLWrapper11insertItemsEii @ 5 NONAME + _ZN12GlxMLWrapper11qt_metacallEN11QMetaObject4CallEiPPv @ 6 NONAME + _ZN12GlxMLWrapper11qt_metacastEPKc @ 7 NONAME + _ZN12GlxMLWrapper11removeItemsEii @ 8 NONAME + _ZN12GlxMLWrapper11setDrmValidEib @ 9 NONAME + _ZN12GlxMLWrapper12getItemCountEv @ 10 NONAME + _ZN12GlxMLWrapper12isSystemItemEi @ 11 NONAME + _ZN12GlxMLWrapper12itemsRemovedEii @ 12 NONAME + _ZN12GlxMLWrapper13itemCorruptedEi @ 13 NONAME + _ZN12GlxMLWrapper13setFocusIndexEi @ 14 NONAME + _ZN12GlxMLWrapper13updateDetailsEv @ 15 NONAME + _ZN12GlxMLWrapper14IsDrmProtectedEi @ 16 NONAME + _ZN12GlxMLWrapper14RetrieveBitmapEi @ 17 NONAME + _ZN12GlxMLWrapper14setContextModeE14GlxContextMode @ 18 NONAME + _ZN12GlxMLWrapper15handlepopulatedEv @ 19 NONAME + _ZN12GlxMLWrapper15retrieveItemUriEi @ 20 NONAME + _ZN12GlxMLWrapper16isCorruptedImageEi @ 21 NONAME + _ZN12GlxMLWrapper16retrieveItemDateEi @ 22 NONAME + _ZN12GlxMLWrapper16retrieveItemIconEi16GlxTBContextType @ 23 NONAME + _ZN12GlxMLWrapper16retrieveItemSizeEi @ 24 NONAME + _ZN12GlxMLWrapper16retrieveItemTimeEi @ 25 NONAME + _ZN12GlxMLWrapper16retrieveListDescEi @ 26 NONAME + _ZN12GlxMLWrapper16setSelectedIndexEi @ 27 NONAME + _ZN12GlxMLWrapper16staticMetaObjectE @ 28 NONAME DATA 16 + _ZN12GlxMLWrapper16updateAlbumTitleE7QString @ 29 NONAME + _ZN12GlxMLWrapper17handleIconCorruptEi @ 30 NONAME + _ZN12GlxMLWrapper17removeContextModeE14GlxContextMode @ 31 NONAME + _ZN12GlxMLWrapper17retrieveItemImageEi16GlxTBContextType @ 32 NONAME + _ZN12GlxMLWrapper17retrieveListTitleEi @ 33 NONAME + _ZN12GlxMLWrapper17retrieveViewTitleEv @ 34 NONAME + _ZN12GlxMLWrapper18handleGeneralErrorEi @ 35 NONAME + _ZN12GlxMLWrapper18handleReceivedIconEi16GlxTBContextType @ 36 NONAME + _ZN12GlxMLWrapper19getStaticMetaObjectEv @ 37 NONAME + _ZN12GlxMLWrapper20handleTitleAvailableE7QString @ 38 NONAME + _ZN12GlxMLWrapper20retrieveListSubTitleEi @ 39 NONAME + _ZN12GlxMLWrapper21getVisibleWindowIndexEv @ 40 NONAME + _ZN12GlxMLWrapper21retrieveItemDimensionEi @ 41 NONAME + _ZN12GlxMLWrapper21retrieveListItemCountEi @ 42 NONAME + _ZN12GlxMLWrapper21setVisibleWindowIndexEi @ 43 NONAME + _ZN12GlxMLWrapper22retrieveItemFrameCountEi @ 44 NONAME + _ZN12GlxMLWrapper23handleListItemAvailableEi @ 45 NONAME + _ZN12GlxMLWrapper26handleDetailsItemAvailableEi @ 46 NONAME + _ZN12GlxMLWrapper9populatedEv @ 47 NONAME + _ZN12GlxMLWrapperC1Eii18TGlxFilterItemType7QString @ 48 NONAME + _ZN12GlxMLWrapperC2Eii18TGlxFilterItemType7QString @ 49 NONAME + _ZN12GlxMLWrapperD0Ev @ 50 NONAME + _ZN12GlxMLWrapperD1Ev @ 51 NONAME + _ZN12GlxMLWrapperD2Ev @ 52 NONAME + _ZNK12GlxMLWrapper10metaObjectEv @ 53 NONAME + _ZNK12GlxMLWrapper13getFocusIndexEv @ 54 NONAME + _ZTI12GlxMLWrapper @ 55 NONAME + _ZTV12GlxMLWrapper @ 56 NONAME diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/bwins/glxmedialistsu.def --- a/ui/uiengine/medialists/bwins/glxmedialistsu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/bwins/glxmedialistsu.def Fri Jul 23 20:41:04 2010 +0530 @@ -10,109 +10,109 @@ ??0TGlxWindowIterator@@QAE@ABV0@@Z @ 9 NONAME ; TGlxWindowIterator::TGlxWindowIterator(class TGlxWindowIterator const &) ?NewL@CGlxDefaultAttributeContext@@SAPAV1@XZ @ 10 NONAME ; class CGlxDefaultAttributeContext * CGlxDefaultAttributeContext::NewL(void) ?SetRangeOffsets@TGlxFromFocusOutwardIterator@@QAEXHH@Z @ 11 NONAME ; void TGlxFromFocusOutwardIterator::SetRangeOffsets(int, int) - ?GetSize@TGlxMedia@@QBEHAAH@Z @ 12 NONAME ; int TGlxMedia::GetSize(int &) const - ??ETGlxWindowIterator@@QAEHH@Z @ 13 NONAME ; int TGlxWindowIterator::operator++(int) - ?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 14 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const - ?NewL@CGlxDefaultListAttributeContext@@SAPAV1@XZ @ 15 NONAME ; class CGlxDefaultListAttributeContext * CGlxDefaultListAttributeContext::NewL(void) - ?InstanceL@MGlxCache@@SAPAV1@XZ @ 16 NONAME ; class MGlxCache * MGlxCache::InstanceL(void) - ?Reset@CGlxMedia@@QAEXXZ @ 17 NONAME ; void CGlxMedia::Reset(void) - ?AddObjects@CGlxListWindow@@QAEXHHHH@Z @ 18 NONAME ; void CGlxListWindow::AddObjects(int, int, int, int) - ??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 19 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *) - ?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 20 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int) - ??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 21 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void) - ?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 22 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &) - ?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 23 NONAME ; class TGlxId TGlxMedia::IdSpaceId(void) const - ??1TGlxSelectionIterator@@QAE@XZ @ 24 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void) - ?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 25 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int) - ??0TGlxSelectionIterator@@QAE@XZ @ 26 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void) - ??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 27 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void) - ?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 28 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const - ??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 29 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void) - ?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 30 NONAME ; int TGlxMedia::GetFrameCount(int &) const - ??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 31 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void) - ?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 32 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int) - ?SetFocusIndex@CGlxListWindow@@QAEXH@Z @ 33 NONAME ; void CGlxListWindow::SetFocusIndex(int) - ??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 34 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void) - ??1CGlxDefaultThumbnailContext@@UAE@XZ @ 35 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void) - ?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 36 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &) - ??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 37 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &) - ?ConstructL@CGlxListWindow@@QAEXXZ @ 38 NONAME ; void CGlxListWindow::ConstructL(void) - ?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 39 NONAME ; void TGlxSequentialIterator::SetRange(int) - ??1TGlxFromVisibleIndexOutwardListIterator@@QAE@XZ @ 40 NONAME ; TGlxFromVisibleIndexOutwardListIterator::~TGlxFromVisibleIndexOutwardListIterator(void) - ?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 41 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const - ??0TGlxScrollingDirectionIterator@@QAE@XZ @ 42 NONAME ; TGlxScrollingDirectionIterator::TGlxScrollingDirectionIterator(void) - ?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 43 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int) - ?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 44 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int) - ?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 45 NONAME ; void CGlxMedia::HandleModified(class RArray const &) - ?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 46 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const - ?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 47 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const - ?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 48 NONAME ; void TGlxSelectionIterator::SetRange(int) - ?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 49 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const - ?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 50 NONAME ; int TGlxMedia::GetDate(class TTime &) const - ?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 51 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const - ?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 52 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &) - ?SetDefaultSpec@CGlxAttributeContext@@QAEXHH@Z @ 53 NONAME ; void CGlxAttributeContext::SetDefaultSpec(int, int) - ?IsStatic@TGlxMedia@@QBEHXZ @ 54 NONAME ; int TGlxMedia::IsStatic(void) const - ??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 55 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &) - ?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 56 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int) - ??1CGlxDefaultAttributeContext@@UAE@XZ @ 57 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void) - ?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 58 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const - ??1TGlxFirstThenLastIterator@@QAE@XZ @ 59 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void) - ?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 60 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const - ??ETGlxSelectionIterator@@UAEHH@Z @ 61 NONAME ; int TGlxSelectionIterator::operator++(int) - ?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 62 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &) - ?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 63 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int) - ?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 64 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const - ?GetDuration@TGlxMedia@@QBEHAAM@Z @ 65 NONAME ; int TGlxMedia::GetDuration(float &) const - ?SetRangeOffsets@TGlxScrollingDirectionIterator@@QAEXHH@Z @ 66 NONAME ; void TGlxScrollingDirectionIterator::SetRangeOffsets(int, int) - ?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 67 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &) - ?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 68 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId const &, class CMPXMedia *) - ?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 69 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *) - ?RemoveObjects@CGlxListWindow@@QAEXHHHH@Z @ 70 NONAME ; void CGlxListWindow::RemoveObjects(int, int, int, int) - ?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 71 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const - ?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 72 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const - ??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 73 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *) - ?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 74 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const - ?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 75 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const - ?AddObjects@CGlxListWindow@@QAEXHH@Z @ 76 NONAME ; void CGlxListWindow::AddObjects(int, int) - ?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 77 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const - ?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 78 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &) - ??0TGlxSequentialIterator@@QAE@XZ @ 79 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void) - ?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 80 NONAME ; int CGlxAttributeContext::AttributeCount(void) - ?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 81 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const - ?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 82 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const - ?SetFocusIndex@CGlxListWindow@@QAEXHH@Z @ 83 NONAME ; void CGlxListWindow::SetFocusIndex(int, int) - ?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 84 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType) - ?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 85 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const - ??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 86 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &) - ?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 87 NONAME ; void TGlxMedia::DeleteLocationAttribute(void) - ?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 88 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const - ??1CGlxMedia@@UAE@XZ @ 89 NONAME ; CGlxMedia::~CGlxMedia(void) - ?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 90 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const - ?IsDrmProtected@TGlxMedia@@QBEHXZ @ 91 NONAME ; int TGlxMedia::IsDrmProtected(void) const - ??1CGlxThumbnailContext@@UAE@XZ @ 92 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void) - ?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 93 NONAME ; int TGlxMedia::GetDrmProtected(int &) const - ?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 94 NONAME ; int TGlxMedia::GetSystemItem(int &) const - ?RemoveObjects@CGlxListWindow@@QAEXHH@Z @ 95 NONAME ; void CGlxListWindow::RemoveObjects(int, int) - ?Close@TGlxFetchContextRemover@@QAEXXZ @ 96 NONAME ; void TGlxFetchContextRemover::Close(void) - ?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 97 NONAME ; class CBase const * CGlxListWindow::At(int) const - ?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 98 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int) - ?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 99 NONAME ; class CBase * CGlxListWindow::At(int) - ??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 100 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void) - ?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 101 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &) - ??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 102 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void) - ?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 103 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int) - ??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 104 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void) - ?Cleanup@CGlxListWindow@@QAEXXZ @ 105 NONAME ; void CGlxListWindow::Cleanup(void) - ??1TGlxScrollingDirectionIterator@@QAE@XZ @ 106 NONAME ; TGlxScrollingDirectionIterator::~TGlxScrollingDirectionIterator(void) - ??1TGlxExclusionIterator@@QAE@XZ @ 107 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void) - ??1CGlxDefaultListAttributeContext@@UAE@XZ @ 108 NONAME ; CGlxDefaultListAttributeContext::~CGlxDefaultListAttributeContext(void) - ??1TGlxFetchContextRemover@@QAE@XZ @ 109 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void) - ?SetRangeOffsets@TGlxFromVisibleIndexOutwardListIterator@@QAEXHH@Z @ 110 NONAME ; void TGlxFromVisibleIndexOutwardListIterator::SetRangeOffsets(int, int) - ?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 111 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int) + ??ETGlxWindowIterator@@QAEHH@Z @ 12 NONAME ; int TGlxWindowIterator::operator++(int) + ?__DbgTestInvariant@CGlxListWindow@@QBEXXZ @ 13 NONAME ; void CGlxListWindow::__DbgTestInvariant(void) const + ?NewL@CGlxDefaultListAttributeContext@@SAPAV1@XZ @ 14 NONAME ; class CGlxDefaultListAttributeContext * CGlxDefaultListAttributeContext::NewL(void) + ?InstanceL@MGlxCache@@SAPAV1@XZ @ 15 NONAME ; class MGlxCache * MGlxCache::InstanceL(void) + ?Reset@CGlxMedia@@QAEXXZ @ 16 NONAME ; void CGlxMedia::Reset(void) + ??0CGlxThumbnailContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 17 NONAME ; CGlxThumbnailContext::CGlxThumbnailContext(class MGlxMediaListIterator *) + ?SetRangeOffsetsL@CGlxListWindow@@QAEXHHHH@Z @ 18 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int, int, int) + ??0TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 19 NONAME ; TGlxFromFocusOutwardBlockyIterator::TGlxFromFocusOutwardBlockyIterator(void) + ?UnmarkAllL@MGlxMediaList@@SAXAAV1@@Z @ 20 NONAME ; void MGlxMediaList::UnmarkAllL(class MGlxMediaList &) + ?IdSpaceId@TGlxMedia@@QBE?AV?$TGlxId@VTGlxIdSpaceIdBase@@@@XZ @ 21 NONAME ; class TGlxId TGlxMedia::IdSpaceId(void) const + ??1TGlxSelectionIterator@@QAE@XZ @ 22 NONAME ; TGlxSelectionIterator::~TGlxSelectionIterator(void) + ?SetGranularity@CGlxAttributeContext@@QAEXI@Z @ 23 NONAME ; void CGlxAttributeContext::SetGranularity(unsigned int) + ??0TGlxSelectionIterator@@QAE@XZ @ 24 NONAME ; TGlxSelectionIterator::TGlxSelectionIterator(void) + ??0TGlxFromFocusOutwardIterator@@QAE@XZ @ 25 NONAME ; TGlxFromFocusOutwardIterator::TGlxFromFocusOutwardIterator(void) + ?AddObjectsL@CGlxListWindow@@QAEXHH@Z @ 26 NONAME ; void CGlxListWindow::AddObjectsL(int, int) + ?SubTitle@TGlxMedia@@QBEABVTDesC16@@XZ @ 27 NONAME ; class TDesC16 const & TGlxMedia::SubTitle(void) const + ??1TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 28 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::~TGlxFromManualIndexOutwardBlockyIterator(void) + ?GetFrameCount@TGlxMedia@@QBEHAAH@Z @ 29 NONAME ; int TGlxMedia::GetFrameCount(int &) const + ??0TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 30 NONAME ; TGlxFromManualIndexBlockyIterator::TGlxFromManualIndexBlockyIterator(void) + ?SetRangeOffsets@TGlxFromIndexOutwardBlockyIterator@@QAEXHH@Z @ 31 NONAME ; void TGlxFromIndexOutwardBlockyIterator::SetRangeOffsets(int, int) + ??1TGlxFromFocusOutwardBlockyIterator@@QAE@XZ @ 32 NONAME ; TGlxFromFocusOutwardBlockyIterator::~TGlxFromFocusOutwardBlockyIterator(void) + ??1CGlxDefaultThumbnailContext@@UAE@XZ @ 33 NONAME ; CGlxDefaultThumbnailContext::~CGlxDefaultThumbnailContext(void) + ?IsFullThumbnail@GlxThumbnailUtility@@SAHABVTMPXAttribute@@@Z @ 34 NONAME ; int GlxThumbnailUtility::IsFullThumbnail(class TMPXAttribute const &) + ??0TGlxFromIndexOutwardBlockyIterator@@QAE@ABVMGlxIndex@0@@Z @ 35 NONAME ; TGlxFromIndexOutwardBlockyIterator::TGlxFromIndexOutwardBlockyIterator(class TGlxFromIndexOutwardBlockyIterator::MGlxIndex const &) + ?ConstructL@CGlxListWindow@@QAEXXZ @ 36 NONAME ; void CGlxListWindow::ConstructL(void) + ?SetRange@TGlxSequentialIterator@@QAEXH@Z @ 37 NONAME ; void TGlxSequentialIterator::SetRange(int) + ??1TGlxFromVisibleIndexOutwardListIterator@@QAE@XZ @ 38 NONAME ; TGlxFromVisibleIndexOutwardListIterator::~TGlxFromVisibleIndexOutwardListIterator(void) + ?GetStaticItemCommand@TGlxMedia@@QBEHAAH@Z @ 39 NONAME ; int TGlxMedia::GetStaticItemCommand(int &) const + ??0TGlxScrollingDirectionIterator@@QAE@XZ @ 40 NONAME ; TGlxScrollingDirectionIterator::TGlxScrollingDirectionIterator(void) + ?SetRangeOffsets@TGlxFromManualIndexBlockyIterator@@QAEXHH@Z @ 41 NONAME ; void TGlxFromManualIndexBlockyIterator::SetRangeOffsets(int, int) + ?SetIndex@TGlxFromManualIndexOutwardBlockyIterator@@QAEXH@Z @ 42 NONAME ; void TGlxFromManualIndexOutwardBlockyIterator::SetIndex(int) + ?HandleModified@CGlxMedia@@QAEXABV?$RArray@VTMPXAttribute@@@@@Z @ 43 NONAME ; void CGlxMedia::HandleModified(class RArray const &) + ?GetLastModifiedDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 44 NONAME ; int TGlxMedia::GetLastModifiedDate(class TTime &) const + ?GetContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 45 NONAME ; int TGlxMedia::GetContainedItemCount(int &) const + ?SetRange@TGlxSelectionIterator@@QAEXH@Z @ 46 NONAME ; void TGlxSelectionIterator::SetRange(int) + ?GetDimensions@TGlxMedia@@QBEHAAVTSize@@@Z @ 47 NONAME ; int TGlxMedia::GetDimensions(class TSize &) const + ?GetDate@TGlxMedia@@QBEHAAVTTime@@@Z @ 48 NONAME ; int TGlxMedia::GetDate(class TTime &) const + ?GetValueText@CGlxMedia@@QBEHAAVTPtrC16@@ABVTMPXAttribute@@@Z @ 49 NONAME ; int CGlxMedia::GetValueText(class TPtrC16 &, class TMPXAttribute const &) const + ?SetTextValueL@CGlxMedia@@QAEXABVTMPXAttribute@@ABVTDesC16@@@Z @ 50 NONAME ; void CGlxMedia::SetTextValueL(class TMPXAttribute const &, class TDesC16 const &) + ?SetDefaultSpec@CGlxAttributeContext@@QAEXHH@Z @ 51 NONAME ; void CGlxAttributeContext::SetDefaultSpec(int, int) + ?RemoveObjectsL@CGlxListWindow@@QAEXHH@Z @ 52 NONAME ; void CGlxListWindow::RemoveObjectsL(int, int) + ?IsStatic@TGlxMedia@@QBEHXZ @ 53 NONAME ; int TGlxMedia::IsStatic(void) const + ??0CGlxListWindow@@QAE@AAVMGlxWindowObjectFactory@@@Z @ 54 NONAME ; CGlxListWindow::CGlxListWindow(class MGlxWindowObjectFactory &) + ?AddSpecForItemL@CGlxThumbnailContext@@QAEXHHH@Z @ 55 NONAME ; void CGlxThumbnailContext::AddSpecForItemL(int, int, int) + ??1CGlxDefaultAttributeContext@@UAE@XZ @ 56 NONAME ; CGlxDefaultAttributeContext::~CGlxDefaultAttributeContext(void) + ?ThumbnailAttribute@TGlxMedia@@QBEPBVCGlxThumbnailAttribute@@AAVTMPXAttribute@@@Z @ 57 NONAME ; class CGlxThumbnailAttribute const * TGlxMedia::ThumbnailAttribute(class TMPXAttribute &) const + ??1TGlxFirstThenLastIterator@@QAE@XZ @ 58 NONAME ; TGlxFirstThenLastIterator::~TGlxFirstThenLastIterator(void) + ?Title@TGlxMedia@@QBEABVTDesC16@@XZ @ 59 NONAME ; class TDesC16 const & TGlxMedia::Title(void) const + ??ETGlxSelectionIterator@@UAEHH@Z @ 60 NONAME ; int TGlxSelectionIterator::operator++(int) + ?AddAttributeL@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 61 NONAME ; void CGlxAttributeContext::AddAttributeL(class TMPXAttribute const &) + ?SetRangeOffsets@CGlxDefaultThumbnailContext@@QAEXHH@Z @ 62 NONAME ; void CGlxDefaultThumbnailContext::SetRangeOffsets(int, int) + ?__DbgTestInvariant@CGlxStaticItemList@@QBEXXZ @ 63 NONAME ; void CGlxStaticItemList::__DbgTestInvariant(void) const + ?GetDuration@TGlxMedia@@QBEHAAM@Z @ 64 NONAME ; int TGlxMedia::GetDuration(float &) const + ?SetRangeOffsets@TGlxScrollingDirectionIterator@@QAEXHH@Z @ 65 NONAME ; void TGlxScrollingDirectionIterator::SetRangeOffsets(int, int) + ?DeleteAttribute@CGlxMedia@@QAEXABVTMPXAttribute@@@Z @ 66 NONAME ; void CGlxMedia::DeleteAttribute(class TMPXAttribute const &) + ?InstanceL@MGlxMediaList@@SAPAV1@ABVCMPXCollectionPath@@ABV?$TGlxId@VTGlxIdHierarchyBase@@@@PAVCMPXMedia@@@Z @ 67 NONAME ; class MGlxMediaList * MGlxMediaList::InstanceL(class CMPXCollectionPath const &, class TGlxId const &, class CMPXMedia *) + ?SetCObjectValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAVCBase@@@Z @ 68 NONAME ; void CGlxMedia::SetCObjectValueL(class TMPXAttribute const &, class CBase *) + ?Iterator@CGlxListWindow@@QBE?AVTGlxWindowIterator@@XZ @ 69 NONAME ; class TGlxWindowIterator CGlxListWindow::Iterator(void) const + ?Category@TGlxMedia@@QBE?AW4TMPXGeneralCategory@@XZ @ 70 NONAME ; enum TMPXGeneralCategory TGlxMedia::Category(void) const + ??0CGlxAttributeContext@@QAE@PAVMGlxMediaListIterator@@@Z @ 71 NONAME ; CGlxAttributeContext::CGlxAttributeContext(class MGlxMediaListIterator *) + ?GetIconInfo@TGlxMedia@@QBEHAAUTIconInfo@@@Z @ 72 NONAME ; int TGlxMedia::GetIconInfo(struct TIconInfo &) const + ?__DbgTestInvariant@CGlxItemList@@QBEXXZ @ 73 NONAME ; void CGlxItemList::__DbgTestInvariant(void) const + ?Comment@TGlxMedia@@QBEABVTDesC16@@XZ @ 74 NONAME ; class TDesC16 const & TGlxMedia::Comment(void) const + ?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@ABVTMPXAttribute@@@Z @ 75 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, class TMPXAttribute const &) + ??0TGlxSequentialIterator@@QAE@XZ @ 76 NONAME ; TGlxSequentialIterator::TGlxSequentialIterator(void) + ?SetFocusIndexL@CGlxListWindow@@QAEXHH@Z @ 77 NONAME ; void CGlxListWindow::SetFocusIndexL(int, int) + ?AttributeCount@CGlxAttributeContext@@QAEHXZ @ 78 NONAME ; int CGlxAttributeContext::AttributeCount(void) + ?GetDrmValidity@TGlxMedia@@QBEHAAW4TGlxMediaGeneralRightsValidity@@@Z @ 79 NONAME ; int TGlxMedia::GetDrmValidity(enum TGlxMediaGeneralRightsValidity &) const + ?__DbgTestInvariant@CGlxNavigableList@@QBEXXZ @ 80 NONAME ; void CGlxNavigableList::__DbgTestInvariant(void) const + ?SetValueL@CGlxMedia@@QAEXABVTMPXAttribute@@PAXW4TMPXAttributeType@@@Z @ 81 NONAME ; void CGlxMedia::SetValueL(class TMPXAttribute const &, void *, enum TMPXAttributeType) + ?ValueText@CGlxMedia@@QBEABVTDesC16@@ABVTMPXAttribute@@@Z @ 82 NONAME ; class TDesC16 const & CGlxMedia::ValueText(class TMPXAttribute const &) const + ??0CGlxMedia@@QAE@ABVTGlxMediaId@@@Z @ 83 NONAME ; CGlxMedia::CGlxMedia(class TGlxMediaId const &) + ?DeleteLocationAttribute@TGlxMedia@@QAEXXZ @ 84 NONAME ; void TGlxMedia::DeleteLocationAttribute(void) + ?GetClosestThumbnail@TGlxMedia@@QBEHAAVTMPXAttribute@@ABVTSize@@H@Z @ 85 NONAME ; int TGlxMedia::GetClosestThumbnail(class TMPXAttribute &, class TSize const &, int) const + ??1CGlxMedia@@UAE@XZ @ 86 NONAME ; CGlxMedia::~CGlxMedia(void) + ?__DbgTestInvariant@CGlxMedia@@QBEXXZ @ 87 NONAME ; void CGlxMedia::__DbgTestInvariant(void) const + ?IsDrmProtected@TGlxMedia@@QBEHXZ @ 88 NONAME ; int TGlxMedia::IsDrmProtected(void) const + ?GetSystemItem@TGlxMedia@@QBEHAAH@Z @ 89 NONAME ; int TGlxMedia::GetSystemItem(int &) const + ??1CGlxThumbnailContext@@UAE@XZ @ 90 NONAME ; CGlxThumbnailContext::~CGlxThumbnailContext(void) + ?GetDrmProtected@TGlxMedia@@QBEHAAH@Z @ 91 NONAME ; int TGlxMedia::GetDrmProtected(int &) const + ?Close@TGlxFetchContextRemover@@QAEXXZ @ 92 NONAME ; void TGlxFetchContextRemover::Close(void) + ?At@CGlxListWindow@@QBEPBVCBase@@H@Z @ 93 NONAME ; class CBase const * CGlxListWindow::At(int) const + ?HasAttributeErrorL@GlxErrorManager@@SAHPBVCGlxMedia@@H@Z @ 94 NONAME ; int GlxErrorManager::HasAttributeErrorL(class CGlxMedia const *, int) + ?At@CGlxListWindow@@QAEPAVCBase@@H@Z @ 95 NONAME ; class CBase * CGlxListWindow::At(int) + ??1TGlxFromManualIndexBlockyIterator@@QAE@XZ @ 96 NONAME ; TGlxFromManualIndexBlockyIterator::~TGlxFromManualIndexBlockyIterator(void) + ?RemoveAttribute@CGlxAttributeContext@@QAEXABVTMPXAttribute@@@Z @ 97 NONAME ; void CGlxAttributeContext::RemoveAttribute(class TMPXAttribute const &) + ??1TGlxFromIndexOutwardBlockyIterator@@QAE@XZ @ 98 NONAME ; TGlxFromIndexOutwardBlockyIterator::~TGlxFromIndexOutwardBlockyIterator(void) + ?ClosestThumbnail@GlxThumbnailUtility@@SAHABVTSize@@ABVCGlxMedia@@H@Z @ 99 NONAME ; int GlxThumbnailUtility::ClosestThumbnail(class TSize const &, class CGlxMedia const &, int) + ??0TGlxFromManualIndexOutwardBlockyIterator@@QAE@XZ @ 100 NONAME ; TGlxFromManualIndexOutwardBlockyIterator::TGlxFromManualIndexOutwardBlockyIterator(void) + ?GetSize@TGlxMedia@@QBEHAAI@Z @ 101 NONAME ; int TGlxMedia::GetSize(unsigned int &) const + ??1TGlxScrollingDirectionIterator@@QAE@XZ @ 102 NONAME ; TGlxScrollingDirectionIterator::~TGlxScrollingDirectionIterator(void) + ?SetFocusIndexL@CGlxListWindow@@QAEXH@Z @ 103 NONAME ; void CGlxListWindow::SetFocusIndexL(int) + ??1TGlxExclusionIterator@@QAE@XZ @ 104 NONAME ; TGlxExclusionIterator::~TGlxExclusionIterator(void) + ??1CGlxDefaultListAttributeContext@@UAE@XZ @ 105 NONAME ; CGlxDefaultListAttributeContext::~CGlxDefaultListAttributeContext(void) + ??1TGlxFetchContextRemover@@QAE@XZ @ 106 NONAME ; TGlxFetchContextRemover::~TGlxFetchContextRemover(void) + ?RemoveObjectsL@CGlxListWindow@@QAEXHHHH@Z @ 107 NONAME ; void CGlxListWindow::RemoveObjectsL(int, int, int, int) + ?CleanupL@CGlxListWindow@@QAEXXZ @ 108 NONAME ; void CGlxListWindow::CleanupL(void) + ?SetRangeOffsets@TGlxFromVisibleIndexOutwardListIterator@@QAEXHH@Z @ 109 NONAME ; void TGlxFromVisibleIndexOutwardListIterator::SetRangeOffsets(int, int) + ?SetDefaultSpec@CGlxThumbnailContext@@QAEXHH@Z @ 110 NONAME ; void CGlxThumbnailContext::SetDefaultSpec(int, int) + ?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 111 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const ??0TGlxFromVisibleIndexOutwardListIterator@@QAE@XZ @ 112 NONAME ; TGlxFromVisibleIndexOutwardListIterator::TGlxFromVisibleIndexOutwardListIterator(void) ??0TGlxSpecificIdIterator@@QAE@ABV?$TGlxId@VTGlxIdSpaceIdBase@@@@VTGlxMediaId@@@Z @ 113 NONAME ; TGlxSpecificIdIterator::TGlxSpecificIdIterator(class TGlxId const &, class TGlxMediaId) - ?GetSlideshowPlayableContainedItemCount@TGlxMedia@@QBEHAAH@Z @ 114 NONAME ; int TGlxMedia::GetSlideshowPlayableContainedItemCount(int &) const + ?AddObjectsL@CGlxListWindow@@QAEXHHHH@Z @ 114 NONAME ; void CGlxListWindow::AddObjectsL(int, int, int, int) ?MatchById@TGlxMedia@@SAHABV1@0@Z @ 115 NONAME ; int TGlxMedia::MatchById(class TGlxMedia const &, class TGlxMedia const &) ?SetRangeOffsetsL@CGlxListWindow@@QAEXHH@Z @ 116 NONAME ; void CGlxListWindow::SetRangeOffsetsL(int, int) ?SetRangeOffsets@CGlxDefaultListAttributeContext@@QAEXHH@Z @ 117 NONAME ; void CGlxDefaultListAttributeContext::SetRangeOffsets(int, int) diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/eabi/glxmedialistsu.def --- a/ui/uiengine/medialists/eabi/glxmedialistsu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/eabi/glxmedialistsu.def Fri Jul 23 20:41:04 2010 +0530 @@ -1,17 +1,17 @@ EXPORTS _ZN13MGlxMediaList10UnmarkAllLERS_ @ 1 NONAME _ZN13MGlxMediaList9InstanceLERK18CMPXCollectionPathRK6TGlxIdI19TGlxIdHierarchyBaseEP9CMPXMedia @ 2 NONAME - _ZN14CGlxListWindow10AddObjectsEii @ 3 NONAME - _ZN14CGlxListWindow10AddObjectsEiiii @ 4 NONAME - _ZN14CGlxListWindow10ConstructLEv @ 5 NONAME - _ZN14CGlxListWindow13RemoveObjectsEii @ 6 NONAME - _ZN14CGlxListWindow13RemoveObjectsEiiii @ 7 NONAME - _ZN14CGlxListWindow13SetFocusIndexEi @ 8 NONAME - _ZN14CGlxListWindow13SetFocusIndexEii @ 9 NONAME + _ZN14CGlxListWindow10ConstructLEv @ 3 NONAME + _ZN14CGlxListWindow11AddObjectsLEii @ 4 NONAME + _ZN14CGlxListWindow11AddObjectsLEiiii @ 5 NONAME + _ZN14CGlxListWindow14RemoveObjectsLEii @ 6 NONAME + _ZN14CGlxListWindow14RemoveObjectsLEiiii @ 7 NONAME + _ZN14CGlxListWindow14SetFocusIndexLEi @ 8 NONAME + _ZN14CGlxListWindow14SetFocusIndexLEii @ 9 NONAME _ZN14CGlxListWindow16SetRangeOffsetsLEii @ 10 NONAME _ZN14CGlxListWindow16SetRangeOffsetsLEiiii @ 11 NONAME _ZN14CGlxListWindow2AtEi @ 12 NONAME - _ZN14CGlxListWindow7CleanupEv @ 13 NONAME + _ZN14CGlxListWindow8CleanupLEv @ 13 NONAME _ZN14CGlxListWindowC1ER23MGlxWindowObjectFactory @ 14 NONAME _ZN14CGlxListWindowC2ER23MGlxWindowObjectFactory @ 15 NONAME _ZN14CGlxListWindowD0Ev @ 16 NONAME @@ -133,80 +133,85 @@ _ZN9MGlxCache9InstanceLEv @ 132 NONAME _ZN9TGlxMedia23DeleteLocationAttributeEv @ 133 NONAME _ZN9TGlxMedia9MatchByIdERKS_S1_ @ 134 NONAME - _ZNK14CGlxListWindow2AtEi @ 135 NONAME - _ZNK14CGlxListWindow8IteratorEv @ 136 NONAME - _ZNK21TGlxSelectionIterator7InRangeEi @ 137 NONAME - _ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 138 NONAME - _ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 139 NONAME - _ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 140 NONAME - _ZNK9TGlxMedia11GetDurationERf @ 141 NONAME - _ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 142 NONAME - _ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 143 NONAME - _ZNK9TGlxMedia13GetDimensionsER5TSize @ 144 NONAME - _ZNK9TGlxMedia13GetFrameCountERi @ 145 NONAME - _ZNK9TGlxMedia13GetSystemItemERi @ 146 NONAME - _ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 147 NONAME - _ZNK9TGlxMedia14IsDrmProtectedEv @ 148 NONAME - _ZNK9TGlxMedia15GetDrmProtectedERi @ 149 NONAME - _ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 150 NONAME - _ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 151 NONAME - _ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 152 NONAME - _ZNK9TGlxMedia20GetStaticItemCommandERi @ 153 NONAME - _ZNK9TGlxMedia21GetContainedItemCountERi @ 154 NONAME - _ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 155 NONAME - _ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 156 NONAME - _ZNK9TGlxMedia3UriEv @ 157 NONAME - _ZNK9TGlxMedia5TitleEv @ 158 NONAME - _ZNK9TGlxMedia7CommentEv @ 159 NONAME - _ZNK9TGlxMedia7GetDateER5TTime @ 160 NONAME - _ZNK9TGlxMedia7GetSizeERi @ 161 NONAME - _ZNK9TGlxMedia8CategoryEv @ 162 NONAME - _ZNK9TGlxMedia8IsStaticEv @ 163 NONAME - _ZNK9TGlxMedia8MimeTypeEv @ 164 NONAME - _ZNK9TGlxMedia8SubTitleEv @ 165 NONAME - _ZNK9TGlxMedia9IdSpaceIdEv @ 166 NONAME - _ZTI13CGlxMediaList @ 167 NONAME - _ZTI14CGlxListWindow @ 168 NONAME - _ZTI15CGlxImageReader @ 169 NONAME - _ZTI16CGlxCacheManager @ 170 NONAME - _ZTI20CGlxAttributeContext @ 171 NONAME - _ZTI20CGlxGarbageCollector @ 172 NONAME - _ZTI20CGlxThumbnailContext @ 173 NONAME - _ZTI21TGlxExclusionIterator @ 174 NONAME - _ZTI21TGlxSelectionIterator @ 175 NONAME - _ZTI22TGlxSequentialIterator @ 176 NONAME - _ZTI22TGlxSpecificIdIterator @ 177 NONAME - _ZTI25TGlxFirstThenLastIterator @ 178 NONAME - _ZTI27CGlxDefaultAttributeContext @ 179 NONAME - _ZTI27CGlxDefaultThumbnailContext @ 180 NONAME - _ZTI28TGlxFromFocusOutwardIterator @ 181 NONAME - _ZTI30TGlxScrollingDirectionIterator @ 182 NONAME - _ZTI31CGlxDefaultListAttributeContext @ 183 NONAME - _ZTI33TGlxFromManualIndexBlockyIterator @ 184 NONAME - _ZTI34TGlxFromFocusOutwardBlockyIterator @ 185 NONAME - _ZTI34TGlxFromIndexOutwardBlockyIterator @ 186 NONAME - _ZTI39TGlxFromVisibleIndexOutwardListIterator @ 187 NONAME - _ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 188 NONAME - _ZTV13CGlxMediaList @ 189 NONAME - _ZTV14CGlxListWindow @ 190 NONAME - _ZTV15CGlxImageReader @ 191 NONAME - _ZTV16CGlxCacheManager @ 192 NONAME - _ZTV20CGlxAttributeContext @ 193 NONAME - _ZTV20CGlxGarbageCollector @ 194 NONAME - _ZTV20CGlxThumbnailContext @ 195 NONAME - _ZTV21TGlxExclusionIterator @ 196 NONAME - _ZTV21TGlxSelectionIterator @ 197 NONAME - _ZTV22TGlxSequentialIterator @ 198 NONAME - _ZTV22TGlxSpecificIdIterator @ 199 NONAME - _ZTV25TGlxFirstThenLastIterator @ 200 NONAME - _ZTV27CGlxDefaultAttributeContext @ 201 NONAME - _ZTV27CGlxDefaultThumbnailContext @ 202 NONAME - _ZTV28TGlxFromFocusOutwardIterator @ 203 NONAME - _ZTV30TGlxScrollingDirectionIterator @ 204 NONAME - _ZTV31CGlxDefaultListAttributeContext @ 205 NONAME - _ZTV33TGlxFromManualIndexBlockyIterator @ 206 NONAME - _ZTV34TGlxFromFocusOutwardBlockyIterator @ 207 NONAME - _ZTV34TGlxFromIndexOutwardBlockyIterator @ 208 NONAME - _ZTV39TGlxFromVisibleIndexOutwardListIterator @ 209 NONAME - _ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 210 NONAME + _ZNK12CGlxItemList18__DbgTestInvariantEv @ 135 NONAME + _ZNK14CGlxListWindow18__DbgTestInvariantEv @ 136 NONAME + _ZNK14CGlxListWindow2AtEi @ 137 NONAME + _ZNK14CGlxListWindow8IteratorEv @ 138 NONAME + _ZNK17CGlxNavigableList18__DbgTestInvariantEv @ 139 NONAME + _ZNK18CGlxStaticItemList18__DbgTestInvariantEv @ 140 NONAME + _ZNK21TGlxSelectionIterator7InRangeEi @ 141 NONAME + _ZNK9CGlxMedia12GetValueTextER7TPtrC16RK13TMPXAttribute @ 142 NONAME + _ZNK9CGlxMedia12ValueCObjectERK13TMPXAttribute @ 143 NONAME + _ZNK9CGlxMedia18__DbgTestInvariantEv @ 144 NONAME + _ZNK9CGlxMedia9ValueTextERK13TMPXAttribute @ 145 NONAME + _ZNK9TGlxMedia11GetDurationERf @ 146 NONAME + _ZNK9TGlxMedia11GetIconInfoER9TIconInfo @ 147 NONAME + _ZNK9TGlxMedia13GetCoordinateER11TCoordinate @ 148 NONAME + _ZNK9TGlxMedia13GetDimensionsER5TSize @ 149 NONAME + _ZNK9TGlxMedia13GetFrameCountERi @ 150 NONAME + _ZNK9TGlxMedia13GetSystemItemERi @ 151 NONAME + _ZNK9TGlxMedia14GetDrmValidityER30TGlxMediaGeneralRightsValidity @ 152 NONAME + _ZNK9TGlxMedia14IsDrmProtectedEv @ 153 NONAME + _ZNK9TGlxMedia15GetDrmProtectedERi @ 154 NONAME + _ZNK9TGlxMedia18ThumbnailAttributeER13TMPXAttribute @ 155 NONAME + _ZNK9TGlxMedia19GetClosestThumbnailER13TMPXAttributeRK5TSizei @ 156 NONAME + _ZNK9TGlxMedia19GetLastModifiedDateER5TTime @ 157 NONAME + _ZNK9TGlxMedia20GetStaticItemCommandERi @ 158 NONAME + _ZNK9TGlxMedia21GetContainedItemCountERi @ 159 NONAME + _ZNK9TGlxMedia26IsSlideShowPlayableContentEv @ 160 NONAME + _ZNK9TGlxMedia38GetSlideshowPlayableContainedItemCountERi @ 161 NONAME + _ZNK9TGlxMedia3UriEv @ 162 NONAME + _ZNK9TGlxMedia5TitleEv @ 163 NONAME + _ZNK9TGlxMedia7CommentEv @ 164 NONAME + _ZNK9TGlxMedia7GetDateER5TTime @ 165 NONAME + _ZNK9TGlxMedia7GetSizeERj @ 166 NONAME + _ZNK9TGlxMedia8CategoryEv @ 167 NONAME + _ZNK9TGlxMedia8IsStaticEv @ 168 NONAME + _ZNK9TGlxMedia8MimeTypeEv @ 169 NONAME + _ZNK9TGlxMedia8SubTitleEv @ 170 NONAME + _ZNK9TGlxMedia9IdSpaceIdEv @ 171 NONAME + _ZTI13CGlxMediaList @ 172 NONAME + _ZTI14CGlxListWindow @ 173 NONAME + _ZTI15CGlxImageReader @ 174 NONAME + _ZTI16CGlxCacheManager @ 175 NONAME + _ZTI20CGlxAttributeContext @ 176 NONAME + _ZTI20CGlxGarbageCollector @ 177 NONAME + _ZTI20CGlxThumbnailContext @ 178 NONAME + _ZTI21TGlxExclusionIterator @ 179 NONAME + _ZTI21TGlxSelectionIterator @ 180 NONAME + _ZTI22TGlxSequentialIterator @ 181 NONAME + _ZTI22TGlxSpecificIdIterator @ 182 NONAME + _ZTI25TGlxFirstThenLastIterator @ 183 NONAME + _ZTI27CGlxDefaultAttributeContext @ 184 NONAME + _ZTI27CGlxDefaultThumbnailContext @ 185 NONAME + _ZTI28TGlxFromFocusOutwardIterator @ 186 NONAME + _ZTI30TGlxScrollingDirectionIterator @ 187 NONAME + _ZTI31CGlxDefaultListAttributeContext @ 188 NONAME + _ZTI33TGlxFromManualIndexBlockyIterator @ 189 NONAME + _ZTI34TGlxFromFocusOutwardBlockyIterator @ 190 NONAME + _ZTI34TGlxFromIndexOutwardBlockyIterator @ 191 NONAME + _ZTI39TGlxFromVisibleIndexOutwardListIterator @ 192 NONAME + _ZTI40TGlxFromManualIndexOutwardBlockyIterator @ 193 NONAME + _ZTV13CGlxMediaList @ 194 NONAME + _ZTV14CGlxListWindow @ 195 NONAME + _ZTV15CGlxImageReader @ 196 NONAME + _ZTV16CGlxCacheManager @ 197 NONAME + _ZTV20CGlxAttributeContext @ 198 NONAME + _ZTV20CGlxGarbageCollector @ 199 NONAME + _ZTV20CGlxThumbnailContext @ 200 NONAME + _ZTV21TGlxExclusionIterator @ 201 NONAME + _ZTV21TGlxSelectionIterator @ 202 NONAME + _ZTV22TGlxSequentialIterator @ 203 NONAME + _ZTV22TGlxSpecificIdIterator @ 204 NONAME + _ZTV25TGlxFirstThenLastIterator @ 205 NONAME + _ZTV27CGlxDefaultAttributeContext @ 206 NONAME + _ZTV27CGlxDefaultThumbnailContext @ 207 NONAME + _ZTV28TGlxFromFocusOutwardIterator @ 208 NONAME + _ZTV30TGlxScrollingDirectionIterator @ 209 NONAME + _ZTV31CGlxDefaultListAttributeContext @ 210 NONAME + _ZTV33TGlxFromManualIndexBlockyIterator @ 211 NONAME + _ZTV34TGlxFromFocusOutwardBlockyIterator @ 212 NONAME + _ZTV34TGlxFromIndexOutwardBlockyIterator @ 213 NONAME + _ZTV39TGlxFromVisibleIndexOutwardListIterator @ 214 NONAME + _ZTV40TGlxFromManualIndexOutwardBlockyIterator @ 215 NONAME diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/inc/glxlistwindow.h --- a/ui/uiengine/medialists/inc/glxlistwindow.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/inc/glxlistwindow.h Fri Jul 23 20:41:04 2010 +0530 @@ -108,7 +108,7 @@ * classes implement MGlxWindowObjectFactory, since vtable would not * be valid in the destructor */ - IMPORT_C void Cleanup(); + IMPORT_C void CleanupL(); /** * Updates range offset. The range is the span of indexes that defined @@ -128,16 +128,16 @@ * Sets the focus. * @param aFocusIndex index of the object to be focused in the list */ - /* @todo depricated */ IMPORT_C void SetFocusIndex( TInt aFocusIndex ); - IMPORT_C void SetFocusIndex( TInt aFocusIndex, TInt aTotalSize ); + /* @todo depricated */ IMPORT_C void SetFocusIndexL( TInt aFocusIndex ); + IMPORT_C void SetFocusIndexL( TInt aFocusIndex, TInt aTotalSize ); /** * Adds objects to the list. Updates window if necessary. * The function assumes that the underlying data structure has * already changed. */ - /* @todo depricated */ IMPORT_C void AddObjects( TInt aFirstNewIndex, TInt aLastNewIndex ); - IMPORT_C void AddObjects( TInt aFocusIndex, TInt aTotalSize, + /* @todo depricated */ IMPORT_C void AddObjectsL( TInt aFirstNewIndex, TInt aLastNewIndex ); + IMPORT_C void AddObjectsL( TInt aFocusIndex, TInt aTotalSize, TInt aFirstNewIndex, TInt aLastNewIndex ); /** @@ -145,8 +145,8 @@ * The function assumes that the underlying data structure has * already changed. */ - /* @todo depricated */ IMPORT_C void RemoveObjects( TInt aFirstRemovedIndex, TInt aLastRemovedIndex ); - IMPORT_C void RemoveObjects( TInt aFocusIndex, TInt aTotalSize, + /* @todo depricated */ IMPORT_C void RemoveObjectsL( TInt aFirstRemovedIndex, TInt aLastRemovedIndex ); + IMPORT_C void RemoveObjectsL( TInt aFocusIndex, TInt aTotalSize, TInt aFirstRemovedIndex, TInt aLastRemovedIndex ); /** @@ -192,9 +192,9 @@ }; /** Update the window based on the change */ - void Update( const TChange& aChange ); + void UpdateL( const TChange& aChange ); /** Move objects from main window to working window, or object pool if not needed */ - void PopulateExistingAndUnuseOld( const TChange& aChange ); + void PopulateExistingAndUnuseOldL( const TChange& aChange ); /** Populate main window with items from object pool */ void PopulateNew(); /** Make working window the main window and vice versa */ diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/inc/glxmedia.h --- a/ui/uiengine/medialists/inc/glxmedia.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/inc/glxmedia.h Fri Jul 23 20:41:04 2010 +0530 @@ -128,7 +128,7 @@ * @return EFalse if unable to get size - aSize is unchanged. * ETrue if size successfully put in aSize. */ - IMPORT_C TBool GetSize(TInt& aSize) const; + IMPORT_C TBool GetSize(TUint& aSize) const; /** * Get the duration associated with the media. diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/inc/glxmedialist.h --- a/ui/uiengine/medialists/inc/glxmedialist.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/inc/glxmedialist.h Fri Jul 23 20:41:04 2010 +0530 @@ -99,7 +99,10 @@ * @param aAttributes attributes to request for the items * @param aDetailedSpecs attribute specifications */ - void AttributeRequestL(RArray& aItemIndexes, RArray& aItemIds, RArray& aAttributes, CMPXAttributeSpecs*& aDetailedSpecs) const; + void AttributeRequestL(RArray& aItemIndexes, + RArray& aItemIds, + RArray& aAttributes, + CMPXAttributeSpecs*& aDetailedSpecs) const; /** * Ordering function for attributes diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxattributecontext.cpp --- a/ui/uiengine/medialists/src/glxattributecontext.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxattributecontext.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -236,12 +236,14 @@ return; } + CleanupClosePushL(aAttributes); // Just list all attributes specified for this context TInt count = iAttributes.Count(); for (TInt i = 0; i < count; i++) { aAttributes.AppendL(iAttributes[i]); } + CleanupStack::Pop(&aAttributes); } // ----------------------------------------------------------------------------- @@ -343,7 +345,7 @@ const TMPXAttribute& aAttribute) const { TRACER("CGlxAttributeContext::AddItemAttributeL"); - + CleanupClosePushL(aAttributes); TIdentityRelation match(&TMPXAttribute::Match); TInt index = aAttributes.Find(aAttribute, match); @@ -351,6 +353,7 @@ { aAttributes.AppendL(aAttribute); } + CleanupStack::Pop(&aAttributes); } // ----------------------------------------------------------------------------- diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxcache.cpp --- a/ui/uiengine/medialists/src/glxcache.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxcache.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -241,6 +241,7 @@ RArray& aNewAttributes) { TRACER("CGlxCache::CopyNewAndModifiedL"); + CleanupClosePushL(aNewAttributes); /// @todo This is all temporary until global chunk based CMPXMedia is available TInt count = aSource.Count(); @@ -305,11 +306,14 @@ } else if (attrib == KGlxMediaGeneralLastModifiedDate) { - aTarget.SetTObjectValueL(attrib, aSource.ValueTObjectL(attrib)); + TTime modified = aSource.ValueTObjectL(attrib); + TTimeIntervalSeconds utcOffset = User::UTCOffset(); + modified += utcOffset; + aTarget.SetTObjectValueL(attrib, modified); } else if (attrib == KMPXMediaGeneralSize) { - aTarget.SetTObjectValueL(attrib, aSource.ValueTObjectL(attrib)); + aTarget.SetTObjectValueL(attrib, aSource.ValueTObjectL(attrib)); } else if (attrib == KMPXMediaColDetailSpaceId) { @@ -373,6 +377,7 @@ } } } + CleanupStack::Pop(&aNewAttributes); } // ----------------------------------------------------------------------------- diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxcachemanager.cpp --- a/ui/uiengine/medialists/src/glxcachemanager.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxcachemanager.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -348,7 +348,7 @@ TInt userCount = item->UserCount(); for ( TInt userIndex = 0; userIndex < userCount; userIndex++ ) { - users.InsertInAddressOrder( &item->User( userIndex ) ); + users.InsertInAddressOrderL( &item->User( userIndex ) ); } } @@ -661,7 +661,9 @@ iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(itemId.Value()), spaceId, tnSize, itemId)); #else CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(item.Uri(), 0); - iThumbnailRequestIds.AppendL(TLoadingTN(iTnEngine->GetThumbnailL(*source), spaceId, tnSize, itemId)); + iThumbnailRequestIds.AppendL(TLoadingTN( + iTnEngine->GetThumbnailL(*source), + spaceId, tnSize, itemId)); CleanupStack::PopAndDestroy(source); #endif } @@ -738,7 +740,7 @@ RFile64& imageHandle = imageVwrMgr->ImageFileHandle(); if ( &imageHandle != NULL ) { - fileName.Append(imageHandle.FullName(fileName)); + imageHandle.FullName(fileName); } else { @@ -933,10 +935,7 @@ if(errInImage == KErrNone) { //need to fetch the original file dimensions - if(errInImage == KErrNone) - { dimensions = iReader->GetDimensions(); - } iMPXMedia->SetTObjectValueL(KGlxMediaGeneralDimensions, dimensions); } else diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxgarbagecollector.cpp --- a/ui/uiengine/medialists/src/glxgarbagecollector.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxgarbagecollector.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -163,6 +163,7 @@ // void CGlxGarbageCollector::FlushPagesL(TInt aCount) { + TRACER("CGlxGarbageCollector::FlushPagesL"); TBool reachedEnd = CleanupCaches(aCount); if ( reachedEnd ) diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxitemlist.cpp --- a/ui/uiengine/medialists/src/glxitemlist.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxitemlist.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -538,7 +538,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxItemList::__DbgTestInvariant() const +EXPORT_C void CGlxItemList::__DbgTestInvariant() const { #ifdef _DEBUG diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxlistwindow.cpp --- a/ui/uiengine/medialists/src/glxlistwindow.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxlistwindow.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -52,7 +52,7 @@ } /** Preparet the window to accept items */ - void Initialize( const CGlxListWindow::TRange& aRange, TInt aTotalSize ) + void InitializeL( const CGlxListWindow::TRange& aRange, TInt aTotalSize ) { __TEST_INVARIANT; @@ -68,7 +68,7 @@ for ( TInt i = iObjects.Count(); i < aRange.iLength; i++ ) { // Append cannot fail since reservation has been made - ( void ) iObjects.Append( NULL ); + ( void ) iObjects.AppendL( NULL ); } // remove unnecessary pointers @@ -276,12 +276,12 @@ // Cleans up remaining objects in the window // ----------------------------------------------------------------------------- // -EXPORT_C void CGlxListWindow::Cleanup() +EXPORT_C void CGlxListWindow::CleanupL() { - TRACER("CGlxListWindow::Cleanup"); + TRACER("CGlxListWindow::CleanupL"); // make the window empty. this will clean up all remaining objects. - Update( TChange( KErrNotFound, 0, EChangeObjectsRemoved, 0, iWindow->TotalSize() - 1 ) ); + UpdateL( TChange( KErrNotFound, 0, EChangeObjectsRemoved, 0, iWindow->TotalSize() - 1 ) ); } // ----------------------------------------------------------------------------- @@ -326,10 +326,10 @@ for ( TInt i = iWindow->Size() + iUnusedObjects.Count(); i < maxObjectCount; i++ ) { // cannot fail since reservation made above - ( void ) iUnusedObjects.Append( iObjectFactory.CreateObjectL() ); + ( void )iUnusedObjects.AppendL( iObjectFactory.CreateObjectL() ); } - Update( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) ); + UpdateL( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) ); } // ----------------------------------------------------------------------------- @@ -347,27 +347,27 @@ // SetFocusIndexL // ----------------------------------------------------------------------------- // DEPRICATED -EXPORT_C void CGlxListWindow::SetFocusIndex( TInt aFocusIndex ) +EXPORT_C void CGlxListWindow::SetFocusIndexL( TInt aFocusIndex ) { - TRACER("CGlxListWindow::SetFocusIndex"); + TRACER("CGlxListWindow::SetFocusIndexL"); - SetFocusIndex( aFocusIndex, iWindow->TotalSize() ); + SetFocusIndexL( aFocusIndex, iWindow->TotalSize() ); } // ----------------------------------------------------------------------------- // SetFocusIndexL // ----------------------------------------------------------------------------- // -EXPORT_C void CGlxListWindow::SetFocusIndex( TInt aFocusIndex, TInt aTotalSize ) +EXPORT_C void CGlxListWindow::SetFocusIndexL( TInt aFocusIndex, TInt aTotalSize ) { - TRACER("CGlxListWindow::SetFocusIndex"); + TRACER("CGlxListWindow::SetFocusIndexL"); __ASSERT_DEBUG( ( 0 <= aFocusIndex && aFocusIndex < aTotalSize ) || ( KErrNotFound == aFocusIndex && 0 == aTotalSize ), Panic( EGlxPanicIllegalArgument ) ); __TEST_INVARIANT; - Update( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) ); + UpdateL( TChange( aFocusIndex, aTotalSize, EChangeNone, 0, 0 ) ); __TEST_INVARIANT; } @@ -376,9 +376,9 @@ // AddObjects // ----------------------------------------------------------------------------- // DEPRICATED -EXPORT_C void CGlxListWindow::AddObjects( TInt aFirstNewIndex, TInt aLastNewIndex ) +EXPORT_C void CGlxListWindow::AddObjectsL( TInt aFirstNewIndex, TInt aLastNewIndex ) { - TRACER("CGlxListWindow::AddObjects"); + TRACER("CGlxListWindow::AddObjectsL"); TInt newItemCount = aLastNewIndex - aFirstNewIndex + 1; TInt newTotalSize = iWindow->TotalSize() + newItemCount; @@ -398,17 +398,17 @@ newFocusIndex += newItemCount; } - AddObjects( newFocusIndex, newTotalSize, aFirstNewIndex, aLastNewIndex ); + AddObjectsL( newFocusIndex, newTotalSize, aFirstNewIndex, aLastNewIndex ); } // ----------------------------------------------------------------------------- // AddObjects // ----------------------------------------------------------------------------- // -EXPORT_C void CGlxListWindow::AddObjects( TInt aFocusIndex, +EXPORT_C void CGlxListWindow::AddObjectsL( TInt aFocusIndex, TInt aTotalSize, TInt aFirstNewIndex, TInt aLastNewIndex ) { - TRACER("CGlxListWindow::AddObjects"); + TRACER("CGlxListWindow::AddObjectsL"); __ASSERT_DEBUG( 0 <= aFirstNewIndex && aFirstNewIndex <= aLastNewIndex && aLastNewIndex < aTotalSize && @@ -416,7 +416,7 @@ Panic( EGlxPanicIllegalArgument ) ); __TEST_INVARIANT; - Update( TChange( aFocusIndex, aTotalSize, EChangeObjectsAdded, + UpdateL( TChange( aFocusIndex, aTotalSize, EChangeObjectsAdded, aFirstNewIndex, aLastNewIndex ) ); __TEST_INVARIANT; @@ -426,9 +426,9 @@ // RemoveObjects // ----------------------------------------------------------------------------- // DEPRICATED -EXPORT_C void CGlxListWindow::RemoveObjects( TInt aFirstRemovedIndex, TInt aLastRemovedIndex ) +EXPORT_C void CGlxListWindow::RemoveObjectsL( TInt aFirstRemovedIndex, TInt aLastRemovedIndex ) { - TRACER("CGlxListWindow::RemoveObjects"); + TRACER("CGlxListWindow::RemoveObjectsL"); TInt itemsRemovedCount = aLastRemovedIndex - aFirstRemovedIndex + 1; TInt newTotalSize = iWindow->TotalSize() - itemsRemovedCount; @@ -461,17 +461,17 @@ } } - RemoveObjects( newFocusIndex, newTotalSize, aFirstRemovedIndex, aLastRemovedIndex ); + RemoveObjectsL( newFocusIndex, newTotalSize, aFirstRemovedIndex, aLastRemovedIndex ); } // ----------------------------------------------------------------------------- // RemoveObjects // ----------------------------------------------------------------------------- // -EXPORT_C void CGlxListWindow::RemoveObjects( TInt aFocusIndex, +EXPORT_C void CGlxListWindow::RemoveObjectsL( TInt aFocusIndex, TInt aTotalSize, TInt aFirstRemovedIndex, TInt aLastRemovedIndex ) { - TRACER("CGlxListWindow::RemoveObjects"); + TRACER("CGlxListWindow::RemoveObjectsL"); __ASSERT_DEBUG( 0 <= aFirstRemovedIndex && aFirstRemovedIndex <= aLastRemovedIndex && ( ( 0 <= aFocusIndex && aFocusIndex < aTotalSize ) || @@ -479,7 +479,7 @@ Panic( EGlxPanicIllegalArgument ) ); __TEST_INVARIANT; - Update( TChange( aFocusIndex, aTotalSize, EChangeObjectsRemoved, + UpdateL( TChange( aFocusIndex, aTotalSize, EChangeObjectsRemoved, aFirstRemovedIndex, aLastRemovedIndex ) ); __TEST_INVARIANT; @@ -489,9 +489,9 @@ // Update // ----------------------------------------------------------------------------- // -void CGlxListWindow::Update( const TChange& aChange ) +void CGlxListWindow::UpdateL( const TChange& aChange ) { - TRACER("CGlxListWindow::Update"); + TRACER("CGlxListWindow::UpdateL"); // (in a list of: |abcdefghijklm| // iWindow: |----efghi----| @@ -500,14 +500,14 @@ // is shorter than max window length) // Prepare the working window to accept objects - iWorkingWindow->Initialize( Range( aChange ), aChange.iNewTotalSize ); + iWorkingWindow->InitializeL( Range( aChange ), aChange.iNewTotalSize ); // iWindow: |----efghi----| // iWorkingWindow: |------00000--| // iUnusedObjects: XXX // move unused objects to pool, and reusable objects to working window - PopulateExistingAndUnuseOld( aChange ); + PopulateExistingAndUnuseOldL( aChange ); // iWindow: |----efghi----| // iWorkingWindow: |------ghi00--| @@ -537,9 +537,9 @@ // PopulateExistingAndUnuseOld // ----------------------------------------------------------------------------- // -void CGlxListWindow::PopulateExistingAndUnuseOld( const TChange& aChange ) +void CGlxListWindow::PopulateExistingAndUnuseOldL( const TChange& aChange ) { - TRACER("CGlxListWindow::PopulateExistingAndUnuseOld"); + TRACER("CGlxListWindow::PopulateExistingAndUnuseOldL"); // move objects that are needed after the change into the working window, // and objects that are not needed into the object pool @@ -563,7 +563,7 @@ iObjectFactory.CleanupObject( index, *( *iWindow )[ index ] ); // add the object to the unused objects pool // cannot fail since reservation made - ( void ) iUnusedObjects.Append( ( *iWindow )[ index ] ); + ( void )iUnusedObjects.AppendL( ( *iWindow )[ index ] ); } // clear the pointer in the existing window. it is not strictly necessary @@ -732,7 +732,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxListWindow::__DbgTestInvariant() const +EXPORT_C void CGlxListWindow::__DbgTestInvariant() const { TRACER("CGlxListWindow::__DbgTestInvariant"); diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxmedia.cpp --- a/ui/uiengine/medialists/src/glxmedia.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxmedia.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -153,7 +153,7 @@ // ----------------------------------------------------------------------------- // Gets the (file) size // ----------------------------------------------------------------------------- -EXPORT_C TBool TGlxMedia::GetSize(TInt& aSize) const +EXPORT_C TBool TGlxMedia::GetSize(TUint& aSize) const { TRACER("TGlxMedia::GetSize"); @@ -580,7 +580,7 @@ __DEBUG_ONLY( _iUserReservationCount-- ); - iUsers.Append( TMediaUser( &aUser, aIndex ) ); // Ignore error, cannot fail since reservation made + iUsers.AppendL( TMediaUser( &aUser, aIndex ) ); // Ignore error, cannot fail since reservation made } // ----------------------------------------------------------------------------- @@ -984,7 +984,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxMedia::__DbgTestInvariant() const +EXPORT_C void CGlxMedia::__DbgTestInvariant() const { TRACER("CGlxMedia::__DbgTestInvariant"); diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxmedialist.cpp --- a/ui/uiengine/medialists/src/glxmedialist.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxmedialist.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -39,6 +39,16 @@ #include "mglxmedialistobserver.h" #include "glxmediastaticitemdefs.h" +/** + * Min & Max wait interval for a modify event, in microseconds + * This is to allow thumbnail manager to procees the event first. + */ +const TInt KModifyEventMinWaitInterval = 2000000; +const TInt KModifyEventMaxWaitInterval = 3000000; +/** + * Maximum items count for minimum wait interval. + */ +const TInt KMaxItemsCount = 500; namespace NGlxMediaList { /** @@ -1327,7 +1337,7 @@ for (TInt level = 0; level < levels; level++) { TGlxMediaId id(aPath.Id(level)); - iPath.Append(id); + iPath.AppendL(id); } @@ -1530,6 +1540,28 @@ } CleanupStack::PopAndDestroy(&itemIndices); + RPointerArray& mediaLists = iMediaListArray->Array(); + TInt listCount = mediaLists.Count(); + GLX_DEBUG2("ML:HandleItemModifiedL listCount=%d", listCount); + if (listCount > 0) + { + CGlxMediaList* mediaList = mediaLists[listCount-1]; + if (mediaList == this) + { + GLX_DEBUG3("ML:HandleItemModifiedL(wait) listCount=%d, Id=%d", + listCount, id.Value()); + TTimeIntervalMicroSeconds32 timeout; + timeout = (mediaList->Count() > KMaxItemsCount ? + KModifyEventMaxWaitInterval : KModifyEventMinWaitInterval ); + RTimer timer; + CleanupClosePushL(timer); + TRequestStatus status; + timer.CreateLocal(); + timer.After(status, timeout); + User::WaitForRequest(status); + CleanupStack::PopAndDestroy(&timer); + } + } } } @@ -1757,6 +1789,7 @@ TRACER("CGlxMediaList::UpdateMedia"); TInt count = iItemList->Count(); + GLX_DEBUG2("CGlxMediaList::UpdateMedia() count=%d", count); for (TInt i = 0; i < count; ++i) { TGlxMedia& item = iItemList->Item( i ); @@ -1859,15 +1892,8 @@ { TRACER("CGlxMediaList::CancelPreviousRequests"); - TInt focusIndex = FocusIndex(); - if(focusIndex >= KErrNone) - { - if(!Item(focusIndex).Properties()) - { // If media is NULL, cancel the previous pending request. // Place a new request for the item in focus, to fetch the media attributes iManager->CancelPreviousRequest(); } - } - } diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxnavigablelist.cpp --- a/ui/uiengine/medialists/src/glxnavigablelist.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxnavigablelist.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -561,6 +561,7 @@ { TRACER( "CGlxNavigableList::SelectionL"); + CleanupClosePushL(aItemIds); aItemIds.Reset(); // Reserve full required space to avoid reallocations during loop @@ -571,6 +572,7 @@ { aItemIds.AppendL( iItemList->Item( iSelectedItemIndices[ i ] ).Id() ); } + CleanupStack::Pop(&aItemIds); } // ----------------------------------------------------------------------------- @@ -924,7 +926,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxNavigableList::__DbgTestInvariant() const +EXPORT_C void CGlxNavigableList::__DbgTestInvariant() const { TRACER( "CGlxNavigableList::__DbgTestInvariant"); diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxstaticitemlist.cpp --- a/ui/uiengine/medialists/src/glxstaticitemlist.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxstaticitemlist.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -720,7 +720,7 @@ // --------------------------------------------------------------------------- // Test invariant // --------------------------------------------------------------------------- -void CGlxStaticItemList::__DbgTestInvariant() const +EXPORT_C void CGlxStaticItemList::__DbgTestInvariant() const { TRACER( "CGlxStaticItemList::__DbgTestInvariant"); diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialists/src/glxthumbnailcontext.cpp --- a/ui/uiengine/medialists/src/glxthumbnailcontext.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialists/src/glxthumbnailcontext.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -32,7 +32,6 @@ #include "glxmedialist.h" #include "glxerrormanager.h" #include "glxthumbnailutility.h" -//#include "mglxcache.h" #include "glxlistutils.h" /** @@ -80,10 +79,7 @@ void CGlxThumbnailContext::ConstructL() { TRACER( "CGlxThumbnailContext::ConstructL"); - - //iCache = MGlxCache::InstanceL(); iResolutionUtility = CGlxResolutionUtility::InstanceL(); - // iResolutionUtility->AddObserverL( *this ); iDrmUtility = CGlxDRMUtility::InstanceL(); @@ -130,16 +126,9 @@ iSpecs.Close(); - if ( iResolutionUtility ) - { - // iResolutionUtility->RemoveObserver( *this ); - iResolutionUtility->Close(); - } + - /*if ( iCache ) - { - iCache->Close(); - }*/ + } // ----------------------------------------------------------------------------- @@ -363,17 +352,7 @@ return requestCount; } -// ----------------------------------------------------------------------------- -// HandleResolutionChanged -// ----------------------------------------------------------------------------- -// -/*void CGlxThumbnailContext::HandleResolutionChangedL() - { - TRACER( "CGlxThumbnailContext::HandleResolutionChanged"); - - // Ask cache manager to refresh, to fetch thumbnails in new size - iCache->RefreshL(); - }*/ + // ----------------------------------------------------------------------------- // SelectItemL diff -r a0f57508af73 -r a3a4c0de738e ui/uiengine/medialistwrapper/src/glxmlwrapper_p.cpp --- a/ui/uiengine/medialistwrapper/src/glxmlwrapper_p.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/uiengine/medialistwrapper/src/glxmlwrapper_p.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -881,7 +881,7 @@ int GlxMLWrapperPrivate::RetrieveItemSize(int aItemIndex) { const TGlxMedia& item = iMediaList->Item( aItemIndex ); - int itemSize ; + TUint itemSize ; item.GetSize(itemSize); return itemSize; } @@ -1316,9 +1316,8 @@ QImage image(data, aBitmap->SizeInPixels().iWidth, aBitmap->SizeInPixels().iHeight, bytesPerLine, QImage::Format_RGB16); QPixmap pixmap = QPixmap::fromImage(image); - if ( aBitmap->SizeInPixels().iWidth > itemWidth || aBitmap->SizeInPixels().iHeight > itemHeight ) { - pixmap = pixmap.scaled( itemWidth, itemHeight, Qt::KeepAspectRatio ); - } + pixmap = pixmap.scaled( itemWidth, itemHeight, Qt::KeepAspectRatio ); + aBitmap->UnlockHeap(); HbIcon* targetIcon = new HbIcon( QIcon( pixmap ) ); diff -r a0f57508af73 -r a3a4c0de738e ui/viewmanagement/statehandler/inc/glxactionhandler.h --- a/ui/viewmanagement/statehandler/inc/glxactionhandler.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/viewmanagement/statehandler/inc/glxactionhandler.h Fri Jul 23 20:41:04 2010 +0530 @@ -22,9 +22,9 @@ #include #include +#include class GlxCommandHandler; -class QModelIndex; class GlxActionHandler : public QObject { diff -r a0f57508af73 -r a3a4c0de738e ui/viewmanagement/viewmanager/inc/glxmainwindoweventfilter.h --- a/ui/viewmanagement/viewmanager/inc/glxmainwindoweventfilter.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/viewmanagement/viewmanager/inc/glxmainwindoweventfilter.h Fri Jul 23 20:41:04 2010 +0530 @@ -23,4 +23,4 @@ }; -#endif \ No newline at end of file +#endif diff -r a0f57508af73 -r a3a4c0de738e ui/viewmanagement/viewmanager/src/glxviewmanager.cpp --- a/ui/viewmanagement/viewmanager/src/glxviewmanager.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/viewmanagement/viewmanager/src/glxviewmanager.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -247,38 +247,8 @@ //To:Do temp code remove later if ( mProgressDialog ) { i = ++i % 10; - switch ( i ) { - case 0 : - icon = HbIcon( QString(":/data/Image1.jpg") ); - break; - case 1 : - icon = HbIcon( QString(":/data/Image2.jpg") ); - break; - case 2 : - icon = HbIcon( QString(":/data/Image3.jpg") ); - break; - case 3 : - icon = HbIcon( QString(":/data/Image4.jpg") ); - break; - case 4 : - icon = HbIcon( QString(":/data/Image5.jpg") ); - break; - case 5 : - icon = HbIcon( QString(":/data/Image6.jpg") ); - break; - case 6 : - icon = HbIcon( QString(":/data/Image7.jpg") ); - break; - case 7 : - icon = HbIcon( QString(":/data/Image8.jpg") ); - break; - case 8 : - icon = HbIcon( QString(":/data/Image9.jpg") ); - break; - case 9 : - icon = HbIcon( QString(":/data/Image10.jpg") ); - break; - } + icon = HbIcon( QString( ":/data/wait/qgn_graf_ring_wait_%1.svg" ).arg( i + 1, 2, 10, QChar( '0' ) ) ); + mProgressDialog->setIcon(icon); int max = mProgressDialog->maximum() ; if ( currentValue > max ) { @@ -286,8 +256,6 @@ max = currentValue ; } - mProgressDialog->setIcon(icon); - if ( currentValue < 0 ) { mProgressDialog->setText( QString( GLX_REFRESHING ) ); //To:Do string will change later mProgressDialog->setProgressValue( 0 ); diff -r a0f57508af73 -r a3a4c0de738e ui/views/detailsview/inc/glxdetailscustomicon.h --- a/ui/views/detailsview/inc/glxdetailscustomicon.h Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,63 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: ?Description -* -*/ - -#ifndef GLXDETAILSCUSTOMICON_H -#define GLXDETAILSCUSTOMICON_H - -#include -class HbIconItem; -class HbIcon; - -class GlxDetailsCustomIcon : public HbWidget -{ - Q_OBJECT - -public: - GlxDetailsCustomIcon(QGraphicsItem *parent); - ~GlxDetailsCustomIcon(); - /* - * Sets the Geometry of the Custom Widget - */ - void setItemGeometry(QRect screenRect); - - /* - * Sets the Size of the Favourite Icon - */ - void setItemSize(const QSizeF &size); - - /* - * Sets the Position of the Favourite Icon - */ - void setItemPos(qreal ax, qreal ay); - - /* - * Sets the Icon of Favourite IconItem. - */ - void setItemIcon(const HbIcon &icon); - -protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent (QGraphicsSceneMouseEvent *event); - -signals : - void updateFavourites(); - -private: - HbIconItem *mFavIcon; -}; - -#endif // GLXDETAILSCUSTOMICON_H diff -r a0f57508af73 -r a3a4c0de738e ui/views/detailsview/inc/glxdetailsview.h --- a/ui/views/detailsview/inc/glxdetailsview.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/detailsview/inc/glxdetailsview.h Fri Jul 23 20:41:04 2010 +0530 @@ -29,8 +29,9 @@ class HbDocumentLoader; class HbLabel; class HbPushButton; -class GlxDetailsNameLabel; -class GlxDetailsDescriptionEdit; +class GlxDetailsTextEdit; +class GlxDetailsIcon; + class GlxDetailsViewDocLoader; class GlxDetailsView : public GlxView @@ -82,6 +83,7 @@ void updateLayout(Qt::Orientation); void rowsRemoved(const QModelIndex &parent, int start, int end); void dataChanged(QModelIndex startIndex, QModelIndex endIndex); + void modelDestroyed(); void updateFavourites(); void UpdateDescription(); void FillDetails(); @@ -153,7 +155,7 @@ HbLabel *mDetailsIcon; //Contains the favourite icon which adds or removes the image to favourite folder - HbPushButton *mFavIcon; + GlxDetailsIcon *mFavIcon; //The media Model to acess the attributes; not owned,dont delete. QAbstractItemModel *mModel; @@ -170,10 +172,10 @@ GlxDetailsViewDocLoader *mDocLoader; //Shows the Images - GlxDetailsNameLabel *mImageName; + GlxDetailsTextEdit *mImageName; //Shows the descriptions - GlxDetailsDescriptionEdit *mDescriptions; + GlxDetailsTextEdit *mDescriptions; //Shows the Date HbLabel *mDateLabel; @@ -183,5 +185,8 @@ //Shows the time HbLabel *mTimeLabel; + + HbIcon mFavIconEnabled; + HbIcon mFavIconDisabled; }; #endif //GLXDETAILSVIEW_H diff -r a0f57508af73 -r a3a4c0de738e ui/views/detailsview/src/glxdetailscustomicon.cpp --- a/ui/views/detailsview/src/glxdetailscustomicon.cpp Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: ?Description -* -*/ - - -#include -#include -#include -#include - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//mousePressEvent -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsCustomIcon::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - Q_UNUSED(event) -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//clearCurrentModel -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsCustomIcon::mouseReleaseEvent (QGraphicsSceneMouseEvent *event) -{ - Q_UNUSED(event) - emit updateFavourites(); -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//GlxDetailsCustomIcon -//-------------------------------------------------------------------------------------------------------------------------------------------- -GlxDetailsCustomIcon::GlxDetailsCustomIcon(QGraphicsItem *parent) : HbWidget(parent) -{ - mFavIcon = new HbIconItem(this); - HbFrameItem* frame = new HbFrameItem(this); - frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); - frame->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans"); - frame->graphicsItem()->setOpacity(0.2); - setBackgroundItem(frame->graphicsItem(),-1); - -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//~GlxDetailsCustomIcon -//-------------------------------------------------------------------------------------------------------------------------------------------- -GlxDetailsCustomIcon::~GlxDetailsCustomIcon() -{ - delete mFavIcon; - mFavIcon = NULL; -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//setItemGeometry -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsCustomIcon::setItemGeometry(QRect screenRect) -{ - setGeometry(screenRect); -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//setItemSize -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsCustomIcon::setItemSize(const QSizeF &size) -{ - mFavIcon->setSize(size); -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//setItemPos -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsCustomIcon::setItemPos(const qreal ax,const qreal ay) -{ - //place the FavIcon with respect to the parent i.e HbWidget - mFavIcon->setPos(ax ,ay); -} - -//-------------------------------------------------------------------------------------------------------------------------------------------- -//setItemIcon -//-------------------------------------------------------------------------------------------------------------------------------------------- -void GlxDetailsCustomIcon::setItemIcon(const HbIcon &icon) -{ - mFavIcon->setIcon(icon); -} diff -r a0f57508af73 -r a3a4c0de738e ui/views/detailsview/src/glxdetailscustomwidgets.cpp --- a/ui/views/detailsview/src/glxdetailscustomwidgets.cpp Sat Jul 10 00:59:39 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -/* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: ?Description -* -*/ - -#include "glxdetailscustomwidgets.h" -#include -#include -#include -#include - -#include -#include -//#include "hbsettingformitem_p.h" -#include -#include -#include -#include - -GlxDetailsCustomWidgets::GlxDetailsCustomWidgets(QGraphicsItem *parent): -HbDataFormViewItem(parent) - { - } - -GlxDetailsCustomWidgets::~GlxDetailsCustomWidgets() - { - } - -HbAbstractViewItem* GlxDetailsCustomWidgets::createItem() - { - return new GlxDetailsCustomWidgets(*this); - } - -HbWidget* GlxDetailsCustomWidgets::createCustomWidget() - { - qDebug("GlxDetailsCustomWidgets::createCustomWidget"); - HbDataFormModelItem::DataItemType itemType = static_cast( - modelIndex().data(HbDataFormModelItem::ItemTypeRole).toInt()); - switch(itemType) - { - - case DateLabelItem : - { - qDebug("GlxDetailsCustomWidgets::createCustomWidget:DateLabelItem"); - HbLabel *dateLabel = new HbLabel(); - return dateLabel; - } - - - - default: - return 0; - - } - } - -bool GlxDetailsCustomWidgets::canSetModelIndex(const QModelIndex &index) const -{ - HbDataFormModelItem::DataItemType itemType = - static_cast( - index.data(HbDataFormModelItem::ItemTypeRole).toInt()); - - if(itemType >= ImageNameItem && - itemType <= CommentsItem ) - { - return true; - } - return false; -} - -//EOF diff -r a0f57508af73 -r a3a4c0de738e ui/views/detailsview/src/glxdetailsview.cpp --- a/ui/views/detailsview/src/glxdetailsview.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/detailsview/src/glxdetailsview.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -44,8 +44,9 @@ #include "glxfavmediamodel.h" #include "glxdocloaderdefs.h" #include -#include "glxdetailsdescriptionedit.h" -#include "glxdetailsnamelabel.h" + +#include "glxdetailstextedit.h" +#include "glxdetailsicon.h" #include "glxviewdocloader.h" @@ -61,7 +62,8 @@ #endif //SIZE OF THE IMAGE , LAYOUTS TEAM NEED TO GIVER THE SIZE IN UNITS -#define GLX_IMAGE_SIZE 215 +#define GLX_IMAGE_WIDTH 333 +#define GLX_IMAGE_HEIGHT 215 const int KBytesInKB = 1024; const int KBytesInMB = 1024 * 1024; const int KBytesInGB = 1024 * 1024 * 1024; @@ -69,29 +71,39 @@ //-------------------------------------------------------------------------------------------------------------------------------------------- //GlxDetailsView //-------------------------------------------------------------------------------------------------------------------------------------------- -GlxDetailsView::GlxDetailsView(HbMainWindow *window) : -GlxView(GLX_DETAILSVIEW_ID), mDetailsIcon(NULL), mFavIcon(NULL), mModel( - NULL), mFavModel(NULL), mWindow(window), - mSelIndex(0),mDocLoader(NULL),mImageName(NULL),mDescriptions(NULL),mDateLabel(NULL),mSizeLabel(NULL),mTimeLabel(NULL) - { +GlxDetailsView::GlxDetailsView(HbMainWindow *window) + : GlxView( GLX_DETAILSVIEW_ID ), + mDetailsIcon( NULL ), + mFavIcon( NULL ), + mModel( NULL ), + mFavModel( NULL ), + mWindow( window ), + mSelIndex( 0 ), + mDocLoader( NULL ), + mImageName( NULL ), + mDescriptions( NULL ), + mDateLabel( NULL ), + mSizeLabel( NULL ), + mTimeLabel( NULL ) +{ GLX_LOG_INFO("GlxDetailsView::GlxDetailsView"); OstTraceFunctionEntry0( GLXDETAILSVIEW_GLXDETAILSVIEW_ENTRY ); setContentFullScreen(true);//for smooth transtion between grid to full screen and vice versa OstTraceFunctionExit0( GLXDETAILSVIEW_GLXDETAILSVIEW_EXIT ); - } +} //-------------------------------------------------------------------------------------------------------------------------------------------- //~GlxDetailsView //-------------------------------------------------------------------------------------------------------------------------------------------- GlxDetailsView::~GlxDetailsView() - { +{ OstTrace0( TRACE_IMPORTANT, GLXDETAILSVIEW_GLXDETAILSVIEW, "GlxDetailsView::~GlxDetailsView" ); delete mDocLoader; mDocLoader = NULL; cleanUp(); - } +} //-------------------------------------------------------------------------------------------------------------------------------------------- //activate @@ -139,19 +151,16 @@ HbView *mView = static_cast (mDocLoader->findWidget( GLX_DETAILSVIEW_VIEW)); - HbWidget *mwidget = static_cast (mDocLoader->findWidget( - "MainWidget")); - mDetailsIcon = static_cast (mDocLoader->findWidget( GLX_DETAILSVIEW_IMAGE)); - mFavIcon = static_cast (mDocLoader->findWidget( + mFavIcon = static_cast (mDocLoader->findWidget( GLX_DETAILSVIEW_FAVICON)); - mDescriptions = static_cast (mDocLoader->findWidget( + mDescriptions = static_cast (mDocLoader->findWidget( GLX_DETAILSVIEW_DESCRPTIONTEXT)); - mImageName = static_cast (mDocLoader->findWidget( + mImageName = static_cast (mDocLoader->findWidget( GLX_DETAILSVIEW_IMGNAME)); mDateLabel = static_cast (mDocLoader->findWidget( @@ -163,22 +172,17 @@ mSizeLabel = static_cast (mDocLoader->findWidget( GLX_DETAILSVIEW_SIZETEXT)); - - //Set the Model + mFavIconEnabled = HbIcon(GLXICON_ADD_TO_FAV); + mFavIconDisabled = HbIcon(GLXICON_REMOVE_FAV); + + //Set the Model mModel = model; if(getSubState() == IMAGEVIEWER_DETAIL_S) { mFavIcon->hide(); } else { - //set the frame graphics to the background of the fav icon - HbFrameItem* frame = new HbFrameItem(this); - frame->frameDrawer().setFrameType(HbFrameDrawer::NinePieces); - frame->frameDrawer().setFrameGraphicsName("qtg_fr_multimedia_trans"); - frame->graphicsItem()->setOpacity(0.2); - mFavIcon->setBackgroundItem(frame->graphicsItem(), -1); - mFavIcon->setBackground(HbIcon("qtg_fr_multimedia_trans")); - mFavIcon->setIcon(HbIcon(GLXICON_REMOVE_FAV)); + mFavIcon->setItemIcon(HbIcon(GLXICON_REMOVE_FAV)); } setWidget(mView); @@ -186,8 +190,6 @@ //Set the Layout Correspondingly. updateLayout(mWindow->orientation()); - //Shows the Image - showImage(); OstTraceFunctionExit0( GLXDETAILSVIEW_INITIALIZEVIEW_EXIT ); } @@ -229,7 +231,7 @@ delete mFavModel; mFavModel = NULL; - + delete mFavIcon; mFavIcon = NULL; @@ -262,55 +264,53 @@ mModel->index(0, 0), GlxFocusIndexRole).value (), 0), GlxUriRole)).value (); - if (mFavModel == NULL) - { + if (mFavModel == NULL) { modelParm.setCollection(KGlxCollectionPluginFavoritesAlbumId); modelParm.setContextMode(GlxContextFavorite); modelParm.setPath(imagePath); mFavModel = new GlxFavMediaModel(modelParm); - } + } } //-------------------------------------------------------------------------------------------------------------------------------------------- //initializeNewModel //-------------------------------------------------------------------------------------------------------------------------------------------- void GlxDetailsView::initializeNewModel() - { +{ OstTrace0( TRACE_NORMAL, GLXDETAILSVIEW_INITIALIZENEWMODEL, "GlxDetailsView::initializeNewModel" ); - - if (mModel) - { - connect(mModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, - SLOT(rowsRemoved(QModelIndex,int,int))); - } + + if (mModel) { + connect( mModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(rowsRemoved(QModelIndex,int,int))); + connect( mModel, SIGNAL( updateDetailsView() ), this, SLOT( FillDetails() )); + connect( mModel, SIGNAL( destroyed() ), this, SLOT( modelDestroyed() ) ); } +} //-------------------------------------------------------------------------------------------------------------------------------------------- //clearCurrentModel //-------------------------------------------------------------------------------------------------------------------------------------------- void GlxDetailsView::clearCurrentModel() - { +{ OstTrace0( TRACE_NORMAL, GLXDETAILSVIEW_CLEARCURRENTMODEL, "GlxDetailsView::clearCurrentModel" ); - if (mModel) - { - disconnect(mModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, - SLOT(rowsRemoved(QModelIndex,int,int))); + if (mModel) { + disconnect(mModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(rowsRemoved(QModelIndex,int,int))); + disconnect(mModel, SIGNAL( updateDetailsView() ), this, SLOT( FillDetails() )); + disconnect( mModel, SIGNAL( destroyed() ), this, SLOT( modelDestroyed() ) ); mModel = NULL; - } } +} //-------------------------------------------------------------------------------------------------------------------------------------------- //setConnections //-------------------------------------------------------------------------------------------------------------------------------------------- void GlxDetailsView::setConnections() - { +{ connect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(updateLayout(Qt::Orientation))); - if(getSubState() != IMAGEVIEWER_DETAIL_S) { - connect(mFavIcon, SIGNAL(clicked()), this, SLOT(updateFavourites())); + connect(mFavIcon, SIGNAL(updateFavourites()), this, SLOT(updateFavourites())); connect(mDescriptions, SIGNAL(labelPressed()), this, SLOT(UpdateDescription())); @@ -318,34 +318,26 @@ connect(mFavModel, SIGNAL( dataChanged(QModelIndex,QModelIndex) ), this, SLOT( dataChanged(QModelIndex,QModelIndex) )); } - - connect(mModel, SIGNAL( updateDetailsView() ), this, SLOT( FillDetails() )); - - - } +} //-------------------------------------------------------------------------------------------------------------------------------------------- //clearConnections //-------------------------------------------------------------------------------------------------------------------------------------------- void GlxDetailsView::clearConnections() - { +{ qDebug("GlxDetailsView:: clearConnections"); disconnect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(updateLayout(Qt::Orientation))); if(mModel && getSubState() != IMAGEVIEWER_DETAIL_S) { - disconnect(mFavIcon, SIGNAL(clicked()), this, SLOT(updateFavourites())); + disconnect(mFavIcon, SIGNAL(updateFavourites()), this, SLOT(updateFavourites())); disconnect(mDescriptions, SIGNAL(labelPressed()), this, SLOT(UpdateDescription())); disconnect(mFavModel, SIGNAL( dataChanged(QModelIndex,QModelIndex) ), this, SLOT( dataChanged(QModelIndex,QModelIndex) )); } - - disconnect(mModel, SIGNAL( updateDetailsView() ), this, SLOT( FillDetails() )); - - - } +} //-------------------------------------------------------------------------------------------------------------------------------------------- //getAnimationItem @@ -384,11 +376,11 @@ //Load the Sections mDocLoader->load(GLX_DETAILSVIEW_DOCMLPATH, section, &loaded); - //This is just to over come the bug in docloader,once that is fixed we can remove the + showImage(); + //This is just to over come the bug in docloader,once that is fixed we can remove the //below lines of code - setImageName(); - setDate(); - + FillDetails(); + GLX_LOG_INFO1("GlxDetailsView::updateLayout =%d\n",loaded); } @@ -414,6 +406,11 @@ } } +void GlxDetailsView::modelDestroyed() +{ + mModel = NULL; +} + //-------------------------------------------------------------------------------------------------------------------------------------------- //FillData //-------------------------------------------------------------------------------------------------------------------------------------------- @@ -442,7 +439,7 @@ //showImage //-------------------------------------------------------------------------------------------------------------------------------------------- void GlxDetailsView::showImage() - { + { OstTrace0( TRACE_NORMAL, GLXDETAILSVIEW_SHOWIMAGE, "GlxDetailsView::showImage" ); QVariant variant = mModel->data(mModel->index(0, 0), GlxFocusIndexRole); @@ -452,17 +449,12 @@ } variant = mModel->data(mModel->index(mSelIndex, 0), GlxFsImageRole); + if (variant.isValid() && variant.canConvert ()) { - QIcon itemIcon = variant.value ().qicon(); - QPixmap itemPixmap = itemIcon.pixmap(GLX_IMAGE_SIZE, GLX_IMAGE_SIZE); - QSize sz(GLX_IMAGE_SIZE, GLX_IMAGE_SIZE); - itemPixmap = itemPixmap.scaled(sz, Qt::IgnoreAspectRatio); - - HbIcon tmp = HbIcon(QIcon(itemPixmap)); - mDetailsIcon->setIcon(tmp); + mDetailsIcon->setIcon(variant.value ()); } - } + } //-------------------------------------------------------------------------------------------------------------------------------------------- //setImageName @@ -470,15 +462,12 @@ void GlxDetailsView::setImageName() { OstTraceFunctionEntry0( GLXDETAILSVIEW_SETIMAGENAME_ENTRY ); - QString temp = ""; QString imagePath = (mModel->data(mModel->index(mModel->data( mModel->index(0, 0), GlxFocusIndexRole).value (), 0), GlxUriRole)).value (); QString imageName = imagePath.section('\\', -1); - temp.append(imageName); - temp.append(""); - mImageName->setItemText(temp); + mImageName->setItemText(imageName); OstTraceFunctionExit0( GLXDETAILSVIEW_SETIMAGENAME_EXIT ); } @@ -487,10 +476,15 @@ //-------------------------------------------------------------------------------------------------------------------------------------------- void GlxDetailsView::setDesc() { + + //This is a hack , Initialize to some characters and then set the text + //as of know if the description text is Null , we cant see the Description edit box + //The issue has been informed to Application designer team. + mDescriptions->setItemText("a"); QString description = (mModel->data(mModel->index(mModel->data( mModel->index(0, 0), GlxFocusIndexRole).value (), 0), GlxDescRole)).value (); - mDescriptions->setItemText(description); + mDescriptions->setItemText(description); } //-------------------------------------------------------------------------------------------------------------------------------------------- @@ -566,11 +560,11 @@ { if (variant.value ()) { - mFavIcon->setIcon(HbIcon(GLXICON_ADD_TO_FAV)); + mFavIcon->setItemIcon(mFavIconEnabled); } else { - mFavIcon->setIcon(HbIcon(GLXICON_REMOVE_FAV)); + mFavIcon->setItemIcon(mFavIconDisabled); } } } diff -r a0f57508af73 -r a3a4c0de738e ui/views/docloaders/src/glxviewdocloader.cpp --- a/ui/views/docloaders/src/glxviewdocloader.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/docloaders/src/glxviewdocloader.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -30,8 +30,9 @@ #include "glxslideshowwidget.h" #include "glxslideshowview.h" #include "glxzoomwidget.h" -#include "glxdetailsnamelabel.h" -#include "glxdetailsdescriptionedit.h" + +#include "glxdetailstextedit.h" +#include "glxdetailsicon.h" //---------------------------------------------------------------------------------------- // createObject:creates the custom widget and views of fullscreen view @@ -112,7 +113,7 @@ { qDebug() << "GlxDetailsViewDocLoader::createObject:GLX_DETAILSVIEW_IMGNAME -->"; - QObject *object = new GlxDetailsNameLabel(); + QObject *object = new GlxDetailsTextEdit(); object->setObjectName(name); return object; } @@ -121,12 +122,21 @@ { qDebug() << "GlxDetailsViewDocLoader::createObject:GLX_DETAILSVIEW_DESCRPTIONTEXT -->"; - QObject *object = new GlxDetailsDescriptionEdit(); + QObject *object = new GlxDetailsTextEdit(); object->setObjectName(name); return object; } - + if (GLX_DETAILSVIEW_FAVICON == name) + { + qDebug() << "GlxDetailsViewDocLoader::createObject:ICON -->"; + + QObject *object = new GlxDetailsIcon(); + object->setObjectName(name); + return object; + } + + return HbDocumentLoader::createObject(type, name); } diff -r a0f57508af73 -r a3a4c0de738e ui/views/fullscreenview/inc/glxcoverflow.h --- a/ui/views/fullscreenview/inc/glxcoverflow.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/fullscreenview/inc/glxcoverflow.h Fri Jul 23 20:41:04 2010 +0530 @@ -160,6 +160,7 @@ bool mZoomOn; QGraphicsItem* mMultitouchFilter; int mTimerId; + bool mIsInit; }; #endif /* GLXCOVERFLOW_H_ */ diff -r a0f57508af73 -r a3a4c0de738e ui/views/fullscreenview/inc/glxfullscreenview.h --- a/ui/views/fullscreenview/inc/glxfullscreenview.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/fullscreenview/inc/glxfullscreenview.h Fri Jul 23 20:41:04 2010 +0530 @@ -111,8 +111,10 @@ void loadFullScreenToolBar(); void addToolBarAction( int commandId, const QString &iconName, const QString &name) ; void imageSelectionAnimation( const QModelIndex &index ); + void cancelSelectionAnimation( ); int getSubState(); void setHdmiModel( QAbstractItemModel *model ); + private: QAbstractItemModel *mModel; //no ownership HbMainWindow *mWindow; //no ownership diff -r a0f57508af73 -r a3a4c0de738e ui/views/fullscreenview/src/glxcoverflow.cpp --- a/ui/views/fullscreenview/src/glxcoverflow.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/fullscreenview/src/glxcoverflow.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -35,25 +35,25 @@ #define GLX_BOUNCEBACK_SPEED 16 #define GLX_BOUNCEBACK_DELTA 8 -GlxCoverFlow::GlxCoverFlow(QGraphicsItem *parent ) - : HbWidget(parent), - mSelItemIndex (0), - mRows(0), - mSelIndex (0), - mStripLen (0), - mCurrentPos(0), - mItemSize (QSize(0,0)), - mModel ( NULL), - mMoveDir(NO_MOVE), +GlxCoverFlow::GlxCoverFlow( QGraphicsItem *parent ) + : HbWidget( parent ), + mSelItemIndex ( 0 ), + mRows( 0 ), + mSelIndex ( 0 ), + mStripLen ( 0 ), + mCurrentPos( 0 ), + mItemSize ( QSize( 0, 0 ) ), + mModel ( NULL ), + mMoveDir( NO_MOVE ), mSpeed ( GLX_COVERFLOW_SPEED ), - mZoomOn(false), - mMultitouchFilter(NULL), - mTimerId(0) + mZoomOn( false ), + mMultitouchFilter( NULL ), + mTimerId( 0 ), + mIsInit( false ) { -//TO:DO through exception - qDebug("GlxCoverFlow::GlxCoverFlow"); - grabGesture(Qt::PanGesture); - grabGesture(Qt::TapGesture); + qDebug( "GlxCoverFlow::GlxCoverFlow" ); + grabGesture( Qt::PanGesture ); + grabGesture( Qt::TapGesture ); connect( this, SIGNAL( autoLeftMoveSignal() ), this, SLOT( autoLeftMove() ), Qt::QueuedConnection ); connect( this, SIGNAL( autoRightMoveSignal() ), this, SLOT( autoRightMove() ), Qt::QueuedConnection ); } @@ -62,6 +62,7 @@ { mMultitouchFilter = mtFilter; } + void GlxCoverFlow::setCoverFlow() { qDebug("GlxCoverFlow::setCoverFlow"); @@ -75,7 +76,8 @@ mIconItem[i]->setObjectName( QString( "Cover%1" ).arg( i ) ); } - mUiOn = FALSE; + mIsInit = true; + mUiOn = false; mBounceBackDeltaX = GLX_BOUNCEBACK_DELTA; } @@ -161,10 +163,11 @@ void GlxCoverFlow::panGesture ( const QPointF & delta ) { qDebug("GlxCoverFlow::panGesture deltaX= %d", (int)delta.x()); - if(getSubState() == IMAGEVIEWER_S || getSubState() == FETCHER_S ) { + + if( !mIsInit || getSubState() == IMAGEVIEWER_S || getSubState() == FETCHER_S ) { return; } - move((int) delta.x()); + move( ( int ) delta.x() ); if( delta.x() > 0 ) { mMoveDir = RIGHT_MOVE; } @@ -239,8 +242,11 @@ int width = mItemSize.width() ; qDebug("GlxCoverFlow::autoLeftMove current pos = %d mBounceBackDeltaX x = %d", mCurrentPos, mBounceBackDeltaX); + if ( !mIsInit ) { + return; + } - if ( mSelIndex == ( mRows -1 )) { + if ( mSelIndex == ( mRows -1 ) ) { mSpeed = GLX_BOUNCEBACK_SPEED; } //for bounce back effect for last image ( it will do the back) @@ -289,9 +295,12 @@ void GlxCoverFlow::autoRightMove() { qDebug("GlxCoverFlow::autoRightMove "); + if ( !mIsInit ) { + return; + } int width = mItemSize.width() ; int diffX = mStripLen - mCurrentPos ; - + //slow the speed for bounce back effect if ( mSelIndex == 0 ) { mSpeed = GLX_BOUNCEBACK_SPEED; @@ -401,6 +410,11 @@ void GlxCoverFlow::loadIconItems() { qDebug("GlxCoverFlow::loadIconItems "); + + if ( !mIsInit ) { + return ; + } + int index = 0; stopAnimation(); mSelIndex = getFocusIndex(); @@ -479,6 +493,7 @@ { qDebug("GlxCoverFlow::partiallyClean Enter"); clearCurrentModel(); //during the animation data update will not cause the crash + mIsInit = false; for ( qint8 i = 0; i < NBR_ICON_ITEM ; i++ ) { if ( mSelItemIndex != i){ delete mIconItem[i] ; @@ -509,6 +524,7 @@ void GlxCoverFlow::ClearCoverFlow() { qDebug("GlxCoverFlow::ClearCoverFlow " ); + mIsInit = false; clearCurrentModel(); for ( qint8 i = 0; i < NBR_ICON_ITEM ; i++ ) { if(mIconItem[i] != NULL ) { diff -r a0f57508af73 -r a3a4c0de738e ui/views/fullscreenview/src/glxfullscreenview.cpp --- a/ui/views/fullscreenview/src/glxfullscreenview.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/fullscreenview/src/glxfullscreenview.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -183,6 +183,10 @@ } //Loads the widgets corresponding to the orientation. loadViewSection(); + + HbView::HbViewFlags flags( HbView::ViewTitleBarTransparent | HbView::ViewStatusBarTransparent); + setViewFlags(flags); + // In case of fetcher don't hide status pane and title bar if(!(XQServiceUtil::isService() && (0 == XQServiceUtil::interfaceName().compare(QLatin1String("com.nokia.symbian.IImageFetch"))))){ setStatusBarVisible(FALSE); @@ -223,6 +227,7 @@ { OstTraceFunctionEntry0( GLXFULLSCREENVIEW_RESETVIEW_ENTRY ); + cancelSelectionAnimation(); //cancel the image selection effect before cleaning the view //Clean up the rest of the resources allocated cleanUp(); @@ -236,6 +241,7 @@ { OstTraceFunctionEntry0( GLXFULLSCREENVIEW_DEACTIVATE_ENTRY ); + cancelSelectionAnimation(); //cancel the image selection effect before cleaning the view //Clean up the rest of the resources allocated cleanUp(); QCoreApplication::instance()->removeEventFilter(this); @@ -265,6 +271,7 @@ if(mFullScreenToolBar) { mFullScreenToolBar->clearActions(); + mFullScreenToolBar->hide(); mFullScreenToolBar = NULL; } @@ -315,7 +322,7 @@ void GlxFullScreenView::setHdmiModel(QAbstractItemModel* model) { if (mTvOutWrapper) { - mTvOutWrapper->setModel(model); + mTvOutWrapper->setModel(model, screenSize()); mTvOutWrapper->setImagetoHDMI(); // for the first image on screen } } @@ -371,8 +378,8 @@ } mFullScreenToolBar->show(); - setStatusBarVisible(TRUE); - setTitleBarVisible(TRUE); + setStatusBarVisible( TRUE ); + setTitleBarVisible( TRUE ); if ( mImageStrip && getSubState() != IMAGEVIEWER_S) { mImageStrip->show(); @@ -621,28 +628,28 @@ if ( mCoverFlow ) { connect( mCoverFlow, SIGNAL( coverFlowEvent( GlxCoverFlowEvent ) ), this, SLOT( coverFlowEventHandle( GlxCoverFlowEvent ) ) ); - connect( mCoverFlow, SIGNAL(changeSelectedIndex(const QModelIndex &)), this, SLOT( changeSelectedIndex( const QModelIndex & ))); + connect( mCoverFlow, SIGNAL( changeSelectedIndex( const QModelIndex & ) ), this, SLOT( changeSelectedIndex( const QModelIndex & ) ) ); } if ( mImageStrip ) { - connect(mImageStrip, SIGNAL( activated(const QModelIndex &) ), this, SLOT( indexChanged(const QModelIndex &) )); - connect(mImageStrip, SIGNAL( scrollingStarted()), this, SLOT( scrollingStarted())); - connect(mImageStrip, SIGNAL( scrollingEnded()), this, SLOT( scrollingEnded())); - connect(mImageStrip, SIGNAL( pressed(const QModelIndex &) ), this, SLOT( pressed(const QModelIndex &) )); - connect(mImageStrip, SIGNAL( released(const QModelIndex &) ), this, SLOT( released(const QModelIndex &) )); + connect( mImageStrip, SIGNAL( activated(const QModelIndex &) ), this, SLOT( indexChanged(const QModelIndex &) ) ); + connect( mImageStrip, SIGNAL( scrollingStarted()), this, SLOT( scrollingStarted() ) ); + connect( mImageStrip, SIGNAL( scrollingEnded()), this, SLOT( scrollingEnded() ) ); + connect( mImageStrip, SIGNAL( pressed( const QModelIndex & ) ), this, SLOT( pressed( const QModelIndex & ) ) ); + connect( mImageStrip, SIGNAL( released( const QModelIndex & ) ), this, SLOT( released( const QModelIndex & ) ) ); } if ( mUiOffTimer ) { - connect(mUiOffTimer, SIGNAL(timeout()), this, SLOT(hideUi())); + connect( mUiOffTimer, SIGNAL( timeout() ), this, SLOT( hideUi() ) ); } - if(mCoverFlow && mZoomWidget) { - connect(mZoomWidget,SIGNAL( pinchGestureReceived(int) ), mCoverFlow, SLOT( zoomStarted(int) ) ); - connect(mZoomWidget,SIGNAL( zoomWidgetMovedBackground(int) ), mCoverFlow, SLOT( zoomFinished(int) ) ); - connect(mCoverFlow,SIGNAL( doubleTapEventReceived(QPointF) ), mZoomWidget, SLOT( animateZoomIn(QPointF) ) ); + if( mCoverFlow && mZoomWidget ) { + connect( mZoomWidget, SIGNAL( pinchGestureReceived( int ) ), mCoverFlow, SLOT( zoomStarted( int ) ) ); + connect( mZoomWidget, SIGNAL( zoomWidgetMovedBackground( int ) ), mCoverFlow, SLOT( zoomFinished( int ) ) ); + connect( mCoverFlow, SIGNAL( doubleTapEventReceived( QPointF ) ), mZoomWidget, SLOT( animateZoomIn( QPointF ) ) ); } - connect(mWindow, SIGNAL(orientationChanged(Qt::Orientation)), this, SLOT(orientationChanged(Qt::Orientation))); + connect( mWindow, SIGNAL( orientationChanged( Qt::Orientation ) ), this, SLOT( orientationChanged( Qt::Orientation ) ) ); OstTraceFunctionExit0( GLXFULLSCREENVIEW_ADDCONNECTION_EXIT ); } @@ -750,6 +757,14 @@ OstTraceFunctionExit0( GLXFULLSCREENVIEW_IMAGESELECTIONANIMATION_EXIT ); } + +void GlxFullScreenView::cancelSelectionAnimation() +{ + if ( mIconItems[0] && HbEffect::effectRunning( mIconItems[1], QString( "SelectShow" ) ) ) { + HbEffect::cancel( mIconItems[0], QString( "SelectHide" ), false, false, true ); + HbEffect::cancel( mIconItems[1], QString( "SelectShow" ), false, true, true ); + } +} void GlxFullScreenView::handleToolBarAction() { diff -r a0f57508af73 -r a3a4c0de738e ui/views/slideshowview/inc/glxslideshowwidget.h --- a/ui/views/slideshowview/inc/glxslideshowwidget.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/slideshowview/inc/glxslideshowwidget.h Fri Jul 23 20:41:04 2010 +0530 @@ -151,6 +151,7 @@ GlxEffectEngine *mEffectEngine; GlxSettingInterface *mSettings; //no ownership HbIconItem *mIconItems[ NBR_ITEM ]; + HbIconItem *mBackGroundItem; HbPushButton *mContinueButton; HbLabel *mErrorNote ; //when all the image are corrupted then show the no image label int mItemIndex; diff -r a0f57508af73 -r a3a4c0de738e ui/views/slideshowview/src/glxslideshowview.cpp --- a/ui/views/slideshowview/src/glxslideshowview.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/slideshowview/src/glxslideshowview.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -117,7 +117,7 @@ mSlideShowWidget->setModel(mModel); if (mTvOutWrapper){ - mTvOutWrapper->setModel(mModel,true); + mTvOutWrapper->setModel(mModel, screenSize(), true); mTvOutWrapper->setImagetoHDMI(); } } diff -r a0f57508af73 -r a3a4c0de738e ui/views/slideshowview/src/glxslideshowwidget.cpp --- a/ui/views/slideshowview/src/glxslideshowwidget.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/slideshowview/src/glxslideshowwidget.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -46,6 +46,7 @@ : HbWidget( parent ), mEffectEngine( NULL ), mSettings( NULL ), + mBackGroundItem( NULL ), mContinueButton( NULL ), mErrorNote( NULL ), mItemIndex( 1 ), @@ -66,6 +67,9 @@ //create the effect engine mEffectEngine = new GlxEffectEngine(); + + mBackGroundItem = new HbIconItem( this ); + mBackGroundItem->setBrush( QBrush( Qt::black ) ); // Now load the view and the contents. // and then set the play icon to the button @@ -77,11 +81,10 @@ for ( int i = 0; i < NBR_ITEM ; i++) { mSelIndex[ i ] = -1; mIconItems[ i ] = new HbIconItem( this ); - mIconItems[ i ]->setBrush( QBrush( Qt::black ) ); mIconItems[ i ]->setAlignment( Qt::AlignCenter ); mIconItems[ i ]->setObjectName( QString( "SlideShowIcon%1" ).arg( i ) ); - } - + } + mSlideTimer = new QTimer(); mItemList.clear(); @@ -125,6 +128,9 @@ delete mIconItems[i] ; mIconItems[i] = NULL; } + + delete mBackGroundItem ; + mBackGroundItem = NULL; if( mSlideTimer ) { delete mSlideTimer; @@ -142,7 +148,7 @@ HbEffect::remove( QString("HbIconItem"), QString(":/data/transitionright.fxml"), QString( "RightMove" )); } -void GlxSlideShowWidget::setModel (QAbstractItemModel *model) +void GlxSlideShowWidget::setModel ( QAbstractItemModel *model ) { TRACER("GlxSlideShowWidget::setModel()"); if ( model == mModel ) { @@ -154,16 +160,17 @@ resetSlideShow(); } -void GlxSlideShowWidget::setItemGeometry(QRect screenRect) +void GlxSlideShowWidget::setItemGeometry( QRect screenRect ) { TRACER("GlxSlideShowWidget::setItemGeometry()"); int index = mItemIndex; mScreenRect = screenRect; - mIconItems[index]->setGeometry(mScreenRect); - index = ( mItemIndex + 1) % NBR_ITEM; - mIconItems[index]->setGeometry( QRect( mScreenRect.width(), mScreenRect.top(), mScreenRect.width(), mScreenRect.height() ) ); + mIconItems[ index ]->setGeometry( mScreenRect ); + index = ( mItemIndex + 1 ) % NBR_ITEM; + mIconItems[ index ]->setGeometry( QRect( mScreenRect.width(), mScreenRect.top(), mScreenRect.width(), mScreenRect.height() ) ); index = mItemIndex ? mItemIndex - 1 : NBR_ITEM - 1; - mIconItems[index]->setGeometry( QRect( -mScreenRect.width(), mScreenRect.top(), mScreenRect.width(), mScreenRect.height() ) ); + mIconItems[ index ]->setGeometry( QRect( -mScreenRect.width(), mScreenRect.top(), mScreenRect.width(), mScreenRect.height() ) ); + mBackGroundItem->setGeometry( mScreenRect ); } void GlxSlideShowWidget::triggeredEffect() diff -r a0f57508af73 -r a3a4c0de738e ui/views/views.pro --- a/ui/views/views.pro Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/views/views.pro Fri Jul 23 20:41:04 2010 +0530 @@ -32,11 +32,9 @@ -lganeswidgets.dll \ -lglxmodelwrapper.dll \ -lglxviewutilities.dll \ - -lglxzoomwidget.dll \ - -ldetailsnamelabel.dll \ - -ldetailsnamelabelplugin.dll \ - -ldetailsdescriptionedit.dll \ - -ldetailsdescriptioneditplugin.dll + -lglxzoomwidget.dll \ + -lglxdetailscustomwidgets.dll \ + -lglxdetailscustomplugin.dll DEFINES += BUILD_GLXVIEWS @@ -55,8 +53,8 @@ ../viewutilities/effectengine/inc \ ../viewutilities/settingutility/inc \ /epoc32/include/mw/hgwidgets \ - ../detailscustomwidget/detailsnamelabel/inc \ - ../detailscustomwidget/detailsdescriptionedit/inc + ../detailscustomwidget/detailscustomwidgets + symbian: { TARGET.UID3 = 0x200009EF diff -r a0f57508af73 -r a3a4c0de738e ui/viewutilities/effectengine/src/glxtransitioneffect.cpp --- a/ui/viewutilities/effectengine/src/glxtransitioneffect.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/viewutilities/effectengine/src/glxtransitioneffect.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -50,44 +50,44 @@ break; case GRID_TO_ALBUMLIST: - mEffectFileList.append( QString(":/data/gridtoalbumlisthide.fxml")); - mItemType.append( QString("HbView") ); - mEventType.append(QString("click4") ); + mEffectFileList.append( QString( "view_hide_normal" ) ); + mItemType.append( QString( "HbView" ) ); + mEventType.append(QString( "click4" ) ); - mEffectFileList.append( QString(":/data/gridtoalbumlist.fxml")); - mItemType.append( QString("HbListView") ); - mEventType.append(QString("click5") ); + mEffectFileList.append( QString( "view_show_normal" ) ); + mItemType.append( QString( "HbListView" ) ); + mEventType.append( QString( "click5" ) ); break; case ALBUMLIST_TO_GRID: - mEffectFileList.append( QString(":/data/albumlisttogrid.fxml")); - mItemType.append( QString("HbListView") ); - mEventType.append(QString("click6") ); + mEffectFileList.append( QString( "view_hide_back" ) ); + mItemType.append( QString( "HbListView" ) ); + mEventType.append( QString( "click6" ) ); - mEffectFileList.append( QString(":/data/albumlisttogridshow.fxml")); - mItemType.append( QString("HbView") ); - mEventType.append(QString("click7") ); + mEffectFileList.append( QString( "view_show_back" ) ); + mItemType.append( QString( "HbView" ) ); + mEventType.append( QString( "click7" ) ); break; case FULLSCREEN_TO_DETAIL : - mEffectFileList.append( QString(":/data/view_flip_hide.fxml")); - mItemType.append( QString("HbView") ); - mEventType.append(QString("click8") ); + mEffectFileList.append( QString( "view_hide_normal_alt" ) ); + mItemType.append( QString( "HbView" ) ); + mEventType.append( QString( "click8" ) ); - mEffectFileList.append( QString(":/data/view_flip_show.fxml")); - mItemType.append( QString("HbView") ); - mEventType.append(QString("click9") ); + mEffectFileList.append( QString( "view_show_normal_alt" ) ); + mItemType.append( QString( "HbView" ) ); + mEventType.append(QString( "click9" ) ); mTransitionLater = true; break; case DETAIL_TO_FULLSCREEN : - mEffectFileList.append( QString(":/data/view_flip_hide.fxml")); - mItemType.append( QString("HbView") ); - mEventType.append(QString("click10") ); + mEffectFileList.append( "view_hide_back_alt" ); + mItemType.append( QString( "HbView" ) ); + mEventType.append( QString( "click10" ) ); - mEffectFileList.append( QString(":/data/view_flip_show.fxml")); - mItemType.append( QString("HbView") ); - mEventType.append(QString("click11") ); + mEffectFileList.append( "view_show_back_alt" ); + mItemType.append( QString( "HbView" ) ); + mEventType.append( QString( "click11" ) ); mTransitionLater = true; break; diff -r a0f57508af73 -r a3a4c0de738e ui/widgets/bwins/glxzoomwidgetu.def --- a/ui/widgets/bwins/glxzoomwidgetu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/widgets/bwins/glxzoomwidgetu.def Fri Jul 23 20:41:04 2010 +0530 @@ -9,36 +9,37 @@ ?staticMetaObject@GlxZoomWidget@@2UQMetaObject@@B @ 8 NONAME ; struct QMetaObject const GlxZoomWidget::staticMetaObject ?tr@GlxZoomWidget@@SA?AVQString@@PBD0H@Z @ 9 NONAME ; class QString GlxZoomWidget::tr(char const *, char const *, int) ?sceneEvent@GlxZoomWidget@@MAE_NPAVQEvent@@@Z @ 10 NONAME ; bool GlxZoomWidget::sceneEvent(class QEvent *) - ?trUtf8@GlxZoomWidget@@SA?AVQString@@PBD0@Z @ 11 NONAME ; class QString GlxZoomWidget::trUtf8(char const *, char const *) - ?getFocusedImage@GlxZoomWidget@@AAE?AVQPixmap@@XZ @ 12 NONAME ; class QPixmap GlxZoomWidget::getFocusedImage(void) - ?setModel@GlxZoomWidget@@QAEXPAVQAbstractItemModel@@@Z @ 13 NONAME ; void GlxZoomWidget::setModel(class QAbstractItemModel *) - ?finalizeWidgetTransform@GlxZoomWidget@@AAEXXZ @ 14 NONAME ; void GlxZoomWidget::finalizeWidgetTransform(void) - ?executeGestureEvent@GlxZoomWidget@@AAE_NPAVQGraphicsItem@@PAVQGestureEvent@@@Z @ 15 NONAME ; bool GlxZoomWidget::executeGestureEvent(class QGraphicsItem *, class QGestureEvent *) - ?zoomImage@GlxZoomWidget@@AAEXMVQPointF@@@Z @ 16 NONAME ; void GlxZoomWidget::zoomImage(float, class QPointF) - ?activate@GlxZoomWidget@@QAEXXZ @ 17 NONAME ; void GlxZoomWidget::activate(void) - ?connectDecodeRequestToPinchEvent@GlxZoomWidget@@QAEXXZ @ 18 NONAME ; void GlxZoomWidget::connectDecodeRequestToPinchEvent(void) - ?indexChanged@GlxZoomWidget@@QAEXH@Z @ 19 NONAME ; void GlxZoomWidget::indexChanged(int) - ?animateZoomIn@GlxZoomWidget@@QAEXVQPointF@@@Z @ 20 NONAME ; void GlxZoomWidget::animateZoomIn(class QPointF) - ?getStaticMetaObject@GlxZoomWidget@@SAABUQMetaObject@@XZ @ 21 NONAME ; struct QMetaObject const & GlxZoomWidget::getStaticMetaObject(void) - ?animationTimeLineFinished@GlxZoomWidget@@QAEXXZ @ 22 NONAME ; void GlxZoomWidget::animationTimeLineFinished(void) - ?qt_metacall@GlxZoomWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 23 NONAME ; int GlxZoomWidget::qt_metacall(enum QMetaObject::Call, int, void * *) - ?zoomWidgetMovedBackground@GlxZoomWidget@@IAEXH@Z @ 24 NONAME ; void GlxZoomWidget::zoomWidgetMovedBackground(int) - ?indexChanged@GlxZoomWidget@@QAEXXZ @ 25 NONAME ; void GlxZoomWidget::indexChanged(void) - ?animateZoomOut@GlxZoomWidget@@QAEXVQPointF@@@Z @ 26 NONAME ; void GlxZoomWidget::animateZoomOut(class QPointF) - ?timerEvent@GlxZoomWidget@@MAEXPAVQTimerEvent@@@Z @ 27 NONAME ; void GlxZoomWidget::timerEvent(class QTimerEvent *) - ?adjustGestureCenter@GlxZoomWidget@@AAEXAAVQPointF@@AAM@Z @ 28 NONAME ; void GlxZoomWidget::adjustGestureCenter(class QPointF &, float &) - ?metaObject@GlxZoomWidget@@UBEPBUQMetaObject@@XZ @ 29 NONAME ; struct QMetaObject const * GlxZoomWidget::metaObject(void) const - ?decodedImageAvailable@GlxZoomWidget@@QAEXXZ @ 30 NONAME ; void GlxZoomWidget::decodedImageAvailable(void) - ??_EGlxZoomWidget@@UAE@I@Z @ 31 NONAME ; GlxZoomWidget::~GlxZoomWidget(unsigned int) - ??1GlxZoomWidget@@UAE@XZ @ 32 NONAME ; GlxZoomWidget::~GlxZoomWidget(void) - ?sceneEventFilter@GlxZoomWidget@@MAE_NPAVQGraphicsItem@@PAVQEvent@@@Z @ 33 NONAME ; bool GlxZoomWidget::sceneEventFilter(class QGraphicsItem *, class QEvent *) - ?pinchGestureReceived@GlxZoomWidget@@IAEXH@Z @ 34 NONAME ; void GlxZoomWidget::pinchGestureReceived(int) - ?setWindowSize@GlxZoomWidget@@QAEXVQSize@@@Z @ 35 NONAME ; void GlxZoomWidget::setWindowSize(class QSize) - ?retreiveFocusedImage@GlxZoomWidget@@AAEXXZ @ 36 NONAME ; void GlxZoomWidget::retreiveFocusedImage(void) - ?animationFrameChanged@GlxZoomWidget@@QAEXH@Z @ 37 NONAME ; void GlxZoomWidget::animationFrameChanged(int) - ?tr@GlxZoomWidget@@SA?AVQString@@PBD0@Z @ 38 NONAME ; class QString GlxZoomWidget::tr(char const *, char const *) - ?trUtf8@GlxZoomWidget@@SA?AVQString@@PBD0H@Z @ 39 NONAME ; class QString GlxZoomWidget::trUtf8(char const *, char const *, int) - ?modelDestroyed@GlxZoomWidget@@IAEXXZ @ 40 NONAME ; void GlxZoomWidget::modelDestroyed(void) - ?setZoomParams@GlxZoomWidget@@AAEXXZ @ 41 NONAME ; void GlxZoomWidget::setZoomParams(void) - ?forceZoomToBackground@GlxZoomWidget@@QAEXXZ @ 42 NONAME ; void GlxZoomWidget::forceZoomToBackground(void) + ?forceZoomToBackground@GlxZoomWidget@@QAEXXZ @ 11 NONAME ; void GlxZoomWidget::forceZoomToBackground(void) + ?trUtf8@GlxZoomWidget@@SA?AVQString@@PBD0@Z @ 12 NONAME ; class QString GlxZoomWidget::trUtf8(char const *, char const *) + ?getFocusedImage@GlxZoomWidget@@AAE?AVQPixmap@@XZ @ 13 NONAME ; class QPixmap GlxZoomWidget::getFocusedImage(void) + ?setModel@GlxZoomWidget@@QAEXPAVQAbstractItemModel@@@Z @ 14 NONAME ; void GlxZoomWidget::setModel(class QAbstractItemModel *) + ?finalizeWidgetTransform@GlxZoomWidget@@AAEXXZ @ 15 NONAME ; void GlxZoomWidget::finalizeWidgetTransform(void) + ?executeGestureEvent@GlxZoomWidget@@AAE_NPAVQGraphicsItem@@PAVQGestureEvent@@@Z @ 16 NONAME ; bool GlxZoomWidget::executeGestureEvent(class QGraphicsItem *, class QGestureEvent *) + ?zoomImage@GlxZoomWidget@@AAEXMVQPointF@@@Z @ 17 NONAME ; void GlxZoomWidget::zoomImage(float, class QPointF) + ?activate@GlxZoomWidget@@QAEXXZ @ 18 NONAME ; void GlxZoomWidget::activate(void) + ?connectDecodeRequestToPinchEvent@GlxZoomWidget@@QAEXXZ @ 19 NONAME ; void GlxZoomWidget::connectDecodeRequestToPinchEvent(void) + ?indexChanged@GlxZoomWidget@@QAEXH@Z @ 20 NONAME ; void GlxZoomWidget::indexChanged(int) + ?animateZoomIn@GlxZoomWidget@@QAEXVQPointF@@@Z @ 21 NONAME ; void GlxZoomWidget::animateZoomIn(class QPointF) + ?getStaticMetaObject@GlxZoomWidget@@SAABUQMetaObject@@XZ @ 22 NONAME ; struct QMetaObject const & GlxZoomWidget::getStaticMetaObject(void) + ?animationTimeLineFinished@GlxZoomWidget@@QAEXXZ @ 23 NONAME ; void GlxZoomWidget::animationTimeLineFinished(void) + ?isFocussedItemCorrupt@GlxZoomWidget@@AAE_NXZ @ 24 NONAME ; bool GlxZoomWidget::isFocussedItemCorrupt(void) + ?qt_metacall@GlxZoomWidget@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 25 NONAME ; int GlxZoomWidget::qt_metacall(enum QMetaObject::Call, int, void * *) + ?zoomWidgetMovedBackground@GlxZoomWidget@@IAEXH@Z @ 26 NONAME ; void GlxZoomWidget::zoomWidgetMovedBackground(int) + ?indexChanged@GlxZoomWidget@@QAEXXZ @ 27 NONAME ; void GlxZoomWidget::indexChanged(void) + ?animateZoomOut@GlxZoomWidget@@QAEXVQPointF@@@Z @ 28 NONAME ; void GlxZoomWidget::animateZoomOut(class QPointF) + ?timerEvent@GlxZoomWidget@@MAEXPAVQTimerEvent@@@Z @ 29 NONAME ; void GlxZoomWidget::timerEvent(class QTimerEvent *) + ?adjustGestureCenter@GlxZoomWidget@@AAEXAAVQPointF@@AAM@Z @ 30 NONAME ; void GlxZoomWidget::adjustGestureCenter(class QPointF &, float &) + ?metaObject@GlxZoomWidget@@UBEPBUQMetaObject@@XZ @ 31 NONAME ; struct QMetaObject const * GlxZoomWidget::metaObject(void) const + ?decodedImageAvailable@GlxZoomWidget@@QAEXXZ @ 32 NONAME ; void GlxZoomWidget::decodedImageAvailable(void) + ??_EGlxZoomWidget@@UAE@I@Z @ 33 NONAME ; GlxZoomWidget::~GlxZoomWidget(unsigned int) + ??1GlxZoomWidget@@UAE@XZ @ 34 NONAME ; GlxZoomWidget::~GlxZoomWidget(void) + ?sceneEventFilter@GlxZoomWidget@@MAE_NPAVQGraphicsItem@@PAVQEvent@@@Z @ 35 NONAME ; bool GlxZoomWidget::sceneEventFilter(class QGraphicsItem *, class QEvent *) + ?pinchGestureReceived@GlxZoomWidget@@IAEXH@Z @ 36 NONAME ; void GlxZoomWidget::pinchGestureReceived(int) + ?setZoomParams@GlxZoomWidget@@AAEXXZ @ 37 NONAME ; void GlxZoomWidget::setZoomParams(void) + ?setWindowSize@GlxZoomWidget@@QAEXVQSize@@@Z @ 38 NONAME ; void GlxZoomWidget::setWindowSize(class QSize) + ?retreiveFocusedImage@GlxZoomWidget@@AAEXXZ @ 39 NONAME ; void GlxZoomWidget::retreiveFocusedImage(void) + ?animationFrameChanged@GlxZoomWidget@@QAEXH@Z @ 40 NONAME ; void GlxZoomWidget::animationFrameChanged(int) + ?modelDestroyed@GlxZoomWidget@@IAEXXZ @ 41 NONAME ; void GlxZoomWidget::modelDestroyed(void) + ?tr@GlxZoomWidget@@SA?AVQString@@PBD0@Z @ 42 NONAME ; class QString GlxZoomWidget::tr(char const *, char const *) + ?trUtf8@GlxZoomWidget@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString GlxZoomWidget::trUtf8(char const *, char const *, int) diff -r a0f57508af73 -r a3a4c0de738e ui/widgets/eabi/glxzoomwidgetu.def --- a/ui/widgets/eabi/glxzoomwidgetu.def Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/widgets/eabi/glxzoomwidgetu.def Fri Jul 23 20:41:04 2010 +0530 @@ -47,4 +47,5 @@ _ZN13GlxZoomWidget14modelDestroyedEv @ 46 NONAME _ZN13GlxZoomWidget13setZoomParamsEv @ 47 NONAME _ZN13GlxZoomWidget21forceZoomToBackgroundEv @ 48 NONAME + _ZN13GlxZoomWidget21isFocussedItemCorruptEv @ 49 NONAME diff -r a0f57508af73 -r a3a4c0de738e ui/widgets/glxzoomwidget/inc/glxzoomwidget.h --- a/ui/widgets/glxzoomwidget/inc/glxzoomwidget.h Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/widgets/glxzoomwidget/inc/glxzoomwidget.h Fri Jul 23 20:41:04 2010 +0530 @@ -98,22 +98,33 @@ //set all the zoom parameters as per the circumstances void setZoomParams(); + bool isFocussedItemCorrupt(); //data members - private: +private: + //to be in sync with the model + QAbstractItemModel *mModel; + + //view Z values + //might push to layouts later + int mMinZValue ; + int mMaxZValue ; + int mTimerId; + + //status flags + //To check if the decode request has already been send or not + bool mImageDecodeRequestSend; + //To check if the pinch gesture is in progress to block any events to HbScrollArea + bool mPinchGestureOngoing; + //to check if decoded image is available + bool mDecodedImageAvailable; + //to check if the widget is actually in Foreground + bool mZoomOngoing; + //view widgets QGraphicsPixmapItem *mZoomItem; //Item containing the pixmap QGraphicsWidget *mZoomWidget; //container :all scaling and transforms would be done on this widget HbIconItem* mBlackBackgroundItem; //for setting black background - //view Z values - //might push to layouts later - - int mMinZValue ; - int mMaxZValue ; - - - //to be in sync with the model - QAbstractItemModel *mModel; int mFocusIndex; //size parameter @@ -132,16 +143,5 @@ //for Decoder support GlxImageDecoderWrapper* mImageDecoder; - //status flags - //To check if the decode request has already been send or not - bool mImageDecodeRequestSend; - //To check if the pinch gesture is in progress to block any events to HbScrollArea - bool mPinchGestureOngoing; - //to check if decoded image is available - bool mDecodedImageAvailable; - //to check if the widget is actually in Foreground - bool mZoomOngoing; - int mTimerId; - }; #endif //GLXZOOMWIDGET_H diff -r a0f57508af73 -r a3a4c0de738e ui/widgets/glxzoomwidget/src/glxzoomwidget.cpp --- a/ui/widgets/glxzoomwidget/src/glxzoomwidget.cpp Sat Jul 10 00:59:39 2010 +0530 +++ b/ui/widgets/glxzoomwidget/src/glxzoomwidget.cpp Fri Jul 23 20:41:04 2010 +0530 @@ -24,7 +24,12 @@ #include "glxmodelparm.h" #include "glxzoomwidget.h" -GlxZoomWidget::GlxZoomWidget(QGraphicsItem *parent):HbScrollArea(parent), mModel(NULL), mMinZValue(MINZVALUE), mMaxZValue(MAXZVALUE), mImageDecodeRequestSend(false), mPinchGestureOngoing(false), mDecodedImageAvailable(false),mZoomOngoing(false), mTimerId(0) +GlxZoomWidget::GlxZoomWidget(QGraphicsItem *parent):HbScrollArea(parent), + mModel(NULL), mMinZValue(MINZVALUE), + mMaxZValue(MAXZVALUE), mTimerId(0), + mImageDecodeRequestSend(false), + mPinchGestureOngoing(false), mDecodedImageAvailable(false), + mZoomOngoing(false) { grabGesture(Qt::PinchGesture); grabGesture(Qt::TapGesture); @@ -189,6 +194,9 @@ return true; } if (QGesture *pinch = event->gesture(Qt::PinchGesture)) { + if (isFocussedItemCorrupt()){ + return true; + } QPinchGesture* pinchG = static_cast(pinch); QPinchGesture::ChangeFlags changeFlags = pinchG->changeFlags(); if (changeFlags & QPinchGesture::ScaleFactorChanged) { @@ -519,15 +527,18 @@ void GlxZoomWidget::animateZoomIn(QPointF animRefPoint) { - emit pinchGestureReceived(mFocusIndex); - //bring the zoom widget to foreground - mZoomOngoing = true; - setZValue(mMaxZValue); - //show the black background - mBlackBackgroundItem->setParentItem(parentItem()); - mBlackBackgroundItem->setZValue(mMaxZValue - 1); - mBlackBackgroundItem->show(); - m_AnimRefPoint = animRefPoint; + if (isFocussedItemCorrupt()){ + return; + } + emit pinchGestureReceived(mFocusIndex); + //bring the zoom widget to foreground + mZoomOngoing = true; + setZValue(mMaxZValue); + //show the black background + mBlackBackgroundItem->setParentItem(parentItem()); + mBlackBackgroundItem->setZValue(mMaxZValue - 1); + mBlackBackgroundItem->show(); + m_AnimRefPoint = animRefPoint; QSizeF requiredSize = mItemSize; requiredSize.scale(mWindowSize*3.5, Qt::KeepAspectRatio); m_FinalAnimatedScaleFactor = requiredSize.width()/mMinDecScaleSize.width(); @@ -579,3 +590,13 @@ mTimerId = 0; } } + +bool GlxZoomWidget::isFocussedItemCorrupt() +{ + QVariant variant = mModel->data( mModel->index( mFocusIndex, 0 ), GlxImageCorruptRole ); + if ( variant.isValid() && variant.canConvert< bool> () ) { + return variant.value< bool > () ; + } + return false ; +} +