FCL/sf/app/musicplayer: comparison mpviewplugins/mpdetailsviewplugin/src/mpdetailsview.cpp

equal deleted inserted replaced

-:0f32e550d9d8
+:612c4815aebe
 #include "mpdetailssharedialog.h"
 #endif
 const int KRecommendationCount = 2;
+const int KOneKiloByteInBytes = 1024;
+const int KOneMegabyteInBytes = 1048576;
+const int KOneGigaByteInBytes = 134217728;
 /*!
 Constructor
 */
 MpDetailsView::MpDetailsView()
 const int maxTextRowCount = 20;
 const int minTextRowCount = 1;
 prototype->setSecondaryTextRowCount(minTextRowCount,maxTextRowCount);
 HbListWidgetItem  *inspireMeItem = new HbListWidgetItem();
-QString info(tr("There are no recommendations for this track, but you can always discover new music on Ovi"));
+inspireMeItem->setSecondaryText( hbTrId( "txt_mus_dblist_val_there_are_no_recommendations" ) );
-inspireMeItem->setText( QString( " " ) );
-inspireMeItem->setSecondaryText( info );
 mInspireList->addItem( inspireMeItem );
 }
 TX_EXIT
 }
 }
 if ( !mSongData->album().isEmpty () ) {
 mAlbumText->setPlainText( mSongData->album() );
 } else {
-mAlbumText->setPlainText( tr( "Unknown") );
+mAlbumText->setPlainText( hbTrId( "txt_mus_other_unknown7") );
 }
 if ( !mSongData->artist().isEmpty() ) {
 mArtistText->setPlainText( mSongData->artist() );
 } else {
-mArtistText->setPlainText( tr( "Unknown") );
+mArtistText->setPlainText( hbTrId( "txt_mus_other_unknown6") );
 }
 if (canQuerySharePlayerLink() ) {
 mMpQueryManager->queryLocalMusicStore(mSongData->artist(),mSongData->album(),mSongData->title());
 }
 TX_ENTRY
 mDetailList->clear();
 if ( !mSongData->albumTrack().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Song number" ) );
+item->setText( hbTrId( "txt_mus_dblist_song_number" ) );
 item->setSecondaryText( mSongData->albumTrack() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->year().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Year" ) );
+item->setText( hbTrId( "txt_mus_dblist_year" ) );
 item->setSecondaryText( mSongData->year() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->genre().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Genre" ) );
+item->setText( hbTrId( "txt_mus_dblist_genre" ) );
 item->setSecondaryText( mSongData->genre() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->composer().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Composer" ) );
+item->setText( hbTrId( "txt_mus_dblist_composer" ) );
 item->setSecondaryText( mSongData->composer() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->fileName().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "File name" ) );
+item->setText( hbTrId( "txt_mus_dblist_file_name" ) );
 item->setSecondaryText( mSongData->fileName() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->mimeType().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Format" ) );
+item->setText( hbTrId( "txt_mus_dblist_format" ) );
 item->setSecondaryText( mSongData->mimeType() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->duration().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Duration" ) );
+item->setText( hbTrId( "txt_mus_dblist_duration" ) );
 item->setSecondaryText( mSongData->duration() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->bitRate().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Bitrate" ) );
+item->setText( hbTrId( "txt_mus_dblist_bitrate" ) );
-item->setSecondaryText( mSongData->bitRate().append( " Kbps" ) );
+bool ok = false;
+int bitRate = mSongData->bitRate().toInt(&ok);
+TX_LOG_ARGS("Warning: If zero, bitrate is not read correctly. It wont show up in details" << ok);
+if(ok) {
+item->setSecondaryText( hbTrId("txt_mus_dblist_bitrate_val_ln_kbps", bitRate) );
+}
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->sampleRate().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Sampling rate" ) );
+item->setText( hbTrId( "txt_mus_dblist_sampling_rate" ) );
-item->setSecondaryText( mSongData->sampleRate().append( " hz" ) );
+bool ok = false;
+int samplingRate = mSongData->sampleRate().toInt(&ok);
+TX_LOG_ARGS("Warning: If zero, sampling rate is not read correctly. It wont show up in details" << ok);
+if(ok) {
+item->setSecondaryText(	hbTrId("txt_mus_dblist_sampling_rate_val_ln_hz", samplingRate) );
+}
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->size().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Size" ) );
+item->setText( hbTrId( "txt_mus_dblist_size" ) );
-item->setSecondaryText( mSongData->size().append( " MB" ) );
+bool ok = false;
+long size = mSongData->size().toLong(&ok); // in bytes
+TX_LOG_ARGS("WARNING: If zero, Cant get song data size right. You wont see the size in details groupbox correctly" << ok );
+if( size < KOneKiloByteInBytes) {
+// under 1 KB
+item->setSecondaryText( hbTrId("txt_mus_dblist_size_val_ln_b", size) );
+} else if( size < KOneMegabyteInBytes ) {
+// under 1 MB
+size /= KOneKiloByteInBytes; // turn size into KB
+item->setSecondaryText( hbTrId("txt_mus_dblist_size_val_ln_kb", size) );
+} else if( size < KOneGigaByteInBytes ) {
+// under 1 GB
+size /= KOneMegabyteInBytes; // turn size to MB
+item->setSecondaryText( hbTrId("txt_mus_dblist_size_val_ln_mb", size) );
+} else {
+// 1 GB or higher
+size /= KOneGigaByteInBytes; // turn size to GB
+item->setSecondaryText( hbTrId("txt_mus_dblist_size_val_ln_gb", size) );
+}
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->modified().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Modified" ) );
+item->setText( hbTrId( "txt_mus_dblist_modified" ) );
 item->setSecondaryText( mSongData->modified() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->copyright().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Copyright" ) );
+item->setText( hbTrId( "txt_mus_dblist_copyright" ) );
 item->setSecondaryText( mSongData->copyright() );
 item->setEnabled( false );
 mDetailList->addItem( item );
 }
 if ( !mSongData->musicURL().isNull() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Web site" ) );
+item->setText( hbTrId( "txt_mus_dblist_web_site" ) );
 item->setSecondaryText( mSongData->musicURL() );
 item->setEnabled( true );
 mDetailList->addItem( item );
 }
 if ( mSongData->isDrmProtected() ) {
 HbListWidgetItem *item = new HbListWidgetItem();
-item->setText( tr( "Licences" ) );
+item->setText( hbTrId( "txt_mus_dblist_licences" ) );
-item->setSecondaryText( tr( "Click for details" ) );
+item->setSecondaryText( hbTrId( "txt_mus_dblist_licences_val_click_for_details" ) );
 item->setEnabled( true );
 mDetailList->addItem( item );
 }
 TX_EXIT
 mSharePopup = new MpDetailsShareDialog();
 }
 if ( !mSharePopup->isInitialized() )
 {
 connect( mSharePopup, SIGNAL( closeShareDialog() ), this, SLOT( closeShareDialog() ) );
+		// TODO: Ask for a localization string for this, there is none in text map
 mSharePopup->initialize( mSongData, tr( "Unknown" ) );
 }
 TX_EXIT
 }

changeset 45	612c4815aebe
parent 43	0f32e550d9d8
child 47	4cc1412daed0