equal
deleted
inserted
replaced
53 |
53 |
54 #include "eikon.hrh" |
54 #include "eikon.hrh" |
55 |
55 |
56 #include <StringLoader.h> |
56 #include <StringLoader.h> |
57 |
57 |
|
58 const TInt KMaxTitleLength = 512; |
58 |
59 |
59 // --------------------------------------------------------------------------- |
60 // --------------------------------------------------------------------------- |
60 // CBrowserGotoPane::NewL |
61 // CBrowserGotoPane::NewL |
61 // --------------------------------------------------------------------------- |
62 // --------------------------------------------------------------------------- |
62 // |
63 // |
1195 iSearchEditor->MakeVisible( ETrue ); |
1196 iSearchEditor->MakeVisible( ETrue ); |
1196 iSearchInputFrame->MakeVisible( ETrue ); |
1197 iSearchInputFrame->MakeVisible( ETrue ); |
1197 // Set the default text if not active// |
1198 // Set the default text if not active// |
1198 if ( ! iSearchPaneActive ) |
1199 if ( ! iSearchPaneActive ) |
1199 { |
1200 { |
1200 SetSearchTextL( *iDefaultSearchText ); |
1201 HBufC* searchProvider = HBufC::NewLC( KMaxTitleLength ); |
|
1202 TPtr searchProviderPtr = searchProvider->Des(); |
|
1203 iContentView->ApiProvider().Preferences().GetStringValueL( KBrowserSearchProviderTitle, |
|
1204 KMaxTitleLength , searchProviderPtr); |
|
1205 if( searchProvider->Length() == 0 ) |
|
1206 { |
|
1207 SetSearchTextL( *iDefaultSearchText ); |
|
1208 } |
|
1209 else |
|
1210 { |
|
1211 SetSearchTextL( *searchProvider ); |
|
1212 delete iDefaultSearchText; |
|
1213 iDefaultSearchText = NULL; |
|
1214 iDefaultSearchText = searchProvider->AllocL(); |
|
1215 } |
|
1216 CleanupStack::PopAndDestroy(searchProvider); |
1201 } |
1217 } |
1202 iSearchInputFrame->ActivateL(); |
1218 iSearchInputFrame->ActivateL(); |
1203 } |
1219 } |
1204 |
1220 |
1205 } |
1221 } |
1219 iEditor->AddFlagToUserFlags( CEikEdwin::EAvkonDisableVKB ); |
1235 iEditor->AddFlagToUserFlags( CEikEdwin::EAvkonDisableVKB ); |
1220 #endif |
1236 #endif |
1221 // if searchpane is empty add default text |
1237 // if searchpane is empty add default text |
1222 if ( !SearchTextLength() ) |
1238 if ( !SearchTextLength() ) |
1223 { |
1239 { |
1224 SetSearchTextL( *iDefaultSearchText ); |
1240 HBufC* searchProvider = HBufC::NewLC( KMaxTitleLength ); |
|
1241 TPtr searchProviderPtr = searchProvider->Des(); |
|
1242 iContentView->ApiProvider().Preferences().GetStringValueL( KBrowserSearchProviderTitle, |
|
1243 KMaxTitleLength , searchProviderPtr); |
|
1244 if( searchProvider->Length() == 0 ) |
|
1245 { |
|
1246 SetSearchTextL( *iDefaultSearchText ); |
|
1247 } |
|
1248 else |
|
1249 { |
|
1250 SetSearchTextL( *searchProvider ); |
|
1251 } |
|
1252 CleanupStack::PopAndDestroy(searchProvider); |
1225 } |
1253 } |
1226 |
1254 |
1227 // if gotopane is empty add default text |
1255 // if gotopane is empty add default text |
1228 if ( !TextLength() ) |
1256 if ( !TextLength() ) |
1229 { |
1257 { |