MCL/sf/mw/inputmethods: comparison fep/aknfep/src/AknFepManager.cpp

equal deleted inserted replaced

-:6ceef9a83b1a
+:6defe5d1bd39
 #include <aknnavi.h>
 #include <aknnavide.h>
 #include <eikedwin.h>
 #include <aknCharMap.h>
+#include <AknFepInternalPSKeys.h>
 const TInt KSelectItemSize(10);
 _LIT(KAknFepResourceFileName, "z:\\resource\\fep\\aknfep.rsc");
 #define text_to_field_mode_hash_key ';'
 	}
 #endif // RD_INTELLIGENT_TEXT_INPUT
 //#endif // __ITI_LONGPRESS_NUM_SHIFT_COPYPASTE__
 #ifdef RD_SCALABLE_UI_V2
-if (iFepPluginManager->BeforeSpell())
+if ( iFepPluginManager != NULL &&
+iFepPluginManager->BeforeSpell() )
 {
 iFepPluginManager->SetBeforeSpell(EFalse);
 }
 else
 #endif
 iShiftKeypressMonitor->Cancel();
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 #ifdef __HALF_QWERTY_KEYPAD
 #ifdef __SHIFT_KEY_LOOP
 				// Cancel multitap timer
-				iPtiEngine->CancelTimerActivity();
+if( iPtiEngine != NULL )
+{
+				    iPtiEngine->CancelTimerActivity();
+}
 #endif //__SHIFT_KEY_LOOP
 #endif //__HALF_QWERTY_KEYPAD
 #endif //RD_INTELLIGENT_TEXT_INPUT
 }
 ClearFlag( EFlagNoActionDuringShiftKeyPress );
 response = EKeyWasNotConsumed;
 }
 #endif
 ResetCcpuFlags();
 }
