MCL/sf/app/homescreen: comparison idlehomescreen/widgetmanager/src/wmlistbox.cpp

equal deleted inserted replaced

-:f966699dea19
+:ff572dfe6d86
 #include <AknLayout.lag>
 #include <AknIconArray.h>
 #include <gulicon.h>
 #include <widgetmanagerview.rsg>
 #include <widgetmanager.mbg>
 #include "wmcommon.h"
 #include "wmplugin.h"
 #include "wmresourceloader.h"
 #include "wmlistbox.h"
 #include "wmwidgetdata.h"
+#include "wmwidgetorderdata.h"
 // CONSTANTS
 // MEMBER FUNCTIONS
 iDefaultLogoImageMask,
 iWmPlugin.ResourceLoader().IconFilePath(),
 EMbmWidgetmanagerQgn_menu_hswidget,
 EMbmWidgetmanagerQgn_menu_hswidget_mask
 );
-AknsUtils::CreateColorIconL(
-skin,
-KAknsIIDQgnIndiWmAdd,
-KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG6,
-iAddWidgetBtnImage,
-iAddWidgetBtnMask,
-iWmPlugin.ResourceLoader().IconFilePath(),
-EMbmWidgetmanagerAdd_widget_button,
-EMbmWidgetmanagerAdd_widget_button_mask,
-KRgbBlack );
-AknsUtils::CreateColorIconL(
-skin,
-KAknsIIDQgnIndiWmAdd,
-KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG10,
-iAddWidgetBtnHighlightImage,
-iAddWidgetBtnHighlightMask,
-iWmPlugin.ResourceLoader().IconFilePath(),
-EMbmWidgetmanagerAdd_widget_button,
-EMbmWidgetmanagerAdd_widget_button_mask,
-KRgbWhite );
 // This is temporary fix for ou1cimx1#228810
 // Can be removed when avkon provides real fix for this error.
 // Currently forever loop in CFormattedCellListBoxData::DrawFormattedSimple
 // never exits if there is no iconarray and name contains tab+digit which
 iListBox = NULL;
 // dispose icons
 delete iDefaultLogoImage;
 delete iDefaultLogoImageMask;
-delete iAddWidgetBtnImage;
-delete iAddWidgetBtnMask;
-delete iAddWidgetBtnHighlightImage;
-delete iAddWidgetBtnHighlightMask;
 	}
 // ---------------------------------------------------------
 // CWmListItemDrawer::ResizeDefaultBitmaps
 // ---------------------------------------------------------
 //
 void CWmListItemDrawer::ResizeDefaultBitmaps()
 {
 	TAknWindowLineLayout logoPane =
 	          AknLayoutScalable_Apps::listrow_wgtman_pane_g1().LayoutLine();
-TAknWindowLineLayout addPane =
-AknLayoutScalable_Apps::listrow_wgtman_pane_g2().LayoutLine();
 TAknLayoutRect layoutRect;
 TRect rect = TRect( ItemCellSize() );
 layoutRect.LayoutRect( rect, logoPane );
 // RESIZE DEFAULT LOGO BITMAPS ACCORDING TO LAYOUT
 TSize size = layoutRect.Rect().Size();
 AknIconUtils::SetSize(
 iDefaultLogoImage, size, EAspectRatioPreserved );
 AknIconUtils::SetSize(
 iDefaultLogoImageMask, size, EAspectRatioPreserved );
-// RESIZE ADD BTN BITMAPS ACCORDING TO LAYOUT
-layoutRect.LayoutRect( rect, addPane );
-size = layoutRect.Rect().Size();
-AknIconUtils::SetSize(
-iAddWidgetBtnImage, size, EAspectRatioPreserved );
-AknIconUtils::SetSize(
-iAddWidgetBtnMask, size, EAspectRatioPreserved );
-AknIconUtils::SetSize(
-iAddWidgetBtnHighlightImage, size, EAspectRatioPreserved );
-AknIconUtils::SetSize(
-iAddWidgetBtnHighlightMask, size, EAspectRatioPreserved );
 }
 // ---------------------------------------------------------
 // CWmListItemDrawer::DrawItem
 // ---------------------------------------------------------
 gc,
 itemRect,
 innerRect,
 KAknsIIDQsnFrList,
 KAknsIIDQsnFrListCenter );
 }
 // DRAW LOGO
 CFbsBitmap* bitmap = const_cast<CFbsBitmap*>(wData.LogoImage());
 CFbsBitmap* mask = const_cast<CFbsBitmap*>(wData.LogoImageMask());
 else if( bitmap && mask )
 {
 logoLayout.DrawImage( gc, bitmap, mask );
 }
