sec fix

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,31 +1,34 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.9 ************
 
 KO/Pi:
 Fixed some problems of the new search options in the search dialog.
 
+PwM/Pi:
+Added "sec" to the timeout config settings to make it clear the timeout values are seconds.
+
 ********** VERSION 2.1.8 ************
 
 KO/Pi:
 Added info about the completion state of a todo in the ListView/Searchdialog.
 If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
 Fixed some updating problems when changing the filter.
 
 KA/Pi:
 In the addressee selection dialog now the formatted name is shown, if not empty.
 Added a column "category" to the addressee selection dialog to make it possible to sort addressees after category.
 Now in the addressee selection dialog a selected contact is remove with a single click from the selected list.
 
 Fixed in the file selector on the Zaurus the problem that symbolic links to files/dirs were ignored.
 Fixed the sorting for size in the file selector on the Z.
 
 Changed the color selection dialog on the Zaurus to a more user friendly version.
 
 ********** VERSION 2.1.7 ************
 
 KO/Pi:
 Fixed several problems in the new Resource handling.
 Added more options to the search dialog. 
 Fixed a problem in the Month view.  
 Added more options to the dialog when setting a todo to stopped.     
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
@@ -262,50 +262,50 @@
 { "Font for Password entries:","Schrift für Passwort Einträge:" },

 { "Font for Password summary:","Schrift für Passwort Übersicht:" },

 { "Font:","Schriftart:" },

 { "Summary","Übersicht" },

 { "Compression:","Kompression:" },

 { "gzip","gzip" },

 { "Encryption:","Verschlüsselung:" },

 { "Blowfish (128 bit)","Blowfish (128 bit)" },

 { "AES-128, Rijndael (128 bit)","AES-128, Rijndael (128 bit)" },

 { "AES-192, Rijndael (192 bit)","AES-192, Rijndael (192 bit)" },

 { "AES-256, Rijndael (256 bit)","AES-256, Rijndael (256 bit)" },

 { "Triple-DES (168 bit)","Triple-DES (168 bit)" },

 { "Twofish (256 bit)","Twofish (256 bit)" },

 { "Twofish-128 (128 bit)","Twofish-128 (128 bit)" },

 { "Hashing:","Hashing:" },

 { "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" },

 { "SHA-256 (256 bit)","SHA-256 (256 bit)" },

 { "SHA-384 (384 bit)","SHA-384 (384 bit)" },

 { "SHA-512 (512 bit)","SHA-512 (512 bit)" },

 { "MD5 (128 bit)","MD5 (128 bit)" },

 { "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" },

 { "Tiger (192 bit)","Tiger (192 bit)" },

 { "Permissions:","Zugriffsrechte:" },

 { "Make backup before saving","Mache Backup vor dem Speichern" },

-{ "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]:" },

-{ "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]:" },

+{ "<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]:" },

+{ "<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]:" },

 { "deep-lock on autolock","Sperre total beim Sperr-Timeout" },

 { "open deeplocked","Öffne total gesperrt" },

 { "Favourite browser:","Bevorzugter Browser:" },

 { "Favourite x-terminal:","Bevorzugtes x-terminal:" },

 { "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" },

 { "Look && feel","Aussehen" },

 { "File","Datei" },

 { "Timeout","Timeout" },

 { "Autostart","Autostart" },

 { "External apps","Externe Applik." },

 { "Miscellaneous","Verschiedenes" },

 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },

 { "edit category descriptions","Ändere Label für Kategorie" },

 { "Close","Schließen" },

 { "Category:","Category:" },

 { "Text1 (Description):","Text1 (Beschreibung):" },

 { "Text2 (Username):","Text2 (Benutzername):" },

 { "Text3 (Password):","Text3 (Passwort):" },

 { "edit/add a password entry","Ändere/hinzufüge Passwort Eintrag" },

 { "Description:","Beschreibung:" },

 { "Username:","Benutzername:" },

 { "Password:","Passwort:" },

 { "&Reveal","&Offen zeigen" },

 { "&Generate","&Generiere" },

