--- a/creator/engine/inc/creator.hrh	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/inc/creator.hrh	Fri Sep 03 17:11:21 2010 +0300
@@ -24,7 +24,14 @@
 
 enum TCreatorIds
     {
-    ECmdCreateFromFile=1,
+
+    // Phonebook entries shuld be the first, bacause some other entries references them
+    ECmdCreatePhoneBookEntries = 1,
+    ECmdCreatePhoneBookEntryContacts,
+    ECmdCreatePhoneBookEntryGroups,
+    ECmdCreatePhoneBookEntrySubscribedContacts,
+    
+    ECmdCreateFromFile,
 
     ECmdCreateCalendarEntries,
     ECmdCreateCalendarEntryAppointments,
@@ -129,11 +136,6 @@
     ECmdCreateMiscEntrySyncSettings,
     ECmdCreateMiscEntryLandmarks,
 
-    ECmdCreatePhoneBookEntries,
-    ECmdCreatePhoneBookEntryContacts,
-    ECmdCreatePhoneBookEntryGroups,
-    ECmdCreatePhoneBookEntrySubscribedContacts,
-
     ECmdDeleteEntries,
     ECmdDeleteAllEntries,
     ECmdDeleteAllCreatorEntries,

--- a/creator/engine/inc/creator_file.h	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/inc/creator_file.h	Fri Sep 03 17:11:21 2010 +0300
@@ -25,8 +25,9 @@
 #include "engine.h"
 #include "creator_modulebase.h"
 
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
 using namespace ContentAccess;
+#include <DRMRights.h>
 
 #include <e32base.h>
 #include <bautils.h>

--- a/creator/engine/inc/creator_phonebook.h	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/inc/creator_phonebook.h	Fri Sep 03 17:11:21 2010 +0300
@@ -56,7 +56,7 @@
     void DeleteAllGroupsCreatedByCreatorL();
     
     void TestPrintOut(CPhonebookParameters* aParam);
-    
+    inline CCreatorPhonebookWrapper* GetPhonebookWrapper(){ return iPhonebookWrapper; };
 private:
     
     void InitializeContactParamsL();

--- a/creator/engine/inc/creator_phonebookapi.h	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/inc/creator_phonebookapi.h	Fri Sep 03 17:11:21 2010 +0300
@@ -42,6 +42,9 @@
     bool deleteContacts( const QList<QContactLocalId>& list );
     QContact contact( const QContactLocalId& contactId );
 
+    QString phoneNumber( const QContactLocalId& contactId );
+    bool contactDetails( const QContactLocalId& contactId, QString& name, QString& phoneNumber, QString& email );
+    
 private:
     bool IsContactGroupL( const QContact& contact );
     

--- a/creator/engine/inc/creator_phonebookwrapper.h	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/inc/creator_phonebookwrapper.h	Fri Sep 03 17:11:21 2010 +0300
@@ -150,6 +150,9 @@
     void DeleteAllGroupsL();
     void DeleteContactsL( RArray<TUint32>& aContactsToDelete, TUid aStoreUid );
     
+    HBufC* GetPhoneNumberL( TUint32 aContactId );
+    TBool GetContactDetailsL( TUint32 aContactId, TDes& aName, TDes& aPhoneNumber, TDes& aEmail );
+    
 private:
     QList<QContactDetail> CreateContactDetailsFromParameters( const TCreatorContactFields& Map );
     QContactDetail CreateContactDetail( QList<QContactDetail>& aContactDetailList,QString aDetail, QString aFieldContext, QString aFieldString, QString aData );

--- a/creator/engine/src/creator_calendar.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_calendar.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -26,6 +26,8 @@
 #include <e32math.h>
 #include <calrrule.h> 
 #include <calalarm.h>
+#include "creator_contactsetcache.h"
+#include "creator_phonebook.h"
 
 static const TInt KCalendarFieldLength = 128;
 
@@ -815,6 +817,32 @@
         	CleanupStack::Pop(); // attendee
         	}
         }
+    // linked attendees:
+     for( TInt i = 0; i < parameters->iAttendeeLinkIds.Count(); ++i )
+        {
+        CCreatorPhonebook* phonebook = dynamic_cast<CCreatorPhonebook*>(iEngine->GetPhonebook());
+        User::LeaveIfNull( phonebook );
+        CCreatorPhonebookWrapper* phonebookWrapper = phonebook->GetPhonebookWrapper();
+        
+        TLinkIdParam attendeeLinkId = parameters->iAttendeeLinkIds[i];
+        const CCreatorContactSet& set = ContactLinkCache::Instance()->ContactSet(attendeeLinkId.iLinkId);
+        const RArray<TUint32> links = set.ContactLinks();
+        TInt numberOfExplicitLinks = links.Count(); // Number of defined contacts in contact-set
+        for( TInt j = 0; j < numberOfExplicitLinks; ++j )
+            {
+            TBuf<128> email;
+            TBuf<128> name;
+            TBuf<128> phoneNumber;
+            phonebookWrapper->GetContactDetailsL( links[j], name, phoneNumber, email );
+            CCalAttendee* attendee = CCalAttendee::NewL( email );
+            CleanupStack::PushL(attendee);
+            if( name.Length() > 0 )
+                attendee->SetCommonNameL( name );
+            attendee->SetResponseRequested(ETrue);
+            aCalEntry.AddAttendeeL(attendee);
+            CleanupStack::Pop(); // attendee
+            }
+        }
     }
 //----------------------------------------------------------------------------
 

