diff -r 12b82dc0e8db -r 81668a704644 filemanager/src/inc/fmfilesystemproxymodel.cpp --- a/filemanager/src/inc/fmfilesystemproxymodel.cpp Thu Sep 30 16:33:59 2010 +0800 +++ b/filemanager/src/inc/fmfilesystemproxymodel.cpp Mon Oct 18 09:44:31 2010 +0800 @@ -20,6 +20,7 @@ #include #include +#include // name column number, this define comes from implementation of QFileSystemModel const int NameColumn = 0; @@ -28,9 +29,9 @@ Constructor */ FmFileSystemProxyModel::FmFileSystemProxyModel( QObject *parent ) : - QSortFilterProxyModel( parent ) + QSortFilterProxyModel( parent ), localizer( 0 ) { - + localizer = new HbDirectoryNameLocalizer; } /*! @@ -38,7 +39,7 @@ */ FmFileSystemProxyModel::~FmFileSystemProxyModel() { - + delete localizer; } /*! @@ -50,11 +51,15 @@ QAbstractItemModel *itemModel = sourceModel(); QFileSystemModel *sourceModel = qobject_cast( itemModel ); if( sourceModel && ( role == Qt::DisplayRole ) ) { - QString name( FmUtils::localize(sourceModel->fileInfo( mapToSource( index ) ).absoluteFilePath()) ); - if( name.isEmpty() ) { + // get absolute path + QString path( sourceModel->fileInfo( mapToSource( index ) ).absoluteFilePath() ); + // get localized name + QString localizedName( localizer->translate( path ) ); + + if( localizedName.isEmpty() ) { return sourceModel->data( mapToSource( index ), role ); } else { - return name; + return localizedName; } } if( sourceModel )