mirror/keepassxc
0
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-19 20:02:18 +02:00
Code

Replace popup with general message which appears on first ESC or close call (#11199)

Browse Source
This commit is contained in:
WinnetouL 2024-09-03 17:34:56 +02:00
parent 69fad1e3da
commit 33ddbbd0ff
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/DatabaseOpenWidget.cpp
View File

@ -85,7 +85,7 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
okBtn->setText(tr("Unlock"));
okBtn->setDefault(true);
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(openDatabase()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(cancelDatabaseUnlock()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(closeDatabase()));
connect(m_ui->addKeyFileLinkLabel, &QLabel::linkActivated, this, &DatabaseOpenWidget::browseKeyFile);
connect(m_ui->keyFileLineEdit, &PasswordWidget::textChanged, this, [&](const QString& text) {
@ -448,15 +448,13 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::buildDatabaseKey()
return databaseKey;
}
void DatabaseOpenWidget::cancelDatabaseUnlock()
void DatabaseOpenWidget::closeDatabase()
{
auto result = MessageBox::question(this,
tr("Cancel Database Unlock"),
tr("Would you like to cancel unlocking this database?"),
MessageBox::Cancel | MessageBox::Ok,
MessageBox::Cancel);
if (result == MessageBox::Ok) {
if (m_escPressedOnce) {
reject();
} else {
m_escPressedOnce = true;
m_ui->messageWidget->showMessage(tr("Press ESC again to close this database."), MessageWidget::Information);
}
}

3
src/gui/DatabaseOpenWidget.h
View File

@ -77,7 +77,7 @@ protected slots:
private slots:
bool browseKeyFile();
void cancelDatabaseUnlock();
void closeDatabase();
void reject();
void toggleHardwareKeyComponent(bool state);
void pollHardwareKey(bool manualTrigger = false);
@ -91,6 +91,7 @@ private:
bool m_manualHardwareKeyRefresh = false;
bool m_blockQuickUnlock = false;
bool m_unlockingDatabase = false;
bool m_escPressedOnce = false;
QTimer m_hideTimer;
QTimer m_hideNoHardwareKeysFoundTimer;