--- a/creator/engine/src/creator_contactelement.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_contactelement.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -196,23 +196,19 @@
             for( TInt i = 0; i < fieldList.Count(); ++i )
                 {
                 TPtrC fieldName = fieldList[i]->Name();
-                CCreatorContactField* field = 0;
-				field = CCreatorContactField::NewL();
-
                 const CCreatorScriptAttribute* amountAttr = fieldList[i]->FindAttributeByName(KAmount);
                 const CCreatorScriptAttribute* rndLenAttr = fieldList[i]->FindAttributeByName(KRandomLength);
                 const CCreatorScriptAttribute* increaseAttr = fieldList[i]->FindAttributeByName(KIncrease);
-                TBool increase( EFalse );
-                if ( increaseAttr )
-                    {
-                    increase = ConvertStrToBooleanL( increaseAttr->Value() );
-                    }
+                //TBool increase( EFalse );
+                //if ( increaseAttr )
+                //    {
+                //    increase = ConvertStrToBooleanL( increaseAttr->Value() );
+                //    }
                 for( TInt j = 0; j < fieldMappingTblSize; ++j )
                     {
                     const FieldMapping& mapping = fieldMappingTbl[j];
                     if( fieldName == mapping.iElementName )
                         {
-                        TInt rndLen = 0;
                         TPtrC content = fieldList[i]->Content();
                                                                         
 //                        MCreatorRandomDataField::TRandomLengthType randomLenType = MCreatorRandomDataField::ERandomLengthUndefined;

--- a/creator/engine/src/creator_file.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_file.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -16,8 +16,6 @@
 */
 
 
-#include <DRMRights.h>
-
 #include "engine.h"
 #include "enginewrapper.h"
 #include "creator_file.h" 

--- a/creator/engine/src/creator_message.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_message.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -22,6 +22,7 @@
 #include "creator_message.h" 
 #include "creator_traces.h"
 #include "creator_contactsetcache.h"
+#include "creator_phonebook.h"
 #include <apgcli.h>
 #include <MuiuServiceUtilities.h>
 #include <utf.h>
@@ -1201,12 +1202,13 @@
     header->SetSubjectL( parameters.iMessageSubject->Des() );
     if( iSenderArray.Count() == 0 )
         {
-        GetSendersL(iSenderArray, parameters, ETrue, 1 );
+        GetSendersL(iSenderArray, parameters, ETrue, KUndef );
         }
     
     if( iSenderArray.Count() > 0 )
         {
-        header->SetFromL(iSenderArray[0]->Des());
+        TInt rndNum = iEngine->RandomNumber( iSenderArray.Count() );
+        header->SetFromL(iSenderArray[rndNum]->Des());
         }
     else
         {
@@ -1529,11 +1531,12 @@
     // Only one sender allowed:
     if( iSenderArray.Count() == 0 )
         {
-        GetSendersL(iSenderArray, aParameters, aUseEmailAddress, 1 );
+        GetSendersL(iSenderArray, aParameters, aUseEmailAddress, KUndef );
         }
     if( iSenderArray.Count() > 0 )
         {        
-        aMsgEntry.iDetails.Set( iSenderArray[0]->Des() );        
+        TInt rnd = iEngine->RandomNumber( iSenderArray.Count() );
+        aMsgEntry.iDetails.Set( iSenderArray[rnd]->Des() );        
         }
     else
         {
@@ -1667,9 +1670,29 @@
         RPointerArray<HBufC>& aAddressArray, 
         const RArray<TLinkIdParam>& aLinkIds, 
         TBool aUseEmailAddress,
-        TInt aNumOfExistingAddresses )
+        TInt /*aNumOfExistingAddresses*/ )
     {
-}
+    CCreatorPhonebook* phonebook = dynamic_cast<CCreatorPhonebook*>(iEngine->GetPhonebook());
+    User::LeaveIfNull( phonebook );
+    CCreatorPhonebookWrapper* phonebookWrapper = phonebook->GetPhonebookWrapper();
+    
+    for( TInt i = 0; i < aLinkIds.Count(); ++i )
+        {
+        const CCreatorContactSet& set = ContactLinkCache::Instance()->ContactSet(aLinkIds[i].iLinkId);
+        const RArray<TUint32> links = set.ContactLinks();//ContactLinkCache::Instance()->ContactSets();//set.ContactLinks();
+        TInt numberOfExplicitLinks = links.Count(); // Number of defined contacts in contact-set
+        for( TInt j = 0; j < numberOfExplicitLinks; ++j )
+            {
+            TBuf<128> name;
+            TBuf<128> email;
+            TBuf<128> phoneNumber;
+            phonebookWrapper->GetContactDetailsL( links[j], name, phoneNumber, email );
+            HBufC* address = ( aUseEmailAddress ? email.AllocLC() : phoneNumber.AllocLC() );
+            aAddressArray.AppendL( address );
+            CleanupStack::Pop( address );
+            }
+        }
+    }
 
 //----------------------------------------------------------------------------
 void CCreatorMessages::DeleteAllL()

--- a/creator/engine/src/creator_note.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_note.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -22,14 +22,6 @@
 #include "creator_note.h" 
 #include "creator_traces.h"
 
-
-const TInt KCreatorDiskSpaceNeededForSingleDeletion( 8192 );
-_LIT( KCreatorNotepadFile, "c:Notepad.dat" );
-
-// @see \s60\app\organizer\notepad\notepad1\LibSrc\NpdCoreModel.cpp KSecureUid.Name()
-_LIT( KCreatorNotepadFormat, "SECURE[101F8878]" ); 
-_LIT( KCreatorNotepadDeleteAllSQL, "DELETE FROM Table1");
-
 //----------------------------------------------------------------------------
 
 CNotepadParameters::CNotepadParameters()
@@ -82,12 +74,13 @@
     if (iParameters)
         {
         delete iParameters;
-        iParameters;
+        iParameters = NULL;
         }
     
     if (iNotepadWrapper)
     	{
 		delete iNotepadWrapper;
+		iNotepadWrapper = NULL;
     	}
     }
 

--- a/creator/engine/src/creator_phonebook.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_phonebook.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -579,7 +579,7 @@
     }
 
 // Checks if the link is a group or not
