From 3bbf11e26fa9c0aa1b44ce4d543ea5e1b9fbbb18 Mon Sep 17 00:00:00 2001
From: thez3ro <silvethebest@yahoo.it>
Date: Sat, 8 Oct 2016 18:55:05 +0200
Subject: [PATCH] Unlocked tray icon #37

---
 share/CMakeLists.txt                          |   2 +-
 .../scalable/apps/keepassx-locked.svgz        | Bin 0 -> 4263 bytes
 src/core/FilePath.cpp                         |  10 ++++++++++
 src/core/FilePath.h                           |   2 ++
 src/gui/DatabaseTabWidget.cpp                 |   8 ++++++++
 src/gui/DatabaseTabWidget.h                   |   3 +++
 src/gui/DatabaseWidget.cpp                    |   1 +
 src/gui/MainWindow.cpp                        |  18 +++++++++++++++++-
 src/gui/MainWindow.h                          |   1 +
 9 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 share/icons/application/scalable/apps/keepassx-locked.svgz

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 6a276d97c..ede76cb68 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -21,7 +21,7 @@ install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
 
 if(UNIX AND NOT APPLE)
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
-            FILES_MATCHING PATTERN "keepassx.png" PATTERN "keepassx.svgz")
+            FILES_MATCHING PATTERN "keepassx*.png" PATTERN "keepassx*.svgz")
     install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor
             FILES_MATCHING PATTERN "application-x-keepassx.png" PATTERN "application-x-keepassx.svgz")
     install(FILES linux/keepassx.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
diff --git a/share/icons/application/scalable/apps/keepassx-locked.svgz b/share/icons/application/scalable/apps/keepassx-locked.svgz
new file mode 100644
index 0000000000000000000000000000000000000000..2c3405c9a951e7dfc8d7f63b906f81a371879ba6
GIT binary patch
literal 4263
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
Ydw$HS%m4lJ@PCF`L6<K@=`%0@0OHy;XaE2J

literal 0
HcmV?d00001

diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
index 06208b7c9..a572bace5 100644
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@@ -90,6 +90,16 @@ QIcon FilePath::applicationIcon()
     return icon("apps", "keepassx");
 }
 
+QIcon FilePath::trayIconLocked()
+{
+    return icon("apps", "keepassx-locked");
+}
+
+QIcon FilePath::trayIconUnlocked()
+{
+    return applicationIcon();
+}
+
 QIcon FilePath::icon(const QString& category, const QString& name, bool fromTheme)
 {
     QString combinedName = category + "/" + name;
diff --git a/src/core/FilePath.h b/src/core/FilePath.h
index c37a90887..34edcbc93 100644
--- a/src/core/FilePath.h
+++ b/src/core/FilePath.h
@@ -28,6 +28,8 @@ public:
     QString dataPath(const QString& name);
     QString pluginPath(const QString& name);
     QIcon applicationIcon();
+    QIcon trayIconLocked();
+    QIcon trayIconUnlocked();
     QIcon icon(const QString& category, const QString& name, bool fromTheme = true);
     QIcon onOffIcon(const QString& category, const QString& name);
 
diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index 1abb6b452..45bbbae83 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -610,6 +610,7 @@ void DatabaseTabWidget::insertDatabase(Database* db, const DatabaseManagerStruct
     connect(dbStruct.dbWidget, SIGNAL(closeRequest()), SLOT(closeDatabaseFromSender()));
     connect(dbStruct.dbWidget, SIGNAL(databaseChanged(Database*)), SLOT(changeDatabase(Database*)));
     connect(dbStruct.dbWidget, SIGNAL(unlockedDatabase()), SLOT(updateTabNameFromDbWidgetSender()));
+    connect(dbStruct.dbWidget, SIGNAL(unlockedDatabase()), SLOT(emitDatabaseUnlockedFromDbWidgetSender()));
 }
 
 DatabaseWidget* DatabaseTabWidget::currentDatabaseWidget()
@@ -706,6 +707,8 @@ void DatabaseTabWidget::lockDatabases()
         dbWidget->lock();
         // database has changed so we can't use the db variable anymore
         updateTabName(dbWidget->database());
+
+        Q_EMIT databaseLocked(dbWidget);
     }
 }
 
@@ -764,6 +767,11 @@ void DatabaseTabWidget::emitActivateDatabaseChanged()
     Q_EMIT activateDatabaseChanged(currentDatabaseWidget());
 }
 
