Merge master with devel

This commit is contained in:
jfmcarreira committed 2015-01-17 03:57:45 +00:00
1 parent b7cbf4490f
commit 406406c106
1 file changed
+6 -4
+6 -4
View File
@@ -245,8 +245,8 @@ Void plaYUVerApp::open()
QStringList filter;
filter << supported
<< formatsList
<< tr( "All Files (*)" );
<< formatsList
<< tr( "All Files (*)" );
QStringList fileNameList = QFileDialog::getOpenFileNames( this, tr( "Open File" ), m_cLastOpenPath, filter.join( ";;" ) );
@@ -292,8 +292,8 @@ Void plaYUVerApp::save()
QStringList filter;
filter << supported
<< formatsList
<< tr( "All Files (*)" );
<< formatsList
<< tr( "All Files (*)" );
QString fileName = QFileDialog::getSaveFileName( this, tr( "Open File" ), QString(), filter.join( ";;" ) );
@@ -310,6 +310,8 @@ Void plaYUVerApp::save()
}
}
Void plaYUVerApp::format()
{
if( m_pcCurrentVideoSubWindow )