# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572191 0
# Node ID c6ebdf800100df54236cced74ca7f8b44ac61dd1
# Parent  379489e9f43b1a10ac9cd85ffe81f7a0927f2e4d# Parent  35a9006a7fc773f00830995f52a170a79b75f14f
Automatic merge from PDK_3.0.h

diff -r 379489e9f43b -r c6ebdf800100 voicerecorder/AppSrc/CVRAppUI.cpp
--- a/voicerecorder/AppSrc/CVRAppUI.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/voicerecorder/AppSrc/CVRAppUI.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -90,7 +90,11 @@
 //
 void CVRAppUi::ConstructL()
     {
-    BaseConstructL( EAknEnableSkin | EAknEnableMSK );
+    BaseConstructL( EAknEnableSkin | EAknEnableMSK 
+#ifdef SINGLE_CLICK_INCLUDED
+    | EAknSingleClickCompatible
+#endif
+	);
 
 	iErrorUI = CErrorUI::NewL();
 
diff -r 379489e9f43b -r c6ebdf800100 voicerecorder/AppSrc/CVRSettingsDialogMMCSupported.cpp
--- a/voicerecorder/AppSrc/CVRSettingsDialogMMCSupported.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/voicerecorder/AppSrc/CVRSettingsDialogMMCSupported.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -219,6 +219,9 @@
 
 	switch ( aEventType )
 		{
+#ifdef SINGLE_CLICK_INCLUDED
+        case EEventItemSingleClicked:
+#endif
 		case EEventItemDoubleClicked: // Pointer events (highlighted item before pressing) 
 		case EEventEnterKeyPressed:	// Normal button presses
 		case EEventEditingStarted: // From ProcessCommand->ECmdChange
diff -r 379489e9f43b -r c6ebdf800100 voicerecorder/RecViewSrc/CVRMdaRecorder.cpp
--- a/voicerecorder/RecViewSrc/CVRMdaRecorder.cpp	Mon Mar 08 21:43:32 2010 +0000
+++ b/voicerecorder/RecViewSrc/CVRMdaRecorder.cpp	Sun Mar 14 13:09:51 2010 +0000
@@ -192,7 +192,10 @@
         if (aPreviousState == CMdaAudioClipUtility::ERecording || aPreviousState == CMdaAudioClipUtility::EPlaying )
         	{ 	
 
-			if ( iMediaServerError != KErrDied &&  iMediaServerError != KErrAccessDenied )
+        	//if ( iMediaServerError != KErrDied &&  iMediaServerError != KErrAccessDenied )
+        	if ( iMediaServerError != KErrDied &&  
+        		 iMediaServerError != KErrAccessDenied &&  
+        		 iMediaServerError != KErrInUse )
 				{
 				TBuf< KVRMaxNoteLabelLength > label;
 
diff -r 379489e9f43b -r c6ebdf800100 voicerecorder/group/VoiceRecorderApp.mmp
--- a/voicerecorder/group/VoiceRecorderApp.mmp	Mon Mar 08 21:43:32 2010 +0000
+++ b/voicerecorder/group/VoiceRecorderApp.mmp	Sun Mar 14 13:09:51 2010 +0000
@@ -20,6 +20,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
+#include "VoiceRecorderSingleClick.hrh"
 
 TARGET	VoiceRecorder.exe
 TARGETTYPE    exe
@@ -32,6 +33,11 @@
 
 CAPABILITY	CAP_APPLICATION
 VENDORID	VID_DEFAULT
+
+#ifdef IAD_INCLUDE_SINGLE_CLICK 
+MACRO SINGLE_CLICK_INCLUDED
+#endif
+
 SOURCEPATH	../AppSrc
 
 SOURCE	CVRApplication.cpp 
diff -r 379489e9f43b -r c6ebdf800100 voicerecorder/group/VoiceRecorderSingleClick.hrh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/voicerecorder/group/VoiceRecorderSingleClick.hrh	Sun Mar 14 13:09:51 2010 +0000
@@ -0,0 +1,32 @@
+/*
+* ============================================================================
+*  Name     : Voice Recorder common resource header file
+*  Part of  : Voice Recorder
+*
+*  Description:
+*     bldvariant headers for project Voice Recorder
+* 
+*  Version  :
+*
+*  Copyright (C) 2002 Nokia Corporation.
+*  This material, including documentation and any related 
+*  computer programs, is protected by copyright controlled by 
+*  Nokia Corporation. All rights are reserved. Copying, 
+*  including reproducing, storing,  adapting or translating, any 
+*  or all of this material requires the prior written consent of 
+*  Nokia Corporation. This material also contains confidential 
+*  information which may not be disclosed to others without the 
+*  prior written consent of Nokia Corporation.
+*
+* ============================================================================
+*/
+
+#ifndef VOICERECORDERSINGLECLICK_HRH_
+#define VOICERECORDERSINGLECLICK_HRH_
+
+#define IAD_INCLUDE_SINGLE_CLICK
+
+
+#endif /* VOICERECORDERSINGLECLICK_HRH_ */
+
+// End of File
diff -r 379489e9f43b -r c6ebdf800100 voicerecorder/group/voicerecorder.rss
--- a/voicerecorder/group/voicerecorder.rss	Mon Mar 08 21:43:32 2010 +0000
+++ b/voicerecorder/group/voicerecorder.rss	Sun Mar 14 13:09:51 2010 +0000
@@ -209,7 +209,7 @@
 	{
 	items=
 		{
-		MENU_ITEM { command = ECmdChange;		txt = qtn_vorec_settings_change; },
+		MENU_ITEM { command = ECmdChange;		txt = qtn_vorec_settings_change; flags = EEikMenuItemSpecific; },
 		MENU_ITEM { command = ECmdHelp; 		txt = qtn_options_help; },
 		MENU_ITEM { command = EEikCmdExit; 		txt = qtn_options_exit; }
 		};
@@ -2153,7 +2153,7 @@
 	{
 	items=
 		{
-		MENU_ITEM { command = ECmdChange;		txt = qtn_vorec_settings_change; },
+		MENU_ITEM { command = ECmdChange;		txt = qtn_vorec_settings_change; flags = EEikMenuItemSpecific; },
 		MENU_ITEM { command = EAknCmdHelp; 		txt = qtn_options_help; },
 		MENU_ITEM { command = ECmdOk; 		txt = qtn_options_exit; }
 		};