1446 } |
1447 } |
1447 #endif // SHOW_UNMARK_ALL_ALWAYS |
1448 #endif // SHOW_UNMARK_ALL_ALWAYS |
1448 |
1449 |
1449 #ifndef SHOW_MARK_ALL_ALWAYS |
1450 #ifndef SHOW_MARK_ALL_ALWAYS |
1450 // As for "mark all", consider items only. |
1451 // As for "mark all", consider items only. |
1451 if ( aState.iVisibleItemCount == aState.iMarkedItemCount ) |
1452 if ( (aState.iVisibleItemCount == aState.iMarkedItemCount) && (aState.iVisibleFolderCount == aState.iMarkedFolderCount) ) |
|
1453 { |
|
1454 //Checking for both items and folders |
|
1455 aMenuPane->SetItemDimmed( EWmlCmdMarkAll, ETrue ); |
|
1456 } |
|
1457 else if( (aState.iVisibleItemCount == 0) && (aState.iVisibleFolderCount < 2))//Only one folder is present and no items |
1452 { |
1458 { |
1453 aMenuPane->SetItemDimmed( EWmlCmdMarkAll, ETrue ); |
1459 aMenuPane->SetItemDimmed( EWmlCmdMarkAll, ETrue ); |
1454 } |
1460 } |
1455 #endif // SHOW_MARK_ALL_ALWAYS |
1461 #endif // SHOW_MARK_ALL_ALWAYS |
1456 break; |
1462 break; |
1469 |
1475 |
1470 //Disable MoveToFolder option if you are in RecentlyVisitedUrl folder |
1476 //Disable MoveToFolder option if you are in RecentlyVisitedUrl folder |
1471 if( iInAdaptiveBookmarksFolder ) |
1477 if( iInAdaptiveBookmarksFolder ) |
1472 { |
1478 { |
1473 aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue ); |
1479 aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue ); |
|
1480 // These options are not required when user press MSK |
|
1481 aMenuPane->SetItemDimmed( EWmlCmdAddBookmark, ETrue ); |
|
1482 aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, ETrue ); |
|
1483 aMenuPane->SetItemDimmed( EWmlCmdSwitchToGotoActive, ETrue ); |
|
1484 aMenuPane->SetItemDimmed( EWmlCmdNewFolder, ETrue ); |
1474 } |
1485 } |
1475 const CFavouritesItem* item = TheContainer()->Listbox()->CurrentItem(); |
1486 const CFavouritesItem* item = TheContainer()->Listbox()->CurrentItem(); |
1476 if ( ( item ) && |
1487 if ( ( item ) && |
1477 ( ( item->Uid() == KFavouritesAdaptiveItemsFolderUid ) || |
1488 ( ( item->Uid() == KFavouritesAdaptiveItemsFolderUid ) || |
1478 ( item->ContextId() != NULL ) ) |
1489 ( item->ContextId() != NULL ) ) |
1479 ) |
1490 ) |
1480 { |
1491 { |
1481 // We can't delete adaptive bookmarks folder, |
1492 // We can't delete adaptive bookmarks folder, |
1482 // or seamless folders |
1493 // or seamless folders |
1483 aMenuPane->SetItemDimmed( EWmlCmdDelete, ETrue ); |
1494 aMenuPane->SetItemDimmed( EWmlCmdDelete, ETrue ); |
|
1495 aMenuPane->SetItemDimmed( EWmlCmdMoveToFolder, ETrue ); |
1484 } |
1496 } |
1485 |
1497 |
1486 if (!iPenEnabled) |
1498 //Enable CopyToBookmarks option if you are in RecentlyVisitedUrl folder |
1487 { |
1499 if( iInAdaptiveBookmarksFolder ) |
1488 aMenuPane->SetItemDimmed( EWmlCmdAddBookmark, ETrue ); |
1500 { |
1489 aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, ETrue ); |
1501 aMenuPane->SetItemDimmed( EWmlCmdCopyToBookmarks, EFalse ); |
1490 aMenuPane->SetItemDimmed( EWmlCmdSwitchToGotoActive, ETrue ); |
1502 } |
1491 aMenuPane->SetItemDimmed( EWmlCmdNewFolder, ETrue ); |
|
1492 } |
|
1493 |
|
1494 break; |
1503 break; |
1495 } |
1504 } |
1496 default: |
1505 default: |
1497 { |
1506 { |
1498 break; |
1507 break; |
1595 // Find bookmark to be moved, sort and remove |
1604 // Find bookmark to be moved, sort and remove |
1596 for ( j=0; j < iItemsToMove->Count(); j++ ) { |
1605 for ( j=0; j < iItemsToMove->Count(); j++ ) { |
1597 if ( (*iItemsToMove)[j] == orderArrayUid ) { |
1606 if ( (*iItemsToMove)[j] == orderArrayUid ) { |
1598 sortedItemsToMove->AppendL( (*iItemsToMove)[j] ); |
1607 sortedItemsToMove->AppendL( (*iItemsToMove)[j] ); |
1599 orderArray->Delete( i ); |
1608 orderArray->Delete( i ); |
|
1609 i--; |
1600 break; |
1610 break; |
1601 } |
1611 } |
1602 } |
1612 } |
1603 |
1613 |
1604 // Stop sorting, if we're done |
1614 // Stop sorting, if we're done |
2203 } |
2212 } |
2204 AddUidToLastPlaceToCurrentListL( item->Uid() ); |
2213 AddUidToLastPlaceToCurrentListL( item->Uid() ); |
2205 iRefresh = EFalse; |
2214 iRefresh = EFalse; |
2206 Model().Database().SetData( CurrentFolder() , *iCurrentOrder ); |
2215 Model().Database().SetData( CurrentFolder() , *iCurrentOrder ); |
2207 CleanupStack::PopAndDestroy(); // item |
2216 CleanupStack::PopAndDestroy(); // item |
|
2217 Container()->Listbox()->ClearSelection(); |
2208 } |
2218 } |
2209 |
2219 |
2210 |
2220 |
2211 // ---------------------------------------------------------------------------- |
2221 // ---------------------------------------------------------------------------- |
2212 // CBrowserBookmarksView::AddUidToLastPlaceToCurrentListL |
2222 // CBrowserBookmarksView::AddUidToLastPlaceToCurrentListL |