1 files changed, 16 insertions, 11 deletions

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
@@ -158,22 +158,27 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
 
   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
   //////////////////////////////////////////////////////
@@ -214,7 +219,7 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   externalappLayout->addWidget(xtermLineEdit,i,1);
   ++i;
 
-
+#if 0
   // miscelaneous page
   //////////////////////////////////////////////////////
   QWidget *miscPage = new QWidget( this );
@@ -252,14 +257,14 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   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() ) );