-TBool CCreatorPhonebook::IsContactGroupL( TUint32& aLink )
+TBool CCreatorPhonebook::IsContactGroupL( TUint32& /*aLink*/ )
 	{
 	//not used right now
 	return EFalse;

--- a/creator/engine/src/creator_phonebookapi.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_phonebookapi.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -36,18 +36,17 @@
     // create a new contact item
     QContact store;
     quint32 id;
-    bool success = false;
     for(int i = 0 ; i < list.count() ; i++ )
     	{
 		QContactDetail cntdetail = list.at(i);
-		success = store.saveDetail(&cntdetail);
+		store.saveDetail(&cntdetail);
     	}
     /*foreach( QContactDetail cntdetail, list )
         {
-        success = store.saveDetail( &cntdetail );
+        store.saveDetail( &cntdetail );
         }
     */
-    success = mContactMngr->saveContact( &store );
+    mContactMngr->saveContact( &store );
     id = store.localId();
     return id;
     }
@@ -158,4 +157,33 @@
     {
     return mContactMngr->contact( contactId );
     }
+
+QString CCreatorPhonebookAPI::phoneNumber( const QContactLocalId& contactId )
+    {
+    QString strNumber;
+    QContact contact = mContactMngr->contact( contactId );
+    if( !contact.isEmpty() )
+        {
+        QContactPhoneNumber phoneNumber = static_cast<QContactPhoneNumber>( contact.detail( QContactPhoneNumber::DefinitionName ) );
+        strNumber = phoneNumber.number();
+        }
+    return strNumber;
+    }
+
+bool CCreatorPhonebookAPI::contactDetails( const QContactLocalId& contactId, QString& name, QString& phoneNumber, QString& email )
+    {
+    bool success(false);
+    QContact contact = mContactMngr->contact( contactId );
+    if( !contact.isEmpty() )
+        {
+        QContactPhoneNumber contactPhoneNumber = static_cast<QContactPhoneNumber>( contact.detail( QContactPhoneNumber::DefinitionName ) );
+        phoneNumber = contactPhoneNumber.number();
+        QContactEmailAddress contactEmailAddress = static_cast<QContactEmailAddress>( contact.detail( QContactEmailAddress::DefinitionName ) );
+        email = contactEmailAddress.emailAddress();
+        QContactDisplayLabel contactDisplayLabel = static_cast<QContactDisplayLabel>( contact.detail( QContactDisplayLabel::DefinitionName ) );
+        name = contactDisplayLabel.label();
+        success = true;
+        }
+    return success;
+    }
 // End of File

