--- a/videoplayback/hbvideoplaybackview/controlsrc/mpxvideoplaybackfiledetailswidget.cpp Fri Jun 11 09:44:20 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/controlsrc/mpxvideoplaybackfiledetailswidget.cpp Thu Jun 24 09:49:13 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 25 %
+// Version : %version: 26 %
#include <QDir>
@@ -42,7 +42,7 @@
// QMPXVideoPlaybackFileDetailsWidget::QMPXVideoPlaybackFileDetailsWidget
// -------------------------------------------------------------------------------------------------
//
-QMPXVideoPlaybackFileDetailsWidget::QMPXVideoPlaybackFileDetailsWidget(
+QMPXVideoPlaybackFileDetailsWidget::QMPXVideoPlaybackFileDetailsWidget(
QMPXVideoPlaybackControlsController* controller )
: mController( controller )
, mListWidget( 0 )
@@ -75,7 +75,7 @@
// load fileDetails widget
//
QGraphicsWidget *widget = loader->findWidget( QString( "fileDetails" ) );
-
+
//
// cast fileDetails widget to HbListWidget
//
@@ -89,7 +89,7 @@
//
// Title
- //
+ //
makeTitleItem( details );
if ( ! mFileDetailsUpdated )
@@ -101,8 +101,8 @@
//
// Description
//
- addItemToListWidget(
- hbTrId( "txt_videos_list_description" ), details->mDescription );
+ addItemToListWidget(
+ hbTrId( "txt_videos_list_description" ), details->mDescription );
//
// Duration
@@ -118,8 +118,8 @@
addItemToListWidget(
hbTrId( "txt_videos_list_duration" ),
- hbTrId( "txt_videos_list_l1l2l3" ).arg( hour ).arg( min ).arg( sec ) );
- }
+ hbTrId( "txt_videos_list_l1l2l3" ).arg( hour ).arg( min ).arg( sec ) );
+ }
//
// Date/Time
@@ -129,27 +129,27 @@
//
// Location
//
- addItemToListWidget( hbTrId( "txt_videos_list_location" ), details->mLocation );
+ addItemToListWidget( hbTrId( "txt_videos_list_location" ), details->mLocation );
//
// Author
//
- addItemToListWidget( hbTrId( "txt_videos_list_author" ), details->mArtist );
+ addItemToListWidget( hbTrId( "txt_videos_list_author" ), details->mArtist );
//
// Copyright
//
- addItemToListWidget( hbTrId( "txt_videos_list_copyright" ), details->mCopyright );
+ addItemToListWidget( hbTrId( "txt_videos_list_copyright" ), details->mCopyright );
//
// Language
//
- addItemToListWidget( hbTrId( "txt_videos_list_language" ), details->mLanguage );
+ addItemToListWidget( hbTrId( "txt_videos_list_language" ), details->mLanguage );
//
// Keywords
//
- addItemToListWidget( hbTrId( "txt_videos_list_keywords" ), details->mKeywords );
+ addItemToListWidget( hbTrId( "txt_videos_list_keywords" ), details->mKeywords );
//
// Size
@@ -163,14 +163,14 @@
{
QString resolution = hbTrId( "txt_videos_list_l1l2" )
.arg( locale.toString( details->mVideoWidth ) )
- .arg( locale.toString( details->mVideoHeight ) );
- addItemToListWidget( hbTrId( "txt_videos_list_resolution" ), resolution );
+ .arg( locale.toString( details->mVideoHeight ) );
+ addItemToListWidget( hbTrId( "txt_videos_list_resolution" ), resolution );
}
//
// Format
//
- addItemToListWidget( hbTrId( "txt_videos_list_format" ), details->mMimeType );
+ addItemToListWidget( hbTrId( "txt_videos_list_format" ), details->mMimeType );
//
// Bitrate
@@ -183,7 +183,7 @@
if ( details->mPlaybackMode == EMPXVideoLocal ||
details->mPlaybackMode == EMPXVideoProgressiveDownload)
{
- QFileInfo fileInfo( details->mClipName );
+ QFileInfo fileInfo( details->mClipName );
QString folder = fileInfo.dir().dirName();
addItemToListWidget( hbTrId( "txt_videos_list_collection_name" ), folder );
}
@@ -234,16 +234,16 @@
// -------------------------------------------------------------------------------------------------
//
void QMPXVideoPlaybackFileDetailsWidget::makeTitleItem( QMPXVideoPlaybackViewFileDetails* details )
-{
+{
MPX_DEBUG(_L("QMPXVideoPlaybackFileDetailsWidget::makeTitleItem()"));
//
// Title should be the first item in file details list
//
if ( mController->viewMode() == EAudioOnlyView )
- {
+ {
//
- // show the title for audio-only view
+ // show the title for audio-only view
//
if ( mListWidget->count() == 0 || ! mListWidget->item( 0 )->text().contains( "Title", Qt::CaseInsensitive ) )
{
@@ -253,9 +253,9 @@
{
//
// If title is not available, show clip name
- //
+ //
QFileInfo fileInfo( details->mClipName );
- title = fileInfo.baseName ();
+ title = fileInfo.completeBaseName();
}
//
@@ -270,7 +270,7 @@
else if ( mListWidget->count() &&
mListWidget->item( 0 )->text().contains( "Title", Qt::CaseInsensitive ) )
{
- //
+ //
// title is displayed under the status pane for video clips,
// so hide the title for this details view
//
@@ -283,17 +283,17 @@
// -------------------------------------------------------------------------------------------------
//
void QMPXVideoPlaybackFileDetailsWidget::makeSizeItem( QMPXVideoPlaybackViewFileDetails* details )
-{
+{
if ( details->mPlaybackMode == EMPXVideoLocal ||
details->mPlaybackMode == EMPXVideoProgressiveDownload )
{
- QFileInfo fileInfo( details->mClipName );
-
+ QFileInfo fileInfo( details->mClipName );
+
//
// to prevent overflow, get an unsigned value of file size
//
ulong fileSize = fileInfo.size();
-
+
//
// convert file size to KB, MB, GB accordingly
//
@@ -329,9 +329,9 @@
int temp = size * 10;
size = (float)temp / 10;
- addItemToListWidget(
+ addItemToListWidget(
hbTrId( "txt_videos_list_file_size" ), scale.arg( locale.toString( size ) ) );
- }
+ }
}
}
@@ -340,7 +340,7 @@
// -------------------------------------------------------------------------------------------------
//
void QMPXVideoPlaybackFileDetailsWidget::makeBitRateItem( QMPXVideoPlaybackViewFileDetails* details )
-{
+{
if ( details->mBitRate > 0 )
{
HbExtendedLocale locale = HbExtendedLocale::system();
@@ -353,17 +353,17 @@
{
bitrate /= KILOBYTE;
}
-
+
if ( bitrate > KILOBYTE )
{
bitrate /= KILOBYTE;
scale = hbTrId( "txt_videos_list_l1_mbps" );
}
-
+
int temp = bitrate * 10;
bitrate = (float)temp / 10;
- addItemToListWidget(
+ addItemToListWidget(
hbTrId( "txt_videos_list_bitrate" ), scale.arg( locale.toString( bitrate ) ) );
}
}
@@ -373,18 +373,18 @@
// -------------------------------------------------------------------------------------------------
//
void QMPXVideoPlaybackFileDetailsWidget::addItemToListWidget( QString item, QString text )
-{
+{
MPX_ENTER_EXIT(_L("QMPXVideoPlaybackFileDetailsWidget::addItemToListWidget"));
-
+
if ( text.count() > 0 )
{
- MPX_DEBUG(_L("QMPXVideoPlaybackFileDetailsWidget::addItemToListWidget( %s %s )"),
+ MPX_DEBUG(_L("QMPXVideoPlaybackFileDetailsWidget::addItemToListWidget( %s %s )"),
item.data(), text.data() );
-
+
HbListWidgetItem* listWidgetItem = new HbListWidgetItem();
listWidgetItem->setText( item );
listWidgetItem->setSecondaryText( text );
-
+
mListWidget->addItem( listWidgetItem );
}
}
@@ -394,21 +394,21 @@
// -------------------------------------------------------------------------------------------------
//
void QMPXVideoPlaybackFileDetailsWidget::makeDateTimeItem( QMPXVideoPlaybackViewFileDetails* details )
-{
+{
MPX_ENTER_EXIT(_L("QMPXVideoPlaybackFileDetailsWidget::makeDateTimeItem"));
-
+
//
// attempt to get 'created' and 'last modified' date/time from metadata first,
// if it's not available, then get it from the file system
//
-
+
if ( details->mPlaybackMode == EMPXVideoLocal ||
details->mPlaybackMode == EMPXVideoProgressiveDownload )
- {
+ {
QDateTime dateTime;
- QFileInfo fileInfo( details->mClipName );
+ QFileInfo fileInfo( details->mClipName );
HbExtendedLocale locale = HbExtendedLocale::system();
-
+
//
// Date created
//
@@ -420,15 +420,15 @@
{
dateTime = fileInfo.created();
}
-
+
//
// convert 'created' date/time to proper string format
// according to its current locale
//
QString date = locale.format( dateTime.date(), r_qtn_date_usual );
QString time = locale.format( dateTime.time(), r_qtn_time_long_with_zero );
- addItemToListWidget( hbTrId( "txt_videos_list_date" ), date + " " + time );
-
+ addItemToListWidget( hbTrId( "txt_videos_list_date" ), date + " " + time );
+
//
// Date modified
//
@@ -440,15 +440,15 @@
{
dateTime = fileInfo.lastModified();
}
-
+
//
// convert 'last modified' date/time to proper string format
// according to its current locale
//
date = locale.format( dateTime.date(), r_qtn_date_usual );
time = locale.format( dateTime.time(), r_qtn_time_long_with_zero );
- addItemToListWidget( hbTrId( "txt_videos_list_modified" ), date + " " + time );
- }
+ addItemToListWidget( hbTrId( "txt_videos_list_modified" ), date + " " + time );
+ }
}
//End of file