Skip to content

Commit 84db88b

Browse files
committed
Rename QgsComposer::progressDialog
- It's a busy indicator that doesn't track operation progress
1 parent aa22c0e commit 84db88b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/app/composer/qgscomposer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ void QgsComposer::setTitle( const QString& title )
492492
}
493493
}
494494

495-
QDialog* QgsComposer::progressDialog( const QString& message, QWidget* parent )
495+
QDialog* QgsComposer::busyIndicatorDialog( const QString& message, QWidget* parent )
496496
{
497497
QDialog* dlg = new QDialog( parent );
498498
dlg->setLayout( new QVBoxLayout() );
@@ -1375,7 +1375,7 @@ void QgsComposer::on_mActionDuplicateComposer_triggered()
13751375
}
13761376

13771377
// provide feedback, since loading of template into duplicate composer will be hidden
1378-
QDialog* dlg = progressDialog( tr( "Duplicating composer..." ), this );
1378+
QDialog* dlg = busyIndicatorDialog( tr( "Duplicating composer..." ), this );
13791379
dlg->show();
13801380

13811381
QgsComposer* newComposer = mQgis->duplicateComposer( this, newTitle );

src/app/composer/qgscomposer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
8787
//! Modal busy indicator dialog with no buttons that deletes on close
8888
//! @param message text to show above busy progress indicator
8989
//! @note added in 1.9
90-
QDialog* progressDialog( const QString& message = QString( "" ), QWidget* parent = 0 );
90+
QDialog* busyIndicatorDialog( const QString& message = QString( "" ), QWidget* parent = 0 );
9191

9292
protected:
9393
//! Move event

src/app/composer/qgscomposermanager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void QgsComposerManager::duplicate_clicked()
253253
}
254254

255255
// provide feedback, since loading of template into duplicate composer will be hidden
256-
QDialog* dlg = currentComposer->progressDialog( tr( "Duplicating composer..." ), this );
256+
QDialog* dlg = currentComposer->busyIndicatorDialog( tr( "Duplicating composer..." ), this );
257257
dlg->show();
258258

259259
QgsComposer* newComposer = QgisApp::instance()->duplicateComposer( currentComposer, newTitle );

0 commit comments

Comments
 (0)