--- a/creator/engine/src/creator_phonebookbase.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_phonebookbase.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -24,7 +24,7 @@
     {
     LOGSTRING("Creator: CCreatorPhonebookBase::QueryDialogClosedL");
     
-    if(aPositiveAction == EFalse && aUserData!=ECreatorPhonebookGetContactFields )
+    if(aPositiveAction == EFalse && aUserData!=ECreatorPhonebookGetContactFields && aUserData!=ECreatorPhonebookContactsAllFields )
         {
         iEngine->ShutDownEnginesL();
         return;

--- a/creator/engine/src/creator_phonebookwrapper.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/engine/src/creator_phonebookwrapper.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -25,8 +25,6 @@
 
 #include <bautils.h> 
 
-_LIT(KTempPath, "C:\\Data\\Creator\\");
-
 typedef struct {
 TInt iFieldCode;
 QString iDetail;
@@ -172,7 +170,6 @@
 			QContactDetail contactDetail =  CreateContactDetail(contDetList, CreatorPbkTextFields[i].iDetail,CreatorPbkTextFields[i].iFieldContext,CreatorPbkTextFields[i].iFieldString, content );
 			AddFieldToList( contDetList, contactDetail );
 			}
-		
 		}
 	arraySize = sizeof(CreatorPhoneNumberFields)/sizeof(PhoneNumInfo);
 		for (TInt i = 0; i < arraySize; i++)
@@ -460,23 +457,6 @@
         if( aDetail == QContactAvatar::DefinitionName)                      //--Contact Picture-----------------------------
                 {
                 QContactAvatar contactAvatar;
-                /*TBuf<KMaxFileName> srcPath;
-                aEngine->RandomPictureFileL(srcPath);
-                TBuf<KMaxFileName> destPath(KTempPath);
-                            
-                if(!BaflUtils::FolderExists( fs, destPath ))
-                    {
-                    BaflUtils::EnsurePathExistsL( fs, destPath );
-                    }
-                
-                TInt err=BaflUtils::CopyFile( fs, srcPath, destPath );
-
-                TParse temp;
-                temp.Set( srcPath,NULL,NULL );
-                destPath.Append(temp.NameAndExt());
-                
-                QString avatarFile = QString::fromUtf16( destPath.Ptr(),destPath.Length() );
-                */
                 QUrl imageUrl;
                 imageUrl.setUrl(aData);
                 contactAvatar.setImageUrl(imageUrl);
@@ -652,3 +632,30 @@
     return KErrNotSupported;
     }
 
+
+HBufC* CCreatorPhonebookWrapper::GetPhoneNumberL( TUint32 aContactId )
+    {
+    QContactLocalId contact = QContactLocalId(aContactId);
+    QString phoneNumber = iPhonebookAPI->phoneNumber(contact);
+    HBufC *buf = HBufC::NewLC( phoneNumber.length() );
+    buf->Des().Copy( phoneNumber.utf16() );
+    CleanupStack::Pop( buf );
+    return buf;
+    }
+
+TBool CCreatorPhonebookWrapper::GetContactDetailsL( TUint32 aContactId, TDes& aName, TDes& aPhoneNumber, TDes& aEmail )
+    {
+    QString name;
+    QString phoneNumber;
+    QString email;
+    
+    QContactLocalId contact = QContactLocalId(aContactId);
+    bool success = iPhonebookAPI->contactDetails( contact, name, phoneNumber, email);
+    if( success )
+        {
+        aName.Copy( name.utf16() );
+        aPhoneNumber.Copy( phoneNumber.utf16() );
+        aEmail.Copy( email.utf16() );
+        }
+    return success ? ETrue : EFalse ;
+    }

--- a/creator/inc/engine.h	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/inc/engine.h	Fri Sep 03 17:11:21 2010 +0300
@@ -241,9 +241,10 @@
     static CCreatorEngine* NewLC(EngineWrapper *aEngineWrapper);	
     ~CCreatorEngine();
 	
-    inline RPointerArray<TMemoryDetails> GetMemoryDetailsList(){ return iMemoryDetailsList; };
-	inline TMemoryDetails GetMemoryDetails(){ return iMemoryDetails; };
+    inline const RPointerArray<TMemoryDetails>& GetMemoryDetailsList(){ return iMemoryDetailsList; };
+	inline const TMemoryDetails& GetMemoryDetails(){ return iMemoryDetails; };
 	inline EngineWrapper* GetEngineWrapper(){ return iEngineWrapper; };
+	inline CCreatorPhonebookBase* GetPhonebook(){ return  iPhonebook; };
 	
 private:
     CCreatorEngine();

--- a/creator/inc/notifications.h	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/inc/notifications.h	Fri Sep 03 17:11:21 2010 +0300
@@ -59,7 +59,7 @@
     /**
      * shows global HbGlobalCommonNote type note
      */
-	static void showGlobalNote(const QString& text, HbMessageBox::MessageBoxType type, HbPopup::DefaultTimeout timeout = HbPopup::ConfirmationNoteTimeout);
+	static void showGlobalNote(const QString& text, HbMessageBox::MessageBoxType type, int timeout = 1000 );
     };
 
 class CreatorDialog

--- a/creator/src/engine.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/src/engine.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -57,7 +57,6 @@
 #include <eikapp.h>
 #include <bitmaptransforms.h>
 
-_LIT(KEDriveError, "Not available");
 _LIT(KTempPathDrive, "d");
 _LIT(KTempPath, ":\\Creator\\");
 const TInt KRegisterDrive = EDriveC;
@@ -623,7 +622,6 @@
 		
 		// remove the progress dialog from the screen
         iEngineWrapper->CloseProgressbar();
-		//ProgressDialogCancelledL();
 		
 		if (iFailedCommands == 0)
 		    {
@@ -679,12 +677,7 @@
 				}
             }
 
