From 74e17baa1c670aaf99e521d7322aea6c81525a92 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Thu, 30 Jan 2014 00:38:22 +0000 Subject: [PATCH] Rename ConfigureResolutionDialog -> ConfigureFormatDialog --- ...onDialog.cpp => ConfigureFormatDialog.cpp} | 24 +++++++++---------- ...lutionDialog.h => ConfigureFormatDialog.h} | 6 ++--- source/ImageInterface.cpp | 8 +++---- 3 files changed, 19 insertions(+), 19 deletions(-) rename source/{ConfigureResolutionDialog.cpp => ConfigureFormatDialog.cpp} (87%) rename source/{ConfigureResolutionDialog.h => ConfigureFormatDialog.h} (95%) diff --git a/source/ConfigureResolutionDialog.cpp b/source/ConfigureFormatDialog.cpp similarity index 87% rename from source/ConfigureResolutionDialog.cpp rename to source/ConfigureFormatDialog.cpp index 5060c02..b025044 100755 --- a/source/ConfigureResolutionDialog.cpp +++ b/source/ConfigureFormatDialog.cpp @@ -17,18 +17,18 @@ */ /** - * \file ConfigureResolutionDialog.cpp + * \file ConfigureFormatDialog.cpp * \brief Dialog box to set the sequence resolution */ #include #include -#include "ConfigureResolutionDialog.h" +#include "ConfigureFormatDialog.h" namespace plaYUVer { -ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : +ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) : QDialog( parent ) { @@ -36,10 +36,10 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : // Config dialog - setObjectName( QStringLiteral( "ConfigureResolution" ) ); + setObjectName( QStringLiteral( "ConfigureFormat" ) ); resize( 392, 292 ); - setWindowTitle( QApplication::translate( "ConfigureResolution", "Configure Resolution", 0 ) ); + setWindowTitle( QApplication::translate( "ConfigureFormat", "Configure Resolution", 0 ) ); setWindowIcon( QIcon( ":/images/dialogicon-grid.png" ) ); MainLayout = new QVBoxLayout( this ); @@ -57,7 +57,7 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : font.setBold( true ); font.setWeight( 75 ); dialogTitleLabel->setFont( font ); - dialogTitleLabel->setText( QApplication::translate( "ConfigureResolution", "Configure Resolution", 0 ) ); + dialogTitleLabel->setText( QApplication::translate( "ConfigureFormat", "Configure Resolution", 0 ) ); headerSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); @@ -93,7 +93,7 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : standardResolutionLayout->addWidget( standardResolutionLabel ); standardResolutionLayout->addItem( horizontalSpacer ); standardResolutionLayout->addWidget( standardResolutionBox ); - standardResolutionLabel->setText( QApplication::translate( "ConfigureResolution", "Standard Resolution", 0 ) ); + standardResolutionLabel->setText( QApplication::translate( "ConfigureFormat", "Standard Resolution", 0 ) ); standardResolutionBox->clear(); standardResolutionBox->insertItems( 0, standardResolutionNames ); standardResolutionBox->setCurrentIndex( -1 ); @@ -111,11 +111,11 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : font1.setBold( true ); font1.setWeight( 75 ); resolutionLabel->setFont( font1 ); - resolutionLabel->setText( QApplication::translate( "ConfigureResolution", "Resolution chosen", 0 ) ); + resolutionLabel->setText( QApplication::translate( "ConfigureFormat", "Resolution chosen", 0 ) ); widthLabel = new QLabel( this ); widthLabel->setObjectName( QStringLiteral( "widthLabel" ) ); - widthLabel->setText( QApplication::translate( "ConfigureResolution", "Width", 0 ) ); + widthLabel->setText( QApplication::translate( "ConfigureFormat", "Width", 0 ) ); widthSpinBox = new QSpinBox( this ); widthSpinBox->setObjectName( QStringLiteral( "widthSpinBox" ) ); widthSpinBox->setRange( 0, 5000 ); @@ -123,7 +123,7 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : heightLabel = new QLabel( this ); heightLabel->setObjectName( QStringLiteral( "heightLabel" ) ); - heightLabel->setText( QApplication::translate( "ConfigureResolution", "Height", 0 ) ); + heightLabel->setText( QApplication::translate( "ConfigureFormat", "Height", 0 ) ); heightSpinBox = new QSpinBox( this ); heightSpinBox->setObjectName( QStringLiteral( "heightSpinBox" ) ); heightSpinBox->setRange( 0, 5000 ); @@ -131,7 +131,7 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : pixelsLabel = new QLabel( this ); pixelsLabel->setObjectName( QStringLiteral( "pixelsLabel" ) ); - pixelsLabel->setText( QApplication::translate( "ConfigureResolution", "Pixels", 0 ) ); + pixelsLabel->setText( QApplication::translate( "ConfigureFormat", "Pixels", 0 ) ); resolutionGrid->addWidget( resolutionLabel, 0, 0, 1, 1 ); resolutionGrid->addWidget( widthLabel, 1, 1, 1, 1 ); @@ -163,7 +163,7 @@ ConfigureResolutionDialog::ConfigureResolutionDialog( QWidget *parent ) : } -void ConfigureResolutionDialog::StandardResolutionSelection() +void ConfigureFormatDialog::StandardResolutionSelection() { Int currIdx = standardResolutionBox->currentIndex(); diff --git a/source/ConfigureResolutionDialog.h b/source/ConfigureFormatDialog.h similarity index 95% rename from source/ConfigureResolutionDialog.h rename to source/ConfigureFormatDialog.h index bab3f58..20ff585 100755 --- a/source/ConfigureResolutionDialog.h +++ b/source/ConfigureFormatDialog.h @@ -17,7 +17,7 @@ */ /** - * \file ConfigureResolutionDialog.h + * \file ConfigureFormatDialog.h * \brief Dialog box to set the sequence resolution */ @@ -45,13 +45,13 @@ namespace plaYUVer /** * */ -class ConfigureResolutionDialog: public QDialog +class ConfigureFormatDialog: public QDialog { Q_OBJECT public: - ConfigureResolutionDialog( QWidget *parent = 0 ); + ConfigureFormatDialog( QWidget *parent = 0 ); QSize getResolution() { diff --git a/source/ImageInterface.cpp b/source/ImageInterface.cpp index 17c6601..34e4c81 100644 --- a/source/ImageInterface.cpp +++ b/source/ImageInterface.cpp @@ -27,7 +27,7 @@ #include #include -#include "ConfigureResolutionDialog.h" +#include "ConfigureFormatDialog.h" #include "ImageInterface.h" #include "viewarea.h" @@ -66,16 +66,16 @@ ImageInterface::~ImageInterface() bool ImageInterface::loadFile( const QString &fileName ) { - ConfigureResolutionDialog resolutionDialog( this ); + ConfigureFormatDialog formatDialog( this ); - if( resolutionDialog.exec() == QDialog::Rejected ) + if( formatDialog.exec() == QDialog::Rejected ) { return false; } QApplication::setOverrideCursor( Qt::WaitCursor ); - m_currStream.init( fileName, resolutionDialog.getResolution().width(), resolutionDialog.getResolution().height() ); + m_currStream.init( fileName, formatDialog.getResolution().width(), formatDialog.getResolution().height() ); m_currStream.readFrame(); if( m_currStream.checkErrors( READING ) )