Merge branch 'devel' of https://github.com/pixlra/playuver into devel
This commit is contained in:
commit
59df69ce63
13 files changed
+178
-147
No files matched your search
@@ -159,7 +159,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
|
||||
m_comboBoxPixelFormat->clear();
|
||||
for( UInt i = 0; i < PlaYUVerFrame::supportedPixelFormatListNames().size(); i++ )
|
||||
{
|
||||
m_comboBoxPixelFormat->insertItem( i, PlaYUVerFrame::supportedPixelFormatListNames()[i].data() );
|
||||
m_comboBoxPixelFormat->insertItem( i, PlaYUVerFrame::supportedPixelFormatListNames()[i].c_str() );
|
||||
}
|
||||
m_comboBoxPixelFormat->setCurrentIndex( 1 );
|
||||
|
||||
|
||||
@@ -452,22 +452,23 @@ Void ModulesHandle::applyAllModuleIf( PlaYUVerAppModuleIf *pcCurrModuleIf )
|
||||
|
||||
QString supported = tr( "Supported Files (" );
|
||||
QStringList formatsList;
|
||||
QStringList formatsExt = PlaYUVerStream::supportedWriteFormatsExt();
|
||||
QStringList formatsName = PlaYUVerStream::supportedWriteFormatsName();
|
||||
std::vector<std::string> formatsExt = PlaYUVerStream::supportedWriteFormatsExt();
|
||||
std::vector<std::string> formatsName = PlaYUVerStream::supportedWriteFormatsName();
|
||||
|
||||
for( Int i = 0; i < formatsName.size(); i++ )
|
||||
for( UInt i = 0; i < formatsName.size(); i++ )
|
||||
{
|
||||
QString currFmt;
|
||||
supported.append( " *." );
|
||||
supported.append( formatsExt[i] );
|
||||
currFmt.append( formatsName[i] );
|
||||
supported.append( QString::fromStdString( formatsExt[i] ) );
|
||||
currFmt.append( QString::fromStdString( formatsName[i] ) );
|
||||
currFmt.append( " (*." );
|
||||
currFmt.append( formatsExt[i] );
|
||||
currFmt.append( QString::fromStdString( formatsExt[i] ) );
|
||||
currFmt.append( ")" );
|
||||
formatsList << currFmt;
|
||||
}
|
||||
supported.append( " )" );
|
||||
|
||||
|
||||
QStringList filter;
|
||||
filter << supported
|
||||
<< formatsList
|
||||
|
||||
@@ -131,7 +131,7 @@ Void QualityHandle::slotQualityMetricChanged( Int idx )
|
||||
|
||||
Void QualityHandle::slotSelectReference()
|
||||
{
|
||||
DialogSubWindowSelector dialogWindowSelection( this, m_pcMainWindowManager, 1, 1 );
|
||||
DialogSubWindowSelector dialogWindowSelection( this, m_pcMainWindowManager, SubWindowHandle::VIDEO_SUBWINDOW, 1, 1 );
|
||||
if( dialogWindowSelection.exec() == QDialog::Accepted )
|
||||
{
|
||||
VideoSubWindow* pcVideoSubWindow;
|
||||
|
||||
@@ -192,6 +192,7 @@ Void VideoHandle::readSettings()
|
||||
{
|
||||
QSettings appSettings;
|
||||
m_arrayActions[VIDEO_LOOP_ACT]->setChecked( appSettings.value( "VideoHandle/Repeat", false ).toBool() );
|
||||
m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->setChecked( appSettings.value( "VideoHandle/VideoZoomLock", false ).toBool() );
|
||||
if( !appSettings.value( "VideoHandle/FrameProperties", true ).toBool() )
|
||||
m_pcFramePropertiesDock->close();
|
||||
}
|
||||
@@ -200,6 +201,7 @@ Void VideoHandle::writeSettings()
|
||||
{
|
||||
QSettings appSettings;
|
||||
appSettings.setValue( "VideoHandle/Repeat", m_arrayActions[VIDEO_LOOP_ACT]->isChecked() );
|
||||
appSettings.setValue( "VideoHandle/VideoZoomLock", m_arrayActions[VIDEO_ZOOM_LOCK_ACT]->isChecked() );
|
||||
appSettings.setValue( "VideoHandle/FrameProperties", m_pcFramePropertiesSideBar->isVisible() );
|
||||
}
|
||||
|
||||
|
||||
+29
-15
@@ -91,8 +91,8 @@ Void plaYUVerApp::parseArgs( Int argc, Char *argv[] )
|
||||
{
|
||||
loadFile( argv[i] );
|
||||
}
|
||||
// m_pcWindowHandle->tileSubWindows();
|
||||
// zoomToFitAll();
|
||||
m_pcWindowHandle->tileSubWindows();
|
||||
zoomToFitAll();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -218,17 +218,17 @@ Void plaYUVerApp::open()
|
||||
{
|
||||
QString supported = tr( "Supported Files (" );
|
||||
QStringList formatsList;
|
||||
QStringList formatsExt = PlaYUVerStream::supportedReadFormatsExt();
|
||||
QStringList formatsName = PlaYUVerStream::supportedReadFormatsName();
|
||||
std::vector<std::string> formatsExt = PlaYUVerStream::supportedReadFormatsExt();
|
||||
std::vector<std::string> formatsName = PlaYUVerStream::supportedReadFormatsName();
|
||||
|
||||
for( Int i = 0; i < formatsName.size(); i++ )
|
||||
for( UInt i = 0; i < formatsName.size(); i++ )
|
||||
{
|
||||
QString currFmt;
|
||||
supported.append( " *." );
|
||||
supported.append( formatsExt[i] );
|
||||
currFmt.append( formatsName[i] );
|
||||
supported.append( QString::fromStdString( formatsExt[i] ) );
|
||||
currFmt.append( QString::fromStdString( formatsName[i] ) );
|
||||
currFmt.append( " (*." );
|
||||
currFmt.append( formatsExt[i] );
|
||||
currFmt.append( QString::fromStdString( formatsExt[i] ) );
|
||||
currFmt.append( ")" );
|
||||
formatsList << currFmt;
|
||||
}
|
||||
@@ -265,17 +265,17 @@ Void plaYUVerApp::save()
|
||||
VideoSubWindow *saveWindow = m_pcCurrentVideoSubWindow;
|
||||
QString supported = tr( "Supported Files (" );
|
||||
QStringList formatsList;
|
||||
QStringList formatsExt = PlaYUVerStream::supportedSaveFormatsExt();
|
||||
QStringList formatsName = PlaYUVerStream::supportedSaveFormatsName();
|
||||
std::vector<std::string> formatsExt = PlaYUVerStream::supportedSaveFormatsExt();
|
||||
std::vector<std::string> formatsName = PlaYUVerStream::supportedSaveFormatsName();
|
||||
|
||||
for( Int i = 0; i < formatsName.size(); i++ )
|
||||
for( UInt i = 0; i < formatsName.size(); i++ )
|
||||
{
|
||||
QString currFmt;
|
||||
supported.append( " *." );
|
||||
supported.append( formatsExt[i] );
|
||||
currFmt.append( formatsName[i] );
|
||||
supported.append( QString::fromStdString( formatsExt[i] ) );
|
||||
currFmt.append( QString::fromStdString( formatsName[i] ) );
|
||||
currFmt.append( " (*." );
|
||||
currFmt.append( formatsExt[i] );
|
||||
currFmt.append( QString::fromStdString( formatsExt[i] ) );
|
||||
currFmt.append( ")" );
|
||||
formatsList << currFmt;
|
||||
}
|
||||
@@ -409,7 +409,6 @@ Void plaYUVerApp::zoomToFitAll()
|
||||
updateZoomFactorSBox();
|
||||
}
|
||||
|
||||
|
||||
Void plaYUVerApp::scaleFrame( int ratio )
|
||||
{
|
||||
if( m_pcCurrentSubWindow )
|
||||
@@ -846,6 +845,20 @@ Void plaYUVerApp::updateRecentFileActions()
|
||||
m_arrayMenu[RECENT_MENU]->setEnabled( m_aRecentFileStreamInfo.size() > 0 ? true : false );
|
||||
}
|
||||
|
||||
Void plaYUVerApp::checkRecentFileActions()
|
||||
{
|
||||
Int i = 0;
|
||||
while( i < m_aRecentFileStreamInfo.size() )
|
||||
{
|
||||
if( !QFileInfo::exists( m_aRecentFileStreamInfo.at( i ).m_cFilename ) )
|
||||
{
|
||||
m_aRecentFileStreamInfo.remove( i );
|
||||
continue;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
Void plaYUVerApp::readSettings()
|
||||
{
|
||||
QSettings appSettings;
|
||||
@@ -862,6 +875,7 @@ Void plaYUVerApp::readSettings()
|
||||
|
||||
QVariant value = appSettings.value( "MainWindow/RecentFileList" );
|
||||
m_aRecentFileStreamInfo = value.value<PlaYUVerStreamInfoVector>();
|
||||
checkRecentFileActions();
|
||||
updateRecentFileActions();
|
||||
|
||||
m_appModuleVideo->readSettings();
|
||||
|
||||
@@ -124,6 +124,7 @@ private:
|
||||
|
||||
Void addStreamInfoToRecentList( PlaYUVerStreamInfo streamInfo );
|
||||
Void updateRecentFileActions();
|
||||
Void checkRecentFileActions();
|
||||
|
||||
Void readSettings();
|
||||
Void writeSettings();
|
||||
|
||||
Reference in new issue
Block a user