-        if ( iPhonebook /*&& iPhonebook->IsActive()*/ )
-            {
-            // virtual phonebook is known to require asynchronous
-            // cancelling of operation
-            }
-        else if ( iDecoder  )
+        if ( iDecoder  )
             {
             iDecoder->Cancel();
             // CancelComplete() will be called from GenerateSourceImageFileL
@@ -1837,7 +1830,7 @@
 
 // ---------------------------------------------------------------------------
 
-TUint32 CCreatorEngine::AccessPointNameToIdL(const TDesC& aAPName, TBool aAnyIfNotFound )
+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->

--- a/creator/src/enginewrapper.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/src/enginewrapper.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -47,9 +47,11 @@
 {
     if (iEngine != 0) {
         delete iEngine;
+        iEngine = NULL;
     }
     if (iProgressDialog != 0) {
         delete iProgressDialog;
+        iProgressDialog = NULL;
     }
 }
 
@@ -76,12 +78,12 @@
 		for(int i=0; i<tMemDetList.Count(); i++)
 			{
 			TMemoryDetails* temp = tMemDetList.operator [](i);
-			QString free = QString::fromUtf16(tMemDetList.operator [](i)->iFree.Ptr(), tMemDetList.operator [](i)->iFree.Length());//QString((QChar*) temp->iFree.Ptr(), temp->iFree.Length());
-			QString size = QString::fromUtf16(tMemDetList.operator [](i)->iSize.Ptr(), tMemDetList.operator [](i)->iSize.Length());//QString((QChar*) temp->iSize.Ptr(), temp->iSize.Length());
-			QString driveLetter = QString::fromUtf8((const char*) &tMemDetList.operator [](i)->iDriveLetter, (int) sizeof(char) );//QString((QChar*) &temp->iDriveLetter, (int) sizeof( char ) );
+			QString free = QString::fromUtf16( temp->iFree.Ptr(), temp->iFree.Length() );
+			QString size = QString::fromUtf16( temp->iSize.Ptr(), temp->iSize.Length() );
+			QChar drive(temp->iDriveLetter.GetUpperCase());
 			memDet.mFree = free; //QString((QChar*)tMemDetList[i]->iFree.Ptr(), tMemDetList[i]->iFree.Length());
 			memDet.mSize = size; //QString((QChar*) tMemDetList[i]->iSize.Ptr(), tMemDetList[i]->iSize.Length());
-			memDet.mDriveLetter = driveLetter;
+			memDet.mDriveLetter = QString(drive);
 			
 			//memDetList[i].mDriveLetter = QString::fromUtf8( (char *) &tMemDetList[i]->iDriveLetter, (int) sizeof( char ) );
 			memDetList.append( memDet );
@@ -96,8 +98,8 @@
     MemoryDetails memoryDetails;
 
     // Convert TMemoryDetails to MemoryDetails 
-	memoryDetails.mRamFree  = QString((QChar*)tMemoryDetails.iRamFree.Ptr(), tMemoryDetails.iRamFree.Length());
-	memoryDetails.mRamSize  = QString((QChar*)tMemoryDetails.iRamSize.Ptr(), tMemoryDetails.iRamSize.Length());
+	memoryDetails.mRamFree  = QString::fromUtf16( tMemoryDetails.iRamFree.Ptr(), tMemoryDetails.iRamFree.Length() );
+	memoryDetails.mRamSize  = QString::fromUtf16( tMemoryDetails.iRamSize.Ptr(), tMemoryDetails.iRamSize.Length() );
 
 	return memoryDetails;
 }
@@ -117,7 +119,7 @@
 void EngineWrapper::ShowNote(const TDesC& aNoteMessage, TInt /*aResourceId*/)
 {
     QString note((QChar*)aNoteMessage.Ptr(),aNoteMessage.Length());
-    Notifications::showGlobalNote(note, HbMessageBox::MessageTypeInformation, HbPopup::ConfirmationNoteTimeout);
+    Notifications::showGlobalNote(note, HbMessageBox::MessageTypeInformation, 1000);
 }
 
 // ---------------------------------------------------------------------------
@@ -125,10 +127,7 @@
 void EngineWrapper::ShowProgressBar(const TDesC& aPrompt, int aMax)
 {
 	QString text((QChar*)aPrompt.Ptr(), aPrompt.Length());
-	if(iProgressDialog){
-        delete iProgressDialog;
-        iProgressDialog = NULL;
-	}
+	CloseProgressbar();
     iProgressDialog = Notifications::showProgressBar(text, aMax);
 	connect(iProgressDialog, SIGNAL(cancelled()), this, SLOT(ProgressDialogCancelled()));
 }
@@ -275,12 +274,15 @@
 
 void EngineWrapper::ProgressDialogCancelled()
 {
-	CloseProgressbar();
 	TRAPD(err, iEngine->ProgressDialogCancelledL());
 	// error handling
     if(err != KErrNone) {
         Notifications::error("Error in operation cancel.");
-    }	
+    }
+    // disconnect & delete iProgressDialog to free memory
+    disconnect(iProgressDialog, SIGNAL(cancelled()), this, SLOT(ProgressDialogCancelled()));
+    iProgressDialog->deleteLater();
+    iProgressDialog = NULL;
 }
 
 // ---------------------------------------------------------------------------

