author | zautrix <zautrix> | 2005-06-24 23:30:30 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-24 23:30:30 (UTC) |
commit | 184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8 (patch) (unidiff) | |
tree | 96074dff5dddd80afa2773f0bf573e0155f73293 | |
parent | 3dbc82b2711811450b77b85a5fd85744a61d0a2c (diff) | |
download | kdepimpi-184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8.zip kdepimpi-184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8.tar.gz kdepimpi-184833db0d1bcb63e7d4bd5945ccdc0e6b92f7b8.tar.bz2 |
sec fix
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 3 | ||||
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 6 | ||||
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | 27 |
3 files changed, 22 insertions, 14 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 2aac9ff..7478ffd 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -1,19 +1,22 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.9 ************ | 3 | ********** VERSION 2.1.9 ************ |
4 | 4 | ||
5 | KO/Pi: | 5 | KO/Pi: |
6 | Fixed some problems of the new search options in the search dialog. | 6 | Fixed some problems of the new search options in the search dialog. |
7 | 7 | ||
8 | PwM/Pi: | ||
9 | Added "sec" to the timeout config settings to make it clear the timeout values are seconds. | ||
10 | |||
8 | ********** VERSION 2.1.8 ************ | 11 | ********** VERSION 2.1.8 ************ |
9 | 12 | ||
10 | KO/Pi: | 13 | KO/Pi: |
11 | Added info about the completion state of a todo in the ListView/Searchdialog. | 14 | Added info about the completion state of a todo in the ListView/Searchdialog. |
12 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. | 15 | If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well. |
13 | Fixed some updating problems when changing the filter. | 16 | Fixed some updating problems when changing the filter. |
14 | 17 | ||
15 | KA/Pi: | 18 | KA/Pi: |
16 | In the addressee selection dialog now the formatted name is shown, if not empty. | 19 | In the addressee selection dialog now the formatted name is shown, if not empty. |
17 | Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. | 20 | Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category. |
18 | Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. | 21 | Now in the addressee selection dialog a selected contact is remove with a single click from the selected list. |
19 | 22 | ||
diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt index 255f2eb..d38eecf 100644 --- a/bin/kdepim/pwmanager/germantranslation.txt +++ b/bin/kdepim/pwmanager/germantranslation.txt | |||
@@ -274,26 +274,26 @@ | |||
274 | { "Twofish (256 bit)","Twofish (256 bit)" }, | 274 | { "Twofish (256 bit)","Twofish (256 bit)" }, |
275 | { "Twofish-128 (128 bit)","Twofish-128 (128 bit)" }, | 275 | { "Twofish-128 (128 bit)","Twofish-128 (128 bit)" }, |
276 | { "Hashing:","Hashing:" }, | 276 | { "Hashing:","Hashing:" }, |
277 | { "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" }, | 277 | { "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" }, |
278 | { "SHA-256 (256 bit)","SHA-256 (256 bit)" }, | 278 | { "SHA-256 (256 bit)","SHA-256 (256 bit)" }, |
279 | { "SHA-384 (384 bit)","SHA-384 (384 bit)" }, | 279 | { "SHA-384 (384 bit)","SHA-384 (384 bit)" }, |
280 | { "SHA-512 (512 bit)","SHA-512 (512 bit)" }, | 280 | { "SHA-512 (512 bit)","SHA-512 (512 bit)" }, |
281 | { "MD5 (128 bit)","MD5 (128 bit)" }, | 281 | { "MD5 (128 bit)","MD5 (128 bit)" }, |
282 | { "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" }, | 282 | { "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" }, |
283 | { "Tiger (192 bit)","Tiger (192 bit)" }, | 283 | { "Tiger (192 bit)","Tiger (192 bit)" }, |
284 | { "Permissions:","Zugriffsrechte:" }, | 284 | { "Permissions:","Zugriffsrechte:" }, |
285 | { "Make backup before saving","Mache Backup vor dem Speichern" }, | 285 | { "Make backup before saving","Mache Backup vor dem Speichern" }, |
286 | { "Password timeout\n(timeout to hold password in\nmemory,so you don't have to\nre-enter it,if you\nalready have entered it)\n[set to 0 to disable]:","Passwort Timeout\n(Timeout um das Passwort\nim Speicher zu halten,\nso dass es nicht noch mal\neingegeben werden muß.)\n[Setze auf 0 zum deaktivieren]:" }, | 286 | { "<b>Password timeout</b> (timeout to hold password in memory,so you don't have to re-enter it,if you already have entered it) [set to 0 to disable]:","<b>Passwort Timeout</b> (Timeout um das Passwort im Speicher zu halten,so dass es nicht noch mal eingegeben werden muß.) [Setze auf 0 zum deaktivieren]:" }, |
287 | { "Auto-lock timeout\n(auto lock document after this\namount of seconds)\n[set to 0 to disable]:","(Total-)Sperr-Timeout\n(Sperre Dokument total nach\ndieser Anzahl Sekunden)\n[Setze auf 0 zum deaktivieren]:" }, | 287 | { "<b>Auto-lock timeout</b> (auto lock document after this\namount of seconds) [set to 0 to disable]:","<b>(Total-)Sperr-Timeout</b> (Sperre Dokument total nach dieser Anzahl Sekunden) [Setze auf 0 zum deaktivieren]:" }, |
288 | { "deep-lock on autolock","Sperre total beim Sperr-Timeout" }, | 288 | { "deep-lock on autolock","Sperre total beim Sperr-Timeout" }, |
289 | { "open deeplocked","Öffne total gesperrt" }, | 289 | { "open deeplocked","Öffne total gesperrt" }, |
290 | { "Favourite browser:","Bevorzugter Browser:" }, | 290 | { "Favourite browser:","Bevorzugter Browser:" }, |
291 | { "Favourite x-terminal:","Bevorzugtes x-terminal:" }, | 291 | { "Favourite x-terminal:","Bevorzugtes x-terminal:" }, |
292 | { "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" }, | 292 | { "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" }, |
293 | { "Look && feel","Aussehen" }, | 293 | { "Look && feel","Aussehen" }, |
294 | { "File","Datei" }, | 294 | { "File","Datei" }, |
295 | { "Timeout","Timeout" }, | 295 | { "Timeout","Timeout" }, |
296 | { "Autostart","Autostart" }, | 296 | { "Autostart","Autostart" }, |
297 | { "External apps","Externe Applik." }, | 297 | { "External apps","Externe Applik." }, |
298 | { "Miscellaneous","Verschiedenes" }, | 298 | { "Miscellaneous","Verschiedenes" }, |
299 | { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, | 299 | { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, |
@@ -360,19 +360,19 @@ | |||
360 | { " days"," Tage" }, | 360 | { " days"," Tage" }, |
361 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, | 361 | { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." }, |
362 | { "Backup Failed!","Backup Problem!" }, | 362 | { "Backup Failed!","Backup Problem!" }, |
363 | { "Try again now","Versuche jetzt nochmal" }, | 363 | { "Try again now","Versuche jetzt nochmal" }, |
364 | { "Try again later","Versuche später nochmal" }, | 364 | { "Try again later","Versuche später nochmal" }, |
365 | { "Try again tomorrow","Versuche morgen nochmal" }, | 365 | { "Try again tomorrow","Versuche morgen nochmal" }, |
366 | { "Disable backup","Schalte Backup ab" }, | 366 | { "Disable backup","Schalte Backup ab" }, |
367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | 367 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | 368 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
369 | { "Choose action","Wähle Aktion" }, | 369 | { "Choose action","Wähle Aktion" }, |
370 | { "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." }, | 370 | { "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." }, |
371 | { "Global Settings...","Globale Einstellungen..." }, | 371 | { "Global Settings...","Globale Einstellungen..." }, |
372 | { "","" }, | 372 | { " sec"," Sek" }, |
373 | { "","" }, | 373 | { "","" }, |
374 | { "","" }, | 374 | { "","" }, |
375 | { "","" }, | 375 | { "","" }, |
376 | { "","" }, | 376 | { "","" }, |
377 | { "","" }, | 377 | { "","" }, |
378 | 378 | ||
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp index c1ca536..2c5189c 100644 --- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp +++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | |||
@@ -149,40 +149,45 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
149 | KPrefsWidBool *sb = addWidBool(i18n("Make backup before saving"), | 149 | KPrefsWidBool *sb = addWidBool(i18n("Make backup before saving"), |
150 | &(prefs->mMakeFileBackup),filePage); | 150 | &(prefs->mMakeFileBackup),filePage); |
151 | fileLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); | 151 | fileLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); |
152 | ++i; | 152 | ++i; |
153 | 153 | ||
154 | // Timeout page | 154 | // Timeout page |
155 | ////////////////////////////////////////////////////// | 155 | ////////////////////////////////////////////////////// |
156 | QWidget *timeoutPage = new QWidget( this ); | 156 | QWidget *timeoutPage = new QWidget( this ); |
157 | QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2); | 157 | QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2); |
158 | 158 | ||
159 | i = 0; | 159 | i = 0; |
160 | pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" ); | 160 | pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" ); |
161 | QLabel* timeoutLabel = new QLabel(pwTimeoutSpinBox, i18n("Password timeout\n(timeout to hold password in\nmemory,so you don't have to\nre-enter it,if you\nalready have entered it)\n[set to 0 to disable]:"), timeoutPage); | 161 | QLabel* timeoutLabel = new QLabel(pwTimeoutSpinBox, i18n("<b>Password timeout</b> (timeout to hold password in memory,so you don't have to re-enter it,if you already have entered it) [set to 0 to disable]:"), timeoutPage); |
162 | timeoutLayout->addMultiCellWidget(timeoutLabel,i, i, 0 ,0); | 162 | timeoutLayout->addMultiCellWidget(timeoutLabel, i, i, 0 ,1); |
163 | timeoutLayout->addWidget(pwTimeoutSpinBox,i,1); | ||
164 | ++i; | 163 | ++i; |
165 | 164 | timeoutLayout->addMultiCellWidget(pwTimeoutSpinBox,i,i,0,1); | |
165 | ++i; | ||
166 | pwTimeoutSpinBox->setSuffix ( i18n(" sec") ); | ||
166 | lockTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "lockTimeoutSpinBox" ); | 167 | lockTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "lockTimeoutSpinBox" ); |
167 | QLabel* lockTimeoutLabel = new QLabel(lockTimeoutSpinBox, i18n("Auto-lock timeout\n(auto lock document after this\namount of seconds)\n[set to 0 to disable]:"), timeoutPage); | 168 | QLabel* lockTimeoutLabel = new QLabel(lockTimeoutSpinBox, i18n("<b>Auto-lock timeout</b> (auto lock document after this\namount of seconds) [set to 0 to disable]:"), timeoutPage); |
168 | timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,0); | 169 | timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,1); |
169 | timeoutLayout->addWidget(lockTimeoutSpinBox,i,1); | 170 | ++i; |
171 | timeoutLayout->addMultiCellWidget(lockTimeoutSpinBox,i,i,0,1); | ||
172 | lockTimeoutSpinBox->setSuffix ( i18n(" sec") ); | ||
170 | ++i; | 173 | ++i; |
171 | 174 | ||
172 | sb = addWidBool(i18n("deep-lock on autolock"), | 175 | sb = addWidBool(i18n("deep-lock on autolock"), |
173 | &(prefs->mAutoDeeplock),timeoutPage); | 176 | &(prefs->mAutoDeeplock),timeoutPage); |
174 | timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); | 177 | timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); |
175 | ++i; | 178 | ++i; |
176 | 179 | sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),timeoutPage); | |
180 | timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); | ||
181 | ++i; | ||
177 | 182 | ||
178 | // Autostart page | 183 | // Autostart page |
179 | ////////////////////////////////////////////////////// | 184 | ////////////////////////////////////////////////////// |
180 | QWidget *autostartPage = new QWidget( this ); | 185 | QWidget *autostartPage = new QWidget( this ); |
181 | QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2); | 186 | QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2); |
182 | 187 | ||
183 | i = 0; | 188 | i = 0; |
184 | 189 | ||
185 | autostartLineEdit = new KURLRequester(autostartPage, "autoStartLineEdit"); | 190 | autostartLineEdit = new KURLRequester(autostartPage, "autoStartLineEdit"); |
186 | QLabel* autostartLineLabel = new QLabel(autostartLineEdit, "Open this file automatically on startup:",autostartPage); | 191 | QLabel* autostartLineLabel = new QLabel(autostartLineEdit, "Open this file automatically on startup:",autostartPage); |
187 | autostartLayout->addMultiCellWidget(autostartLineLabel,i,i,0,1); | 192 | autostartLayout->addMultiCellWidget(autostartLineLabel,i,i,0,1); |
188 | ++i; | 193 | ++i; |
@@ -205,25 +210,25 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
205 | browserLineEdit = new QLineEdit(externalappPage); | 210 | browserLineEdit = new QLineEdit(externalappPage); |
206 | QLabel* browserLineLabel = new QLabel(browserLineEdit, i18n("Favourite browser:"), externalappPage); | 211 | QLabel* browserLineLabel = new QLabel(browserLineEdit, i18n("Favourite browser:"), externalappPage); |
207 | externalappLayout->addWidget(browserLineLabel,i,0); | 212 | externalappLayout->addWidget(browserLineLabel,i,0); |
208 | externalappLayout->addWidget(browserLineEdit,i,1); | 213 | externalappLayout->addWidget(browserLineEdit,i,1); |
209 | ++i; | 214 | ++i; |
210 | 215 | ||
211 | xtermLineEdit = new QLineEdit(externalappPage); | 216 | xtermLineEdit = new QLineEdit(externalappPage); |
212 | QLabel* xtermLineLabel = new QLabel(xtermLineEdit, i18n("Favourite x-terminal:"), externalappPage); | 217 | QLabel* xtermLineLabel = new QLabel(xtermLineEdit, i18n("Favourite x-terminal:"), externalappPage); |
213 | externalappLayout->addWidget(xtermLineLabel,i,0); | 218 | externalappLayout->addWidget(xtermLineLabel,i,0); |
214 | externalappLayout->addWidget(xtermLineEdit,i,1); | 219 | externalappLayout->addWidget(xtermLineEdit,i,1); |
215 | ++i; | 220 | ++i; |
216 | 221 | ||
217 | 222 | #if 0 | |
218 | // miscelaneous page | 223 | // miscelaneous page |
219 | ////////////////////////////////////////////////////// | 224 | ////////////////////////////////////////////////////// |
220 | QWidget *miscPage = new QWidget( this ); | 225 | QWidget *miscPage = new QWidget( this ); |
221 | QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2); | 226 | QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2); |
222 | 227 | ||
223 | i = 0; | 228 | i = 0; |
224 | 229 | ||
225 | /*US ENH: PWM/Pi has no tray and con be minimized | 230 | /*US ENH: PWM/Pi has no tray and con be minimized |
226 | sb = addWidBool(i18n("Show icon in system-tray"),&(prefs->mTray),miscPage); | 231 | sb = addWidBool(i18n("Show icon in system-tray"),&(prefs->mTray),miscPage); |
227 | miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); | 232 | miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); |
228 | ++i; | 233 | ++i; |
229 | */ | 234 | */ |
@@ -243,32 +248,32 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
243 | minimizeRadio->addRadio(i18n("deep-lock")); | 248 | minimizeRadio->addRadio(i18n("deep-lock")); |
244 | miscLayout->addMultiCellWidget( (QWidget*)minimizeRadio->groupBox(),i,i,0,2); | 249 | miscLayout->addMultiCellWidget( (QWidget*)minimizeRadio->groupBox(),i,i,0,2); |
245 | ++i; | 250 | ++i; |
246 | 251 | ||
247 | sb = addWidBool(i18n("KWallet emulation"),&(prefs->mKWalletEmu),miscPage); | 252 | sb = addWidBool(i18n("KWallet emulation"),&(prefs->mKWalletEmu),miscPage); |
248 | miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); | 253 | miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); |
249 | ++i; | 254 | ++i; |
250 | 255 | ||
251 | sb = addWidBool(i18n("Close instead Minimize into tray"),&(prefs->mClose),miscPage); | 256 | sb = addWidBool(i18n("Close instead Minimize into tray"),&(prefs->mClose),miscPage); |
252 | miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); | 257 | miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1); |
253 | ++i; | 258 | ++i; |
254 | */ | 259 | */ |
255 | 260 | #endif | |
256 | 261 | ||
257 | tabWidget->addTab( windowStylePage, i18n( "Look && feel" ) ); | 262 | tabWidget->addTab( windowStylePage, i18n( "Look && feel" ) ); |
258 | tabWidget->addTab( filePage, i18n( "File" ) ); | 263 | tabWidget->addTab( filePage, i18n( "File" ) ); |
259 | tabWidget->addTab( timeoutPage, i18n( "Timeout" ) ); | 264 | tabWidget->addTab( timeoutPage, i18n( "Timeout" ) ); |
260 | tabWidget->addTab( autostartPage, i18n( "Autostart" ) ); | 265 | tabWidget->addTab( autostartPage, i18n( "Autostart" ) ); |
261 | tabWidget->addTab( externalappPage, i18n( "External apps" ) ); | 266 | tabWidget->addTab( externalappPage, i18n( "External apps" ) ); |
262 | tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) ); | 267 | //tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) ); |
263 | 268 | ||
264 | 269 | ||
265 | connect( permissionLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); | 270 | connect( permissionLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); |
266 | connect( pwTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) ); | 271 | connect( pwTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) ); |
267 | connect( lockTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) ); | 272 | connect( lockTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) ); |
268 | connect( autostartLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); | 273 | connect( autostartLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); |
269 | connect( browserLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); | 274 | connect( browserLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); |
270 | connect( xtermLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); | 275 | connect( xtermLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) ); |
271 | 276 | ||
272 | } | 277 | } |
273 | 278 | ||
274 | 279 | ||