FCL/sf/mw/appsupport: comparison sysresmonitoring/oodmonitor/oodmonitor2/src/outofdiskglobalnote.cpp

equal deleted inserted replaced

-:2e3d3ce01487
+:c4cbaa4fb734
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 */
 // SYSTEM INCLUDES
 #include <e32property.h>
-#include <AknGlobalNote.h>
-#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
-#include <aknSDData.h>
-#include <avkon.rsg>
 #include <data_caging_path_literals.hrh>
 #include <driveinfo.h>
 #include <outofdiskmonitor.rsg>
 #include <bautils.h>                // BaflUtils
 #include <StringLoader.h>
-#include <aknnotewrappers.h>
 // USER INCLUDES
 #include "UiklafInternalCRKeys.h"
 #include "OodTraces.h"
 #include "outofdiskglobalnote.h"
 // ---------------------------------------------------------
 //
 COutOfDiskGlobalNote::~COutOfDiskGlobalNote()
 {
 TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote");
-delete iQuery;
 iOODResourceFile.Close();
 Cancel(); // Cancel active object
 TRACES("COutOfDiskGlobalNote::~COutOfDiskGlobalNote: End");
 }
 // ---------------------------------------------------------
 //
 void COutOfDiskGlobalNote::DisplayL(const TDesC& aMessage)
 {
 TRACES("COutOfDiskGlobalNote::DisplayL");
-if (iNoteInfo.iNoteId > KErrNotFound)
-{
+TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: Create iQuery");
-CancelNoteL();
+CHbDeviceMessageBoxSymbian* globalNote = CHbDeviceMessageBoxSymbian::NewL(CHbDeviceMessageBoxSymbian::EWarning);
-}
+CleanupStack::PushL(globalNote);
+globalNote->SetTextL(aMessage);
-if (!iQuery)
+globalNote->SetTimeoutL(0);
-{
+globalNote->ExecL();
-TRACES("COutOfDiskGlobalNote::COutOfDiskGlobalNote::DisplayL: Create iQuery");
+CleanupStack::PopAndDestroy(globalNote);
-iQuery = CAknGlobalNote::NewL();
-iQuery->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
-}
-iNoteInfo.iNoteId = iQuery->ShowNoteL(iStatus, EAknGlobalWarningNote, aMessage);
-SetActive();
 TRACES("COutOfDiskGlobalNote::DisplayL: End");
 }
 // ---------------------------------------------------------
 // Use a global query to display the message but make sure that eiksrv is
 return;
 }
 if (iOutOfDiskMonitor->GetGlobalNotesAllowed())
 {
-TInt sdDialogId = 0;
 TResourceReader resReader;
 HBufC8* str(NULL);
 CDesCArray* strings = new ( ELeave ) CDesCArrayFlat( 2 );
 CleanupStack::PushL( strings );
 {
 TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Warning note! Drive: %c", aDrive+'A');
 if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory())
 {
-sdDialogId = EAknDiskWarnignNote;
 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_LOW);
 resReader.SetBuffer(str);
 strings->AppendL( driveName );
 }
 else if (driveStatus & DriveInfo::EDriveRemovable)
 {
 TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Warning note! volNameLength: %d", nameLength);
-sdDialogId = EAknMMCWarningNote;
 TBufC<KMaxFileName> name(volInfo.iName);
 if (nameLength)
 {
 	        str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MEMORY_CARD_LOW_NAME);
 	            resReader.SetBuffer(str);
 		            strings->AppendL( driveName );
 }
 }
 else
 {
-sdDialogId = EAknDiskWarnignNote;
 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_MEMORY_LOW);
 resReader.SetBuffer(str);
 strings->AppendL( driveName );
 }
 }
 else if (aStatus==DISK_SPACE_CRITICAL)
 {
 TRACES1("COutOfDiskGlobalNote::ShowGlobalQueryL: Critical note! Drive: %c", aDrive+'A');
 if (aDrive == iOutOfDiskMonitor->GetDefaultPhoneMemory())
 {
-sdDialogId = EAknDiskFullNote;
 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_DEVICE_MEMORY_FULL);
 resReader.SetBuffer(str);
 strings->AppendL( driveName );
 }
 else if (driveStatus & DriveInfo::EDriveRemovable)
 {
-sdDialogId = EAknMMCFullNote;
 TBufC<KMaxFileName> name(volInfo.iName);
 if (nameLength)
 {
 	        str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MEMORY_CARD_FULL_NAME);
 	            resReader.SetBuffer(str);
 		            strings->AppendL( driveName );
 }
 }
 else
 {
-sdDialogId = EAknDiskFullNote;
 str = iOODResourceFile.AllocReadLC(R_QTN_MEMLO_MASS_STORAGE_FULL);
 resReader.SetBuffer(str);
 strings->AppendL( driveName );
 }
 }
 resReader.SetBuffer(str);
-	    HBufC* message( FormatStringL(resReader.ReadHBufCL()->Des(), *strings));
+	      HBufC* resHandle = resReader.ReadHBufCL();
-	    TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message);
+CleanupStack::PushL( resHandle );
+HBufC* message(FormatStringL(resHandle->Des(),*strings));
+CleanupStack::PushL( message );
+	      TRACES1("COutOfDiskMonitor::ShowGlobalQueryL: txt: %S",message);
 DisplayL(message->Des());
-		TBuf8<2> sdDriveName;
-		sdDriveName.Append(aDrive+'A');
-		sdDriveName.Append(_L8(":"));
-CAknSDData* sd = CAknSDData::NewL(KAknSecondaryDisplayCategory, sdDialogId, sdDriveName);
-iQuery->SetSecondaryDisplayData(sd);
 iNoteInfo.iStatus = aStatus;
 iNoteInfo.iDrive = aDrive;
+CleanupStack::PopAndDestroy(message);
+CleanupStack::PopAndDestroy(resHandle);
 CleanupStack::PopAndDestroy( str );
 CleanupStack::PopAndDestroy( strings );
 iOutOfDiskMonitor->SetAsDisplayedL(aDrive, aStatus);
 }
 TRACES("COutOfDiskGlobalNote::ShowGlobalQueryL: End");
 }
 //
 void COutOfDiskGlobalNote::CancelNoteL()
 {
 TRACES("COutOfDiskGlobalNote::CancelNoteL");
-if (iNoteInfo.iNoteId > KErrNotFound)
-{
-iQuery->CancelNoteL(iNoteInfo.iNoteId);
-}
 Cancel();
 TRACES("COutOfDiskGlobalNote::CancelNoteL: End");
 }
 // -----------------------------------------------------------------------------

changeset 21	c4cbaa4fb734
parent 0	2e3d3ce01487
child 29	6a787171e1de