+// DRAW NAME
 TRgb textColor;
 TAknsQsnTextColorsIndex index =
 ( aItemIsCurrent && listFocused && highlightEnabled )?
 EAknsCIQsnTextColorsCG10 : EAknsCIQsnTextColorsCG6;
 AknsUtils::GetCachedColor(
 skin, textColor, KAknsIIDQsnTextColors, index );
-// DRAW TEXT
 TAknTextLineLayout titleTextLayout =
 AknLayoutScalable_Apps::listrow_wgtman_pane_t1().LayoutLine();
 TAknLayoutText textLayoutTitle;
 textLayoutTitle.LayoutText( itemRect, titleTextLayout );
 textLayoutTitle.DrawText( gc, wData.Name(), ETrue, textColor );
-if ( !wData.IsUninstalling() &&
+if ( wData.IsUninstalling() )
-wData.HsContentInfo().CanBeAdded() )
+{
-{
+// DRAW UNINSTALL ANIMATION
-// DRAW ADD BUTTON
-TAknLayoutRect addButtonLayout;
-addButtonLayout.LayoutRect( itemRect,
-AknLayoutScalable_Apps::listrow_wgtman_pane_g2().LayoutLine() );
-if ( aItemIsCurrent && listFocused && highlightEnabled )
-{
-addButtonLayout.DrawImage( gc,
-iAddWidgetBtnHighlightImage, iAddWidgetBtnHighlightMask );
-}
-else
-{
-addButtonLayout.DrawImage( gc,
-iAddWidgetBtnImage, iAddWidgetBtnMask );
-}
-}
-if ( !wData.IsUninstalling() )
-{
-TAknTextLineLayout descTextLayout =
-AknLayoutScalable_Apps::listrow_wgtman_pane_t2().LayoutLine();
-gc.SetPenSize(TSize(1,1));
-// DRAW DESCRIPTION TEXT
-TAknLayoutText textLayoutDes;
-textLayoutDes.LayoutText( itemRect, descTextLayout );
-textLayoutDes.DrawText( gc, wData.Description(), ETrue, textColor );
-}
-else
-{
-// draw animation
 TAknLayoutRect animationLayout;
 animationLayout.LayoutRect( itemRect,
 AknLayoutScalable_Apps::wait_bar_pane_cp09().LayoutLine() );
 TSize size = animationLayout.Rect().Size();
 CFbsBitmap* animBitmap =
 // CWmListItemDrawer::HandleSkinChanged
 // ---------------------------------------------------------
 //
 void CWmListItemDrawer::HandleSkinChanged()
 {
-CFbsBitmap* addWidgetBtnImage( NULL );
+ResizeDefaultBitmaps();
-CFbsBitmap* addWidgetBtnMask( NULL );
-CFbsBitmap* addWidgetBtnHighlightImage( NULL );
-CFbsBitmap* addWidgetBtnHighlightMask( NULL );
-MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-TRAPD( err,
-AknsUtils::CreateColorIconLC(
-skin,
-KAknsIIDQgnIndiWmAdd,
-KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG6,
-addWidgetBtnImage,
-addWidgetBtnMask,
-iWmPlugin.ResourceLoader().IconFilePath(),
-EMbmWidgetmanagerAdd_widget_button,
-EMbmWidgetmanagerAdd_widget_button_mask,
-KRgbBlack );
-AknsUtils::CreateColorIconLC(
-skin,
-KAknsIIDQgnIndiWmAdd,
-KAknsIIDQsnTextColors,
-EAknsCIQsnTextColorsCG10,
-addWidgetBtnHighlightImage,
-addWidgetBtnHighlightMask,
-iWmPlugin.ResourceLoader().IconFilePath(),
-EMbmWidgetmanagerAdd_widget_button,
-EMbmWidgetmanagerAdd_widget_button_mask,
-KRgbWhite );
-CleanupStack::Pop( 4 ); // pop icons
-);
-if ( KErrNone == err )
-{
-// delete old icons
-delete iAddWidgetBtnImage;
-iAddWidgetBtnImage = NULL;
-delete iAddWidgetBtnMask;
-iAddWidgetBtnMask = NULL;
-delete iAddWidgetBtnHighlightImage;
-iAddWidgetBtnHighlightImage = NULL;
-delete iAddWidgetBtnHighlightMask;
-iAddWidgetBtnHighlightMask = NULL;
-// transfer ownership
-iAddWidgetBtnImage = addWidgetBtnImage;
-addWidgetBtnImage = NULL;
-iAddWidgetBtnMask = addWidgetBtnMask;
-addWidgetBtnMask = NULL;
-iAddWidgetBtnHighlightImage = addWidgetBtnHighlightImage;
-addWidgetBtnHighlightImage = NULL;
-iAddWidgetBtnHighlightMask = addWidgetBtnHighlightMask;
-addWidgetBtnHighlightMask = NULL;
-// resize new created icons
-ResizeDefaultBitmaps();
-}
 }
 // ---------------------------------------------------------
 // CWmListBox::NewL
 // ---------------------------------------------------------
 // CWmListBox::~CWmListBox
 // ---------------------------------------------------------
 //
 CWmListBox::~CWmListBox()
 {
-iWidgetDatas.ResetAndDestroy();
+iVisibleWidgetArray.ResetAndDestroy();
+iOrderDataArray.ResetAndDestroy();
 }
 // ---------------------------------------------------------
 // CWmListBox::ConstructL
 // ---------------------------------------------------------
 {
 CEikFormattedCellListBox::ConstructL( aParent, aFlags );
 SetContainerWindowL( *aParent );
 // set model point to the widgets array
-Model()->SetItemTextArray( &iWidgetDatas );
+Model()->SetItemTextArray( &iVisibleWidgetArray );
 Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
 // set empty-text to null
 View()->SetListEmptyTextL( KNullDesC );
 // ---------------------------------------------------------
 //
 CWmWidgetData* CWmListBox::WidgetData()
 {
 TInt index = CurrentListBoxItemIndex();
-return (index>=0 ? iWidgetDatas[index] : NULL);
+return (index>=0 ? iVisibleWidgetArray[index] : NULL);
 }
 // ---------------------------------------------------------
 // CWmListBox::WidgetData
 // ---------------------------------------------------------
 //
 CWmWidgetData& CWmListBox::WidgetData( TInt aItemIndex )
 {
-return *iWidgetDatas[ RealIndex( aItemIndex ) ];
+return *iVisibleWidgetArray[ RealIndex( aItemIndex ) ];
 }
 // ---------------------------------------------------------
 // CWmListBox::AddWidgetDataL
 // ---------------------------------------------------------
 TBool aRedraw )
 {
 if ( aWidgetData )
 {
 aWidgetData->SetObserver( this );
-iWidgetDatas.InsertInOrderAllowRepeatsL( aWidgetData,
+iVisibleWidgetArray.InsertInOrderAllowRepeatsL( aWidgetData,
 SortOrder(EStoredOrder) );
 if ( aRedraw ) { HandleItemAdditionL(); }
 }
 }
 void CWmListBox::RemoveWidgetData( TInt aItemIndex )
 {
 TInt realIndex = RealIndex( aItemIndex );
 TBool current = ( aItemIndex == CurrentItemIndex() );
 // remove widget data
-CWmWidgetData* data = iWidgetDatas[realIndex];
+CWmWidgetData* data = iVisibleWidgetArray[realIndex];
-iWidgetDatas.Remove( realIndex );
+iVisibleWidgetArray.Remove( realIndex );
 // reorganise
 TRAP_IGNORE(
 AknListBoxUtils::HandleItemRemovalAndPositionHighlightL(
 this, realIndex, current ) );
+// Remove item from order array
+for ( TInt i = 0; i < iOrderDataArray.Count(); i++ )
+{
+CWmWidgetOrderData* order = iOrderDataArray[i];
+if ( order->EqualsTo( data->Uid(), data->PublisherId() ) )
+{
+iOrderDataArray.Remove( i );
+delete order;
+order = NULL;
+break;
+}
+}
 // delete now
 delete data;
 data = NULL;
 }
 // ---------------------------------------------------------
 // CWmListBox::SetSortOrderL
 // ---------------------------------------------------------
 //
-void CWmListBox::SetSortOrderL( TSortOrder aOrder )
+void CWmListBox::DoSortToVisibleArray( TSortOrder aOrder )
 {
 // now sort the existing data
-iWidgetDatas.Sort( SortOrder( aOrder ) );
+iVisibleWidgetArray.Sort( SortOrder( aOrder ) );
 DrawNow();
 }
 // ---------------------------------------------------------
 // CWmListBox::CreateItemDrawerL
 //
 void CWmListBox::HandleLayoutChanged()
 {
 iLogoSize = TSize( 0, 0);
 	iLogoSize = LogoSize();
-for ( TInt i=0; i<iWidgetDatas.Count(); i++)
+for ( TInt i=0; i<iVisibleWidgetArray.Count(); i++)
 {
-iWidgetDatas[i]->ReCreateLogo( iLogoSize );
+iVisibleWidgetArray[i]->ReCreateLogo( iLogoSize );
 }
 }
 // ---------------------------------------------------------
 // CWmListBox::HandleSkinChanged
 void CWmListBox::HandleWidgetDataChanged( CWmWidgetData* aWidgetData )
 {
 if ( !iFindPaneIsVisible )
 {
 // spontaneous change in the model. Cause table to redraw
-TInt index = iWidgetDatas.Find( aWidgetData );
+TInt index = iVisibleWidgetArray.Find( aWidgetData );
 if ( index >= 0 )
 {
 // redraw item.
 RedrawItem( RealIndex( index ) );
 }
 return itemDrawer->DefaultLogoMask();
 }
 return NULL;
 }
+// ---------------------------------------------------------
+// CWmListBox::SortOrderToOrderData
+// ---------------------------------------------------------
+//
+TLinearOrder<CWmWidgetOrderData> CWmListBox::SortOrderToOrderData( TSortOrder aOrder )
+{
+if ( aOrder == EStoredOrder )
+{
+return TLinearOrder<CWmWidgetOrderData>(
+CWmWidgetOrderData::CompareByPersistentWidgetOrder );
+}
+else
+{
+return TLinearOrder<CWmWidgetOrderData>(
+CWmWidgetOrderData::CompareByName );
+}
+}
+// ---------------------------------------------------------
+// CWmListBox::SetSortOrderToOrderDataL
+// ---------------------------------------------------------
+//
+void CWmListBox::DoSortToOrderData( TSortOrder aOrder )
+{
+iOrderDataArray.Sort( SortOrderToOrderData( aOrder ) );
+}
+// ---------------------------------------------------------
+// CWmListBox::AddWidgetDataL
+// ---------------------------------------------------------
+//
+void CWmListBox::AddOrderDataL( CWmWidgetOrderData* aOrderData )
+{
+if ( aOrderData )
+{
+iOrderDataArray.InsertInOrderAllowRepeatsL( aOrderData,
+SortOrderToOrderData( EStoredOrder ) );
+}
+}
+// ---------------------------------------------------------
+// CWmListBox::OrderData
+// ---------------------------------------------------------
+//
+CWmWidgetOrderData* CWmListBox::OrderData( TInt aItemIndex )
+{
+return iOrderDataArray[ aItemIndex ];
+}
 // End of File

branch	RCL_3
changeset 11	ff572dfe6d86
parent 9	f966699dea19
child 12	9674c1a575e9