Minor fixes for 2.4.1

src/format/Kdbx3Reader.cpp

@@ -78,7 +78,8 @@ bool Kdbx3Reader::readDatabaseImpl(QIODevice* device,
     QByteArray realStart = cipherStream.read(32);
 
     if (realStart != m_streamStartBytes) {
-        raiseError(tr("Wrong key or database file is corrupt."));
+        raiseError(tr("Invalid credentials were provided, please try again.\n"
+                      "If this reoccurs, then your database file may be corrupt."));
         return false;
     }
 

src/format/Kdbx4Reader.cpp

@@ -71,7 +71,8 @@ bool Kdbx4Reader::readDatabaseImpl(QIODevice* device,
     // clang-format off
     QByteArray hmacKey = KeePass2::hmacKey(m_masterSeed, db->transformedMasterKey());
     if (headerHmac != CryptoHash::hmac(headerData, HmacBlockStream::getHmacKey(UINT64_MAX, hmacKey), CryptoHash::Sha256)) {
-        raiseError(tr("Wrong key or database file is corrupt. (HMAC mismatch)"));
+        raiseError(tr("Invalid credentials were provided, please try again.\n"
+                      "If this reoccurs, then your database file may be corrupt.") + " " + tr("(HMAC mismatch)"));
         return false;
     }
     HmacBlockStream hmacStream(device, hmacKey);

src/format/KeePass1Reader.cpp

@@ -372,7 +372,8 @@ KeePass1Reader::testKeys(const QString& password, const QByteArray& keyfileData,
     }
 
     if (!cipherStream) {
-        raiseError(tr("Wrong key or database file is corrupt."));
+        raiseError(tr("Invalid credentials were provided, please try again.\n"
+                      "If this reoccurs, then your database file may be corrupt."));
     }
 
     return cipherStream.take();

src/gui/ApplicationSettingsWidgetGeneral.ui

@@ -470,7 +470,7 @@
             <item alignment="Qt::AlignRight">
              <widget class="QLabel" name="languageLabel_2">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
@@ -490,6 +490,13 @@
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QLabel" name="languageLabel_3">
+              <property name="text">
+               <string>(restart program to activate)</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>

src/gui/DatabaseOpenWidget.cpp

@@ -194,8 +194,7 @@ void DatabaseOpenWidget::openDatabase()
     bool ok = m_db->open(m_filename, masterKey, &error, false);
     QApplication::restoreOverrideCursor();
     if (!ok) {
-        m_ui->messageWidget->showMessage(tr("Unable to open the database:\n%1").arg(error),
-                                         MessageWidget::MessageType::Error);
+        m_ui->messageWidget->showMessage(error, MessageWidget::MessageType::Error);
         return;
     }
 
@@ -223,7 +222,7 @@ void DatabaseOpenWidget::openDatabase()
         }
         emit dialogFinished(true);
     } else {
-        m_ui->messageWidget->showMessage(tr("Unable to open the database:\n%1").arg(error), MessageWidget::Error);
+        m_ui->messageWidget->showMessage(error, MessageWidget::Error);
         m_ui->editPassword->setText("");
 
 #ifdef WITH_XC_TOUCHID
@@ -268,7 +267,7 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::databaseKey()
         QString keyFilename = m_ui->comboKeyFile->currentText();
         QString errorMsg;
         if (!key->load(keyFilename, &errorMsg)) {
-            m_ui->messageWidget->showMessage(tr("Can't open key file:\n%1").arg(errorMsg), MessageWidget::Error);
+            m_ui->messageWidget->showMessage(tr("Failed to open key file: %1").arg(errorMsg), MessageWidget::Error);
             return {};
         }
         if (key->type() != FileKey::Hashed && !config()->get("Messages/NoLegacyKeyFileWarning").toBool()) {

src/gui/DatabaseWidget.cpp

@@ -260,12 +260,11 @@ bool DatabaseWidget::isSearchActive() const
 bool DatabaseWidget::isEditWidgetModified() const
 {
     if (currentWidget() == m_editEntryWidget) {
-        return m_editEntryWidget->hasBeenModified();
-    } else {
-        // other edit widget don't have a hasBeenModified() method yet
-        // assume that they already have been modified
-        return true;
+        return m_editEntryWidget->isModified();
+    } else if (currentWidget() == m_editGroupWidget) {
+        return m_editGroupWidget->isModified();
     }
+    return false;
 }
 
 QList<int> DatabaseWidget::mainSplitterSizes() const
@@ -1247,7 +1246,7 @@ bool DatabaseWidget::lock()
 
     clipboard()->clearCopiedText();
 
-    if (currentMode() == DatabaseWidget::Mode::EditMode) {
+    if (isEditWidgetModified()) {
         auto result = MessageBox::question(this,
                                            tr("Lock Database?"),
                                            tr("You are editing an entry. Discard changes and lock anyway?"),

src/gui/EditWidget.cpp

@@ -30,6 +30,7 @@ EditWidget::EditWidget(QWidget* parent)
 {
     m_ui->setupUi(this);
     setReadOnly(false);
+    setModified(false);
 
     m_ui->messageWidget->setHidden(true);
 
@@ -43,6 +44,7 @@ EditWidget::EditWidget(QWidget* parent)
 
     connect(m_ui->buttonBox, SIGNAL(accepted()), SIGNAL(accepted()));
     connect(m_ui->buttonBox, SIGNAL(rejected()), SIGNAL(rejected()));
+    connect(m_ui->buttonBox, SIGNAL(clicked(QAbstractButton*)), SLOT(buttonClicked(QAbstractButton*)));
 }
 
 EditWidget::~EditWidget()
@@ -106,9 +108,6 @@ void EditWidget::setReadOnly(bool readOnly)
         m_ui->buttonBox->setStandardButtons(QDialogButtonBox::Close);
     } else {
         m_ui->buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply);
-        // Find and connect the apply button
-        QPushButton* applyButton = m_ui->buttonBox->button(QDialogButtonBox::Apply);
-        connect(applyButton, SIGNAL(clicked()), SIGNAL(apply()));
     }
 }
 
@@ -117,6 +116,17 @@ bool EditWidget::readOnly() const
     return m_readOnly;
 }
 
+void EditWidget::setModified(bool state)
+{
+    m_modified = state;
+    enableApplyButton(state);
+}
+
+bool EditWidget::isModified() const
+{
+    return m_modified;
+}
+
 void EditWidget::enableApplyButton(bool enabled)
 {
     QPushButton* applyButton = m_ui->buttonBox->button(QDialogButtonBox::Apply);
@@ -125,6 +135,27 @@ void EditWidget::enableApplyButton(bool enabled)
     }
 }
 
