# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401369 -7200 # Node ID 685c7418c584482ace87e4e612c84856057d1cb8 # Parent 2703485a934c7cd99da5e5d98ad3956b65c50a8e Revision: 201007 Kit: 201008 diff -r 2703485a934c -r 685c7418c584 launcher/group/launcher.mmp --- a/launcher/group/launcher.mmp Fri Feb 19 22:51:38 2010 +0200 +++ b/launcher/group/launcher.mmp Fri Mar 12 15:42:49 2010 +0200 @@ -18,6 +18,7 @@ #include #include +#include "../symbian_version.hrh" TARGET Launcher.exe @@ -76,7 +77,6 @@ LIBRARY eikcoctl.lib LIBRARY eikctl.lib LIBRARY aknnotify.lib -LIBRARY sendui.lib LIBRARY egul.lib LIBRARY aknicon.lib LIBRARY flogger.lib @@ -88,5 +88,8 @@ LIBRARY xmlframework.lib LIBRARY charconv.lib LIBRARY commondialogs.lib +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) +LIBRARY sendui.lib +#endif // End of File diff -r 2703485a934c -r 685c7418c584 launcher/inc/launcher.hrh --- a/launcher/inc/launcher.hrh Fri Feb 19 22:51:38 2010 +0200 +++ b/launcher/inc/launcher.hrh Fri Mar 12 15:42:49 2010 +0200 @@ -20,6 +20,7 @@ #ifndef __LAUNCHER_HRH__ #define __LAUNCHER_HRH__ +#include "../symbian_version.hrh" enum TLauncherCommandIds { @@ -36,9 +37,12 @@ ECmdSkipHiddenAndEmbedOnly, ECmdDoNotSkipAnyFiles, ECmdDeleteLog, - ECmdAbout, + ECmdAbout + #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) + , ECmdSendUISystemDllFile, ECmdSendUILogFile + #endif }; enum TLauncherTabViewId diff -r 2703485a934c -r 685c7418c584 launcher/inc/launcherappui.h --- a/launcher/inc/launcherappui.h Fri Feb 19 22:51:38 2010 +0200 +++ b/launcher/inc/launcherappui.h Fri Mar 12 15:42:49 2010 +0200 @@ -27,8 +27,10 @@ #include #include #include +#include "../symbian_version.hrh" +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) #include - +#endif #include "LauncherEngine.h" // FORWARD DECLARATIONS @@ -94,11 +96,13 @@ CAknNavigationDecorator* iDecoratedTabGroup; CLauncherEngine* iEngine; + #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) #ifdef RD_SUPPORT_SENDUI_API_V2 CSendUi* iSendUi; #else CSendAppUi* iSendAppUi; #endif + #endif public: CAknTabGroup* TabGroup() { return iTabGroup; } diff -r 2703485a934c -r 685c7418c584 launcher/inc/launcherengine.h --- a/launcher/inc/launcherengine.h Fri Feb 19 22:51:38 2010 +0200 +++ b/launcher/inc/launcherengine.h Fri Mar 12 15:42:49 2010 +0200 @@ -24,7 +24,10 @@ #include #include #include +#include "../symbian_version.hrh" +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) #include +#endif #include #include @@ -61,8 +64,10 @@ TBool BCLogFileExists(); void AnalyseDLLsL(); void StopLaunchingL(); + #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) void SendLogViaSendUiL(CSendUi* aSendUi); void SendListOfSystemDllsViaSendUiL(CSendUi* aSendUi); + #endif TBool SelectRequiredDLLsFileL(); // From MLauncherParserObserver diff -r 2703485a934c -r 685c7418c584 launcher/src/launcherappui.cpp --- a/launcher/src/launcherappui.cpp Fri Feb 19 22:51:38 2010 +0200 +++ b/launcher/src/launcherappui.cpp Fri Mar 12 15:42:49 2010 +0200 @@ -39,9 +39,9 @@ void CLauncherAppUi::ConstructL() { BaseConstructL(EAknEnableSkin); - + #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) iSendUi = CSendUi::NewL(); - + #endif // Show tabs for main views from resources CEikStatusPane* sp = StatusPane(); @@ -91,8 +91,9 @@ delete iEngine; delete iDecoratedTabGroup; - + #if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) delete iSendUi; + #endif } // ------------------------------------------------------------------------------ @@ -114,6 +115,7 @@ aMenuPane->SetItemDimmed(ECmdDeleteLog, !(iEngine->LogFileExists() || iEngine->BCLogFileExists())); // SendUI for the log file +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) if (iEngine->LogFileExists() || iEngine->BCLogFileExists()) { TInt index(0); @@ -121,8 +123,9 @@ iSendUi->AddSendMenuItemL(*aMenuPane, index-1, ECmdSendUILogFile, TSendingCapabilities(0, 0, TSendingCapabilities::ESupportsAttachments)); aMenuPane->SetItemTextL(ECmdSendUILogFile, _L("Send log(s)")); } +#endif } - +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) else if (aResourceId == R_LAUNCHER_DLLINFO_SUBMENU) { //SendUI for the system dll file @@ -133,6 +136,7 @@ aMenuPane->SetItemTextL(ECmdSendUISystemDllFile, _L("Send list of DLLs")); aMenuPane->SetItemButtonState(ECmdSendUISystemDllFile, EEikMenuItemSymbolIndeterminate); } +#endif } // ---------------------------------------------------- @@ -238,7 +242,7 @@ iEngine->StopLaunchingL(); break; } - +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) case ECmdSendUILogFile: { iEngine->SendLogViaSendUiL(iSendUi); @@ -250,6 +254,7 @@ iEngine->SendListOfSystemDllsViaSendUiL(iSendUi); break; } +#endif case EAknSoftkeyCancel: { iEngine->Cancel(); diff -r 2703485a934c -r 685c7418c584 launcher/src/launcherengine.cpp --- a/launcher/src/launcherengine.cpp Fri Feb 19 22:51:38 2010 +0200 +++ b/launcher/src/launcherengine.cpp Fri Mar 12 15:42:49 2010 +0200 @@ -1591,6 +1591,7 @@ // --------------------------------------------------------------------------- +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) void CLauncherEngine::SendLogViaSendUiL(CSendUi* aSendUi) { LOGSTRING("Launcher: CLauncherEngine::SendLogViaSendUiL"); @@ -1608,9 +1609,11 @@ aSendUi->ShowQueryAndSendL( messageData, TSendingCapabilities(0, 0, TSendingCapabilities::ESupportsAttachments )); CleanupStack::PopAndDestroy(); //messageData } +#endif // --------------------------------------------------------------------------- +#if ( SYMBIAN_VERSION_SUPPORT < SYMBIAN_4 ) void CLauncherEngine::SendListOfSystemDllsViaSendUiL(CSendUi* aSendUi) { LOGSTRING("Launcher: CLauncherEngine::SendListOfDllsViaSendUiL"); @@ -1630,6 +1633,7 @@ errorNote->ExecuteLD(message); } } +#endif // --------------------------------------------------------------------------- diff -r 2703485a934c -r 685c7418c584 launcher/symbian_version.hrh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/launcher/symbian_version.hrh Fri Mar 12 15:42:49 2010 +0200 @@ -0,0 +1,43 @@ +/* +* Copyright (c) 2009 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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: Symbian version configuration file +* +*/ + +#ifndef __SYMBIAN_VERSION_HRH +#define __SYMBIAN_VERSION_HRH + +// S60 and Symbian version number enumeration definitions + +#define S60_30 30 +#define S60_31 31 +#define S60_32 32 +#define S60_50 50 +#define S60_51 91 +#define S60_52 92 +#define SYMBIAN_1 50 +#define SYMBIAN_2 91 +#define SYMBIAN_3 92 +#define SYMBIAN_4 101 + + +/** + * Defines the S60 or Symbian version used by this component. This flag can be + * used to variate the source code based on the SDK in use. The value of the + * flag should be always changed to reflect the current build environment. + */ +#define SYMBIAN_VERSION_SUPPORT SYMBIAN_3 + + +#endif // __SYMBIAN_VERSION_HRH diff -r 2703485a934c -r 685c7418c584 stifui/group/ReleaseNote.txt --- a/stifui/group/ReleaseNote.txt Fri Feb 19 22:51:38 2010 +0200 +++ b/stifui/group/ReleaseNote.txt Fri Mar 12 15:42:49 2010 +0200 @@ -1,5 +1,5 @@ ======================================================================== -RELEASE NOTE FOR STIF UI - STIF_201003 (7.3.25) +RELEASE NOTE FOR STIF UI - STIF_201006 (7.3.26) SUPPORTING SERIES 60 3.0 -> ======================================================================== diff -r 2703485a934c -r 685c7418c584 stifui/sis/Stifui_31.sis Binary file stifui/sis/Stifui_31.sis has changed diff -r 2703485a934c -r 685c7418c584 stifui/stifui/inc/MenuListBox.h --- a/stifui/stifui/inc/MenuListBox.h Fri Feb 19 22:51:38 2010 +0200 +++ b/stifui/stifui/inc/MenuListBox.h Fri Mar 12 15:42:49 2010 +0200 @@ -22,7 +22,7 @@ #include #include "Stifui.hrh" #include "AppUIAppUi.h" -#include +#include #include // CONSTANTS diff -r 2703485a934c -r 685c7418c584 stifui/stifui/inc/version.h --- a/stifui/stifui/inc/version.h Fri Feb 19 22:51:38 2010 +0200 +++ b/stifui/stifui/inc/version.h Fri Mar 12 15:42:49 2010 +0200 @@ -20,9 +20,9 @@ #define STIFUI_MAJOR_VERSION 7 #define STIFUI_MINOR_VERSION 3 -#define STIFUI_BUILD_VERSION 25 +#define STIFUI_BUILD_VERSION 26 -#define STIFUI_REL_DATE "19th Jan 2010" +#define STIFUI_REL_DATE "09th Feb 2010" #define TO_UNICODE(text) _L(text) diff -r 2703485a934c -r 685c7418c584 stifui/stifui/src/AppUIAppUi.cpp --- a/stifui/stifui/src/AppUIAppUi.cpp Fri Feb 19 22:51:38 2010 +0200 +++ b/stifui/stifui/src/AppUIAppUi.cpp Fri Mar 12 15:42:49 2010 +0200 @@ -42,7 +42,7 @@ #include #include -#include +#include _LIT( KTestSet, "DefaultSet" ); diff -r 2703485a934c -r 685c7418c584 stifui/stifui/src/MenuListBox.cpp --- a/stifui/stifui/src/MenuListBox.cpp Fri Feb 19 22:51:38 2010 +0200 +++ b/stifui/stifui/src/MenuListBox.cpp Fri Mar 12 15:42:49 2010 +0200 @@ -17,7 +17,7 @@ // INCLUDE FILES #include "MenuListBox.h" -#include +#include // ================= MEMBER FUNCTIONS ======================= // ---------------------------------------------------------