author | ulf69 <ulf69> | 2004-10-16 01:02:53 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-10-16 01:02:53 (UTC) |
commit | 9c82c0ed220d9efe16ea383e65f760f01492787d (patch) (unidiff) | |
tree | 2aedddfad3e72de7c2c92ff216d7df2cc83fe258 | |
parent | 1821dcc08c8f6f2bc0fdb991c335ed03262d1443 (diff) | |
download | kdepimpi-9c82c0ed220d9efe16ea383e65f760f01492787d.zip kdepimpi-9c82c0ed220d9efe16ea383e65f760f01492787d.tar.gz kdepimpi-9c82c0ed220d9efe16ea383e65f760f01492787d.tar.bz2 |
added configsettings for crypt ans hash algo
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | 51 | ||||
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.h | 8 |
2 files changed, 53 insertions, 6 deletions
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp index 8afea76..525bdaa 100644 --- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp +++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | |||
@@ -87,7 +87,39 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
87 | i = 0; | 87 | i = 0; |
88 | KPrefsWidRadios * compr = addWidRadios(i18n("Compression:") ,&(prefs->mCompression), filePage); | 88 | QLabel* kcfg_compression_label = new QLabel(i18n("Compression:"), filePage); |
89 | compr->addRadio(i18n("none")); | 89 | fileLayout->addWidget(kcfg_compression_label,i,0); |
90 | compr->addRadio(i18n("gzip")); | 90 | kcfg_compression = new QComboBox(filePage, "kcfg_compression"); |
91 | compr->addRadio(i18n("bzip2")); | 91 | kcfg_compression->insertItem(i18n("None")); |
92 | fileLayout->addMultiCellWidget( (QWidget*)compr->groupBox(),i,i,0,1); | 92 | kcfg_compression->insertItem(i18n("gzip")); |
93 | //US not yet supported: kcfg_compression->insertItem(i18n("bzip2")); | ||
94 | fileLayout->addWidget( kcfg_compression,i,1); | ||
95 | ++i; | ||
96 | |||
97 | QLabel* kcfg_crypt_label = new QLabel(i18n("Encryption:"), filePage); | ||
98 | fileLayout->addWidget(kcfg_crypt_label,i,0); | ||
99 | kcfg_cryptAlgo = new QComboBox(filePage, "kcfg_cryptAlgo"); | ||
100 | kcfg_cryptAlgo->insertItem(i18n("Blowfish (128 bit)")); | ||
101 | #ifdef CONFIG_PWMANAGER_GCRY | ||
102 | kcfg_cryptAlgo->insertItem(i18n("AES-128, Rijndael (128 bit)")); | ||
103 | kcfg_cryptAlgo->insertItem(i18n("AES-192, Rijndael (192 bit)")); | ||
104 | kcfg_cryptAlgo->insertItem(i18n("AES-256, Rijndael (256 bit)")); | ||
105 | kcfg_cryptAlgo->insertItem(i18n("Triple-DES (168 bit)")); | ||
106 | kcfg_cryptAlgo->insertItem(i18n("Twofish (256 bit)")); | ||
107 | kcfg_cryptAlgo->insertItem(i18n("Twofish-128 (128 bit)")); | ||
108 | #endif // CONFIG_PWMANAGER_GCRY | ||
109 | fileLayout->addWidget( kcfg_cryptAlgo,i,1); | ||
110 | ++i; | ||
111 | |||
112 | QLabel* kcfg_hash_label = new QLabel(i18n("Hashing:"), filePage); | ||
113 | fileLayout->addWidget(kcfg_hash_label,i,0); | ||
114 | kcfg_hashAlgo = new QComboBox(filePage, "kcfg_hashAlgo"); | ||
115 | kcfg_hashAlgo->insertItem(i18n("SHA-160, SHA1 (160 bit)")); | ||
116 | #ifdef CONFIG_PWMANAGER_GCRY | ||
117 | kcfg_hashAlgo->insertItem(i18n("SHA-256 (256 bit)")); | ||
118 | kcfg_hashAlgo->insertItem(i18n("SHA-384 (384 bit)")); | ||
119 | kcfg_hashAlgo->insertItem(i18n("SHA-512 (512 bit)")); | ||
120 | kcfg_hashAlgo->insertItem(i18n("MD5 (128 bit)")); | ||
121 | kcfg_hashAlgo->insertItem(i18n("RIPE-MD-160 (160 bit)")); | ||
122 | kcfg_hashAlgo->insertItem(i18n("Tiger (192 bit)")); | ||
123 | #endif // CONFIG_PWMANAGER_GCRY | ||
124 | fileLayout->addWidget( kcfg_hashAlgo,i,1); | ||
93 | ++i; | 125 | ++i; |
@@ -229,2 +261,3 @@ void PWMConfigWidget::usrReadConfig() | |||
229 | 261 | ||
262 | |||
230 | setFilePermissions(prefs->mFilePermissions); | 263 | setFilePermissions(prefs->mFilePermissions); |
@@ -237,2 +270,5 @@ void PWMConfigWidget::usrReadConfig() | |||
237 | 270 | ||
271 | kcfg_compression->setCurrentItem(prefs->mCompression); | ||
272 | kcfg_cryptAlgo->setCurrentItem(prefs->mCryptAlgo); | ||
273 | kcfg_hashAlgo->setCurrentItem(prefs->mHashAlgo); | ||
238 | } | 274 | } |
@@ -251,2 +287,7 @@ void PWMConfigWidget::usrWriteConfig() | |||
251 | prefs->mXTermCommand = xtermLineEdit->text(); | 287 | prefs->mXTermCommand = xtermLineEdit->text(); |
288 | |||
289 | prefs->mCompression = kcfg_compression->currentItem(); | ||
290 | prefs->mCryptAlgo = kcfg_cryptAlgo->currentItem(); | ||
291 | prefs->mHashAlgo = kcfg_hashAlgo->currentItem(); | ||
292 | |||
252 | } | 293 | } |
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.h b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.h index 1c7f5bf..0fad6af 100644 --- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.h +++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.h | |||
@@ -32,2 +32,4 @@ class PWMPrefs; | |||
32 | class KURLRequester; | 32 | class KURLRequester; |
33 | class QComboBox; | ||
34 | |||
33 | 35 | ||
@@ -53,3 +55,7 @@ class PWMConfigWidget : public KPrefsWidget | |||
53 | QLineEdit* xtermLineEdit; | 55 | QLineEdit* xtermLineEdit; |
54 | 56 | QComboBox* kcfg_compression; | |
57 | QComboBox* kcfg_cryptAlgo; | ||
58 | QComboBox* kcfg_hashAlgo; | ||
59 | |||
60 | |||
55 | private: | 61 | private: |