FCL/sf/app/files: comparison filemanager/src/inc/fmutils

equal deleted inserted replaced

-:b3155376f2b4
+:6e96d2143d46
 #include <QFileInfo>
 #include <QDesktopServices>
 #include <QUrl>
 #include <QVariant>
+#include <hbglobal.h>
 #define BURCONFIGFILE  "burconfig.xml"
 const int KMaxFileName=0x100;
 const int KMaxPath=0x100;
 QString FmUtils::getDriveNameFromPath( const QString &path )
 quint32 drvStatus = GetDriveType( (LPCWSTR)driver.constData() );
 if ( drvStatus == DRIVE_REMOVABLE  ) {
 state |= FmDriverInfo::EDriveRemovable;
 }
 #ifdef _DEBUG_DISABLE_DRIVE_D_TEST_DRIVEHIDE_
-	if ( driverName.contains( "D", Qt::CaseInsensitive )  ) {
+	if ( driverName.contains( Drive_D, Qt::CaseInsensitive )  ) {
 		state |= FmDriverInfo::EDriveNotPresent;
 }
 #endif
 #ifdef _DEBUG_LOCKED_DRIVE_Z
-	if ( driverName.contains( "Z", Qt::CaseInsensitive )  ) {
+	if ( driverName.contains( Drive_Z, Qt::CaseInsensitive )  ) {
 		state |= FmDriverInfo::EDriveLocked;
 }
 #endif
 	if( !(state&FmDriverInfo::EDriveNotPresent) && !(state&FmDriverInfo::EDriveLocked) &&
 		!(state&FmDriverInfo::EDriveCorrupted) ) {
 		return QString::number( size / (1024.0 * 1024.0), 'f', 1 ) + " MB";
 	} else {
 	    return QString::number( size / ( 1024.0 * 1024.0 * 1024.0 ), 'f', 1 ) + " GB";
 	}
 }
 /*
 quint32 FmUtils::getDriverState( const QString &driverName )
 {
 quint32 state( 0 );
 }
 }
 return 0;
 }
-void FmUtils::ejectDrive( const QString &driverName )
+int FmUtils::ejectDrive( const QString &driverName )
 {
 Q_UNUSED( driverName );
+	return FmErrNone;
 }
 QString FmUtils::getFileType( const QString &filePath  )
 {
 Q_UNUSED( filePath );
 return 0;
 }
 bool FmUtils::isDriveC( const QString &driverName )
 {
-	if( driverName.contains("C",Qt::CaseInsensitive) ){
+	if( driverName.contains(Drive_C,Qt::CaseInsensitive) ){
 return true;
 }
 else{
 return false;
 }
 newFilePath = filePath.left( filePath.length() - 1 );
 }
 return newFilePath;
 }
-bool FmUtils::checkDriveFilter( const QString &driveName )
+bool FmUtils::checkDriveAccessFilter( const QString &driveName )
 {
 #ifdef _DEBUG_HIDE_VIEWFOLDER_WINDOWS_
-if( driveName.contains( "D:" ) || driveName.contains( "Z:" ) ) {
+if( driveName.contains( Drive_D, Qt::CaseInsensitive ) || driveName.contains( Drive_Z, Qt::CaseInsensitive ) ) {
 return false;
 }
 #endif
 return true;
 }
 #endif
 return path;
 }
-bool FmUtils::isPathAccessabel( const QString &path )
+int FmUtils::isPathAccessabel( const QString &path )
 {
 if(!isDriveAvailable( path ) ) { //used to filter locked drive
-return false;
+return FmErrDriveNotAvailable;
 }
 QFileInfo fileInfo( path );
 #ifdef _DEBUG_HIDE_VIEWFOLDER_WINDOWS_
 if( fileInfo.absoluteFilePath().contains( QString( Drive_Z ), Qt::CaseInsensitive ) ) {
 return false;
 }
 #endif
 if( !fileInfo.exists() ) {
-return false;
+return FmErrPathNotExist;
 }
-return true;
+return FmErrNone;
 }
 bool FmUtils::isDriveAvailable( const QString &path )
 {
 #ifdef _DEBUG_DISABLE_DRIVE_D_TEST_DRIVEHIDE_
-	if(path.contains("D:"))
+	if(path.contains(Drive_D, Qt::CaseInsensitive))
 		return false;
 #endif
 #ifdef _DEBUG_LOCKED_DRIVE_Z
-	if(path.contains("Z:"))
+	if(path.contains(Drive_Z, Qt::CaseInsensitive))
 		return false;
 #endif
 	return true;
 }
 {
 QFileInfoList infoList = QDir::drives();
 foreach( QFileInfo fileInfo, infoList ) {
 QString driveName = fileInfo.absolutePath();
-if( checkDriveFilter( driveName ) ) {
+if( checkDriveAccessFilter( driveName ) ) {
 if( !isHideUnAvailableDrive ) {
 driveList.append( driveName );
 }
 else if ( isDriveAvailable( driveName ) ) {
 driveList.append( driveName );
 QString FmUtils::fillDriveVolume( QString driveName, bool isFillWithDefaultVolume )
 {
 QString ret;
 QString tempDriveName = fillPathWithSplash( driveName );
-ret = removePathSplash( driveName );
+QString checkedDriveName( removePathSplash( driveName ) );
 FmDriverInfo driverInfo = FmUtils::queryDriverInfo( tempDriveName );
 QString volumeName = driverInfo.volumeName();
 if( volumeName.isEmpty() && isFillWithDefaultVolume ){
-FmDriverInfo::DriveState driveState = FmUtils::queryDriverInfo( tempDriveName ).FmDriverInfo::driveState();
+FmDriverInfo::DriveState driveState = queryDriverInfo( tempDriveName ).driveState();
-if( !( driveState & FmDriverInfo::EDriveNotPresent ) ){
+if( driveState & FmDriverInfo::EDriveAvailable ){
 if( driveState & FmDriverInfo::EDriveRemovable ) {
 if( driveState & FmDriverInfo::EDriveMassStorage ) {
-volumeName.append( QObject::tr( "Mass Storage" ) );
+// Mass Storage
+ret = hbTrId( "txt_fmgr_dblist_1_mass_storage" ).arg( checkedDriveName );
+} else if( driveState & FmDriverInfo::EDriveUsbMemory ) {
+// USB Memory
+ret = hbTrId( "txt_fmgr_dblist_1_usb_memory" ).arg( checkedDriveName );
+} else{
+// Memory Card
+ret = hbTrId( "txt_fmgr_dblist_1_memory_card" ).arg( checkedDriveName );
 }
-else{
+} else{
-volumeName.append( QObject::tr( "Memory Card" ) );
+				// phone memory
-}
+				ret = hbTrId( "txt_fmgr_dblist_1_device_memory" ).arg( checkedDriveName );
-}
-else{
-volumeName.append( QObject::tr( "Phone Memory" ) );
 }
 }
-}
+} else {
+ret = hbTrId( "txt_fmgr_dblist_1_2" ).arg( checkedDriveName ).arg( volumeName );
-ret += QString( " " ) + volumeName;
+}
 return ret;
 }
 int FmUtils::launchFile( const QString &filePath )
 {
 if( name.length() > KMaxFileName ) {
 return false;
 }
 return true;
 }
+bool FmUtils::checkNewFolderOrFile( const QString &path, QString &errString )
+{
+QFileInfo fileInfo( path );
+bool ret( true );
+if (!FmUtils::checkFolderFileName( fileInfo.fileName() ) ) {
+errString = hbTrId( "Invalid file or folder name, try again!" );
+ret = false;
+} else if( !FmUtils::checkMaxPathLength( path ) ) {
+errString = hbTrId( "the path you specified is too long, try again!" );
+ret = false;
+} else if (fileInfo.exists()) {
+errString = hbTrId( "%1 already exist!" ).arg( fileInfo.fileName() );
+ret = false;
+}
+return ret;
+}

changeset 30	6e96d2143d46
parent 29	b3155376f2b4
child 35	060d0b1ab845