FCL/sf/app/rndtools: comparison creator/src/engine.cpp

equal deleted inserted replaced

-:d8e625c87f33
+:e7a04a6385be
 #include <eikenv.h>
 #include <s32file.h>
 #include <coemain.h>
+#include <driveinfo.h>
 #include <datacreator.rsg>
 #include "mainview.h"
 #include "engine.h"
 #include "enginewrapper.h"
 #include <cntdb.h>//For Math
 #include "creator_scriptentry.h"
 #include "creator_modulebase.h"
-#include "creator_browser.h"
+//#include "creator_browser.h"
 #include "creator_calendar.h"
 #include "creator_phonebookbase.h"
 #include "creator_note.h"
 #include "creator_log.h"
-#include "creator_connectionmethodbase.h"
+//#include "creator_connectionmethodbase.h"
 #include "creator_mailbox.h"
 //#include "creator_imps.h"
 #include "creator_message.h"
 #include "creator_landmark.h"
 iTimer.Close();
 	iEnv->DeleteResourceFile(iResourceFileId);
+	iMemoryDetailsList.Reset();
 delete iPictureFileArray;
 delete iSoundFileArray;
 delete iTempPath;
 delete iFrameImageData;
 delete iEncoder;
 // ---------------------------------------------------------------------------
 void CCreatorEngine::RequestMemoryDetails()
 {
+	TDriveList dl;
 // variables for memory and disk handling
-TDriveNumber cDrive=EDriveC;
-TDriveNumber dDrive=EDriveD;
-TDriveNumber eDrive=EDriveE;
 TVolumeInfo vinfo;
-TBuf<16> cFree;
-TBuf<16> dFree;
+//*************************************************************************
-TBuf<16> eFree;
-TBuf<16> cSize;
+//*************************************************************************
-TBuf<16> dSize;
-TBuf<16> eSize;
 // get an access to file server
 RFs& fsSession = CEikonEnv::Static()->FsSession();
-// check the C-drive
+fsSession.DriveList(dl);
-fsSession.Volume(vinfo, cDrive);
-iMemoryDetails.iCFree.Num(TInt64(vinfo.iFree/1024));
+for(TInt driveNum = EDriveC; driveNum <= EDriveZ ; driveNum ++ )
-iMemoryDetails.iCSize.Num(TInt64(vinfo.iSize/1024));
+	{
+		if( dl[driveNum] )
-// the same thing for D-drive
+			{
-fsSession.Volume(vinfo, dDrive);
+			TMemoryDetails *memDet = new TMemoryDetails;
-	iMemoryDetails.iDFree.Num(TInt64(vinfo.iFree/1024));
+			if(fsSession.Volume(vinfo, driveNum) == KErrNone)
-	iMemoryDetails.iDSize.Num(TInt64(vinfo.iSize/1024));
+				{
+				memDet->iFree.Num(TInt64(vinfo.iFree/1024));
-// the same thing for E-drive (MMC), if it exists
+				memDet->iSize.Num(TInt64(vinfo.iSize/1024));
-if (MMC_OK())
+				}
-{
+			else
-fsSession.Volume(vinfo, eDrive);
+				{
-iMemoryDetails.iEFree.Num(TInt64(vinfo.iFree/1024));
+				memDet->iFree.Num( 0 );
-		iMemoryDetails.iESize.Num(TInt64(vinfo.iSize/1024));
+				memDet->iSize.Num( 0 );
+				}
-}
+			User::LeaveIfError(fsSession.DriveToChar(driveNum,memDet->iDriveLetter));
+			iMemoryDetailsList.AppendL( memDet );
-	else {
+			}
-		iMemoryDetails.iEFree = KEDriveError;
+	}
-		iMemoryDetails.iENotAvailable = ETrue;
-		}
 // available work memory
 TMemoryInfoV1Buf memory;
 UserHal::MemoryInfo(memory);
 TInt64 freeMemBytes=(TInt64)(memory().iFreeRamInBytes);
 TInt64 sizeMemBytes=(TInt64)(memory().iTotalRamInBytes);
 TInt64 sizeWorkMemBytes = sizeMemBytes;
-iMemoryDetails.iHFree.Num(TInt64(freeMemBytes/1024));
+TInt64 sizeRomBytes = (TInt64)(memory().iTotalRomInBytes);
-iMemoryDetails.iHSize.Num(TInt64(sizeWorkMemBytes/1024));
+iMemoryDetails.iRamFree.Num(TInt64(freeMemBytes/1024));
+iMemoryDetails.iRamSize.Num(TInt64(sizeWorkMemBytes/1024));
+iMemoryDetails.iRomSize.Num(TInt64(sizeRomBytes/1024));
 }
 // ---------------------------------------------------------------------------
 TBool CCreatorEngine::MMC_OK() const
 // launch a command
 TCreatorIds cmd = (TCreatorIds)iCommandArray->At(iCurrentEntry).iCommandId;
 switch( cmd )
 {
+/*
 	    case ECmdCreateBrowserBookmarkEntries: { iBrowser->CreateBookmarkEntryL(reinterpret_cast<CBrowserParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateBrowserBookmarkFolderEntries: { iBrowser->CreateBookmarkFolderEntryL(reinterpret_cast<CBrowserParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateBrowserSavedPageEntries: { iBrowser->CreateSavedDeckEntryL(reinterpret_cast<CBrowserParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateBrowserSavedPageFolderEntries: { iBrowser->CreateSavedDeckFolderEntryL(reinterpret_cast<CBrowserParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
+*/
 case ECmdCreateCalendarEntryAppointments: { iCalendar->CreateAppointmentEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 	    case ECmdCreateCalendarEntryEvents: { iCalendar->CreateEventEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 	    case ECmdCreateCalendarEntryAnniversaries: { iCalendar->CreateAnniversaryEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 	    case ECmdCreateCalendarEntryToDos: { iCalendar->CreateTodoEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 case ECmdCreateCalendarEntryReminders: { iCalendar->CreateReminderEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 	    case ECmdCreateMiscEntryNotes: { iNotepad->CreateNoteEntryL(reinterpret_cast<CNotepadParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateLogEntryMissedCalls: { iLogs->CreateMissedCallEntryL(reinterpret_cast<CLogsParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateLogEntryReceivedCalls: { iLogs->CreateReceivedCallEntryL(reinterpret_cast<CLogsParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateLogEntryDialledNumbers: { iLogs->CreateDialledNumberEntryL(reinterpret_cast<CLogsParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
+/*
 case ECmdCreateMiscEntryAccessPoints: { iAccessPoints->CreateConnectionSettingsEntryL(iCommandArray->At(iCurrentEntry).iParameters); } break;
 case ECmdDeleteIAPs: { iAccessPoints->DeleteAllL(); } break;
 case ECmdDeleteCreatorIAPs: { iAccessPoints->DeleteAllCreatedByCreatorL(); } break;
+*/
 case ECmdCreateMiscEntryLandmarks: { iLandmarks->CreateLandmarkEntryL(reinterpret_cast<CLandmarkParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 	    case ECmdCreateMessagingEntryMailboxes: { iMailboxes->CreateMailboxEntryL(reinterpret_cast<CMailboxesParameters*>(iCommandArray->At(iCurrentEntry).iParameters)); } break;
 /*
 #ifdef __PRESENCE
 }
 case ECmdDeleteCreatorIMPSs:
 {
 //            iIMPS->DeleteAllCreatedByCreatorL();
 break;
 }
+/*
 case ECmdDeleteBrowserBookmarks:
 {
 iBrowser->DeleteAllBookmarksL();
 break;
 }
 case ECmdDeleteCreatorBrowserSavedPageFolders:
 {
 iBrowser->DeleteAllSavedPageFoldersCreatedByCreatorL();
 break;
 }
+*/
 case ECmdDeleteCreatorFiles:
 {
 iFiles->DeleteAllCreatedByCreatorL();
 break;
 }
 __ASSERT_ALWAYS(!iCommandArray, User::Panic(_L("iCommandArray"), 701));
 iCommandArray = new(ELeave) CCommandArray(10000);
 // init all modules here
 TInt err(KErrNone);
-TRAP(err, iBrowser = CCreatorBrowser::NewL(this));
+//    TRAP(err, iBrowser = CCreatorBrowser::NewL(this));
 TRAP(err, iCalendar = CCreatorInterimCalendar::NewL(this));
 TRAP(err, iPhonebook = (CCreatorPhonebookBase*)TCreatorFactory::CreatePhoneBookL(this));
 TRAP(err, iNotepad = CCreatorNotepad::NewL(this));
 TRAP(err, iLogs = CCreatorLogs::NewL(this));
-TRAP(err, iAccessPoints = (CCreatorConnectionSettingsBase*)TCreatorFactory::CreateConnectionSettingsL(this));
+//    TRAP(err, iAccessPoints = (CCreatorConnectionSettingsBase*)TCreatorFactory::CreateConnectionSettingsL(this));
 TRAP(err, iMailboxes = CCreatorMailboxes::NewL(this));
 TRAP(err, iFiles = CCreatorFiles::NewL(this));
 TRAP(err, iMessages = CCreatorMessages::NewL(this));
 TRAP(err, iLandmarks = CCreatorLandmarks::NewL(this));
 ContactLinkCache::InitializeL();
 iMessages = NULL;
 delete iFiles;
 iFiles = NULL;
 delete iMailboxes;
 iMailboxes = NULL;
-delete iAccessPoints;
+//   delete iAccessPoints;
-iAccessPoints = NULL;
+//    iAccessPoints = NULL;
 delete iLogs;
 iLogs = NULL;
 delete iNotepad;
 iNotepad = NULL;
 delete iPhonebook;
 iPhonebook = NULL;
 delete iCalendar;
 iCalendar = NULL;
-delete iBrowser;
+//   delete iBrowser;
-iBrowser = NULL;
+//   iBrowser = NULL;
 delete iLandmarks;
 iLandmarks = NULL;
 ContactLinkCache::DestroyL();
 // now delete the command array
 {
 case ECreatorEngineDeleteAllEntries:
 AppendToCommandArrayL( ECmdDeleteContacts, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteContactGroups, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCalendarEntries, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteBrowserBookmarks, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteBrowserBookmarks, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteBrowserBookmarkFolders, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteBrowserBookmarkFolders, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteBrowserSavedPages, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteBrowserSavedPages, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteBrowserSavedPageFolders, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteBrowserSavedPageFolders, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteLogs, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteMessages, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteIAPs, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteIAPs, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteIMPSs, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteIMPSs, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteNotes, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteLandmarks, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorFiles, NULL, 1 );
 // started exucuting delete commands
 break;
 case ECreatorEngineDeleteAllCreatorEntries:
 AppendToCommandArrayL( ECmdDeleteCreatorContacts, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorContactGroups, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorCalendarEntries, NULL, 1 );
+/*
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserBookmarks, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserBookmarkFolders, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserSavedPages, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorBrowserSavedPageFolders, NULL, 1 );
+*/
 AppendToCommandArrayL( ECmdDeleteCreatorFiles, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorLogs, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorMessages, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteCreatorIAPs, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteCreatorIAPs, NULL, 1 );
-AppendToCommandArrayL( ECmdDeleteCreatorIMPSs, NULL, 1 );
+//AppendToCommandArrayL( ECmdDeleteCreatorIMPSs, NULL, 1 );
 AppendToCommandArrayL( ECmdDeleteCreatorLandmarks, NULL, 1 );
 // started exucuting delete commands
 ExecuteFirstCommandL( KDeletingText );
 break;
 StartEnginesL();
 // set the home module
 switch(aCommand)
 {
-	    case ECmdCreateBrowserBookmarkEntries:
+/*
+case ECmdCreateBrowserBookmarkEntries:
 	    case ECmdCreateBrowserBookmarkFolderEntries:
 	    case ECmdCreateBrowserSavedPageEntries:
 	    case ECmdCreateBrowserSavedPageFolderEntries:
 	    case ECmdDeleteBrowserBookmarks:
 	    case ECmdDeleteBrowserBookmarkFolders:
 case ECmdDeleteCreatorBrowserSavedPageFolders:
 {
 iUsedOptionsMenuModule = iBrowser;
 }
 break;
+*/
 case ECmdCreateCalendarEntryAppointments:
 	    case ECmdCreateCalendarEntryEvents:
 	    case ECmdCreateCalendarEntryAnniversaries:
 	    case ECmdCreateCalendarEntryToDos:
 	    case ECmdCreateCalendarEntryReminders:
 	    case ECmdDeleteCreatorLogs:
 {
 iUsedOptionsMenuModule = iLogs;
 }
 break;
+/*
 	    case ECmdCreateMiscEntryAccessPoints:
 	    case ECmdDeleteIAPs:
 	    case ECmdDeleteCreatorIAPs:
 {
 iUsedOptionsMenuModule = iAccessPoints;
 }
 break;
+*/
 	    case ECmdCreateMessagingEntryMailboxes:
 	    case ECmdDeleteMailboxes:
 	    case ECmdDeleteCreatorMailboxes:
 {
 iUsedOptionsMenuModule = iMailboxes;
 TUint32 CCreatorEngine::AccessPointNameToIdL(const TDesC& aAPName, TBool aAnyIfNotFound )
 {
 LOGSTRING("Creator: CCreatorEngine::AccessPointNameToIdL");
 // Accespoint impl moved from engine to accespoint implementations for supporting 3.0-3.1 and 3.2->
-return iAccessPoints->AccessPointNameToIdL(aAPName, aAnyIfNotFound );
+//return iAccessPoints->AccessPointNameToIdL(aAPName, aAnyIfNotFound );
+return 0;
 }
 static CCreatorEngine::TTestDataPath SoundFiles[] = {
 CCreatorEngine::EMIDI_10kB,
 CCreatorEngine::EWAVE_20kB,

changeset 31	e7a04a6385be
parent 28	4cc0d1a608c1
child 48	da3ec8478e66