Skip to content

Commit

Permalink
Rename QgsComposer::progressDialog
Browse files Browse the repository at this point in the history
- It's a busy indicator that doesn't track operation progress
  • Loading branch information
dakcarto committed Feb 27, 2013
1 parent aa22c0e commit 84db88b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/app/composer/qgscomposer.cpp
Expand Up @@ -492,7 +492,7 @@ void QgsComposer::setTitle( const QString& title )
}
}

QDialog* QgsComposer::progressDialog( const QString& message, QWidget* parent )
QDialog* QgsComposer::busyIndicatorDialog( const QString& message, QWidget* parent )
{
QDialog* dlg = new QDialog( parent );
dlg->setLayout( new QVBoxLayout() );
Expand Down Expand Up @@ -1375,7 +1375,7 @@ void QgsComposer::on_mActionDuplicateComposer_triggered()
}

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

QgsComposer* newComposer = mQgis->duplicateComposer( this, newTitle );
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposer.h
Expand Up @@ -87,7 +87,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
//! Modal busy indicator dialog with no buttons that deletes on close
//! @param message text to show above busy progress indicator
//! @note added in 1.9
QDialog* progressDialog( const QString& message = QString( "" ), QWidget* parent = 0 );
QDialog* busyIndicatorDialog( const QString& message = QString( "" ), QWidget* parent = 0 );

protected:
//! Move event
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposermanager.cpp
Expand Up @@ -253,7 +253,7 @@ void QgsComposerManager::duplicate_clicked()
}

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

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

0 comments on commit 84db88b

Please sign in to comment.