-//Removed as part of the fix STAA-7FXCTK
 /*    if (EPtiKeyboardQwerty4x10 == KeyboardLayout())
 	{
 	FepUI()->HandleKeyL(EKeyLeftCtrl, EShortKeyPress);
 	}*/
 {
 CommitInlineEditL();
 HBufC* spell = iFepPluginManager->SpellTextInput();
 iFepPluginManager->SetITUTSpellingStateL(EFalse);
-iFepPluginManager->DestroySpellEditor();
+iFepPluginManager->HideSpellEditor();
 if (spell)
 {
 CleanupStack::PushL(spell);
 TPtr text = spell->Des();
 */
 #ifdef RD_SCALABLE_UI_V2
 if (iFepPluginManager->IsSpellVisible())
 {
 TRAP_IGNORE(iFepPluginManager->SetITUTSpellingStateL(EFalse));
-iFepPluginManager->DestroySpellEditor();
+iFepPluginManager->HideSpellEditor();
 TRAP_IGNORE(UpdateCbaL(NULL));
 if (iFepPluginManager->CaseUpdatesSupressed())
 {
 SetFlag(EFlagSupressAutoUpdate);
 	        break;
 case EAknFepCmdPredSettings:
 	LaunchPredictiveSettingDialogL();
 	break;
 /*
-	    This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+	    This code is the part of fixing TSW Error
 	    "Matches" and "insert word" options are not available under Edit Menu.
 	    This is For Insert Word Functionality*/
 case EAknEditMenuCmdInsertWord:
 	HandleChangeInFocus();
 LaunchInsertWordQueryL(KNullDesC, TCursorSelection(0,0));
 #ifdef RD_SCALABLE_UI_V2
 TInt oldPermitModes = -1;
 if (R_AVKON_TOUCH_TOUCHINPUT_MENU == aResourceId )
 {
 oldPermitModes = iPermittedInputModes;
-iPermittedInputModes = iFepPluginManager->PreviousPermitMode();
-}
+if( iFepPluginManager != NULL )
+{
-iFepPluginManager->InitMenuPaneL( iRememberEditorState, aMenuPane, aResourceId );
+iPermittedInputModes = iFepPluginManager->PreviousPermitMode();
+}
+}
+if( iFepPluginManager != NULL )
+{
+iFepPluginManager->InitMenuPaneL( iRememberEditorState, aMenuPane, aResourceId );
+}
 if (oldPermitModes != -1)
 {
 iPermittedInputModes = oldPermitModes;
 }
 #endif //  RD_SCALABLE_UI_V2
 }
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 // Predictive QWERTY (XT9) changes ---->
 case R_AKNFEP_PRED_INPUT_OPTIONS_SUBMENU:
 	{
-	// This part of code fixing TSW Errors :STAA-7GZE5W
+	// This part of code fixing TSW Errors
-	//									   :STAA-7GZEBX
 	// "Edit word" option is not available under edit menu in ITU-T mode.
 	// "Insert word" Should not be available QWERTY mode.
-//TSW: AKSS-7P87XG
-//TSW: AKSS-7P88Wf
 	if (IsKoreanInputLanguage() ||
 iPtiEngine->CurrentLanguage()->LanguageCode() == ELangPrcChinese ||
 iPtiEngine->CurrentLanguage()->LanguageCode() == ELangTaiwanChinese ||
 iPtiEngine->CurrentLanguage()->LanguageCode() == ELangHongKongChinese  )
 		{
 default:
 break;
 }
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 	/*
-This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+This code is the part of fixing TSW Error Edit Menu :
 "Matches" and "insert word" options are not available under Edit Menu.
 This is To make visible/invisible the Insert Word in Optios menu & Edit Menu*/
 iIsLastResourceEditMenu = aResourceId;
 #endif
 }
 {
 aMenuPane->SetItemDimmed(EAknCmdEditModeNumber, EFalse);
 }
 }
-//modified by zhangfeiyan, fix bug SKIN-7LABJ3
 if ( IsModePermitted( ENativeNumber ) )
 {
 if ( iLanguageCapabilities.iArabicIndicDigitsAllowed &&
 !(iAknEditorFlags & EAknEditorFlagLatinInputModesOnly) &&
 iMode != ENativeNumber )
 {
 aMenuPane->SetItemDimmed(EAknCmdMultitapPredictiveT9On, EFalse);
 }
 }
-if ( ( iMode == ENumber || iMode == ENativeNumber ) &&
+if ( ( iMode == ENumber || iMode == ENativeNumber || iMode == EHangul ) &&
 (iPermittedInputModes & (EAknEditorTextInputMode | EAknEditorSecretAlphaInputMode)) )
 {
 aMenuPane->SetItemDimmed(EAknCmdEditModeAlpha, EFalse);
 }
 if (IsFlagSet(EFlagInsideInlineEditingTransaction))
 {
 TryRemoveNoMatchesIndicatorL();
 		/*
-	    This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+	    This code is the part of fixing TSW Error Edit Menu :
 	    "Matches" and "insert word" options are not available under Edit Menu.
 	    When we launch Edit Menu.the word which in Inline Editing in the BackGorund
 	    Should not Commit*/
 #ifndef RD_INTELLIGENT_TEXT_INPUT
 CommitInlineEditL();
 #endif
 		/*
-	    This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+	    This code is the part of fixing TSW ErrorEdit Menu :
 	    "Matches" and "insert word" options are not available under Edit Menu.
 	    This Flag is useful for deciding whether "Matches" Menu Item can Visible
 	    or not*/
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 SetFlag(EFlagInlineEditInBackground);
 #endif
 		/*
-	    This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+	    This code is the part of fixing TSW Error  Edit Menu :
 	    "Matches" and "insert word" options are not available under Edit Menu.*/
 #ifndef RD_INTELLIGENT_TEXT_INPUT
 ClearFlag(EFlagInsideInlineEditingTransaction);
 #endif
 }
 if (IsFlagSet(EFlagInsideInlineEditingTransaction))
 {
 TryRemoveNoMatchesIndicatorL();
 		/*
-	    This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+	    This code is the part of fixing TSW Error :  Edit Menu :
 	    "Matches" and "insert word" options are not available under Edit Menu.
 	    When we launch Edit Menu.the word which in Inline Editing in the BackGorund
 	    Should not Commit*/
 #ifndef RD_INTELLIGENT_TEXT_INPUT
 CommitInlineEditL();
 #endif
 		/*
-	    This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+	    This code is the part of fixing TSW Error :  Edit Menu :
 	    "Matches" and "insert word" options are not available under Edit Menu.
 	    This Flag is useful for deciding whether "Matches" Menu Item can Visible
 	    or not*/
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 SetFlag(EFlagInlineEditInBackground);
 #endif
 		/*
-	    This code is the part of fixing TSW Error ID: BSAN-7G58DB :  Edit Menu :
+	    This code is the part of fixing TSW Error :  Edit Menu :
 	    "Matches" and "insert word" options are not available under Edit Menu.*/
 #ifndef RD_INTELLIGENT_TEXT_INPUT
 ClearFlag(EFlagInsideInlineEditingTransaction);
 #endif
 }
 {
 charResourceId = NumericModeSCTResourceId();
 if ( charResourceId != ENoCharacters && IsAbleToLaunchSCT()&&
 EditorType() != CAknExtendedInputCapabilities::EEikSecretEditorBased)
 {
-menuPane->ConstructMenuSctRowL( iEditCharsPtr, charResourceId );
+if( menuPane != NULL )
+{
+menuPane->ConstructMenuSctRowL( iEditCharsPtr, charResourceId );
+}
 }
 else
 {
 currentEditorSCTResId = charResourceId;
 }
 inlineEditorTl.iY -= height;
 GetScreenCoordinatesL(inlineEditorBr, height, ascent);
 // Focus next word in list ---->
-// To fix the bug STAA-7GYDB6, Candidate list opens with the highlight on 3rd candidate when Exact typing is use.
+// To fix the bug Candidate list opens with the highlight on 3rd candidate when Exact typing is use.
 // Show the popup.
 TInt selectedIdx = aFocusedIndex;
 TKeyEvent lastKeyEvent;
 if(selectedIdx == KErrNotFound)
 	  fixedToolbar->SetDimmed(ETrue);
 	  fixedToolbar->DrawDeferred();
 	  }
 TUid fepUid = CCoeEnv::Static()->FepUid();
 ClearExtendedFlag(EExtendedFlagEdwinEditorDestroyed);
+	RProperty::Set(KPSUidAknFep,KAknFepSettingDialogState,1);
 	UiInterface()->LaunchPredictiveSettingDialogL(R_PREDICTIVESETTING_DIALOG,
 												  R_PREDICTIVESETTINGDIALOG_MENUBAR,
 												  R_PREDICTIVETEXTOFF_CONFIRMATION_QUERY,
 												  R_AKNFEP_PRED_INPUT_SETTINGS_TITLE);
 PrepareFepAfterDialogExitL(fepUid);
+	RProperty::Set(KPSUidAknFep,KAknFepSettingDialogState,0);
 #ifdef RD_SCALABLE_UI_V2
 // // Addtion of ITI features on FSQ.
 if ( iFepPluginManager
 && iFepPluginManager->IsSupportITIOnFSQ() )
 {
 && !IsFeatureSupportedJapanese())  //new find pane
 {
 // the default chinese find mode is the first mode in the hash key loop, except PrcChinese
 if( iLanguageCapabilities.iInputLanguageCode == ELangPrcChinese)
 {
-// Fix bug EHST-6DBFUJ: Default searching language shall be ELatin
+// Default searching language shall be ELatin
 // Changed from EPinyin to ELatin here
 TryChangeModeL(ELatin);
 }
 else
 {
 {
 break;
 }
 }
 }
-// Add This condition for Fixing EYYE-7HHBWW: Phonebook, ReTe, PF52.50_2008_wk32:
+// Add This condition for  Phonebook, ReTe, PF52.50_2008_wk32:
 // Navigation bar disappears after tapping find pane and then returning back to Names list view.
 if (!(editingStateIndicator == (MAknEditingStateIndicator*)iIndicator &&
 ( iFepPluginManager && iFepPluginManager->PluginInputMode() == EPluginInputModeItut ) &&
 IsFindPaneEditor()))
 {
 }
 void CAknFepManager::UpdateNumberIndicator( TAknEditingState& aNewState )
 {
-// chnage for AIYR-6L7DGU; This problrm persist in all variants.
 // The fix is made only for Hindi
 UpdateNumericEditorDigitType();
 TBool supportsWesternNumericIntegerOrReal =
 ( iInputCapabilities.SupportsWesternNumericIntegerPositive() ||
 iInputCapabilities.SupportsWesternNumericIntegerNegative() ||
 TBool CAknFepManager::IsAbleToLaunchSmiley() const
 {
 TBool ableToLaunchSmiley(EFalse);
 CAknEdwinState* edwinState = EditorState();
-if(edwinState)
+if ( edwinState && EditorHasFreeSpace() )
 {
 CAknEdwinFormAccessor* formAccessor = edwinState->FormAccessor();
 if(formAccessor)
 {
 CEikEdwin *edwin = static_cast<CEikEdwin*>(formAccessor->FormClientControl());
 if (IsCcpuFlagSet(ECcpuStateStartCopy | ECcpuStateCopy | ECcpuStateStartCut | ECcpuStateCut))
 {
 return;
 }
-//For bug ESSG-7RXC96
 if((iAknEditorFlags & EAknEditorFlagFindPane)&& IsChineseInputLanguage()&& aResourceId != NULL)
 {
 return;
 }
 }
 else
 {
 iSharedDataInterface->ResetPredictiveTextOn();
 }
+if ( iFepPluginManager && iFepPluginManager->IsSupportITIOnFSQ() )
+	{
+SendEventsToPluginManL( EPluginUpdatePenInputITIStatus );
+	}
 }
 }
 void CAknFepManager::SetWesternAutoComplete( const TBool aWesternAutoComplete )
 {
 TInt index = 0;
 SetFlag( EFlagForegroundUIComponentVisible );
 CleanupStack::Pop( icons );	// iUiInterface->LaunchListPopupL takes ownership immediately
 #ifdef RD_SCALABLE_UI_V2
-/* tp teleca fix 17.9.2009 to IKIM-7VK8GG*/
+if( iFepFullyConstructed && iFepPluginManager && !iFepPluginManager->IsInMenuOpen() )
-if( iFepFullyConstructed && iFepPluginManager)
 {
 iFepPluginManager->SetMenuState();
 }
-// tp teleca fix end
 #endif
 // Fire up the dialog
 #ifdef RD_SCALABLE_UI_V2
 iCancelPopupInQwerty = aLaunchedByTouchWin;
 #endif //RD_SCALABLE_UI_V2
 ( (TAknFepUiIndicInputManager :: IsIndicDigitsSupported(TLanguage(aInputLanguage))) );
 UpdateLocalDigitMode();
 MAknFepManagerInterface* fepUI = iLangMan->GetFepUI(ELatin, iCharWidth, ETrue);
 MPtiLanguage* ptiLanguage = iPtiEngine->GetLanguage(fepUI->SupportLanguage(ELatin));
-if (ptiLanguage) // can be NULL in some uncommon situations, see TAVN-6SWB4Z
+if (ptiLanguage) // can be NULL in some uncommon situations
 {
 iLanguageCapabilities.iSupportsWesternPredictive =
 ptiLanguage->HasInputMode(EPtiEnginePredictive);
 // tp teleca change Korean lang does not support predictive
 // and we want to disable predictive even with local editors
 {
 if (iFepPluginManager->PluginInputMode() == EPluginInputModeItut ||
 iFepPluginManager->PluginInputMode() == EPluginInputModeFSQ ||
 iFepPluginManager->PluginInputMode() == EPluginInputModeFingerHwr)
 {
-SetStopProcessFocus(ETrue, EFalse);
+SetStopProcessFocus(ETrue, ETrue);
 iFepPluginManager->SetMenuState();
 }
 else if (!iFepPluginManager->IsGlobleNotes())
 {
 iFepPluginManager->ClosePluginInputUiL( ETrue );
 aKey = 0;
 	if (!iPtiEngine)
 		return;
-CPtiCoreLanguage* lang = (CPtiCoreLanguage*)iPtiEngine->GetLanguage(iLanguageCapabilities.iInputLanguageCode);
+CPtiCoreLanguage* lang = static_cast<CPtiCoreLanguage*>( iPtiEngine->CurrentLanguage() );
 if (!lang)
 return;
 const TBool vietnamese = (iLanguageCapabilities.iInputLanguageCode == ELangVietnamese);

branch	RCL_3
changeset 7	6defe5d1bd39
parent 6	6ceef9a83b1a
child 8	4eb1ae11334f