diff -r 1957042d8c7e -r ada7962b4308 filemanager/src/fmbkupenginewrapper/src/fmbackupsettings.cpp --- a/filemanager/src/fmbkupenginewrapper/src/fmbackupsettings.cpp Fri Apr 16 14:53:38 2010 +0300 +++ b/filemanager/src/fmbkupenginewrapper/src/fmbackupsettings.cpp Mon May 03 12:24:39 2010 +0300 @@ -17,13 +17,17 @@ */ #include "fmbackupsettings.h" +#include "fmbkupengine.h" +#include "fmcommon.h" #include +#include #include #include -FmBackupSettings::FmBackupSettings( void ) +FmBackupSettings::FmBackupSettings( FmBkupEngine *aFmBkupEngine ) : mBkupEngine( aFmBkupEngine ) { + } FmBackupSettings::~FmBackupSettings( void ) @@ -219,6 +223,9 @@ case EFileManagerBackupWeekdayFriday: ret = constFileManagerBackupWeekdayFirday; break; + case EFileManagerBackupWeekdaySaturday: + ret = constFileManagerBackupWeekdaySaturday; + break; case EFileManagerBackupWeekdaySunday: ret = constFileManagerBackupWeekdaySunday; break; @@ -280,8 +287,13 @@ mBackupEntryList.push_back( entry ); } - entry = createTargetDriveEntry(); - mBackupEntryList.push_back( entry ); + QStringList driveList; + mBkupEngine->getBackupDriveList( driveList ); + + if( driveList.count() > 1 ) { + entry = createTargetDriveEntry(); + mBackupEntryList.push_back( entry ); + } } void FmBackupSettings::resetAndDestoryBackupEntry() @@ -299,6 +311,12 @@ void FmBackupSettings::load() { + + QStringList driveList; + mBkupEngine->getBackupDriveList( driveList ); + QString defaultDrive( driveList.first() ); + + QSettings settings("Nokia", "FileManager"); settings.beginGroup("BackupConfigure"); @@ -307,7 +325,7 @@ mScheduling = (TFileManagerBackupSchedule)(settings.value("scheduling", EFileManagerBackupScheduleNever ).toInt()); // Never schedule for default value mWeekday = (TFileManagerBackupWeekday)(settings.value("weekday", EFileManagerBackupWeekdayMonday ).toInt()); // monday for default value mTime = (settings.value("time", QTime::currentTime() ).toTime()); // empty for default - mTargetDrive = (settings.value("targetDrive", "c:") ).toString(); // C for default + mTargetDrive = (settings.value("targetDrive", defaultDrive ) ).toString(); // C for default settings.endGroup(); refreshList();