From cda5e990ac8ceb40aa4612e56f46d22d5558e3d7 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Thu, 15 May 2014 22:51:13 +0200
Subject: [PATCH] Show in-edit-mode warning when database is locked.

---
 src/gui/DatabaseTabWidget.cpp |  2 +-
 src/gui/DatabaseWidget.cpp    | 15 ++++++++++++++-
 src/gui/DatabaseWidget.h      |  3 ++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index 8c2ba06d9..e529cc428 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -189,7 +189,7 @@ bool DatabaseTabWidget::closeDatabase(Database* db)
     if (dbName.right(1) == "*") {
         dbName.chop(1);
     }
-    if (dbStruct.dbWidget->currentMode() == DatabaseWidget::EditMode && db->hasKey()) {
+    if (dbStruct.dbWidget->isInEditMode() && db->hasKey()) {
         QMessageBox::StandardButton result =
             MessageBox::question(
             this, tr("Close?"),
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index c70348a9e..72fe0ef7f 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -167,7 +167,7 @@ DatabaseWidget::~DatabaseWidget()
 {
 }
 
-DatabaseWidget::Mode DatabaseWidget::currentMode()
+DatabaseWidget::Mode DatabaseWidget::currentMode() const
 {
     if (currentWidget() == Q_NULLPTR) {
         return DatabaseWidget::None;
@@ -183,6 +183,19 @@ DatabaseWidget::Mode DatabaseWidget::currentMode()
     }
 }
 
+bool DatabaseWidget::isInEditMode() const
+{
+    if (currentMode() == DatabaseWidget::LockedMode) {
+        return m_widgetBeforeLock != Q_NULLPTR
+                && m_widgetBeforeLock != m_mainWidget
+                && m_widgetBeforeLock != m_unlockDatabaseWidget;
+    }
+    else {
+        return currentMode() == DatabaseWidget::EditMode;
+    }
+}
+
+
 void DatabaseWidget::emitCurrentModeChanged()
 {
     Q_EMIT currentModeChanged(currentMode());
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 22e3992d2..b159cbd16 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -68,12 +68,13 @@ public:
     int addWidget(QWidget* w);
     void setCurrentIndex(int index);
     void setCurrentWidget(QWidget* widget);
-    DatabaseWidget::Mode currentMode();
+    DatabaseWidget::Mode currentMode() const;
     void lock();
     void updateFilename(const QString& filename);
     int numberOfSelectedEntries();
     QStringList customEntryAttributes();
     bool isGroupSelected();
+    bool isInEditMode() const;
 
 Q_SIGNALS:
     void closeRequest();