"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/app/qgisapp.cpp" between
QGIS-final-3_10_5.tar.gz and QGIS-final-3_10_6.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Long-term release (3.10.x series).

qgisapp.cpp  (QGIS-final-3_10_5):qgisapp.cpp  (QGIS-final-3_10_6)
skipping to change at line 4694 skipping to change at line 4694
if ( !sAbt ) if ( !sAbt )
{ {
QApplication::setOverrideCursor( Qt::WaitCursor ); QApplication::setOverrideCursor( Qt::WaitCursor );
sAbt = new QgsAbout( this ); sAbt = new QgsAbout( this );
QString versionString = QStringLiteral( "<html><body><div align='center'><ta ble width='100%'>" ); QString versionString = QStringLiteral( "<html><body><div align='center'><ta ble width='100%'>" );
versionString += QStringLiteral( "<tr><td>%1</td><td>%2</td><td>" ).arg( tr( "QGIS version" ), Qgis::QGIS_VERSION ); versionString += QStringLiteral( "<tr><td>%1</td><td>%2</td><td>" ).arg( tr( "QGIS version" ), Qgis::QGIS_VERSION );
if ( QString( Qgis::QGIS_DEV_VERSION ) == QLatin1String( "exported" ) ) if ( QString( Qgis::QGIS_DEV_VERSION ) == QLatin1String( "exported" ) )
{ {
versionString += QStringLiteral( "%1</td><td><a href=\"https://github.com/ versionString += tr( "QGIS code branch" );
qgis/QGIS/tree/release-%1_%2\">Release %1.%2</a></td>" ) if ( Qgis::QGIS_VERSION.endsWith( QLatin1String( "Master" ) ) )
.arg( tr( "QGIS code branch" ) ).arg( Qgis::QGIS_VERSION_ {
INT / 10000 ).arg( Qgis::QGIS_VERSION_INT / 100 % 100 ); versionString += QLatin1String( "</td><td><a href=\"https://github.com/q
gis/QGIS/tree/master\">master</a></td>" );
}
else
{
versionString += QStringLiteral( "</td><td><a href=\"https://github.com/qg
is/QGIS/tree/release-%1_%2\">Release %1.%2</a></td>" )
.arg( Qgis::QGIS_VERSION_INT / 10000 ).arg( Qgis::QGIS_VE
RSION_INT / 100 % 100 );
}
} }
else else
{ {
versionString += QStringLiteral( "%1</td><td><a href=\"https://github.com/ qgis/QGIS/commit/%2\">%2</a></td>" ).arg( tr( "QGIS code revision" ) ).arg( Qgis ::QGIS_DEV_VERSION ); versionString += QStringLiteral( "%1</td><td><a href=\"https://github.com/ qgis/QGIS/commit/%2\">%2</a></td>" ).arg( tr( "QGIS code revision" ) ).arg( Qgis ::QGIS_DEV_VERSION );
} }
versionString += QLatin1String( "</tr><tr>" ); versionString += QLatin1String( "</tr><tr>" );
versionString += QStringLiteral( "<td>%1</td><td>%2</td>" ).arg( tr( "Compil ed against Qt" ), QT_VERSION_STR ); versionString += QStringLiteral( "<td>%1</td><td>%2</td>" ).arg( tr( "Compil ed against Qt" ), QT_VERSION_STR );
versionString += QStringLiteral( "<td>%1</td><td>%2</td>" ).arg( tr( "Runnin g against Qt" ), qVersion() ); versionString += QStringLiteral( "<td>%1</td><td>%2</td>" ).arg( tr( "Runnin g against Qt" ), qVersion() );
skipping to change at line 5644 skipping to change at line 5652
QgsLayerTreeUtils::insertLayerBelow( QgsProject::instance()->layerTreeRoot(), oldLayer, newLayer ); QgsLayerTreeUtils::insertLayerBelow( QgsProject::instance()->layerTreeRoot(), oldLayer, newLayer );
// and remove the old layer // and remove the old layer
QgsProject::instance()->removeMapLayer( oldLayer ); QgsProject::instance()->removeMapLayer( oldLayer );
} // QgisApp:replaceSelectedVectorLayer } // QgisApp:replaceSelectedVectorLayer
void QgisApp::fileExit() void QgisApp::fileExit()
{ {
if ( QgsApplication::taskManager()->countActiveTasks() > 0 ) if ( QgsApplication::taskManager()->countActiveTasks() > 0 )
{ {
QStringList tasks; QStringList tasks;
const auto constActiveTasks = QgsApplication::taskManager()->activeTasks(); const QList< QgsTask * > activeTasks = QgsApplication::taskManager()->active
for ( QgsTask *task : constActiveTasks ) Tasks();
for ( QgsTask *task : activeTasks )
{ {
if ( task->flags() & QgsTask::CancelWithoutPrompt )
continue;
tasks << tr( " • %1" ).arg( task->description() ); tasks << tr( " • %1" ).arg( task->description() );
} }
// active tasks // prompt if any tasks which require user confirmation remain, otherwise jus
if ( QMessageBox::question( this, tr( "Active Tasks" ), t cancel them directly and continue with shutdown.
tr( "The following tasks are currently running i if ( tasks.empty() )
n the background:\n\n%1\n\nDo you want to try canceling these active tasks?" ).a
rg( tasks.join( QStringLiteral( "\n" ) ) ),
QMessageBox::Yes | QMessageBox::No ) == QMessage
Box::Yes )
{ {
// all tasks can be silently terminated without warning
QgsApplication::taskManager()->cancelAll(); QgsApplication::taskManager()->cancelAll();
} }
return; else
{
if ( QMessageBox::question( this, tr( "Active Tasks" ),
tr( "The following tasks are currently running
in the background:\n\n%1\n\nDo you want to try canceling these active tasks?" )
.arg( tasks.join( QStringLiteral( "\n" ) ) ),
QMessageBox::Yes | QMessageBox::No ) == QMessa
geBox::Yes )
{
QgsApplication::taskManager()->cancelAll();
}
return;
}
} }
QgsCanvasRefreshBlocker refreshBlocker; QgsCanvasRefreshBlocker refreshBlocker;
if ( checkUnsavedLayerEdits() && checkMemoryLayers() && saveDirty() ) if ( checkUnsavedLayerEdits() && checkMemoryLayers() && saveDirty() )
{ {
closeProject(); closeProject();
userProfileManager()->setDefaultFromActive(); userProfileManager()->setDefaultFromActive();
// shouldn't be needed, but from this stage on, we don't want/need ANY map c anvas refreshes to take place // shouldn't be needed, but from this stage on, we don't want/need ANY map c anvas refreshes to take place
mFreezeCount = 1000000; mFreezeCount = 1000000;
 End of changes. 6 change blocks. 
14 lines changed or deleted 36 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)