# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1262861689 -7200
# Node ID b5888e2aa4727d8630870c7bd018305109c155ee
# Parent  8c5d936e5675ccb389a5506452a973fcf1c194d3
Revision: 200951
Kit: 201001

diff -r 8c5d936e5675 -r b5888e2aa472 gssettingsuis/Gs/group/bld.inf
--- a/gssettingsuis/Gs/group/bld.inf	Thu Dec 17 08:52:52 2009 +0200
+++ b/gssettingsuis/Gs/group/bld.inf	Thu Jan 07 12:54:49 2010 +0200
@@ -27,14 +27,6 @@
 
     PRJ_MMPFILES
 
-    //gnumakefile icons_dc.mk
-
-    #ifdef __SCALABLE_ICONS
-        gnumakefile icons_aif_scalable_dc.mk
-    //#else
-        //gnumakefile icons_aif_bitmaps_dc.mk
-    #endif //__SCALABLE_ICONS
-
     ../group/GS.mmp
 
 
diff -r 8c5d936e5675 -r b5888e2aa472 profilesservices/MediaFileList/Inc/mediafiledialog.h
--- a/profilesservices/MediaFileList/Inc/mediafiledialog.h	Thu Dec 17 08:52:52 2009 +0200
+++ b/profilesservices/MediaFileList/Inc/mediafiledialog.h	Thu Jan 07 12:54:49 2010 +0200
@@ -294,8 +294,10 @@
 		void ShowErrorNoteL( TInt aError );
     	void ShowPreviewErrorNoteL( TInt aError, TInt aMediaType );
 		void DeleteMenuItem( CEikMenuPane* aMenuPane, TInt aCommandId );
-		CGulIcon* IconL( TAknsItemID aId, const TDesC& aFileName,
-		                 TInt aFileIndex, TInt aFileMaskIndex );
+		CGulIcon* IconL(TAknsItemID aId, const TDesC& aFileName, TInt aFileIndex,
+			TInt aFileMaskIndex);
+		CGulIcon* IconL(TAknsItemID aId, const TDesC& aFileName, TInt aFileIndex,
+			TInt aFileMaskIndex, TAknsQsnIconColorsIndex colorIndex);
 		static TInt CloseDialog( TAny *aObj );
 		void CloseDialogWithDelayL();
 		
diff -r 8c5d936e5675 -r b5888e2aa472 profilesservices/MediaFileList/Src/mediafiledialog.cpp
--- a/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Thu Dec 17 08:52:52 2009 +0200
+++ b/profilesservices/MediaFileList/Src/mediafiledialog.cpp	Thu Jan 07 12:54:49 2010 +0200
@@ -1105,12 +1105,12 @@
     // memory card icon
     icons->AppendL( IconL( KAknsIIDQgnIndiMmcAdd, iIconFileName,
                            EMbmMediafilelistQgn_indi_mmc_add,
-                           EMbmMediafilelistQgn_indi_mmc_add_mask ) );
+                           EMbmMediafilelistQgn_indi_mmc_add_mask, EAknsCIQsnIconColorsCG13 ) );
 
      // mass storage icon
     icons->AppendL( IconL( KAknsIIDQgnPropLinkEmbdSmall, iIconFileName,
                            EMbmMediafilelistQgn_indi_fmgr_ms_add,
-                           EMbmMediafilelistQgn_indi_fmgr_ms_add_mask ) );
+                           EMbmMediafilelistQgn_indi_fmgr_ms_add_mask,EAknsCIQsnIconColorsCG13 ) );
 
     // empty icon
     icons->AppendL( IconL( KAknsIIDQgnPropEmpty, KAvkonBitmapFile,
@@ -1145,6 +1145,31 @@
 	}
 
 
+// -----------------------------------------------------------------------------
+// CMediaFileDialog::IconL
+// For MMC icon and Mass Storage icon
+// -----------------------------------------------------------------------------
+//
+CGulIcon* CMediaFileDialog::IconL(TAknsItemID aId, const TDesC& aFileName,
+                                   TInt aFileIndex, TInt aFileMaskIndex, TAknsQsnIconColorsIndex colorIndex)
+	{
+	TRgb defaultColour(KRgbBlack);
+	CFbsBitmap* bmap = NULL;
+	CFbsBitmap* mask = NULL;
+
+	AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), defaultColour, KAknsIIDQsnIconColors,
+			colorIndex);
+	AknsUtils::CreateColorIconLC(AknsUtils::SkinInstance(), KAknsIIDQgnIndiMmcAdd,
+			KAknsIIDQsnIconColors, colorIndex, bmap, mask,
+			aFileName, aFileIndex, aFileMaskIndex, defaultColour);
+
+	CGulIcon* icon = CGulIcon::NewL(bmap, mask);
+	icon->SetBitmapsOwnedExternally(EFalse);
+	CleanupStack::Pop(2);
+	return icon;
+	}
+
+
 // ----------------------------------------------------------------------------
 // CMediaFileDialog::ShowContextMenuL
 // 
@@ -3065,7 +3090,7 @@
         return;
         }
 
-    if ( aEventType == EEventItemDoubleClicked || aEventType == EEventEnterKeyPressed )
+    if ( aEventType == EEventItemSingleClicked  || aEventType == EEventEnterKeyPressed )
         {
         TBool closeDialog = HandleOKL( EAttrDoubleClicked );
         
diff -r 8c5d936e5675 -r b5888e2aa472 profilesservices/MediaFileList/group/MediaFileList.mmp
--- a/profilesservices/MediaFileList/group/MediaFileList.mmp	Thu Dec 17 08:52:52 2009 +0200
+++ b/profilesservices/MediaFileList/group/MediaFileList.mmp	Thu Jan 07 12:54:49 2010 +0200
@@ -53,7 +53,7 @@
 
 USERINCLUDE    ../Inc
 APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/mmf/common
+SYSTEMINCLUDE /epoc32/include/mmf/common /epoc32/include/platform/mmf/common
 
 LIBRARY   avkon.lib
 LIBRARY   bafl.lib