mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 14:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release/2.1.3' into develop

Browse source
This commit is contained in:
Janek Bevendorff 2017-02-25 04:20:08 +01:00
commit 1f6f7b614c
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
2 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/gui/DatabaseTabWidget.cpp
View file

@ -21,6 +21,7 @@
#include <QLockFile> #include <QLockFile>
#include <QSaveFile> #include <QSaveFile>
#include <QTabWidget> #include <QTabWidget>
#include <QPushButton>
#include "autotype/AutoType.h" #include "autotype/AutoType.h"
#include "core/Config.h" #include "core/Config.h"
@ -158,21 +159,29 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw,
// for now silently ignore if we can't create a lock file // for now silently ignore if we can't create a lock file
// due to lack of permissions // due to lack of permissions
if (lockFile->error() != QLockFile::PermissionError) { if (lockFile->error() != QLockFile::PermissionError) {
QMessageBox::StandardButton result = MessageBox::question(this, tr("Open database"), QMessageBox msgBox;
tr("The database you are trying to open is locked by another instance of KeePassXC.\n" msgBox.setWindowTitle(tr("Database already opened"));
"Do you want to open it anyway? Alternatively the database is opened read-only."), msgBox.setText(tr("The database you are trying to open is locked by another instance of KeePassXC.\n\n"
QMessageBox::Yes | QMessageBox::No); "Do you want to open it anyway?"));
msgBox.setIcon(QMessageBox::Question);
msgBox.addButton(QMessageBox::Yes);
msgBox.addButton(QMessageBox::No);
auto readOnlyButton = msgBox.addButton(tr("Open read-only"), QMessageBox::AcceptRole);
msgBox.setDefaultButton(readOnlyButton);
msgBox.setEscapeButton(QMessageBox::No);
auto result = msgBox.exec();
if (result == QMessageBox::No) { if (msgBox.clickedButton() == readOnlyButton) {
dbStruct.readOnly = true; dbStruct.readOnly = true;
delete lockFile; delete lockFile;
lockFile = nullptr; lockFile = nullptr;
} } else if (result == QMessageBox::Yes) {
else {
// take over the lock file if possible // take over the lock file if possible
if (lockFile->removeStaleLockFile()) { if (lockFile->removeStaleLockFile()) {
lockFile->tryLock(); lockFile->tryLock();
} }
} else {
return;
} }
} }
} }

15
src/gui/DatabaseWidget.cpp
View file

@ -287,7 +287,7 @@ void DatabaseWidget::createEntry()
void DatabaseWidget::setIconFromParent() void DatabaseWidget::setIconFromParent()
{ {
if (!config()->get("UseGroupIconOnEntryCreation", true).toBool()) { if (!config()->get("UseGroupIconOnEntryCreation").toBool()) {
return; return;
} }
@ -1068,8 +1068,7 @@ void DatabaseWidget::reloadDatabaseFile()
// Merge the old database into the new one // Merge the old database into the new one
m_db->setEmitModified(false); m_db->setEmitModified(false);
db->merge(m_db); db->merge(m_db);
} } else {
else {
// Since we are accepting the new file as-is, internally mark as unmodified // Since we are accepting the new file as-is, internally mark as unmodified
// TODO: when saving is moved out of DatabaseTabWidget, this should be replaced // TODO: when saving is moved out of DatabaseTabWidget, this should be replaced
m_databaseModified = false; m_databaseModified = false;
@ -1093,16 +1092,10 @@ void DatabaseWidget::reloadDatabaseFile()
restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload); restoreGroupEntryFocus(groupBeforeReload, entryBeforeReload);
} }
else { } else {
m_messageWidget->showMessage(
tr("Could not parse or unlock the new database file while attempting"
" to autoreload this database."), MessageWidget::Error);
}
}
else {
m_messageWidget->showMessage( m_messageWidget->showMessage(
tr("Could not open the new database file while attempting to autoreload this database."), tr("Could not open the new database file while attempting to autoreload this database."),
MessageWidget::Error); MessageWidget::Error);
} }
// Rewatch the database file // Rewatch the database file