| -rw-r--r-- | pwmanager/pwmanager/pwmprefs.cpp | 20 | ||||
| -rw-r--r-- | pwmanager/pwmanager/pwmprefs.h | 18 |
2 files changed, 35 insertions, 3 deletions
diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp index 7fd347f..fdc34e0 100644 --- a/pwmanager/pwmanager/pwmprefs.cpp +++ b/pwmanager/pwmanager/pwmprefs.cpp @@ -24,48 +24,50 @@ */ #include <kconfig.h> #include <klocale.h> #include <kstaticdeleter.h> #include "pwmprefs.h" PWMPrefs *PWMPrefs::sInstance = 0; static KStaticDeleter<PWMPrefs> staticDeleter; PWMPrefs::PWMPrefs() : KPimPrefs("pwmanagerrc") { KPrefs::setCurrentGroup( "Global" ); addItemString( "autoStart", &mAutoStart, "" ); addItemString( "browserCommand", &mBrowserCommand, "" ); addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND); addItemFont( "entryFont", &mEntryFont); addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT ); addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT ); addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION ); + addItemInt("cryptAlgo", &mCryptAlgo, CONF_DEFAULT_CRYPTALGO); + addItemInt("hashAlgo", &mHashAlgo, CONF_DEFAULT_HASHALGO); addItemInt( "filePermissions", &mFilePermissions, CONF_DEFAULT_FILEPERMISSIONS ); addItemInt( "minimizeLock", &mMinimizeLock, CONF_DEFAULT_MINIMIZELOCK ); addItemBool( "unlockOnOpen", &mUnlockOnOpen, CONF_DEFAULT_UNLOCKONOPEN ); addItemBool( "tray", &mTray, CONF_DEFAULT_TRAY ); addItemBool( "makeFileBackup", &mMakeFileBackup, CONF_DEFAULT_MAKEFILEBACKUP ); addItemBool( "autostartDeepLocked", &mAutostartDeeplocked, CONF_DEFAULT_AUTOSTART_DEEPL ); addItemBool( "autoDeepLock", &mAutoDeeplock, CONF_DEFAULT_AUTODEEPLOCK ); addItemBool( "kwalletEmu", &mKWalletEmu, CONF_DEFAULT_KWALLETEMU ); addItemBool( "newEntrLockStat", &mNewEntrLockStat, CONF_DEFAULT_NEWENTRLOCKSTAT ); KPrefs::setCurrentGroup( "Wnd" ); addItemSize( "MainWndSize", &mMainWndSize); addItemInt( "MainViewStyle", &mMainViewStyle, CONF_DEFAULT_MAINVIEWSTYLE ); addItemBool( "autoMinimizeOnStart", &mAutoMinimizeOnStart, CONF_DEFAULT_AUTOMINIMIZE ); addItemBool( "close", &mClose, CONF_DEFAULT_WNDCLOSE ); addItemIntList( "commentSplitter", &mCommentSplitter ); addItemIntList( "categorySplitter", &mCategorySplitter ); } PWMPrefs::~PWMPrefs() { } @@ -173,48 +175,58 @@ bool PWMPrefs::confGlobNewEntrLockStat() { return mNewEntrLockStat; } QSize PWMPrefs::confWndMainWndSize() { return mMainWndSize; } int PWMPrefs::confWndMainViewStyle() { return mMainViewStyle; } bool PWMPrefs::confWndAutoMinimizeOnStart() { return mAutoMinimizeOnStart; } bool PWMPrefs::confWndClose() { return mClose; } +int PWMPrefs::confGlobCryptAlgo() +{ + return mCryptAlgo + 1; +} + +int PWMPrefs::confGlobHashAlgo() +{ + return mHashAlgo + 1; +} + /******************************************************************* * functions for writing the configuration settings *******************************************************************/ void PWMPrefs::confGlobAutoStart(const QString &e) { mAutoStart = e; } void PWMPrefs::confGlobBrowserCommand(const QString &e) { mBrowserCommand = e; } void PWMPrefs::confGlobXtermCommand(const QString &e) { mXTermCommand = e; } void PWMPrefs::confGlobEntryFont(const QFont &e) { mEntryFont = e; } @@ -277,25 +289,33 @@ void PWMPrefs::confGlobNewEntrLockStat(bool e) { mNewEntrLockStat = e; } void PWMPrefs::confWndMainWndSize(const QSize &e) { mMainWndSize = e; } void PWMPrefs::confWndMainViewStyle(int e) { mMainViewStyle = e; } void PWMPrefs::confWndAutoMinimizeOnStart(bool e) { mAutoMinimizeOnStart = e; } void PWMPrefs::confWndClose(bool e) { mClose = e; } +void PWMPrefs::confGlobCryptAlgo(int e) +{ + mCryptAlgo = e - 1; +} +void PWMPrefs::confGlobHashAlgo(int e) +{ + mHashAlgo = e - 1; +} diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h index 9fed7d2..1c8b982 100644 --- a/pwmanager/pwmanager/pwmprefs.h +++ b/pwmanager/pwmanager/pwmprefs.h @@ -15,132 +15,144 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. As a special exception, permission is given to link this program with any edition of Qt, and distribute the resulting executable, without including the source code for Qt in the source distribution. $Id$ */ #ifndef PWMPREFS_H #define PWMPREFS_H #include <qstringlist.h> #include <qsize.h> #include <kpimprefs.h> class KConfig; #define conf() PWMPrefs::instance() + + #define CONF_DEFAULT_PWTIMEOUT 10 /* 10 sec */ #define CONF_DEFAULT_LOCKTIMEOUT 0 /* 0 == disable */ #define CONF_DEFAULT_TRAY true -#define CONF_DEFAULT_UNLOCKONOPEN false -#define CONF_DEFAULT_MAINVIEWSTYLE 0 +#define CONF_DEFAULT_UNLOCKONOPEN true +#define CONF_DEFAULT_MAINVIEWSTYLE 1/* Category List Left */ #define CONF_DEFAULT_COMPRESSION 0x01 /* gzip */ +#define CONF_DEFAULT_CRYPTALGO (0x01 - 1)/* blowfish */ +#define CONF_DEFAULT_HASHALGO (0x01 - 1)/* sha1 */ #define CONF_DEFAULT_AUTOMINIMIZE false #define CONF_DEFAULT_BROWSERCOMMAND "" #define CONF_DEFAULT_XTERMCOMMAND "konsole -e" #define CONF_DEFAULT_FILEPERMISSIONS 0600 #define CONF_DEFAULT_MAKEFILEBACKUP false #define CONF_DEFAULT_AUTOSTART_DEEPL true #define CONF_DEFAULT_AUTODEEPLOCK true #define CONF_DEFAULT_KWALLETEMU true #define CONF_DEFAULT_MINIMIZELOCK 2 /* deep-lock */ -#define CONF_DEFAULT_NEWENTRLOCKSTAT true /* locked */ +#define CONF_DEFAULT_NEWENTRLOCKSTAT false/* new entries unlocked */ #define CONF_DEFAULT_WNDCLOSE true /* don't minimize to tray */ + class PWMPrefs : public KPimPrefs { public: virtual ~PWMPrefs(); static PWMPrefs *instance(); public: /* functions for reading the configuration settings */ /* GLOBAL */ QString confGlobAutoStart(); QString confGlobBrowserCommand(); QString confGlobXtermCommand(); QFont confGlobEntryFont(); int confGlobPwTimeout(); int confGlobLockTimeout(); int confGlobCompression(); + int confGlobCryptAlgo(); + int confGlobHashAlgo(); int confGlobFilePermissions(); int confGlobMinimizeLock(); bool confGlobUnlockOnOpen(); bool confGlobTray(); bool confGlobMakeFileBackup(); bool confGlobAutostartDeepLocked(); bool confGlobAutoDeepLock(); bool confGlobKwalletEmu(); bool confGlobNewEntrLockStat(); /* WND */ QSize confWndMainWndSize(); int confWndMainViewStyle(); bool confWndAutoMinimizeOnStart(); bool confWndClose(); public: /* functions for writing the configuration settings */ /* GLOBAL */ void confGlobAutoStart(const QString &e); void confGlobBrowserCommand(const QString &e); void confGlobXtermCommand(const QString &e); void confGlobEntryFont(const QFont &e); void confGlobPwTimeout(int e); void confGlobLockTimeout(int e); void confGlobCompression(int e); + void confGlobCryptAlgo(int e); + void confGlobHashAlgo(int e); + void confGlobFilePermissions(int e); void confGlobMinimizeLock(int e); void confGlobUnlockOnOpen(bool e); void confGlobTray(bool e); void confGlobMakeFileBackup(bool e); void confGlobAutostartDeepLocked(bool e); void confGlobAutoDeepLock(bool e); void confGlobKwalletEmu(bool e); void confGlobNewEntrLockStat(bool e); /* WND */ void confWndMainWndSize(const QSize &e); void confWndMainViewStyle(int e); void confWndAutoMinimizeOnStart(bool e); void confWndClose(bool e); QString mAutoStart; QString mBrowserCommand; QString mXTermCommand; QFont mEntryFont; int mPwTimeout; int mLockTimeout; int mCompression; + int mCryptAlgo; + int mHashAlgo; int mFilePermissions; int mMinimizeLock; bool mUnlockOnOpen; bool mTray; bool mMakeFileBackup; bool mAutostartDeeplocked; bool mAutoDeeplock; bool mKWalletEmu; bool mNewEntrLockStat; QSize mMainWndSize; int mMainViewStyle; bool mAutoMinimizeOnStart; bool mClose; //US ENH QValueList<int> mCommentSplitter; QValueList<int> mCategorySplitter; // US introduce a nonconst way to return the config object. KConfig* getConfig(); private: PWMPrefs(); |