Merge devel into master

This commit is contained in:
jfmcarreira committed 2014-06-15 13:07:15 +01:00
1 parent 7a5a965a29
commit b02072c585
13 files changed
+310 -87

No files matched your search

+2 -2
View File
@@ -101,12 +101,12 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
resolutionLabel->setText( "Resolution chosen" );
QLabel* widthLabel = new QLabel( "Width" );
m_spinBoxWidth = new QSpinBox();
m_spinBoxWidth->setRange( 0, 7240 );
m_spinBoxWidth->setRange( 0, 8192 );
m_spinBoxWidth->setValue( 0 );
QLabel* heightLabel = new QLabel( "Height" );
m_spinBoxheight = new QSpinBox();
m_spinBoxheight->setRange( 0, 5432 );
m_spinBoxheight->setRange( 0, 4608 );
m_spinBoxheight->setValue( 0 );
QLabel* pixelsLabel = new QLabel();