Upgrade to 0.4.3 base on merge from mainstream branch

[keepassx] / src / KpxConfig.h

diff --git a/src/KpxConfig.h b/src/KpxConfig.h
index 45ff3ec..2de2c15 100644 (file)
--- a/src/KpxConfig.h
+++ b/src/KpxConfig.h
@@ -70,6 +70,7 @@ public:
        QString lastKeyLocation(){return settings.value("Options/LastKeyLocation").toString();}
        tKeyType lastKeyType(){return stringToKeyType(settings.value("Options/LastKeyType").toString());}
        QByteArray mainWindowGeometry();
+       bool minimizeToTray(){return settings.value("Options/MinimizeToTray",false).toBool();}  
        bool minimizeTray(){return settings.value("Options/MinimizeTray",false).toBool();}
        bool startMinimized(){return settings.value("Options/StartMinimized",false).toBool();}
        bool startLocked(){return settings.value("Options/StartLocked",false).toBool();}
@@ -142,6 +143,7 @@ public:
        void setLastKeyLocation(const QString& value){settings.setValue("Options/LastKeyLocation",value);}
        void setLastKeyType(tKeyType value){settings.setValue("Options/LastKeyType",keyTypeToString(value));}
        void setMainWindowGeometry(const QByteArray& value){settings.setValue("UI/MainWindowGeometry",value);}
+       void setMinimizeToTray(bool value){settings.setValue("Options/MinimizeToTray",value);}
        void setMinimizeTray(bool value){settings.setValue("Options/MinimizeTray",value);}
        void setStartMinimized(bool value){settings.setValue("Options/StartMinimized",value);}
        void setStartLocked(bool value){settings.setValue("Options/StartLocked",value);}