@@ -348,31 +348,31 @@
 { "nothing to do","Nichts zu tun" },

 { "Sorry, there's nothing to save.\nPlease first add some passwords.","Sorry, es gibt nichts zu speichern.\nBitte erst Passwörter hinzufügen." },

 { "Add new password","Passwort hinzufügen" },

 { "Successfully saved data.","Datei gespeichert." },

 { "Category:","Kategorie:" },

 { "LOCKED","GESPERRT" },

 { "Colors","Farben" },

 { "Alternating background of list views","Abwechselnder Hintergrund für Listen" },

 { "Backup enabled","Backup angeschaltet" },

 { "Use standard backup dir","Standard Backupverzeichnis" },

 { "Number of Backups:","Anzahl der Backups" },

 { "Make backup every ","Mache ein Backup alle " },

 { " days"," Tage" }, 

 { "Creating backup ... please wait ...","Erzeuge Backup ... bitte warten ..." },

 { "Backup Failed!","Backup Problem!" },

 { "Try again now","Versuche jetzt nochmal" },

 { "Try again later","Versuche später nochmal" },

 { "Try again tomorrow","Versuche morgen nochmal" },

 { "Disable backup","Schalte Backup ab" },

 { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },

 { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },

 { "Choose action","Wähle Aktion" },

 { "&Configure PwM/Pi...","Konfiguriere PwM/Pi..." },

 { "Global Settings...","Globale Einstellungen..." },

-{ "","" },

+{ " sec"," Sek" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 { "","" },

 

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
@@ -137,150 +137,155 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   kcfg_hashAlgo->insertItem(i18n("RIPE-MD-160 (160 bit)"));
   kcfg_hashAlgo->insertItem(i18n("Tiger (192 bit)"));
 #endif // CONFIG_PWMANAGER_GCRY
   fileLayout->addWidget( kcfg_hashAlgo,i,1);
   ++i;   
 
   permissionLineEdit = new QLineEdit(filePage);
   QLabel* permissionLineLabel = new QLabel(permissionLineEdit, i18n("Permissions:"), filePage);
   fileLayout->addWidget(permissionLineLabel,i,0);
   fileLayout->addWidget(permissionLineEdit,i,1);
   ++i;
 
   KPrefsWidBool *sb = addWidBool(i18n("Make backup before saving"),
                       &(prefs->mMakeFileBackup),filePage);
   fileLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   // Timeout page
   //////////////////////////////////////////////////////
   QWidget *timeoutPage = new QWidget( this );
   QGridLayout *timeoutLayout = new QGridLayout( timeoutPage, 3, 2);
 
   i = 0;
   pwTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "pwTimeoutSpinBox" );
-  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);
-  timeoutLayout->addMultiCellWidget(timeoutLabel,i, i, 0 ,0);
-  timeoutLayout->addWidget(pwTimeoutSpinBox,i,1);
+  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);
+  timeoutLayout->addMultiCellWidget(timeoutLabel, i, i, 0 ,1);
   ++i;
-
+  timeoutLayout->addMultiCellWidget(pwTimeoutSpinBox,i,i,0,1);
+  ++i;
+  pwTimeoutSpinBox->setSuffix ( i18n(" sec") );
   lockTimeoutSpinBox = new QSpinBox( 0,600,10,timeoutPage, "lockTimeoutSpinBox" );
-  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);
-  timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,0);
-  timeoutLayout->addWidget(lockTimeoutSpinBox,i,1);
+  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);
+  timeoutLayout->addMultiCellWidget(lockTimeoutLabel,i, i, 0 ,1);
+  ++i;
+  timeoutLayout->addMultiCellWidget(lockTimeoutSpinBox,i,i,0,1);
+  lockTimeoutSpinBox->setSuffix ( i18n(" sec") );
   ++i;
 
   sb = addWidBool(i18n("deep-lock on autolock"),
                       &(prefs->mAutoDeeplock),timeoutPage);
   timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
