equal
deleted
inserted
replaced
449 } |
449 } |
450 |
450 |
451 #ifdef __RSS_FEEDS |
451 #ifdef __RSS_FEEDS |
452 case EWmlCmdOpenFeedsFolder: |
452 case EWmlCmdOpenFeedsFolder: |
453 { |
453 { |
|
454 //complete remaining startup in Browser and then proceed |
|
455 if ( !ApiProvider().StartedUp() ) |
|
456 ApiProvider().CompleteDelayedInit(); |
454 ApiProvider().FeedsClientUtilities().ShowFolderViewL(); |
457 ApiProvider().FeedsClientUtilities().ShowFolderViewL(); |
455 break; |
458 break; |
456 } |
459 } |
457 #endif // __RSS_FEEDS |
460 #endif // __RSS_FEEDS |
458 |
461 |
928 { |
931 { |
929 // default case for everything else is Back |
932 // default case for everything else is Back |
930 aRsk.setPair(EBrowserBookmarksCmdBack, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_BACK); |
933 aRsk.setPair(EBrowserBookmarksCmdBack, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_BACK); |
931 |
934 |
932 // OR, it could be exit under these conditions |
935 // OR, it could be exit under these conditions |
933 if ( !ApiProvider().StartedUp() || |
936 if ( (!iInAdaptiveBookmarksFolder && !ApiProvider().IsPageLoaded() && !ApiProvider().Fetching()) ) |
934 (!iInAdaptiveBookmarksFolder && !ApiProvider().IsPageLoaded() && !ApiProvider().Fetching()) ) |
|
935 { |
937 { |
936 if ( iCurrentFolder == KFavouritesRootUid ) |
938 if ( iCurrentFolder == KFavouritesRootUid ) |
937 { |
939 { |
938 aRsk.setPair(EAknSoftkeyExit, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_EXIT); |
940 aRsk.setPair(EAknSoftkeyExit, R_BROWSER_BOOKMARKS_DYN_SK_TEXT_SOFTKEY_EXIT); |
939 } |
941 } |
1213 break; |
1215 break; |
1214 } |
1216 } |
1215 } |
1217 } |
1216 } |
1218 } |
1217 |
1219 |
1218 if ( TheContainer()->Listbox()->CurrentItem()->IsFolder() ) |
1220 if ( TheContainer()->Listbox()->CurrentItem() && TheContainer()->Listbox()->CurrentItem()->IsFolder() ) |
1219 { |
1221 { |
1220 SetEmptyTextL(); |
1222 SetEmptyTextL(); |
1221 } |
1223 } |
1222 |
1224 |
1223 CBrowserFavouritesView::HandleListBoxEventL( aListBox, aEventType ); |
1225 CBrowserFavouritesView::HandleListBoxEventL( aListBox, aEventType ); |
1358 break; |
1360 break; |
1359 } |
1361 } |
1360 case R_GOTO_SUBMENU: |
1362 case R_GOTO_SUBMENU: |
1361 { |
1363 { |
1362 // back to page |
1364 // back to page |
1363 if ( !ApiProvider().StartedUp() || (!ApiProvider().IsPageLoaded() && !ApiProvider().Fetching())) |
1365 if ( !ApiProvider().IsPageLoaded() && !ApiProvider().Fetching()) |
1364 { |
1366 { |
1365 aMenuPane->SetItemDimmed( EWmlCmdBackToPage, ETrue ); |
1367 aMenuPane->SetItemDimmed( EWmlCmdBackToPage, ETrue ); |
1366 } |
1368 } |
1367 |
1369 |
1368 // bookmarks |
1370 // bookmarks |
2152 iShowDownlods = ETrue; |
2154 iShowDownlods = ETrue; |
2153 // Show the downloads later since contentview has not initialized yet |
2155 // Show the downloads later since contentview has not initialized yet |
2154 } |
2156 } |
2155 |
2157 |
2156 // complete remaining application launch process, aynchronously |
2158 // complete remaining application launch process, aynchronously |
2157 iAsyncComplete = CIdle::NewL( CActive::EPriorityIdle ); |
2159 // complete remaining init as soon as possible, otherwise it can be dangerous (crash) |
|
2160 // since UI code (views) are interdependent |
|
2161 iAsyncComplete = CIdle::NewL( CActive::EPriorityHigh ); |
2158 iAsyncComplete->Start( TCallBack( CompleteAppInitCallback, &iApiProvider ) ); |
2162 iAsyncComplete->Start( TCallBack( CompleteAppInitCallback, &iApiProvider ) ); |
2159 return; |
2163 return; |
2160 } |
2164 } |
2161 #endif |
2165 #endif |
2162 |
2166 |
2242 // CBrowserBookmarksView::UpdateFavIcons |
2246 // CBrowserBookmarksView::UpdateFavIcons |
2243 // ---------------------------------------------------------------------------- |
2247 // ---------------------------------------------------------------------------- |
2244 // |
2248 // |
2245 void CBrowserBookmarksView::UpdateFavIconsL() |
2249 void CBrowserBookmarksView::UpdateFavIconsL() |
2246 { |
2250 { |
2247 Container()->Listbox()->UpdateFavIconsL(); |
2251 if ( Container() && Container()->Listbox() ) |
|
2252 Container()->Listbox()->UpdateFavIconsL(); |
2248 } |
2253 } |
2249 |
2254 |
2250 |
2255 |
2251 // ---------------------------------------------------------------------------- |
2256 // ---------------------------------------------------------------------------- |
2252 // CBrowserBookmarksView::CheckForDownloads |
2257 // CBrowserBookmarksView::CheckForDownloads |