--- a/creator/src/notifications.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/creator/src/notifications.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -39,6 +39,7 @@
 {
     HbMessageBox *messageBox = new HbMessageBox(type);
     messageBox->setText(text);
+    messageBox->setStandardButtons( HbMessageBox::Ok );
     if(label.length())
         {
         HbLabel *header = new HbLabel(label, messageBox);
@@ -54,7 +55,7 @@
 void Notifications::about()
 {
     showMessageBox(HbMessageBox::MessageTypeInformation,
-        "Version 6.1.0 - June 18th 2010. Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Licensed under Eclipse Public License v1.0.",
+        "Version 6.1.1 - August 27th 2010. Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. Licensed under Eclipse Public License v1.0.",
         "About Creator", 
         HbPopup::NoTimeout
         );
@@ -83,7 +84,7 @@
 
 // ---------------------------------------------------------------------------
 
-void Notifications::showGlobalNote(const QString& text, HbMessageBox::MessageBoxType type, HbPopup::DefaultTimeout timeout)
+void Notifications::showGlobalNote(const QString& text, HbMessageBox::MessageBoxType type, int timeout)
 {
     showMessageBox(type, text, QString("Creator"), timeout);
 }
@@ -100,6 +101,7 @@
 void CreatorYesNoDialog::launch(const QString& text, const QString& label, MUIObserver* observer, int userData) throw(std::exception)
 {
     CreatorYesNoDialog* dlg = new CreatorYesNoDialog(observer, userData);
+    dlg->setStandardButtons( HbMessageBox::Yes | HbMessageBox::No );
     dlg->setText(text);
     if(label.length())
         dlg->setHeadingWidget(new HbLabel(label, dlg));
@@ -143,10 +145,10 @@
     HbValidator *validator = new HbValidator(dlg);
     QString tmp;
     if (acceptsZero == false) {
-        tmp.append("[1-9]{1}\\d{1,4}");
+        tmp.append("^[1-9]{1}\\d{0,4}");
     }
     else {
-        tmp.append("^[0-9]{5}");
+        tmp.append("^[0-9]{1,5}");
     }
         
     QRegExp rxBasic(tmp);
@@ -213,6 +215,7 @@
         dlg->setHeadingWidget(new HbLabel(label, dlg));
     dlg->setStringItems(items);
     dlg->setSelectionMode(HbAbstractItemView::SingleSelection); 
+    dlg->setSelectedItems(QList<QVariant>());
     dlg->setAttribute(Qt::WA_DeleteOnClose);
     dlg->open(dlg, SLOT(DialogClosed(HbAction*)));
 }

--- a/filebrowser/engine/FB.hrh	Mon Aug 23 15:50:54 2010 +0300
+++ b/filebrowser/engine/FB.hrh	Fri Sep 03 17:11:21 2010 +0300
@@ -285,4 +285,10 @@
     EMsgAttachmentsOutbox
     };
 
+enum TClipBoardMode
+    {
+    EClipBoardModeCut = 0,
+    EClipBoardModeCopy
+    };
+
 #endif      // FILEBROWSER_HRH

--- a/filebrowser/engine/FBFileOps.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/filebrowser/engine/FBFileOps.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -391,6 +391,8 @@
             {
             TRAP(err, DoFindEntriesRecursiveL(_L("*"), sourcePath));    // recursively under directories of current directory entry
             }
+        // ensure that target folder exists in case of copying empty folder
+        BaflUtils::EnsurePathExistsL(iFs, targetPath);
         // a path has a trailing backslash so it needs to be removed before the call
         err = FileOpAttribs(targetPath.Left(targetPath.Length()-1), aSourceEntry.iEntry.iAtt, 0, 0, 0);
         }

--- a/filebrowser/engine/FBFileUtils.cpp	Mon Aug 23 15:50:54 2010 +0300
+++ b/filebrowser/engine/FBFileUtils.cpp	Fri Sep 03 17:11:21 2010 +0300
@@ -362,8 +362,8 @@
     //LOGSTRING("Creator: CCreatorEngine::CheckForMoreCommandsL");
     
     // update the progress bar
-    if (iProgressInfo)
-        iProgressInfo->IncrementAndDraw(1);
+//    if (iProgressInfo)
+//        iProgressInfo->IncrementAndDraw(1);
 
 	// check if we have more commands to be executed
 	if (iCurrentEntry >= CommandArrayCount() - 1)
@@ -406,15 +406,15 @@
             }
         else if (iSucceededOperations == 1 && iFailedOperations == 0)    
             {
-//            _LIT(KMessage, "Operation succeeded");
-//            iEngine->FileBrowserUI()->ShowConfirmationNote(KMessage);
+            _LIT(KMessage, "Operation succeeded");
+            iEngine->FileBrowserUI()->ShowConfirmationNote(KMessage);
             }
         else if (iSucceededOperations > 0 && iFailedOperations == 0)    
             {
-//            _LIT(KMessage, "%d operations succeeded");
-//            TBuf<128> noteMsg;
-//            noteMsg.Format(KMessage, iSucceededOperations);
-//            iEngine->FileBrowserUI()->ShowConfirmationNote(noteMsg);
+            _LIT(KMessage, "%d operations succeeded");
+            TBuf<128> noteMsg;
+            noteMsg.Format(KMessage, iSucceededOperations);
+            iEngine->FileBrowserUI()->ShowConfirmationNote(noteMsg);
             }
         else if (iSucceededOperations == 0 && iFailedOperations > 1)    
             {
@@ -443,6 +443,7 @@
             }
 
         RefreshViewL();
+        iEngine->FileBrowserUI()->NotifyModelHasChanged();
 
             }
 	else
