equal
deleted
inserted
replaced
35 #include <peninputdataconverter.h> |
35 #include <peninputdataconverter.h> |
36 #include <peninputdataprovider.h> |
36 #include <peninputdataprovider.h> |
37 #include <peninputclientlayoutinfo.h> |
37 #include <peninputclientlayoutinfo.h> |
38 #include <peninputlayoutchoicelist.h> |
38 #include <peninputlayoutchoicelist.h> |
39 #include <peninputlongpressbutton.h> |
39 #include <peninputlongpressbutton.h> |
40 |
40 #include <bautils.h> |
41 #include <aknlayoutscalable_apps.cdl.h> |
41 #include <aknlayoutscalable_apps.cdl.h> |
42 #include <peninputlayoutbubblectrl.h> |
42 #include <peninputlayoutbubblectrl.h> |
43 #include <peninputscrollablelist.h> |
43 #include <peninputscrollablelist.h> |
44 |
44 |
45 #include <e32keys.h> |
45 #include <e32keys.h> |
93 iUiStateMgr(aUiStateMgr), |
93 iUiStateMgr(aUiStateMgr), |
94 iPopupInited(EFalse), |
94 iPopupInited(EFalse), |
95 iPopupSet(EFalse), |
95 iPopupSet(EFalse), |
96 iLafMgr(NULL), |
96 iLafMgr(NULL), |
97 iFirstConstruct(ETrue), |
97 iFirstConstruct(ETrue), |
98 iIndiWithText( EFalse ) |
98 iIndiWithText( EFalse ), |
|
99 iUSRscFileExist( EFalse ) |
99 { |
100 { |
100 } |
101 } |
101 |
102 |
102 // -------------------------------------------------------------------------- |
103 // -------------------------------------------------------------------------- |
103 // CPeninputGenericVkbWindow::NewL |
104 // CPeninputGenericVkbWindow::NewL |
138 iBmpRotator = CPeninputSyncBitmapRotator::NewL(); |
139 iBmpRotator = CPeninputSyncBitmapRotator::NewL(); |
139 iLafMgr = CPeninputGenericVkbLafMgr::NewL(); |
140 iLafMgr = CPeninputGenericVkbLafMgr::NewL(); |
140 iLafMgr->SetInputModeL(TPluginInputMode (iLayoutContext->LayoutType())); |
141 iLafMgr->SetInputModeL(TPluginInputMode (iLayoutContext->LayoutType())); |
141 CPeninputLayoutWindowExt::ConstructL(); |
142 CPeninputLayoutWindowExt::ConstructL(); |
142 |
143 |
|
144 // Save whether American rsc file exist or not |
|
145 TBuf<KMaxFileLength> usUSRscFileName; |
|
146 usUSRscFileName= KConfigurationResourceFile(); |
|
147 usUSRscFileName.AppendNum( ELangAmerican ); |
|
148 usUSRscFileName.Append( KResourceFileExtName ); |
|
149 |
|
150 RFs fileSession; |
|
151 User::LeaveIfError( fileSession.Connect() ); |
|
152 CleanupClosePushL( fileSession ); |
|
153 if ( BaflUtils::FileExists( fileSession , usUSRscFileName )) |
|
154 { |
|
155 iUSRscFileExist = ETrue; |
|
156 } |
|
157 CleanupStack::PopAndDestroy( 1 ); |
143 // For addition of ITI features, add a candidate list in vkb window |
158 // For addition of ITI features, add a candidate list in vkb window |
144 CreateCandidateListL(); |
159 CreateCandidateListL(); |
145 } |
160 } |
146 |
161 |
147 // -------------------------------------------------------------------------- |
162 // -------------------------------------------------------------------------- |
456 if ( rs == KErrNone ) |
471 if ( rs == KErrNone ) |
457 { |
472 { |
458 file.Close(); |
473 file.Close(); |
459 aLangID = ELangCanadianFrench; |
474 aLangID = ELangCanadianFrench; |
460 } |
475 } |
461 |
476 } |
462 } |
477 // If US Rsc file exist, use it instead of English rsc file |
|
478 if(( aLangID == ELangEnglish ) && ( iUSRscFileExist )) |
|
479 { |
|
480 aLangID = ELangAmerican; |
|
481 } |
463 iResourceFilename.Zero(); |
482 iResourceFilename.Zero(); |
464 // Generate resource file name according to language id |
483 // Generate resource file name according to language id |
465 iResourceFilename = KConfigurationResourceFile(); |
484 iResourceFilename = KConfigurationResourceFile(); |
466 |
485 |
467 if ( aLangID < 10 ) |
486 if ( aLangID < 10 ) |