# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268649601 -7200 # Node ID 91123d004e8feb69295690726bc3ef8daf1acbf3 # Parent 41042d2af523c2f542d0d0a5af5d12e50562dc42 Revision: 201009 Kit: 201010 diff -r 41042d2af523 -r 91123d004e8f basiclocationinfodisplay/blid/engine/src/CBlidSettings.cpp --- a/basiclocationinfodisplay/blid/engine/src/CBlidSettings.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/basiclocationinfodisplay/blid/engine/src/CBlidSettings.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -25,7 +25,7 @@ #include "MBlidEngObserver.h" #include "CBlidMeasurementSettingListener.h" #include "BlidSettingsCrkeys.h" -#include "blid.hrh" +#include "Blid.hrh" // CONSTANTS diff -r 41042d2af523 -r 91123d004e8f basiclocationinfodisplay/blid/ui/inc/CBlidArrivedTonePayerUtility.h --- a/basiclocationinfodisplay/blid/ui/inc/CBlidArrivedTonePayerUtility.h Fri Mar 12 15:42:12 2010 +0200 +++ b/basiclocationinfodisplay/blid/ui/inc/CBlidArrivedTonePayerUtility.h Mon Mar 15 12:40:01 2010 +0200 @@ -82,7 +82,7 @@ void ConstructL( ); public: - void PlayToneL( TFileName aFileName ); + void PlayToneL( const TFileName& aFileName ); void CanclePayer(); private: diff -r 41042d2af523 -r 91123d004e8f basiclocationinfodisplay/blid/ui/inc/CBlidBaseView.h --- a/basiclocationinfodisplay/blid/ui/inc/CBlidBaseView.h Fri Mar 12 15:42:12 2010 +0200 +++ b/basiclocationinfodisplay/blid/ui/inc/CBlidBaseView.h Mon Mar 15 12:40:01 2010 +0200 @@ -92,7 +92,7 @@ * * @param aMenuPane A pointer to CEikMenuPane */ - void HandleHelpFeature( CEikMenuPane* aMenuPane ) const; + void HandleHelpFeatureL( CEikMenuPane* aMenuPane ) const; /** * Insert waypoint to MBlidRouter's array diff -r 41042d2af523 -r 91123d004e8f basiclocationinfodisplay/blid/ui/src/CBlidArrivedTonePayerUtility.cpp --- a/basiclocationinfodisplay/blid/ui/src/CBlidArrivedTonePayerUtility.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/basiclocationinfodisplay/blid/ui/src/CBlidArrivedTonePayerUtility.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -90,7 +90,7 @@ // Plays the appropriate tone // --------------------------------------------------------- // -void CBlidArrivedTonePlayerUtility::PlayToneL( TFileName aFileName ) +void CBlidArrivedTonePlayerUtility::PlayToneL( const TFileName& aFileName ) { iFileName = aFileName; CanclePayer(); diff -r 41042d2af523 -r 91123d004e8f basiclocationinfodisplay/blid/ui/src/CBlidBaseView.cpp --- a/basiclocationinfodisplay/blid/ui/src/CBlidBaseView.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/basiclocationinfodisplay/blid/ui/src/CBlidBaseView.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -179,7 +179,7 @@ } case R_BLID_MAIN_MENU: { - CBlidBaseView::HandleHelpFeature( aMenuPane ); + CBlidBaseView::HandleHelpFeatureL( aMenuPane ); break; } @@ -274,11 +274,11 @@ } // --------------------------------------------------------- -// CBlidBaseView::HandleHelpFeature +// CBlidBaseView::HandleHelpFeatureL // Handles the Help option command // --------------------------------------------------------- // -void CBlidBaseView::HandleHelpFeature( CEikMenuPane* aMenuPane ) const +void CBlidBaseView::HandleHelpFeatureL( CEikMenuPane* aMenuPane ) const { //implementation for req 406-917. Hide position view based on feature variation flag TInt helpSettingValue = ELocHelpNotHidden; @@ -306,7 +306,6 @@ // TBool CBlidBaseView::InsertWaypointL() { - TInt index(KErrCancel); TBuf textData; StringLoader::Load( textData, R_BLID_WAYPOINT_NAME, iCoeEnv ); TInt errorCode(KErrNone); @@ -330,58 +329,41 @@ }while( CheckIfExistL( textData, errorCode, removedIndex ) ); - if(errorCode != KErrNone) - { - return EFalse; - } + if(errorCode != KErrNone) + { + return EFalse; + } - /// if KMaxNumberOfWaypoints or more than that is already present - /// display note. - if ( iRouter->Count() >= KMaxNumberOfWaypoints ) - { - static_cast(AppUi() - )->ShowDialogL( BlidNotes::EBlidOverWriteWaypointNote ); - return EFalse; - } + /// if KMaxNumberOfWaypoints or more than that is already present + /// display note. + if ( iRouter->Count() >= KMaxNumberOfWaypoints ) + { + static_cast(AppUi() + )->ShowDialogL( BlidNotes::EBlidOverWriteWaypointNote ); + return EFalse; + } - TInt retVal(KErrNone); - if ( index >=0 ) - { - if ( iRouter->IndexOfWaypoint() >=0 && - index >= iRouter->IndexOfWaypoint() ) - { - index++; - } - retVal = iRouter->RemoveL( index ); - if(retVal == KErrDiskFull) - { - BlidNotes::OutOfMemoryNoteL(); - } - } - - if(retVal == KErrNone) - { - TNamedCoordinate* waypoint = new(ELeave)TNamedCoordinate(); - CleanupStack::PushL( waypoint ); - waypoint->SetName( textData ); - TPosition position = iLocation->GetCurrentPosition(); - waypoint->SetCoordinate( position.Latitude(), - position.Longitude(), - position.Altitude() ); - position.SetHorizontalAccuracy(position.HorizontalAccuracy()); - waypoint->SetAccuracy(position.HorizontalAccuracy()); - //iRouter takes waypoint's ownership - TInt retVal = iRouter->AppendL( waypoint, ETrue); - if(retVal == KErrDiskFull) - { - delete waypoint; - BlidNotes::OutOfMemoryNoteL(); - returnValue = EFalse; - } - CleanupStack::Pop(); //waypoint - } - return returnValue; - } + TNamedCoordinate* waypoint = new(ELeave)TNamedCoordinate(); + CleanupStack::PushL( waypoint ); + waypoint->SetName( textData ); + TPosition position = iLocation->GetCurrentPosition(); + waypoint->SetCoordinate( position.Latitude(), + position.Longitude(), + position.Altitude() ); + position.SetHorizontalAccuracy(position.HorizontalAccuracy()); + waypoint->SetAccuracy(position.HorizontalAccuracy()); + //iRouter takes waypoint's ownership + TInt retVal = iRouter->AppendL( waypoint, ETrue); + if(retVal == KErrDiskFull) + { + delete waypoint; + BlidNotes::OutOfMemoryNoteL(); + returnValue = EFalse; + } + CleanupStack::Pop(); //waypoint + + return returnValue; + } // ---------------------------------------------------------------------------- // CBlidBaseView::SelectWaypoint diff -r 41042d2af523 -r 91123d004e8f basiclocationinfodisplay/blid/ui/src/CBlidSettingsView.cpp --- a/basiclocationinfodisplay/blid/ui/src/CBlidSettingsView.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/basiclocationinfodisplay/blid/ui/src/CBlidSettingsView.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -237,7 +237,7 @@ { case R_BLID_MAIN_MENU: { - CBlidBaseView::HandleHelpFeature( aMenuPane ); + CBlidBaseView::HandleHelpFeatureL( aMenuPane ); break; } case R_BLID_SETTINGS_MENU: diff -r 41042d2af523 -r 91123d004e8f basiclocationinfodisplay/blid/ui/src/CBlidTripMeterView.cpp --- a/basiclocationinfodisplay/blid/ui/src/CBlidTripMeterView.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/basiclocationinfodisplay/blid/ui/src/CBlidTripMeterView.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -432,7 +432,7 @@ } case R_BLID_MAIN_MENU: { - CBlidBaseView::HandleHelpFeature( aMenuPane ); + CBlidBaseView::HandleHelpFeatureL( aMenuPane ); break; } case R_BLID_SAVE_CURRENT_LOCATION_MENU: diff -r 41042d2af523 -r 91123d004e8f eventsui/eventsmgmtui/src/evtmgmtuimodel.cpp --- a/eventsui/eventsmgmtui/src/evtmgmtuimodel.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/eventsui/eventsmgmtui/src/evtmgmtuimodel.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -149,7 +149,7 @@ // Append the Icon ID if( aIndex==0 ) - ptr.AppendNum( 0 ); + ptr.AppendNum( 1 ); else { // Get the Index based on the Status Filter @@ -158,17 +158,17 @@ { case EActive: { - ptr.AppendNum( 1 ); + ptr.AppendNum( 2 ); break; } case EDraft: { - ptr.AppendNum( 2 ); + ptr.AppendNum( 3 ); break; } case ECompleted: { - ptr.AppendNum( 3 ); + ptr.AppendNum( 4 ); break; } } @@ -209,7 +209,7 @@ } ptr.Append( EKeyTab ); if( iEventsArray[aIndex-1]->Repeat() ) - ptr.AppendNum(4); + ptr.AppendNum(5); } return *iBuffer; diff -r 41042d2af523 -r 91123d004e8f eventsui/eventsmgmtui/src/evtmgmtuistartupcontainer.cpp --- a/eventsui/eventsmgmtui/src/evtmgmtuistartupcontainer.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/eventsui/eventsmgmtui/src/evtmgmtuistartupcontainer.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -18,6 +18,7 @@ // SYSTEM INCLUDES #include +#include #include #include #include // Icon Array @@ -481,6 +482,12 @@ TFileName *iconFile = IconFileNameLC(); + //mark + AddColorIconL( *icons, + AknIconUtils::AvkonIconFileName(), + KAknsIIDQgnIndiMarkedAdd, + EMbmAvkonQgn_indi_marked_add, EMbmAvkonQgn_indi_marked_add_mask ); + //Create new event AddIconL( *icons, *iconFile, diff -r 41042d2af523 -r 91123d004e8f landmarksui/app/data/Landmarks.rss --- a/landmarksui/app/data/Landmarks.rss Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/app/data/Landmarks.rss Mon Mar 15 12:40:01 2010 +0200 @@ -137,30 +137,12 @@ }, MENU_ITEM { - command = ELmkCmdEditLm; - txt = qtn_lm_opt_edit_landmark; - flags = EEikMenuItemSpecific; - }, - MENU_ITEM - { command = ELmkCmdNewLm; txt = qtn_lm_opt_new_landmark; cascade = r_lmk_new_landmark_submenu; }, MENU_ITEM { - command = ELmkCmdDeleteLm; - txt = qtn_lm_opt_delete_landmark; - flags = EEikMenuItemSpecific; - }, - MENU_ITEM - { - command = ELmkCmdAddToCat; - txt = qtn_lm_opt_add_to_category; - flags = EEikMenuItemSpecific; - }, - MENU_ITEM - { command = ELmkShowOnMapPlaceHolder; txt = qtn_mnn_option_show_on_map; flags = EEikMenuItemSpecific; @@ -173,64 +155,26 @@ }, MENU_ITEM { - command = ELmkCmdSendDummy; - txt = qtn_options_send_via; - }, - // This menu item will be replaced by AIW. - MENU_ITEM - { - command = ELmkAppMenuAiwId; // The same ID than in interest. - txt = qtn_options_call; // Will be replaced by AIW (plugin). - cascade = r_lmk_app_call_submenu; // Added submenu for AIW usage. + command = ELmkCmdAddToCat; + txt = qtn_lm_opt_add_to_category; + flags = EEikMenuItemSpecific; }, MENU_ITEM { - command = ELmkCmdGoToUrl; - txt = qtn_lm_opt_go_to_url; - } - }; - } - -// ----------------------------------------------------------------------------- -// -// r_lmk_app_call_submenu -// -// The submenu where call menu options are put by AVKON. -// ----------------------------------------------------------------------------- -// -RESOURCE MENU_PANE r_lmk_app_call_submenu - { - items = - { - // This menu item will be replaced by AIW. + command = ERemoveFromCat; + txt = qtn_lm_opt_remove_from_category; + flags = EEikMenuItemSpecific; + }, MENU_ITEM { - command = ELmkAppSubMenuAiwId; // The same ID than in interest. - txt = ""; // Will be replaced by AIW (plugin). - } - }; - } - -// ----------------------------------------------------------------------------- -// -// r_lmk_app_aiw_interest -// -// ----------------------------------------------------------------------------- -// -RESOURCE AIW_INTEREST r_lmk_app_aiw_interest - { - items= - { - // This application is interested in calling from menu. - AIW_CRITERIA_ITEM + command = ELmkCmdSendDummy; + txt = qtn_options_send_via; + }, + MENU_ITEM { - // Some unique id in this RSS, by default use KaiwCmdCall. - id = ELmkAppSubMenuAiwId; - serviceCmd = KAiwCmdCall; - serviceClass = KAiwClassMenu; - contentType = "*"; - defaultProvider = 0x101F868E; - maxProviders = 1; + command = ELmkCmdDeleteLm; + txt = qtn_lm_opt_delete_landmark; + flags = EEikMenuItemSpecific; } }; } @@ -252,17 +196,6 @@ }, MENU_ITEM { - command = ELmkCmdChangeIcon; - txt = qtn_lm_opt_change_landmark_icon; - }, - MENU_ITEM - { - command = ERemoveFromCat; - txt = qtn_lm_opt_remove_from_category; - flags = EEikMenuItemSpecific; - }, - MENU_ITEM - { command=ELmkCmdLaunchPositionSettings; txt=qtn_lm_options_pos_settings; } @@ -333,11 +266,6 @@ }, MENU_ITEM { - command = ELmkCmdDeleteLm; - txt = qtn_lm_opt_delete_landmark; - }, - MENU_ITEM - { command = ELmkCmdAddToCat; txt = qtn_lm_opt_add_to_category; }, @@ -345,6 +273,11 @@ { command = ELmkCmdSendDummy; txt = qtn_options_send_via; + }, + MENU_ITEM + { + command = ELmkCmdDeleteLm; + txt = qtn_lm_opt_delete_landmark; } }; } @@ -478,9 +411,9 @@ MENU_TITLE {menu_pane=r_lmk_main_menu; txt="";}, MENU_TITLE - {menu_pane=r_lmk_category_settings_menu2; txt="";}, + {menu_pane = R_AVKON_MENUPANE_MARKABLE_LIST;}, MENU_TITLE - {menu_pane = R_AVKON_MENUPANE_MARKABLE_LIST;}, + {menu_pane=r_lmk_category_settings_menu2; txt="";}, MENU_TITLE {menu_pane=r_lmk_category_settings_menu1; txt="";} }; diff -r 41042d2af523 -r 91123d004e8f landmarksui/app/src/CLmkByLmView.cpp --- a/landmarksui/app/src/CLmkByLmView.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/app/src/CLmkByLmView.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -182,8 +182,6 @@ case ELmkCmdSendVia10: case ELmkCmdSend: case ELmkCmdOpenLm: - case ELmkCmdGoToUrl: - case ELmkCmdCall: case EAknCmdMark: case EAknCmdUnmark: case EAknMarkAll: @@ -202,7 +200,6 @@ if (markedCount > 0 && aCommand == ELmkCmdOpenLm && !iContainer->IsEditorOpened()) { - DEBUG( CLmkByLmView::HandleCommandL ELmkCmdOpenLm showing c menu); if (MenuBar()) { MenuBar()->SetContextMenuTitleResourceId(R_LMK_OK_MENUBAR); @@ -212,13 +209,11 @@ else if (aCommand == ELmkCmdOpenLm && !iContainer->IsEditorOpened()) { - DEBUG( CLmkByLmView::HandleCommandL ELmkCmdOpenLm ); iContainer->SelectorImpl().ProcessCommandL(aCommand); iContainer->SetEditorOpenedBool(ETrue); } else { - DEBUG( CLmkByLmView::HandleCommandL ProcessCommandL aCommand ); iContainer->SelectorImpl().ProcessCommandL(aCommand); } // Set pointer event handling ETrue @@ -227,12 +222,11 @@ } default: { - DEBUG( CLmkByLmView::HandleCommandL default ); (static_cast (AppUi()))->HandleCommandL(aCommand); break; } } -DEBUG ( CLmkByLmView::HandleCommandL End ); + DEBUG ( CLmkByLmView::HandleCommandL End ); } // --------------------------------------------------------- @@ -256,20 +250,27 @@ switch (aResourceId) { - case R_LMK_APP_CALL_SUBMENU: - { - // Initialise the call UI AIW menu via selector - selector.AttachToAIWMenuL(R_LMK_APP_CALL_SUBMENU, - R_LMK_APP_AIW_INTEREST); - selector.InitializeMenuPaneL(*aMenuPane, aResourceId); - selector.AttachInterestL(R_LMK_APP_AIW_INTEREST); - break; - } case R_LMK_BYLM_MENU1: { + //always dimmed + aMenuPane->SetItemDimmed(ERemoveFromCat, ETrue); aMenuPane->SetItemDimmed(ELmkCmdSendDummy, ETrue); - aMenuPane->SetItemDimmed(ELmkAppMenuAiwId, ETrue); - aMenuPane->SetItemDimmed(ELmkCmdGoToUrl, ETrue); + + // Send menu is handled by the sender: + if ( FeatureManager::FeatureSupported( KFeatureIdLandmarksConverter ) ) + { + iLmkSender.DisplaySendMenuL( *aMenuPane, visibleCount ); + if( visibleCount > 0 ) + { + TInt pos( 0 ); + aMenuPane->ItemAndPos( ELmkCmdSend, pos ); + if( pos > 0 ) + { + aMenuPane->SetItemDimmed(ELmkCmdSend,EFalse ); + aMenuPane->SetItemSpecific(ELmkCmdSend,ETrue); + } + } + } /* If multiple landmarks are selected then we have to dim @@ -344,13 +345,6 @@ } break; } - case R_LMK_BYLM_MENU2: - { - //always dimmed - aMenuPane->SetItemDimmed(ELmkCmdChangeIcon, ETrue); - aMenuPane->SetItemDimmed(ERemoveFromCat, ETrue); - break; - } case R_LMK_OK_MENU: { DEBUG( CLmkByLmView::DynInitMenuPaneL R_LMK_OK_MENU ); @@ -433,8 +427,6 @@ //for touch event iContainer->SetListBoxObserver(this); #endif//RD_SCALABLE_UI_V2 - // Attach CAll UI base service Interest - selector.AttachInterestL(R_LMK_APP_AIW_INTEREST); if (!iListMemento) { // Memento not created yet, create it now: iListMemento = selector.MementoL(); @@ -603,19 +595,24 @@ { case KAiwCmdMnNavigateTo: { - iContainer->GetSelectedLandmarksL(lmkArray); - CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); - iMapNavInterface->NavigateToLandmarkL(lmkArray[0], aMenuCommand); - CleanupStack::PopAndDestroy(); // lmkArray + if (iContainer->GetSelectedLandmarksL(lmkArray) == KErrNone) + { + CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); + iMapNavInterface->NavigateToLandmarkL(lmkArray[0], + aMenuCommand); + CleanupStack::PopAndDestroy(); // lmkArray + } break; } case KAiwCmdMnShowMap: { - TInt retval = iContainer->GetSelectedLandmarksL(lmkArray); - CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); - iMapNavInterface->ShowLandmarksOnMapL(lmkArray, aMenuCommand, - CLmkMapNavigationInterface::EByLmkView); - CleanupStack::PopAndDestroy(); // lmkArray + if (iContainer->GetSelectedLandmarksL(lmkArray) == KErrNone) + { + CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); + iMapNavInterface->ShowLandmarksOnMapL(lmkArray, aMenuCommand, + CLmkMapNavigationInterface::EByLmkView); + CleanupStack::PopAndDestroy(); // lmkArray + } break; } case KAiwCmdMnSelectFromMap: @@ -624,16 +621,6 @@ iMapNavInterface->GetLandmarkFromMapL(aMenuCommand); break; } - case KAiwCmdCall: - { - // Handle AIW specific service commands - CLmkAppSelectorImplBase& selector = iContainer->SelectorImpl(); - if (selector.ListVisibleItemCount() > 0) - { - selector.ExecuteAIWCallCmdL(aMenuCommand); - } - break; - } default: { result = EFalse; diff -r 41042d2af523 -r 91123d004e8f landmarksui/app/src/CLmkCategoryContentsView.cpp --- a/landmarksui/app/src/CLmkCategoryContentsView.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/app/src/CLmkCategoryContentsView.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -180,8 +180,6 @@ case ELmkCmdSendVia10: case ELmkCmdSend: case ELmkCmdOpenLm: - case ELmkCmdGoToUrl: - case ELmkCmdCall: case EAknCmdMark: case EAknCmdUnmark: case EAknMarkAll: @@ -272,20 +270,29 @@ switch (aResourceId) { - case R_LMK_APP_CALL_SUBMENU: - { - // Initialise the call UI AIW menu via selector - selector.AttachToAIWMenuL(R_LMK_APP_CALL_SUBMENU, - R_LMK_APP_AIW_INTEREST); - selector.InitializeMenuPaneL(*aMenuPane, aResourceId); - selector.AttachInterestL(R_LMK_APP_AIW_INTEREST); - break; - } case R_LMK_BYLM_MENU1: { + if (iContainer->IsUncategorizedCategory() || visibleCount == 0) + { + aMenuPane->SetItemDimmed(ERemoveFromCat, ETrue); + } aMenuPane->SetItemDimmed(ELmkCmdSendDummy, ETrue); - aMenuPane->SetItemDimmed(ELmkAppMenuAiwId, ETrue); - aMenuPane->SetItemDimmed(ELmkCmdGoToUrl, ETrue); + + // Send menu is handled by the sender: + if ( FeatureManager::FeatureSupported( KFeatureIdLandmarksConverter ) ) + { + iLmkSender.DisplaySendMenuL( *aMenuPane, visibleCount ); + if( visibleCount > 0 ) + { + TInt pos( 0 ); + aMenuPane->ItemAndPos( ELmkCmdSend, pos ); + if( pos > 0 ) + { + aMenuPane->SetItemDimmed(ELmkCmdSend,EFalse ); + aMenuPane->SetItemSpecific(ELmkCmdSend,ETrue); + } + } + } /* If multiple landmarks are selected then we have to dim @@ -344,32 +351,18 @@ { break; } - + // dimming navigate to item + aMenuPane->SetItemDimmed(navigateToCmd, ETrue); + + // handling of showonmap item if (isLandmarkDataEmpty || markedCount > 1) { aMenuPane->SetItemDimmed(showOnMapCmd, ETrue); - aMenuPane->SetItemDimmed(navigateToCmd, ETrue); } else { aMenuPane->SetItemDimmed(showOnMapCmd, EFalse); aMenuPane->SetItemSpecific(showOnMapCmd, ETrue); - if (iContainer->IsUncategorizedCategory()) - { - aMenuPane->SetItemDimmed(navigateToCmd, EFalse); - aMenuPane->SetItemSpecific(navigateToCmd, ETrue); - } - else - aMenuPane->SetItemDimmed(navigateToCmd, ETrue); - } - break; - } - case R_LMK_BYLM_MENU2: - { - aMenuPane->SetItemDimmed(ELmkCmdChangeIcon, ETrue); - if (iContainer->IsUncategorizedCategory() || visibleCount == 0) - { - aMenuPane->SetItemDimmed(ERemoveFromCat, ETrue); } break; } @@ -460,8 +453,6 @@ CLmkAppSelectorImplBase& selector = iContainer->SelectorImpl(); AppUi()->AddToStackL(*this, iContainer); - // Attach CAll UI base service Interest - selector.AttachInterestL(R_LMK_APP_AIW_INTEREST); #ifdef RD_SCALABLE_UI_V2 //for touch event @@ -653,19 +644,24 @@ { case KAiwCmdMnNavigateTo: { - iContainer->GetSelectedLandmarksL(lmkArray); - CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); - iMapNavInterface->NavigateToLandmarkL(lmkArray[0], aMenuCommand); - CleanupStack::PopAndDestroy(); // lmkArray + if (iContainer->GetSelectedLandmarksL(lmkArray) == KErrNone) + { + CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); + iMapNavInterface->NavigateToLandmarkL(lmkArray[0], + aMenuCommand); + CleanupStack::PopAndDestroy(); // lmkArray + } break; } case KAiwCmdMnShowMap: { - TInt retval = iContainer->GetSelectedLandmarksL(lmkArray); - CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); - iMapNavInterface->ShowLandmarksOnMapL(lmkArray, aMenuCommand, - CLmkMapNavigationInterface::EByLmkView); - CleanupStack::PopAndDestroy(); // lmkArray + if (iContainer->GetSelectedLandmarksL(lmkArray) == KErrNone) + { + CleanupStack::PushL(TCleanupItem(CleanupArray, &lmkArray)); + iMapNavInterface->ShowLandmarksOnMapL(lmkArray, aMenuCommand, + CLmkMapNavigationInterface::EByLmkView); + CleanupStack::PopAndDestroy(); // lmkArray + } break; } case KAiwCmdMnSelectFromMap: @@ -683,16 +679,6 @@ categoryId); break; } - case KAiwCmdCall: - { - // Handle AIW specific service commands - CLmkAppSelectorImplBase& selector = iContainer->SelectorImpl(); - if (selector.ListVisibleItemCount() > 0) - { - selector.ExecuteAIWCallCmdL(aMenuCommand); - } - break; - } default: { result = EFalse; diff -r 41042d2af523 -r 91123d004e8f landmarksui/app/src/CLmkCategorySettingsView.cpp --- a/landmarksui/app/src/CLmkCategorySettingsView.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/app/src/CLmkCategorySettingsView.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -305,13 +305,18 @@ // void CLmkCategorySettingsView::HandleListBoxEventL(CEikListBox* aListBox, TListBoxEvent aEventType) - { + { + TInt count(aListBox->Model()->NumberOfItems()); + if( count == 0 ) + return; + + TInt markedCount = aListBox->SelectionIndexes()->Count(); + switch (aEventType) { - //case EEventItemDoubleClicked: case EEventItemSingleClicked: { - if( aListBox->SelectionIndexes()->Count() > 0 ) + if( markedCount > 0 ) { CEikMenuBar* menubar = MenuBar(); if (menubar) @@ -319,17 +324,18 @@ menubar->SetContextMenuTitleResourceId(R_LMK_CATEGORY_SETTINGS_OK_MENUBAR); TRAP_IGNORE( menubar->TryDisplayContextMenuBarL() ); } - } - break; - } - //case EEventItemClicked: - case EEventPanningStarted: - case EEventPanningStopped: - case EEventFlickStarted: - case EEventFlickStopped: - case EEventPenDownOnItem: - case EEventItemDraggingActioned: - { + } + else + { + CLmkAppCategorySettingsImpl& LCategorySettingsImpl = + iContainer->SelectorImpl(); + // Checkif the category is a global category only when some items present + TBool retVal = LCategorySettingsImpl.IsPredefinedCategoryL(); + if( retVal ) + HandleCommandL( ELmkCmdChangeIcon ); + else + HandleCommandL( ELmkCmdRenameCat ); + } break; } default: diff -r 41042d2af523 -r 91123d004e8f landmarksui/uicontrols/inc/clmkgotourlcmd.h --- a/landmarksui/uicontrols/inc/clmkgotourlcmd.h Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/uicontrols/inc/clmkgotourlcmd.h Mon Mar 15 12:40:01 2010 +0200 @@ -25,8 +25,8 @@ #define CLMKGOTOURLCMD_H // INCLUDES -#include -#include +#include +#include #include class MDownloadedContentHandler; diff -r 41042d2af523 -r 91123d004e8f landmarksui/uicontrols/src/CLmkDlgPackageSelectorImpl.cpp --- a/landmarksui/uicontrols/src/CLmkDlgPackageSelectorImpl.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/uicontrols/src/CLmkDlgPackageSelectorImpl.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -396,7 +396,6 @@ isLandmarkDataEmpty = ETrue; } - TInt showOnMapCmd = -1; TInt cnt = aMenuPane->NumberOfItemsInPane(); for (TInt i = 0; i < cnt; ++i) { @@ -405,18 +404,13 @@ if (iMapNavInterface->GetServiceCmdByMenuCmd( itemData.iCommandId) == KAiwCmdMnShowMap) { - showOnMapCmd = itemData.iCommandId; + if (isLandmarkDataEmpty) + aMenuPane->SetItemDimmed(itemData.iCommandId, ETrue); + else + aMenuPane->SetItemDimmed(itemData.iCommandId, EFalse); + break; } } - - if (isLandmarkDataEmpty) - { - aMenuPane->SetItemDimmed(showOnMapCmd, ETrue); - } - else if (showOnMapCmd != -1) - { - aMenuPane->SetItemDimmed(showOnMapCmd, EFalse); - } break; } case R_LMK_PKGVIEWER_SAVE_LANDMARK_SUBMENU: diff -r 41042d2af523 -r 91123d004e8f landmarksui/uicontrols/src/CLmkGoToUrlCmd.cpp --- a/landmarksui/uicontrols/src/CLmkGoToUrlCmd.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/uicontrols/src/CLmkGoToUrlCmd.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -22,8 +22,8 @@ // INCLUDE FILES -#include -#include +#include +#include #include "clmkgotourlcmd.h" _LIT(KProtocolForURL, "4 "); diff -r 41042d2af523 -r 91123d004e8f landmarksui/uicontrols/src/CLmkPackageEditorImpl.cpp --- a/landmarksui/uicontrols/src/CLmkPackageEditorImpl.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/landmarksui/uicontrols/src/CLmkPackageEditorImpl.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -146,13 +146,40 @@ case R_AVKON_FORM_MENUPANE: { CAknForm::DynInitMenuPaneL(aResourceId, aMenuPane); + TBool hideMN = EFalse; + if (iIsHideCoordinate) + { + if (IsLandmarkDataEmptyL(iLandmark)) + { + hideMN = ETrue; + } + } + else if (ArePositionFieldEmptyL()) + { + hideMN = ETrue; + } - // delete the show on map & Navigate To options - aMenuPane->DeleteMenuItem(ELmkShowOnMapPlaceHolder); - aMenuPane->DeleteMenuItem(ELmkNavigateToPlaceHolder); + if (hideMN) + { + // delete the show on map & Navigate To options + aMenuPane->DeleteMenuItem(ELmkShowOnMapPlaceHolder); + aMenuPane->DeleteMenuItem(ELmkNavigateToPlaceHolder); + } + iMapNavInterface->AttachMenuPaneL(aMenuPane, R_LMK_EDITOR_MENU, + ELmkCmdMnNav); - aMenuPane->SetItemDimmed(ELmkCmdSendDummy, ETrue); - aMenuPane->SetItemDimmed(ELmkCmdSaveLm, ETrue); + // Send menu is handled by the sender: + if ( FeatureManager::FeatureSupported( KFeatureIdLandmarksConverter ) ) + { + aMenuPane->SetItemDimmed(ELmkCmdSendDummy, EFalse); + + // Use default "Send" item text from SendUI + iSender.DisplaySendMenuL(*aMenuPane, 1); + } + else + { + aMenuPane->SetItemDimmed(ELmkCmdSendDummy, ETrue); + } if (FeatureManager::FeatureSupported(KFeatureIdHelp) && !iIsHideHelp) @@ -164,8 +191,9 @@ aMenuPane->SetItemDimmed(EAknCmdHelp, ETrue); } + //shown in package editor mode: + aMenuPane->SetItemDimmed(ELmkCmdSaveLm, EFalse); DimmMenuItemsL(aMenuPane); - //always dimmed aMenuPane->SetItemDimmed(EAknFormCmdEdit, ETrue); aMenuPane->SetItemDimmed(EAknFormCmdSave, ETrue); diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcapp/inc/lcappui.h --- a/locationcentre/lcapp/inc/lcappui.h Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcapp/inc/lcappui.h Mon Mar 15 12:40:01 2010 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include // FORWARD DECLARATIONS diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcapp/inc/lcdocument.h --- a/locationcentre/lcapp/inc/lcdocument.h Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcapp/inc/lcdocument.h Mon Mar 15 12:40:01 2010 +0200 @@ -20,7 +20,7 @@ #define C_LCDOCUMENT_H // SYSTEM INCLUDES -#include +#include // FORWARD DECLARATIONS class CEikAppUi; diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcapp/inc/lcview.h --- a/locationcentre/lcapp/inc/lcview.h Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcapp/inc/lcview.h Mon Mar 15 12:40:01 2010 +0200 @@ -21,7 +21,7 @@ // SYSTEM INCLUDES #include -#include +#include // FORWARD DECLARATIONS class CLcContainer; diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcapp/src/lccontainer.cpp --- a/locationcentre/lcapp/src/lccontainer.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcapp/src/lccontainer.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -21,16 +21,16 @@ #include #include #include -#include // Icon Array +#include // Icon Array #include // Column Listbox #include // Gul Icon #include // TResourceReader #include #include -#include +#include #include // Status pane #include // CAknTitlePane -#include +#include // USER INCLUDES #include "lccontainer.h" diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcapp/src/lclistbox.cpp --- a/locationcentre/lcapp/src/lclistbox.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcapp/src/lclistbox.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -19,7 +19,7 @@ // SYSTEM INCLUDES #include #include -#include +#include // USER INCLUDES #include "lclistbox.h" diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcserver/inc/lcregappstore.h --- a/locationcentre/lcserver/inc/lcregappstore.h Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcserver/inc/lcregappstore.h Mon Mar 15 12:40:01 2010 +0200 @@ -117,7 +117,7 @@ * @param aRegAppInfoFile is full path to app info * database file. */ - void OpenDbL( const TFileName aRegAppInfoFile ); + void OpenDbL( const TFileName& aRegAppInfoFile ); /** * Creates and opens a new app info database. Creates a @@ -130,7 +130,7 @@ * @param aRegAppInfoFile is full path to app info * database file. */ - void CreateDbL( const TFileName aRegAppInfoFile ); + void CreateDbL( const TFileName& aRegAppInfoFile ); /** * Closes the database opened with either OpenDbL or diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcserver/inc/lcregistrationparser.h --- a/locationcentre/lcserver/inc/lcregistrationparser.h Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcserver/inc/lcregistrationparser.h Mon Mar 15 12:40:01 2010 +0200 @@ -20,9 +20,9 @@ #define C_LCREGISTRATIONPARSER_H // SYSTEM INCLUDES -#include -#include -#include +#include +#include +#include #include //USER INCLUDE diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcserver/inc/lcregistry.h --- a/locationcentre/lcserver/inc/lcregistry.h Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcserver/inc/lcregistry.h Mon Mar 15 12:40:01 2010 +0200 @@ -205,7 +205,7 @@ * @param aLcRegAppInfo Pointer reference to regappinfo. * @return KErrBadName if the regappinfo file name is not correct one. */ - CLcRegAppInfo* CreateAppRegInfoL( TFileName aFileName ); + CLcRegAppInfo* CreateAppRegInfoL( TFileName& aFileName ); /** * This function insert single registration info into @@ -227,7 +227,7 @@ * @param aFileName[ in ] Name of the file to check if in MMC. * @return If file is in MMC then return ETrue else EFalse. */ - TBool IsInMMc( TFileName aFileName ); + TBool IsInMMc( TFileName& aFileName ); /** * This function checks presence for a certain registration file @@ -241,7 +241,7 @@ * @return On successfull * execution return ETrue else EFalse. */ - TBool DoesApplicationExists( TFileName aFileName, + TBool DoesApplicationExists( TFileName& aFileName, CLcRegAppInfo*& alcRegAppInfoPtr ); /** @@ -273,7 +273,7 @@ * @param aFileName[ in ] Name of the current file to compare. * @return ETrue else EFalse. */ - TBool IsAppUpgraded( TFileName aFileName ); + TBool IsAppUpgraded( TFileName& aFileName ); /** * This function sets name for certains application name diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcserver/src/lcregappstore.cpp --- a/locationcentre/lcserver/src/lcregappstore.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcserver/src/lcregappstore.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -112,7 +112,7 @@ // void CLcRegAppStore::OpenDbL // --------------------------------------------------------------------------- // -void CLcRegAppStore::OpenDbL( const TFileName aRegAppInfoFile ) +void CLcRegAppStore::OpenDbL( const TFileName& aRegAppInfoFile ) { // if it is already open then close it. Close(); @@ -143,7 +143,7 @@ // // Create a new database. The database will be in exclusive access mode. // --------------------------------------------------------------------------- -void CLcRegAppStore::CreateDbL( const TFileName aRegAppInfoFile ) +void CLcRegAppStore::CreateDbL( const TFileName& aRegAppInfoFile ) { // if it is already open then close it. Close(); diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcserver/src/lcregistrationparser.cpp --- a/locationcentre/lcserver/src/lcregistrationparser.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcserver/src/lcregistrationparser.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -17,10 +17,10 @@ // INCLUDE FILES -#include -#include +#include +#include #include -#include +#include #include // USER INCLUDE diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcserver/src/lcregistry.cpp --- a/locationcentre/lcserver/src/lcregistry.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcserver/src/lcregistry.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -17,9 +17,9 @@ // SYSTEM INCLUDES -#include +#include #include -#include // CDocumentHandler +#include // CDocumentHandler #include // USER INCLUDES @@ -350,7 +350,8 @@ { // Check if the Application suffered an Upgrade. If its an upgrade // then its equivalent to a new installation. - if ( IsAppUpgraded( regAppInfo->FileName())) + TFileName fileName = regAppInfo->FileName(); + if ( IsAppUpgraded(fileName) ) { // Remove the element from the Old array TInt index = iAppInfoArray.Find( regAppInfo ); @@ -514,7 +515,7 @@ // CLcRegistry::IsInMMc // ---------------------------------------------------------------------------- // -TBool CLcRegistry::IsInMMc( TFileName aFileName ) +TBool CLcRegistry::IsInMMc( TFileName& aFileName ) { TBool lResult = EFalse; TParse parse; @@ -540,7 +541,7 @@ // CLcRegistry::DoesApplicationExists // ---------------------------------------------------------------------------- // -TBool CLcRegistry::DoesApplicationExists( TFileName aFileName, +TBool CLcRegistry::DoesApplicationExists( TFileName& aFileName, CLcRegAppInfo*& alcRegAppInfoPtr ) { // This function checks wheather registration info with same file name @@ -564,7 +565,7 @@ // CLcRegistry::CreateAppRegInfoL // ---------------------------------------------------------------------------- // -CLcRegAppInfo* CLcRegistry::CreateAppRegInfoL( TFileName aFileName ) +CLcRegAppInfo* CLcRegistry::CreateAppRegInfoL( TFileName& aFileName ) { DEBUG( "+ CLcRegistry::CreateAppRegInfoL" ); @@ -913,7 +914,7 @@ // CLcRegistry::IsAppUpgraded // ----------------------------------------------------------------------------- // -TBool CLcRegistry::IsAppUpgraded( TFileName aFileName ) +TBool CLcRegistry::IsAppUpgraded( TFileName& aFileName ) { DEBUG( "+ CLcRegistry::CheckforAppUpgrade("); diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcservice/src/lcpopuplistbox.cpp --- a/locationcentre/lcservice/src/lcpopuplistbox.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcservice/src/lcpopuplistbox.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -17,7 +17,7 @@ // SYSTEM INCLUDES -#include // Icon Array +#include // Icon Array #include // Column Listbox // USER INCLUDES diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcservice/src/lcservice.cpp --- a/locationcentre/lcservice/src/lcservice.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcservice/src/lcservice.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -233,7 +233,9 @@ { // The Filter construction without any arguments will act as no filtering // applied on the list of Location based Applications and Contents/Services. + // coverity[var_decl : FALSE] TLcLocationAppFilter filter; + // coverity[uninit_use_in_call : FALSE] return iImplementation->SelectLocationApplicationL( filter ); } diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcservice/src/lcserviceimpl.cpp --- a/locationcentre/lcservice/src/lcserviceimpl.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcservice/src/lcserviceimpl.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include // USER INCLUDES diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcutils/inc/lcapplauncher.h --- a/locationcentre/lcutils/inc/lcapplauncher.h Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcutils/inc/lcapplauncher.h Mon Mar 15 12:40:01 2010 +0200 @@ -22,7 +22,7 @@ // SYSTEM INCLUDES #include -#include +#include // USER INCLUDES diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcutils/src/lcapplauncher.cpp --- a/locationcentre/lcutils/src/lcapplauncher.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcutils/src/lcapplauncher.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff -r 41042d2af523 -r 91123d004e8f locationcentre/lcutils/src/lciconloader.cpp --- a/locationcentre/lcutils/src/lciconloader.cpp Fri Mar 12 15:42:12 2010 +0200 +++ b/locationcentre/lcutils/src/lciconloader.cpp Mon Mar 15 12:40:01 2010 +0200 @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include