@@ -629,16 +630,8 @@
 
 void CFileBrowserFileUtils::RefreshViewL()
     {
-	// TODO
-
 //    if (iEngine->FileListContainer())
 //        {
-//        // create a list box if it doesn't already exist
-//        if (!iEngine->FileListContainer()->ListBox())
-//            iEngine->FileListContainer()->CreateListBoxL(iEngine->Settings().iFileViewMode);
-//
-//        // clear selections if any
-//        iEngine->FileListContainer()->ListBox()->ClearSelection();
 //
 //        // make sure that the search field is disabled
 //        iEngine->FileListContainer()->DisableSearchFieldL();
@@ -651,17 +644,8 @@
 //
 //        // set text items
 //        iEngine->FileListContainer()->SetListBoxTextArrayL(GenerateItemTextArrayL());
-
-//        // make sure that the current item index is not out of array
-//        if (iEngine->FileListContainer()->CurrentListBoxItemIndex() == -1 && // -1 is a hardcoded value meaning that no current item index
-//                iEngine->FileListContainer()->ListBox()->Model()->NumberOfItems() > 0)
-//            iEngine->FileListContainer()->ListBox()->SetCurrentItemIndex( iEngine->FileListContainer()->ListBox()->Model()->NumberOfItems() - 1 );
-//
 //        }
-    
-//        iEngine->FileListContainer()->UpdateToolbar();
-
-        }
+    }
     
 // --------------------------------------------------------------------------------------------
 
@@ -1537,50 +1521,11 @@
     }
 
 // --------------------------------------------------------------------------------------------
-//TInt CFileBrowserFileUtils::GetSelectedItemsOrCurrentItemL(CFileEntryList* aFileEntryList)
-//    {
-//    aFileEntryList->Reset();
-//
-//    const CArrayFix<TInt>* selectionIndexes = iEngine->GetSelectedIndices();
-//    // by default use selected items
-//    if (selectionIndexes && selectionIndexes->Count() > 0)
-//        {
-//        TInt ref(0);
-//        TKeyArrayFix key(0, ECmpTUint16);
-//        TInt index(0);
-//
-//        for (TInt i=0; i<iFileEntryList->Count(); i++)
-//            {
-//            ref = i;
-//
-//            if (selectionIndexes->Find(ref, key, index) == 0)
-//                {
-//                aFileEntryList->AppendL(iFileEntryList->At(i));
-//                }
-//            }
-//        }
-//
-//    // or if none selected, use the current item index
-//    else
-//        {
-////        TInt currentItemIndex = iEngine->FileListContainer()->CurrentListBoxItemIndex();
-//        TInt currentItemIndex = iEngine->QueryCurrentItemIndex();
-//        if (iFileEntryList->Count() > currentItemIndex && currentItemIndex >= 0)
-//            {
-//            aFileEntryList->AppendL(iFileEntryList->At(currentItemIndex));
-//            }
-//        }
-//
-//    return aFileEntryList->Count();
-//    }
-
-// --------------------------------------------------------------------------------------------
 
 TInt CFileBrowserFileUtils::ClipboardCutL(const CArrayFix<TInt>* aSelectionIndices)
     {
 	
     iClipBoardMode = EClipBoardModeCut;
-    //TInt operations = GetSelectedItemsOrCurrentItemL(iClipBoardList);
     TInt operations = SetSelectedItemsOrCurrentItemL(aSelectionIndices, iClipBoardList);
     return operations;
     }
@@ -1590,7 +1535,6 @@
 TInt CFileBrowserFileUtils::ClipboardCopyL(const CArrayFix<TInt>* aSelectionIndices)
     {
     iClipBoardMode = EClipBoardModeCopy;
-    //TInt operations = GetSelectedItemsOrCurrentItemL(iClipBoardList);
     TInt operations = SetSelectedItemsOrCurrentItemL(aSelectionIndices, iClipBoardList);
     return operations;
     }
@@ -1634,17 +1578,10 @@
     // run folder selection dialog
     //    CFileBrowserDestinationFolderSelectionDlg* dlg = CFileBrowserDestinationFolderSelectionDlg::NewL(destinationFolder, iDriveEntryList, iconArray);
 
-    // get entry list
-    //CFileEntryList* entryList = new(ELeave) CFileEntryList(32);
-    //GetSelectedItemsOrCurrentItemL(entryList);
-    //CleanupStack::PushL(entryList);
-
     // do the file operations
     //DoCopyToFolderL(entryList, aTargetDir, aOverwriteOptions, aMove);
     DoCopyToFolderL(iCurrentSelectionList, aTargetDir, aOverwriteOptions, aMove);
 
-    //CleanupStack::PopAndDestroy(); // entryList
-
     //    CleanupStack::Pop(); //iconArray
     }
 
@@ -1735,12 +1672,6 @@
                     }
 
                 }
-
-            // execute all operations
-            if (aDeleteSource)
-                StartExecutingCommandsL(_L("Moving"));
-            else
-                StartExecutingCommandsL(_L("Copying"));
             }
         }
     }
@@ -1769,9 +1700,6 @@
             }
 
         }
-
-    // execute all operations
-    StartExecutingCommandsL(_L("Deleting"));
     }
 
 
@@ -1823,15 +1751,12 @@
                                  );
             }
         }
