Showing with 6 additions and 3 deletions.
  1. +2 −2 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  2. +4 −1 src/plugins/georeferencer/qgstransformsettingsdialog.cpp
4 changes: 2 additions & 2 deletions src/plugins/georeferencer/qgsgeorefplugingui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ void QgsGeorefPluginGui::layerWillBeRemoved( QString theLayerId )
void QgsGeorefPluginGui::createActions()
{
// File actions
mActionOpenRaster->setIcon( getThemeIcon( "/mActionOpenRaster.png" ) );
mActionOpenRaster->setIcon( getThemeIcon( "/mActionAddRasterLayer.svg" ) );
connect( mActionOpenRaster, SIGNAL( triggered() ), this, SLOT( openRaster() ) );

mActionStartGeoref->setIcon( getThemeIcon( "/mActionStartGeoref.png" ) );
Expand Down Expand Up @@ -1076,7 +1076,7 @@ void QgsGeorefPluginGui::updateIconTheme( QString theme )
{
Q_UNUSED( theme );
// File actions
mActionOpenRaster->setIcon( getThemeIcon( "/mActionOpenRaster.png" ) );
mActionOpenRaster->setIcon( getThemeIcon( "/mActionAddRasterLayer.svg" ) );
mActionStartGeoref->setIcon( getThemeIcon( "/mActionStartGeoref.png" ) );
mActionGDALScript->setIcon( getThemeIcon( "/mActionGDALScript.png" ) );
mActionLoadGCPpoints->setIcon( getThemeIcon( "/mActionLoadGCPpoints.png" ) );
Expand Down
5 changes: 4 additions & 1 deletion src/plugins/georeferencer/qgstransformsettingsdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, c
cmbResampling->setCurrentIndex( s.value( "/Plugin-GeoReferencer/lastresampling", 0 ).toInt() );
cmbCompressionComboBox->setCurrentIndex( s.value( "/Plugin-GeoReferencer/lastcompression", 0 ).toInt() );
leTargetSRS->setText( s.value( "/Plugin-GeoReferencer/targetsrs" ).toString() );
mWorldFileCheckBox->setChecked( s.value( "/Plugin-Georeferencer/word_file_checkbox", false ).toBool() );

cbxUserResolution->setChecked( s.value( "/Plugin-Georeferencer/user_specified_resolution", false ).toBool() );
bool ok;
Expand Down Expand Up @@ -137,6 +138,7 @@ void QgsTransformSettingsDialog::resetSettings()
s.setValue( "/Plugin-GeoReferencer/user_specified_resolution", false );
s.setValue( "/Plugin-GeoReferencer/user_specified_resx", 1.0 );
s.setValue( "/Plugin-GeoReferencer/user_specified_resy", -1.0 );
s.setValue( "/Plugin-GeoReferencer/word_file_checkbox", false );
s.setValue( "/Plugin-GeoReferencer/lastPDFReportDir", "" );
}

Expand All @@ -158,7 +160,7 @@ void QgsTransformSettingsDialog::accept()
int minGCPpoints;
if ( checkGCPpoints( cmbTransformType->itemData( cmbTransformType->currentIndex() ).toInt(), minGCPpoints ) )
{
if ( leOutputRaster->text().isEmpty() )
if ( leOutputRaster->text().isEmpty() && !mWorldFileCheckBox->isChecked() )
{
QMessageBox::information( this, tr( "Info" ), tr( "Please set output name" ) );
return;
Expand Down Expand Up @@ -195,6 +197,7 @@ void QgsTransformSettingsDialog::accept()
s.setValue( "/Plugin-GeoReferencer/user_specified_resolution", cbxUserResolution->isChecked() );
s.setValue( "/Plugin-GeoReferencer/user_specified_resx", dsbHorizRes->value() );
s.setValue( "/Plugin-GeoReferencer/user_specified_resy", dsbVerticalRes->value() );
s.setValue( "/Plugin-GeoReferencer/word_file_checkbox", mWorldFileCheckBox->isChecked() );
QString pdfReportFileName = mReportFileLineEdit->text();
if ( !pdfReportFileName.isEmpty() )
{
Expand Down