--- a/voicerecorder/AppSrc/CVRAppUI.cpp Mon Jan 18 20:21:38 2010 +0200
+++ b/voicerecorder/AppSrc/CVRAppUI.cpp Fri Feb 19 22:53:07 2010 +0200
@@ -90,7 +90,11 @@
//
void CVRAppUi::ConstructL()
{
- BaseConstructL( EAknEnableSkin | EAknEnableMSK );
+ BaseConstructL( EAknEnableSkin | EAknEnableMSK
+#ifdef SINGLE_CLICK_INCLUDED
+ | EAknSingleClickCompatible
+#endif
+ );
iErrorUI = CErrorUI::NewL();
--- a/voicerecorder/AppSrc/CVRSettingsDialogMMCSupported.cpp Mon Jan 18 20:21:38 2010 +0200
+++ b/voicerecorder/AppSrc/CVRSettingsDialogMMCSupported.cpp Fri Feb 19 22:53:07 2010 +0200
@@ -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
--- a/voicerecorder/RecViewSrc/CVRMdaRecorder.cpp Mon Jan 18 20:21:38 2010 +0200
+++ b/voicerecorder/RecViewSrc/CVRMdaRecorder.cpp Fri Feb 19 22:53:07 2010 +0200
@@ -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;
--- a/voicerecorder/group/VoiceRecorderApp.mmp Mon Jan 18 20:21:38 2010 +0200
+++ b/voicerecorder/group/VoiceRecorderApp.mmp Fri Feb 19 22:53:07 2010 +0200
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/voicerecorder/group/VoiceRecorderSingleClick.hrh Fri Feb 19 22:53:07 2010 +0200
@@ -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
--- a/voicerecorder/group/voicerecorder.rss Mon Jan 18 20:21:38 2010 +0200
+++ b/voicerecorder/group/voicerecorder.rss Fri Feb 19 22:53:07 2010 +0200
@@ -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; }
};