diff --git a/source/app/PropertiesSidebar.cpp b/source/app/PropertiesSidebar.cpp index 0fe5a3f..1344f87 100644 --- a/source/app/PropertiesSidebar.cpp +++ b/source/app/PropertiesSidebar.cpp @@ -53,6 +53,12 @@ StreamPropertiesSideBar::StreamPropertiesSideBar( QWidget* parent ) : // ----------------- GUI definition ----------------- + QLabel *streamNameLabel = new QLabel( tr( "Name:" ) ); + streamNameLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter ); + labelNameValue = new QLabel; + labelNameValue->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); + labelNameValue->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + QLabel *formatLabel = new QLabel( tr( "File Format:" ) ); formatLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter ); labelFormatValue = new QLabel; @@ -83,6 +89,9 @@ StreamPropertiesSideBar::StreamPropertiesSideBar( QWidget* parent ) : QGridLayout *propertiesLayout = new QGridLayout; Int layout_line = 0; +// propertiesLayout->addWidget( streamNameLabel, layout_line, 0 ); +// propertiesLayout->addWidget( labelNameValue, layout_line, 1 ); +// layout_line++; propertiesLayout->addWidget( formatLabel, layout_line, 0 ); propertiesLayout->addWidget( labelFormatValue, layout_line, 1 ); layout_line++; @@ -126,6 +135,7 @@ QSize StreamPropertiesSideBar::sizeHint() const Void StreamPropertiesSideBar::setData( PlaYUVerStream* pcStream ) { // Clear information. + labelNameValue->clear(); labelFormatValue->clear(); labelCodecValue->clear(); labelDurationValueTime->clear(); @@ -143,11 +153,13 @@ Void StreamPropertiesSideBar::setData( PlaYUVerStream* pcStream ) m_pcStream = pcStream; setEnabled( true ); - QString value; + + labelNameValue->setText( QFileInfo( m_pcStream->getFileName() ).fileName() ); labelFormatValue->setText( m_pcStream->getFormatName() ); labelCodecValue->setText( m_pcStream->getCodecName() ); Int duration[3]; m_pcStream->getDuration( duration ); + QString value; value = QString( tr( "%1h:%2m:%3s" ) ).arg( duration[0] ).arg( duration[1] ).arg( duration[2] ); labelDurationValueTime->setText( value ); value = QString( tr( "%1 frms" ) ).arg( m_pcStream->getFrameNum() ); diff --git a/source/app/PropertiesSidebar.h b/source/app/PropertiesSidebar.h index 96bc195..7691df0 100644 --- a/source/app/PropertiesSidebar.h +++ b/source/app/PropertiesSidebar.h @@ -55,6 +55,7 @@ private: PlaYUVerStream* m_pcStream; Bool m_bIsVisible; + QLabel* labelNameValue; QLabel* labelFormatValue; QLabel* labelCodecValue; QLabel* labelDurationValueTime; diff --git a/source/app/plaYUVerApp.cpp b/source/app/plaYUVerApp.cpp index 2b74012..1b49d55 100644 --- a/source/app/plaYUVerApp.cpp +++ b/source/app/plaYUVerApp.cpp @@ -53,6 +53,7 @@ plaYUVerApp::plaYUVerApp() setCentralWidget( mdiArea ); //mdiArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAsNeeded ); //mdiArea->setVerticalScrollBarPolicy( Qt::ScrollBarAsNeeded ); + mdiArea->setActivationOrder( QMdiArea::ActivationHistoryOrder ); connect( mdiArea, SIGNAL( subWindowActivated(QMdiSubWindow*) ), this, SLOT( chageSubWindowSelection() ) ); @@ -878,6 +879,7 @@ Void plaYUVerApp::chageSubWindowSelection() if( activeSubWindow() ) { m_pcCurrentSubWindow = new_window; + setWindowTitle( QApplication::applicationName() + " - " + m_pcCurrentSubWindow->getWindowName() ); if( !plaYUVerApp::findSubWindow( mdiArea, m_pcCurrentSubWindow->getRefSubWindow() ) ) { m_pcCurrentSubWindow->setRefSubWindow( NULL );