Merge branch devel

This commit is contained in:
jfmcarreira committed 2017-09-23 02:15:29 +01:00
1 parent ed075fcbd3
commit eb31fc0287
16 files changed
+231 -205

No files matched your search

+1 -2
View File
@@ -347,7 +347,7 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget* parent ) : QDialog( paren
m_spinBoxFrameRate = new QSpinBox();
m_spinBoxFrameRate->setSuffix( QStringLiteral( " Hz" ) );
m_spinBoxFrameRate->setMinimumWidth( 30 );
m_spinBoxFrameRate->setRange( 0, 200 );
m_spinBoxFrameRate->setRange( 0, 1000 );
m_spinBoxFrameRate->setValue( 30 );
framerateFormatLayout->addWidget( framerateFormatLabel );
framerateFormatLayout->addItem(
@@ -442,7 +442,6 @@ Int ConfigureFormatDialog::runConfigureFormatDialog( const QString& Filename,
if( standardResolutionSizes.at( i ) == QSize( rWidth, rHeight ) )
{
m_comboBoxStandardResolution->setCurrentIndex( i );
qDebug() << "ola";
break;
}
}