+void DatabaseTabWidget::emitDatabaseUnlockedFromDbWidgetSender()
+{
+    Q_EMIT databaseUnlocked(static_cast<DatabaseWidget*>(sender()));
+}
+
 void DatabaseTabWidget::connectDatabase(Database* newDb, Database* oldDb)
 {
     if (oldDb) {
diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h
index de4a9ca12..618b48b1c 100644
--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@@ -80,6 +80,8 @@ Q_SIGNALS:
     void tabNameChanged();
     void databaseWithFileClosed(QString filePath);
     void activateDatabaseChanged(DatabaseWidget* dbWidget);
+    void databaseLocked(DatabaseWidget* dbWidget);
+    void databaseUnlocked(DatabaseWidget* dbWidget);
 
 private Q_SLOTS:
     void updateTabName(Database* db);
@@ -89,6 +91,7 @@ private Q_SLOTS:
     void toggleTabbar();
     void changeDatabase(Database* newDb);
     void emitActivateDatabaseChanged();
+    void emitDatabaseUnlockedFromDbWidgetSender();
 
 private:
     bool saveDatabase(Database* db);
diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 120379171..0ede41926 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -658,6 +658,7 @@ void DatabaseWidget::openDatabase(bool accepted)
     if (accepted) {
         replaceDatabase(static_cast<DatabaseOpenWidget*>(sender())->database());
         setCurrentWidget(m_mainWidget);
+        Q_EMIT unlockedDatabase();
 
         // We won't need those anymore and KeePass1OpenWidget closes
         // the file in its dtor.
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 6dccf1dc3..f3d41521c 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -185,6 +185,10 @@ MainWindow::MainWindow()
             SLOT(databaseTabChanged(int)));
     connect(m_ui->tabWidget, SIGNAL(currentChanged(int)),
             SLOT(setMenuActionState()));
+    connect(m_ui->tabWidget, SIGNAL(databaseLocked(DatabaseWidget*)),
+            SLOT(databaseStatusChanged(DatabaseWidget*)));
+    connect(m_ui->tabWidget, SIGNAL(databaseUnlocked(DatabaseWidget*)),
+            SLOT(databaseStatusChanged(DatabaseWidget*)));
     connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(setMenuActionState()));
     connect(m_ui->stackedWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle()));
     connect(m_ui->settingsWidget, SIGNAL(editFinished(bool)), SLOT(switchToDatabases()));
@@ -486,6 +490,11 @@ void MainWindow::switchToSettings()
     m_ui->stackedWidget->setCurrentIndex(1);
 }
 
+void MainWindow::databaseStatusChanged(DatabaseWidget *)
+{
+    updateTrayIcon();
+}
+
 void MainWindow::databaseTabChanged(int tabIndex)
 {
     if (tabIndex != -1 && m_ui->stackedWidget->currentIndex() == 2) {
@@ -573,7 +582,7 @@ void MainWindow::updateTrayIcon()
 {
     if (isTrayIconEnabled()) {
         if (!m_trayIcon) {
-            m_trayIcon = new QSystemTrayIcon(filePath()->applicationIcon(), this);
+            m_trayIcon = new QSystemTrayIcon(this);
 
             QMenu* menu = new QMenu(this);
 
@@ -587,8 +596,15 @@ void MainWindow::updateTrayIcon()
             connect(actionToggle, SIGNAL(triggered()), SLOT(toggleWindow()));
 
             m_trayIcon->setContextMenu(menu);
+            m_trayIcon->setIcon(filePath()->applicationIcon());
             m_trayIcon->show();
         }
+        if (m_ui->tabWidget->hasLockableDatabases()) {
+            m_trayIcon->setIcon(filePath()->trayIconUnlocked());
+        }
+        else {
+            m_trayIcon->setIcon(filePath()->trayIconLocked());
+        }
     }
     else {
         if (m_trayIcon) {
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index 02019312d..7e1a18293 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -54,6 +54,7 @@ private Q_SLOTS:
     void showAboutDialog();
     void switchToDatabases();
     void switchToSettings();
+    void databaseStatusChanged(DatabaseWidget *dbWidget);
     void databaseTabChanged(int tabIndex);
     void openRecentDatabase(QAction* action);
     void clearLastDatabases();