--- a/commonuis/CommonDialogs/src/CAknFileSelectionModel.cpp Tue May 25 12:58:19 2010 +0300
+++ b/commonuis/CommonDialogs/src/CAknFileSelectionModel.cpp Wed Jun 09 09:58:37 2010 +0300
@@ -51,6 +51,13 @@
_LIT( KCFDMimeTypeJava, "application/java-archive" );
_LIT( KCFDMimeTypeFlash, "application/x-shockwave-flash" );
+_LIT( KCFDMimeTypeJad, "text/vnd.sun.j2me.app-descriptor" );
+_LIT( KCFDMimeTypePdf, "application/pdf" );
+_LIT( KCFDMimeTypeZip, "application/*zip*");
+_LIT( KCFDMimeTypeDoc, "application/vnd.ms-word");
+_LIT( KCFDMimeTypePpt, "application/vnd.ms-powerpoint");
+_LIT( KCFDMimeTypeXls, "application/vnd.ms-excel");
+
_LIT( KCFDFileExtSis, ".sis" );
_LIT( KCFDFileExtSisx, ".sisx");
_LIT( KCFDFileExtMid, ".mid" );
@@ -714,18 +721,27 @@
{
iconIndex = EGameFileIcon;
}
- else if( dataTypeBuf.MatchF( KCFDMimeTypeNote ) == 0 )
+ else if( dataTypeBuf.MatchF( KCFDMimeTypeJava ) == 0
+ || dataTypeBuf.MatchF( KCFDMimeTypeJad ) == 0 )
{
- iconIndex = ENoteFileIcon;
- }
- else if( dataTypeBuf.MatchF( KCFDMimeTypeJava ) == 0 )
- {
- iconIndex = EJavaFileIcon;
+ iconIndex = EAppFileIcon;
}
else if ( dataTypeBuf.MatchF( KCFDMimeTypeFlash ) == 0 )
{
iconIndex = EFlashFileIcon;
}
+ else if ( dataTypeBuf.MatchF( KCFDMimeTypeZip ) == 0 )
+ {
+ iconIndex = EAppFileIcon;
+ }
+ else if ( dataTypeBuf.MatchF( KCFDMimeTypePdf ) == 0
+ || dataTypeBuf.MatchF( KCFDMimeTypeDoc ) == 0
+ || dataTypeBuf.MatchF( KCFDMimeTypePpt ) == 0
+ || dataTypeBuf.MatchF( KCFDMimeTypeXls ) == 0
+ || dataTypeBuf.MatchF( KCFDMimeTypeNote ) == 0 )
+ {
+ iconIndex = ENoteFileIcon;
+ }
else
{
// Check from the file name extension, if it's a SIS file:
@@ -740,7 +756,7 @@
if( ext.CompareF( KCFDFileExtSis ) == 0
|| ext.CompareF( KCFDFileExtSisx ) == 0 )
{
- iconIndex = ESisFileIcon;
+ iconIndex = EAppFileIcon;
}
// RApaLsSession does not recognize .mid's:
else if( ext.CompareF( KCFDFileExtMid ) == 0 )