browserui/browser/SettingsSrc/SettingsContainer.cpp
changeset 37 481242ead638
parent 31 868cceedabd3
child 46 5dedbccec665
equal deleted inserted replaced
33:97c9f46387be 37:481242ead638
   239     // Privacy Category item
   239     // Privacy Category item
   240     AddCategoryListBoxItemL( R_SETTINGS_CATEGORY_PRIVACY, *itemArray );
   240     AddCategoryListBoxItemL( R_SETTINGS_CATEGORY_PRIVACY, *itemArray );
   241     iSettingIndex->AppendL( EWmlSettingsPrivacy );
   241     iSettingIndex->AppendL( EWmlSettingsPrivacy );
   242 
   242 
   243 #ifdef __RSS_FEEDS
   243 #ifdef __RSS_FEEDS
       
   244     #if !defined(BRDO_OCC_ENABLED_FF)
   244     // Web feeds Category item
   245     // Web feeds Category item
   245     if (!ApiProvider().IsEmbeddedModeOn())
   246     if (!ApiProvider().IsEmbeddedModeOn())
   246         {
   247         {
   247         AddCategoryListBoxItemL( R_SETTINGS_CATEGORY_WEBFEEDS, *itemArray );
   248         AddCategoryListBoxItemL( R_SETTINGS_CATEGORY_WEBFEEDS, *itemArray );
   248         iSettingIndex->AppendL( EWmlSettingsWebFeeds );
   249         iSettingIndex->AppendL( EWmlSettingsWebFeeds );
   249         }
   250         }
       
   251     #endif
   250 #endif // __RSS_FEEDS
   252 #endif // __RSS_FEEDS
   251 
   253 
   252     
   254     
   253     if (!iPenEnabled)
   255     if (!iPenEnabled)
   254     {
   256     {
   366     //
   368     //
   367 
   369 
   368     // Default Access Point
   370     // Default Access Point
   369     if ( !ApiProvider().Preferences().CustomAccessPointDefined() )
   371     if ( !ApiProvider().Preferences().CustomAccessPointDefined() )
   370         {
   372         {
       
   373         #if !defined(BRDO_OCC_ENABLED_FF)
       
   374         //Access point setting is not required if OCC is enabled
   371         AppendDefaultAccessPointL( itemArray, itemText );
   375         AppendDefaultAccessPointL( itemArray, itemText );
       
   376         #endif
   372         }
   377         }
   373 
   378 
   374     // Home Page
   379     // Home Page
   375     if( ApiProvider().Preferences().
   380     if( ApiProvider().Preferences().
   376                 UiLocalFeatureSupported( KBrowserUiHomePageSetting ) &&
   381                 UiLocalFeatureSupported( KBrowserUiHomePageSetting ) &&
  3357 // CSettingsContainer::HandleListBoxEventL
  3362 // CSettingsContainer::HandleListBoxEventL
  3358 // -----------------------------------------------------------------------------
  3363 // -----------------------------------------------------------------------------
  3359 //
  3364 //
  3360 void CSettingsContainer::HandleListBoxEventL(CEikListBox* aListBox,TListBoxEvent aEventType)
  3365 void CSettingsContainer::HandleListBoxEventL(CEikListBox* aListBox,TListBoxEvent aEventType)
  3361     {
  3366     {
       
  3367     TKeyResponse ret = EKeyWasNotConsumed;
  3362     if (iPenEnabled)
  3368     if (iPenEnabled)
  3363         {
  3369         {
  3364         if (iSettingListBox && aListBox == iSettingListBox)
  3370         if (iSettingListBox && aListBox == iSettingListBox)
  3365             {
  3371             {
  3366             switch (aEventType)
  3372             switch (aEventType)
  3376                     keyEvent.iCode = EKeyDevice3;
  3382                     keyEvent.iCode = EKeyDevice3;
  3377                     keyEvent.iScanCode = EStdKeyDevice3;
  3383                     keyEvent.iScanCode = EStdKeyDevice3;
  3378                     CCoeEnv::Static()->SimulateKeyEventL( keyEvent, EEventKey );
  3384                     CCoeEnv::Static()->SimulateKeyEventL( keyEvent, EEventKey );
  3379                     }
  3385                     }
  3380                     break;
  3386                     break;
       
  3387 #ifdef BRDO_SINGLE_CLICK_ENABLED_FF					
       
  3388                 case MEikListBoxObserver::EEventItemSingleClicked:
       
  3389 
       
  3390                     switch ( iSettingIndex->At( iSettingListBox->CurrentItemIndex() ) )
       
  3391                         {
       
  3392                         case EWmlSettingsGeneral:
       
  3393                         case EWmlSettingsPrivacy:
       
  3394                         case EWmlSettingsPage:
       
  3395                         case EWmlSettingsWebFeeds:
       
  3396                         case EWmlSettingsToolbar:
       
  3397                         case EWmlSettingsShortcuts:
       
  3398                         {
       
  3399                             DisplayCorrectSettingCategoryListL();
       
  3400                             break;
       
  3401                         }
       
  3402                         
       
  3403                         // Individual Settings
       
  3404                         case EWmlSettingsAccesspoint:
       
  3405                         case EWmlSettingsHomePage:
       
  3406                         case EWmlSettingsBackList:
       
  3407                         case EWmlSettingsHttpSecurityWarnings:
       
  3408                         case EWmlSettingsEcma:
       
  3409                         case EWmlSettingsScriptLog:
       
  3410                         case EWmlSettingsDownloadsOpen:
       
  3411                         case EWmlSettingsAutoLoadContent:
       
  3412                         case EWmlSettingsFullScreen:
       
  3413                         case EWmlSettingsPageOverview:
       
  3414                         case EWmlSettingsMediaVolume:
       
  3415                         case EWmlSettingsEncoding:
       
  3416                         case EWmlSettingsPopupBlocking:
       
  3417                         case EWmlSettingsAutoRefresh:
       
  3418                         case EWmlSettingsAdaptiveBookmarks:
       
  3419                         case EWmlSettingsFormDataSaving:
       
  3420         #ifdef __WIM
       
  3421                         case EWmlSettingsSaveReceipt:
       
  3422         #endif
       
  3423                         case EWmlSettingsCookies:
       
  3424                         case EWmlSettingsIMEINotification:
       
  3425                         case EWmlSettingsAutomaticUpdatingAP:
       
  3426                         case EWmlSettingsAutomaticUpdatingWhileRoaming:
       
  3427                         case EWmlSettingsUrlSuffix:
       
  3428                         case EWmlSettingsFontSize:
       
  3429                         case EWmlSettingsToolbarButton1Cmd:
       
  3430                         case EWmlSettingsToolbarButton2Cmd:
       
  3431                         case EWmlSettingsToolbarButton3Cmd:
       
  3432                         case EWmlSettingsToolbarButton4Cmd:
       
  3433                         case EWmlSettingsToolbarButton5Cmd:
       
  3434                         case EWmlSettingsToolbarButton6Cmd:
       
  3435                         case EWmlSettingsToolbarButton7Cmd:
       
  3436                         case EWmlSettingsShortCutKey1Cmd:
       
  3437                         case EWmlSettingsShortCutKey2Cmd:
       
  3438                         case EWmlSettingsShortCutKey3Cmd:
       
  3439                         case EWmlSettingsShortCutKey4Cmd:
       
  3440                         case EWmlSettingsShortCutKey5Cmd:
       
  3441                         case EWmlSettingsShortCutKey6Cmd:
       
  3442                         case EWmlSettingsShortCutKey7Cmd:
       
  3443                         case EWmlSettingsShortCutKey8Cmd:
       
  3444                         case EWmlSettingsShortCutKey9Cmd:
       
  3445                         case EWmlSettingsShortCutKey0Cmd:
       
  3446                         case EWmlSettingsShortCutKeyStarCmd:
       
  3447                         case EWmlSettingsShortCutKeyHashCmd:
       
  3448                         case EWmlSettingsSearchProvider:
       
  3449                         {
       
  3450                             ChangeItemL( ETrue );
       
  3451                             ret = EKeyWasConsumed;
       
  3452                             break;
       
  3453                         }
       
  3454                         default:
       
  3455                             break;
       
  3456                         }	
       
  3457 #endif					
  3381                 default:
  3458                 default:
  3382                     break;
  3459                     break;
  3383                 }
  3460                 }
  3384             }
  3461             }
  3385         }
  3462         }