- 
+   sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),timeoutPage);
+  timeoutLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
+  ++i;   
 
   // Autostart page
   //////////////////////////////////////////////////////
   QWidget *autostartPage = new QWidget( this );
   QGridLayout *autostartLayout = new QGridLayout( autostartPage, 3, 2);
 
   i = 0;
 
   autostartLineEdit = new KURLRequester(autostartPage, "autoStartLineEdit");
   QLabel* autostartLineLabel = new QLabel(autostartLineEdit, "Open this file automatically on startup:",autostartPage);
   autostartLayout->addMultiCellWidget(autostartLineLabel,i,i,0,1);
   ++i;
   autostartLayout->addMultiCellWidget(autostartLineEdit,i,i,0,1);
   ++i;
 
   sb = addWidBool(i18n("open deeplocked"),
                       &(prefs->mAutostartDeeplocked),autostartPage);
   autostartLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
 
   // external app page
   //////////////////////////////////////////////////////
   QWidget *externalappPage = new QWidget( this );
   QGridLayout *externalappLayout = new QGridLayout( externalappPage, 3, 2);
 
   i = 0;
 
   browserLineEdit = new QLineEdit(externalappPage);
   QLabel* browserLineLabel = new QLabel(browserLineEdit, i18n("Favourite browser:"), externalappPage);
   externalappLayout->addWidget(browserLineLabel,i,0);
   externalappLayout->addWidget(browserLineEdit,i,1);
   ++i;
 
   xtermLineEdit = new QLineEdit(externalappPage);
   QLabel* xtermLineLabel = new QLabel(xtermLineEdit, i18n("Favourite x-terminal:"), externalappPage);
   externalappLayout->addWidget(xtermLineLabel,i,0);
   externalappLayout->addWidget(xtermLineEdit,i,1);
   ++i;
 
-
+#if 0
   // miscelaneous page
   //////////////////////////////////////////////////////
   QWidget *miscPage = new QWidget( this );
   QGridLayout *miscLayout = new QGridLayout( miscPage, 3, 2);
 
   i = 0;
 
   /*US ENH: PWM/Pi has no tray and con be minimized
   sb = addWidBool(i18n("Show icon in system-tray"),&(prefs->mTray),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
   */
 
   sb = addWidBool(i18n("Open document with passwords unlocked"),&(prefs->mUnlockOnOpen),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   /*US ENH: PWM/Pi has no tray and con be minimized
   sb = addWidBool(i18n("auto-minimize to tray on startup"),&(prefs->mAutoMinimizeOnStart),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   KPrefsWidRadios * minimizeRadio = addWidRadios(i18n("auto-lock on minimize:") ,&(prefs->mMinimizeLock), miscPage);
   minimizeRadio->addRadio(i18n("don't lock"));
   minimizeRadio->addRadio(i18n("normal lock")); 
   minimizeRadio->addRadio(i18n("deep-lock")); 
   miscLayout->addMultiCellWidget( (QWidget*)minimizeRadio->groupBox(),i,i,0,2);
    ++i;   
 
   sb = addWidBool(i18n("KWallet emulation"),&(prefs->mKWalletEmu),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
 
   sb = addWidBool(i18n("Close instead Minimize into tray"),&(prefs->mClose),miscPage);
   miscLayout->addMultiCellWidget(sb->checkBox(), i,i,0,1);
   ++i;   
   */
-
+#endif
 
   tabWidget->addTab( windowStylePage, i18n( "Look && feel" ) );
   tabWidget->addTab( filePage, i18n( "File" ) );
   tabWidget->addTab( timeoutPage, i18n( "Timeout" ) );
   tabWidget->addTab( autostartPage, i18n( "Autostart" ) );
   tabWidget->addTab( externalappPage, i18n( "External apps" ) );
-  tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) );
+  //tabWidget->addTab( miscPage, i18n( "Miscellaneous" ) );
 
 
   connect( permissionLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
   connect( pwTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) );
   connect( lockTimeoutSpinBox, SIGNAL( valueChanged(int) ), this, SLOT( modified() ) );
   connect( autostartLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
   connect( browserLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
   connect( xtermLineEdit, SIGNAL( textChanged(const QString&) ), this, SLOT( modified() ) );
 
 }
 
 
 void PWMConfigWidget::usrReadConfig()
 {
   PWMPrefs* prefs = PWMPrefs::instance();
 
 
   setFilePermissions(prefs->mFilePermissions);
 
   pwTimeoutSpinBox->setValue(prefs->mPwTimeout);
   lockTimeoutSpinBox->setValue(prefs->mLockTimeout);
   autostartLineEdit->setURL(prefs->mAutoStart);
   browserLineEdit->setText(prefs->mBrowserCommand);
   xtermLineEdit->setText(prefs->mXTermCommand);