+void EditWidget::showApplyButton(bool state)
+{
+    if (!m_readOnly) {
+        auto buttons = m_ui->buttonBox->standardButtons();
+        if (state) {
+            buttons |= QDialogButtonBox::Apply;
+        } else {
+            buttons &= ~QDialogButtonBox::Apply;
+        }
+        m_ui->buttonBox->setStandardButtons(buttons);
+    }
+}
+
+void EditWidget::buttonClicked(QAbstractButton* button)
+{
+    auto stdButton = m_ui->buttonBox->standardButton(button);
+    if (stdButton == QDialogButtonBox::Apply) {
+        emit apply();
+    }
+}
+
 void EditWidget::showMessage(const QString& text, MessageWidget::MessageType type)
 {
     // Show error messages for a longer time to make sure the user can read them

src/gui/EditWidget.h

@@ -49,6 +49,8 @@ class EditWidget : public DialogyWidget
     void setReadOnly(bool readOnly);
     bool readOnly() const;
     void enableApplyButton(bool enabled);
+    void showApplyButton(bool state);
+    virtual bool isModified() const;
 
 signals:
     void apply();
@@ -58,10 +60,13 @@ class EditWidget : public DialogyWidget
 protected slots:
     void showMessage(const QString& text, MessageWidget::MessageType type);
     void hideMessage();
+    void setModified(bool state = true);
+    void buttonClicked(QAbstractButton* button);
 
 private:
     const QScopedPointer<Ui::EditWidget> m_ui;
     bool m_readOnly;
+    bool m_modified;
 
     Q_DISABLE_COPY(EditWidget)
 };

src/gui/SearchWidget.cpp

@@ -1,5 +1,4 @@
 /*
- *  Copyright (C) 2016 Jonathan White <support@dmapps.us>
  *  Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -97,6 +96,13 @@ bool SearchWidget::eventFilter(QObject* obj, QEvent* event)
         if (keyEvent->key() == Qt::Key_Escape) {
             emit escapePressed();
             return true;
+        } else if (keyEvent->matches(QKeySequence::Copy)) {
+            // If Control+C is pressed in the search edit when no text
+            // is selected, copy the password of the current entry.
+            if (!m_ui->searchEdit->hasSelectedText()) {
+                emit copyPressed();
+                return true;
+            }
         } else if (keyEvent->matches(QKeySequence::MoveToNextLine)) {
             if (m_ui->searchEdit->cursorPosition() == m_ui->searchEdit->text().length()) {
                 // If down is pressed at EOL, move the focus to the entry view