mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewcontainer.cpp
--- a/mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewcontainer.cpp Mon Mar 15 12:40:11 2010 +0200
+++ b/mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewcontainer.cpp Wed Mar 31 21:26:33 2010 +0300
@@ -168,7 +168,8 @@
UpdateProgressBarGraphics();
iMode = EUninitialized;
- iLabels[ETextDownloadState]->MakeVisible( ETrue );
+ // suppress download text per UI spec
+ iLabels[ETextDownloadState]->MakeVisible( EFalse );
iLabels[ETextArtist]->MakeVisible( EFalse );
iLabels[ETextTrack]->MakeVisible( EFalse );
iLabels[ETextElapsedTime]->MakeVisible( EFalse );
@@ -331,6 +332,7 @@
CMPXPlaybackViewInfoLabel* label = iLabels[aLabel];
if(aLabel == ETextDownloadState)
{
+ /*
iSliderPaneRect = iLayout->IndicatorLayout( Rect(), ESliderPane );
iLayout->LayoutLabel(
iLabels[ETextDownloadState], iSliderPaneRect, ETextDownloadState );
@@ -348,6 +350,9 @@
*iLabels[ETextDownloadState],
EColorLabelText,
color );
+ */
+ // suppress download text per UI spec.
+ return;
}
if ( label )
{
@@ -381,7 +386,7 @@
case EUninitialized:
{
// Set label visibility
- iLabels[ETextDownloadState]->MakeVisible( ETrue );
+ //iLabels[ETextDownloadState]->MakeVisible( EFalse );
iLabels[ETextArtist]->MakeVisible( ETrue );
iLabels[ETextTrack]->MakeVisible( ETrue );
//iLabels[ETextEmpty]->MakeVisible( EFalse );
@@ -392,7 +397,7 @@
case ENoTracksMode:
{
// Set label visibility
- iLabels[ETextDownloadState]->MakeVisible( ETrue );
+ //iLabels[ETextDownloadState]->MakeVisible( ETrue );
iLabels[ETextArtist]->MakeVisible( EFalse );
iLabels[ETextTrack]->MakeVisible( EFalse );
//iLabels[ETextEmpty]->MakeVisible( ETrue );
@@ -404,7 +409,7 @@
case EStopMode:
{
// Fixed the layout for Download label and time label are overlaped in position
- iLabels[ETextDownloadState]->MakeVisible( EFalse );
+ //iLabels[ETextDownloadState]->MakeVisible( EFalse );
iLabels[ETextTrack]->MakeVisible( ETrue );
iLabels[ETextArtist]->MakeVisible( ETrue );
//iLabels[ETextEmpty]->MakeVisible( EFalse );
@@ -414,7 +419,7 @@
}
case EInitialising:
{
- iLabels[ETextDownloadState]->MakeVisible( ETrue );
+ //iLabels[ETextDownloadState]->MakeVisible( ETrue );
iLabels[ETextTrack]->MakeVisible( ETrue );
iLabels[ETextArtist]->MakeVisible( ETrue );
//iLabels[ETextEmpty]->MakeVisible( EFalse );
@@ -424,7 +429,7 @@
}
case EMediaKeySkipping:
{
- iLabels[ETextDownloadState]->MakeVisible( ETrue );
+ //iLabels[ETextDownloadState]->MakeVisible( ETrue );
iLabels[ETextTrack]->MakeVisible( ETrue );
iLabels[ETextArtist]->MakeVisible( ETrue );
//iLabels[ETextEmpty]->MakeVisible( EFalse );
@@ -434,7 +439,7 @@
}
case EInvalidMode:
{
- iLabels[ETextDownloadState]->MakeVisible( EFalse );
+ //iLabels[ETextDownloadState]->MakeVisible( EFalse );
iLabels[ETextTrack]->MakeVisible( EFalse );
iLabels[ETextArtist]->MakeVisible( EFalse );
//iLabels[ETextEmpty]->MakeVisible( EFalse );
@@ -446,7 +451,7 @@
case EBufferingMode:
{
// Set label visibility
- iLabels[ETextDownloadState]->MakeVisible( EFalse );
+ //iLabels[ETextDownloadState]->MakeVisible( EFalse );
iLabels[ETextArtist]->MakeVisible( ETrue );
iLabels[ETextTrack]->MakeVisible( ETrue );
//iLabels[ETextEmpty]->MakeVisible( EFalse );
@@ -457,7 +462,7 @@
default:
{
// Set label visibility
- iLabels[ETextDownloadState]->MakeVisible( EFalse );
+ //iLabels[ETextDownloadState]->MakeVisible( EFalse );
iLabels[ETextArtist]->MakeVisible( ETrue );
iLabels[ETextTrack]->MakeVisible( ETrue );
//iLabels[ETextEmpty]->MakeVisible( EFalse );
@@ -1473,8 +1478,9 @@
iLabels[ETextPlaylistCount], myRect, ETextPlaylistCount );
//iLayout->LayoutLabel(
// iLabels[ETextEmpty], myRect, ETextEmpty );
- iLayout->LayoutLabel(
- iLabels[ETextDownloadState], iSliderPaneRect, ETextDownloadState );
+ // suppress download text per UI spec
+ //iLayout->LayoutLabel(
+ // iLabels[ETextDownloadState], iSliderPaneRect, ETextDownloadState );
if ( iFMTXMode )
{