Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-05-10 10:35:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Show a busy cursor while doing master key transformations.

Browse source
This commit is contained in:
Felix Geyer 2012-07-27 18:54:35 +02:00
parent 3a2f387892
commit 886187baee
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/DatabaseOpenWidget.cpp
View file

@ -127,7 +127,9 @@ void DatabaseOpenWidget::openDatabase()
if (m_db) { if (m_db) {
delete m_db; delete m_db;
} }
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
m_db = reader.readDatabase(&file, masterKey); m_db = reader.readDatabase(&file, masterKey);
QApplication::restoreOverrideCursor();
if (m_db) { if (m_db) {
Q_EMIT editFinished(true); Q_EMIT editFinished(true);

6
src/gui/DatabaseSettingsWidget.cpp
View file

@ -83,7 +83,11 @@ void DatabaseSettingsWidget::save()
meta->setDescription(m_ui->dbDescriptionEdit->text()); meta->setDescription(m_ui->dbDescriptionEdit->text());
meta->setDefaultUserName(m_ui->defaultUsernameEdit->text()); meta->setDefaultUserName(m_ui->defaultUsernameEdit->text());
meta->setRecycleBinEnabled(m_ui->recycleBinEnabledCheckBox->isChecked()); meta->setRecycleBinEnabled(m_ui->recycleBinEnabledCheckBox->isChecked());
m_db->setTransformRounds(m_ui->transformRoundsSpinBox->value()); if (static_cast<quint64>(m_ui->transformRoundsSpinBox->value()) != m_db->transformRounds()) {
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
m_db->setTransformRounds(m_ui->transformRoundsSpinBox->value());
QApplication::restoreOverrideCursor();
}
bool truncate = false; bool truncate = false;

2
src/gui/DatabaseWidget.cpp
View file

@ -504,7 +504,9 @@ void DatabaseWidget::switchToGroupEdit(Group* group, bool create)
void DatabaseWidget::updateMasterKey(bool accepted) void DatabaseWidget::updateMasterKey(bool accepted)
{ {
if (accepted) { if (accepted) {
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
m_db->setKey(m_changeMasterKeyWidget->newMasterKey()); m_db->setKey(m_changeMasterKeyWidget->newMasterKey());
QApplication::restoreOverrideCursor();
} }
else if (!m_db->hasKey()) { else if (!m_db->hasKey()) {
Q_EMIT closeRequest(); Q_EMIT closeRequest();

2
src/gui/KeePass1OpenWidget.cpp
View file

@ -55,7 +55,9 @@ void KeePass1OpenWidget::openDatabase()
if (m_db) { if (m_db) {
delete m_db; delete m_db;
} }
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
m_db = reader.readDatabase(&file, password, keyFileName); m_db = reader.readDatabase(&file, password, keyFileName);
QApplication::restoreOverrideCursor();
if (m_db) { if (m_db) {
m_db->metadata()->setName(QFileInfo(m_filename).completeBaseName()); m_db->metadata()->setName(QFileInfo(m_filename).completeBaseName());