-
-    // execute all operations
-    StartExecutingCommandsL(_L("Touching"));
     }
 
 TBool CFileBrowserFileUtils::TargetExists(const TInt aIndex, const TFileName &newName)
     {
     TBool alreadyExists(EFalse);
-    if (iDriveEntryList->Count() > aIndex && aIndex >= 0)
+    if (iFileEntryList->Count() > aIndex && aIndex >= 0)
         {
 
         TFileEntry fileEntry = iFileEntryList->At(aIndex);
@@ -1854,7 +1779,7 @@
 
 void CFileBrowserFileUtils::RenameL(const TInt aIndex, const TFileName &newName)
     {
-        if (iDriveEntryList->Count() > aIndex && aIndex >= 0)
+        if (iFileEntryList->Count() > aIndex && aIndex >= 0)
         {
             TFileEntry fileEntry = iFileEntryList->At(aIndex);
 
@@ -1866,91 +1791,33 @@
                                   new(ELeave)CCommandParamsRename(fileEntry, targetEntry, CFileMan::EOverWrite)
                                  );
         }
-    // execute all operations done from caller
-    // StartExecutingCommandsL(_L("Renaming"));
     }
 
 // --------------------------------------------------------------------------------------------
 
-void CFileBrowserFileUtils::SetAttributesL()
+void CFileBrowserFileUtils::SetAttributesL(TUint &aSetAttMask, TUint &aClearAttMask, TBool &aRecurse)
     {
-//    CFileEntryList* entries = new(ELeave) CFileEntryList(16);
-//    GetSelectedItemsOrCurrentItemL(entries);
-//    CleanupStack::PushL(entries);
-//
-//    if (entries->Count() > 0)
-//        {
-//        TFileName naviText = _L("Multiple entries");
-//
-//        TUint setAttMask(0);
-//        TUint clearAttMask(0);
-//        //TBool recurse(EFalse);
-//
-//        // set default masks if only one file selected
-//        if (entries->Count() == 1)
-//            {
-//            TFileEntry fileEntry = entries->At(0);
-//
-//            naviText.Copy(fileEntry.iEntry.iName);
-//
-//            if (fileEntry.iEntry.IsArchive())
-//                setAttMask |= KEntryAttArchive;
-//            else
-//                clearAttMask |= KEntryAttArchive;
-//
-//            if (fileEntry.iEntry.IsHidden())
-//                setAttMask |= KEntryAttHidden;
-//            else
-//                clearAttMask |= KEntryAttHidden;
-//
-//            if (fileEntry.iEntry.IsReadOnly())
-//                setAttMask |= KEntryAttReadOnly;
-//            else
-//                clearAttMask |= KEntryAttReadOnly;
-//
-//            if (fileEntry.iEntry.IsSystem())
-//                setAttMask |= KEntryAttSystem;
-//            else
-//                clearAttMask |= KEntryAttSystem;
-//            }
-//
-        //iEngine->FileListContainer()->SetScreenLayoutL(EDisplayModeNormal);
-        //iEngine->FileListContainer()->SetNaviPaneTextL(naviText);
-
-        //CFileBrowserAttributeEditorDlg* dlg = CFileBrowserAttributeEditorDlg::NewL(setAttMask, clearAttMask, recurse);
-        //TBool dlgResult = dlg->RunEditorLD();
-
-        //iEngine->FileListContainer()->SetScreenLayoutL(iEngine->Settings().iDisplayMode);
-        //iEngine->FileListContainer()->SetNaviPaneTextL(iCurrentPath);        
-//
-//        if (dlgResult && (setAttMask > 0 || clearAttMask > 0))
-//            {
-//            for (TInt i=0; i<entries->Count(); i++)
-//                {
-//                TFileEntry fileEntry = entries->At(i);
-//
-//                // append the new command to the command array
-//                if (fileEntry.iEntry.IsDir() && recurse)
-//                    {
-//                    AppendToCommandArrayL(EFileBrowserFileOpCommandAttribs,
-//                                          new(ELeave)CCommandParamsAttribs(fileEntry, setAttMask, clearAttMask, fileEntry.iEntry.iModified, CFileMan::ERecurse)
-//                                         );
-//                    }
-//                else
-//                    {
-//                    AppendToCommandArrayL(EFileBrowserFileOpCommandAttribs,
-//                                          new(ELeave)CCommandParamsAttribs(fileEntry, setAttMask, clearAttMask, fileEntry.iEntry.iModified, 0)
-//                                         );
-//                    }
-//                }
-//
-//            // execute all operations
-//            StartExecutingCommandsL(_L("Changing attributes"));
-//            }
-//
-//        }
-//
-//    CleanupStack::PopAndDestroy(); //entries
+    for (TInt i=0; i<iCurrentSelectionList->Count(); i++)
+        {
+        TFileEntry fileEntry = iCurrentSelectionList->At(i);
+
+        // append the new command to the command array
+        if (fileEntry.iEntry.IsDir() && aRecurse)
+            {
+            AppendToCommandArrayL(EFileBrowserFileOpCommandAttribs,
+                                  new(ELeave)CCommandParamsAttribs(fileEntry, aSetAttMask, aClearAttMask, fileEntry.iEntry.iModified, CFileMan::ERecurse)
+                                 );
+            }
+        else
+            {
+            AppendToCommandArrayL(EFileBrowserFileOpCommandAttribs,
+                                  new(ELeave)CCommandParamsAttribs(fileEntry, aSetAttMask, aClearAttMask, fileEntry.iEntry.iModified, 0)
+                                 );
+            }
+        }
+
+    // execute all operations
+    StartExecutingCommandsL(_L("Changing attributes"));
     }
        
 // --------------------------------------------------------------------------------------------