pwmpi fixes

8 files changed, 33 insertions, 7 deletions

diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index adf288b..a63be31 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -256,14 +256,16 @@
 { "<LOCKED>","<GESPERRT>" },

 { "To unlock click the icon on the left.","Zum Entsperren auf linkes Icon klicken." },

 { "PwManager","PwManager" },

 { "Window-style:","Window-Stil:" },

 { "Category on top","Kategorien oben" },

 { "Category-list left/top","Kategorien links oben" },

-{ "<b>Font for Password entries:</b>","<b>Schrift für Passwort Einträge:</b>" },

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

diff --git a/pwmanager/pwmanager/commentbox.cpp b/pwmanager/pwmanager/commentbox.cpp
index 0f32561..51f88b2 100644
--- a/pwmanager/pwmanager/commentbox.cpp
+++ b/pwmanager/pwmanager/commentbox.cpp
@@ -38,12 +38,13 @@ CommentBox::CommentBox(QWidget *_parentWidget)
 {
 	PWM_ASSERT(_parentWidget);
 	parentWidget = _parentWidget;
 	textDta = 0;
 	htmlDta = 0;
 	mode = mode_notSet;
+    setFont( prefs->mViewFont );
 }
 
 CommentBox::~CommentBox()
 {
 	clearText();
 	clearHtml();
diff --git a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
index a8696ea..c1ca536 100644
--- a/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
+++ b/pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp
@@ -67,25 +67,34 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
   KPrefsWidRadios * windowStyle = addWidRadios(i18n("Window-style:") ,&(prefs->mMainViewStyle), windowStylePage);
   windowStyle->addRadio(i18n("Category on top"));
   windowStyle->addRadio(i18n("Category-list left/top")); 
   windowStyleLayout->addMultiCellWidget( (QWidget*)windowStyle->groupBox(),i,i,0,2);
    ++i;   
    
-   QLabel* lab = new QLabel(i18n("<b>Font for Password entries:</b>"), windowStylePage);
+   QLabel* lab = new QLabel(i18n("Font for Password entries:"), windowStylePage);
    windowStyleLayout->addMultiCellWidget( lab,i,i,0,2);
-   
-
    ++i;
-  
-  KPrefsWidFont *selEntrFont =
+    KPrefsWidFont *selEntrFont =
       addWidFont(i18n("Password"),i18n("Font:"),
                  &(prefs->mEntryFont),windowStylePage);
   windowStyleLayout->addWidget(selEntrFont->label(),i,0);
   windowStyleLayout->addWidget(selEntrFont->preview(),i,1);
   windowStyleLayout->addWidget(selEntrFont->button(),i,2);
   ++i;
+
+ lab = new QLabel(i18n("Font for Password summary:"), windowStylePage);
+   windowStyleLayout->addMultiCellWidget( lab,i,i,0,2);
+   ++i;
+    selEntrFont =
+      addWidFont(i18n("Summary"),i18n("Font:"),
+                 &(prefs->mViewFont),windowStylePage);
+  windowStyleLayout->addWidget(selEntrFont->label(),i,0);
+  windowStyleLayout->addWidget(selEntrFont->preview(),i,1);
+  windowStyleLayout->addWidget(selEntrFont->button(),i,2);
+  ++i;
+
   lab = new QLabel(i18n(""), windowStylePage);
    windowStyleLayout->addMultiCellWidget( lab,i,i,0,2);
 
   // File page
   //////////////////////////////////////////////////////
   QWidget *filePage = new QWidget( this );
diff --git a/pwmanager/pwmanager/listviewpwm.cpp b/pwmanager/pwmanager/listviewpwm.cpp
index 9f351d6..85e788c 100644
--- a/pwmanager/pwmanager/listviewpwm.cpp
+++ b/pwmanager/pwmanager/listviewpwm.cpp
@@ -31,12 +31,13 @@
 #endif 
 
 ListViewPwM::ListViewPwM(QWidget *parent, const char *name)
  : KListView(parent, name)
 {
 //	setResizeMode(QListView::AllColumns);
+  setAllColumnsShowFocus (true );
 }
 
 bool ListViewPwM::event(QEvent *e)
 {
 	if (e->type() == QEvent::LayoutHint)
 		emit layoutChanged();
diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp
index 31fb2e0..444186c 100644
--- a/pwmanager/pwmanager/pwmprefs.cpp
+++ b/pwmanager/pwmanager/pwmprefs.cpp
@@ -40,12 +40,13 @@ PWMPrefs::PWMPrefs()
   KPrefs::setCurrentGroup( "Global" );
 
   addItemString( "autoStart", &mAutoStart, "" );
   addItemString( "browserCommand", &mBrowserCommand, "" );
   addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND);
   addItemFont( "entryFont", &mEntryFont,KGlobalSettings::generalFont());
+  addItemFont( "viewFont", &mViewFont,KGlobalSettings::generalFont());
   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 );
@@ -117,12 +118,16 @@ QString PWMPrefs::confGlobXtermCommand()
 }
 
 QFont PWMPrefs::confGlobEntryFont()
 {
   return mEntryFont;
 }
+QFont PWMPrefs::confGlobViewFont()
+{
+  return mViewFont;
+}
 
 int PWMPrefs::confGlobPwTimeout()
 {
   return mPwTimeout;
 }
 
@@ -231,12 +236,16 @@ void PWMPrefs::confGlobXtermCommand(const QString &e)
 }
 
 void PWMPrefs::confGlobEntryFont(const QFont &e)
 {
   mEntryFont = e;
 }
+void PWMPrefs::confGlobViewFont(const QFont &e)
+{
+  mViewFont = e;
+}
 
 void PWMPrefs::confGlobPwTimeout(int e)
 {
   mPwTimeout = e;
 }
 
diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h
index 5b8f9d8..1f6a35c 100644
--- a/pwmanager/pwmanager/pwmprefs.h
+++ b/pwmanager/pwmanager/pwmprefs.h
@@ -70,12 +70,13 @@ public:
 	/* functions for reading the configuration settings */
 	/* GLOBAL */
 	QString confGlobAutoStart();
 	QString confGlobBrowserCommand();
 	QString confGlobXtermCommand();
 	QFont confGlobEntryFont();
+	QFont confGlobViewFont();
 	int confGlobPwTimeout();
 	int confGlobLockTimeout();
 	int confGlobCompression();
 	int confGlobCryptAlgo();
 	int confGlobHashAlgo();
 	int confGlobFilePermissions();
@@ -97,12 +98,13 @@ 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 confGlobViewFont(const QFont &e);
 	void confGlobPwTimeout(int e);
 	void confGlobLockTimeout(int e);
 	void confGlobCompression(int e);
 	void confGlobCryptAlgo(int e);
 	void confGlobHashAlgo(int e);
 
@@ -124,12 +126,13 @@ public:
 
 
   QString mAutoStart;
   QString mBrowserCommand;
   QString mXTermCommand;
   QFont mEntryFont;
+  QFont mViewFont;
   int mPwTimeout;
   int mLockTimeout;
   int mCompression;
   int mCryptAlgo;
   int mHashAlgo;
   int mFilePermissions;
diff --git a/pwmanager/pwmanager/pwmviewstyle_0.cpp b/pwmanager/pwmanager/pwmviewstyle_0.cpp
index 1453d03..1fc8a34 100644
--- a/pwmanager/pwmanager/pwmviewstyle_0.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_0.cpp
@@ -96,13 +96,13 @@ void PwMViewStyle_0::selectCategory(const QString &cat)
 //US ENH: I need a place to load the view dependend settings. Eg. splittersize
 void PwMViewStyle_0::restoreSettings(PWMPrefs* prefs)
 {
   //load and store the size of the listviewcolumns
   lv->restoreLayout(prefs->getConfig(), "listview");
   splitter1->setSizes( prefs->mCommentSplitter );
-
+  commentBox->setFont( prefs->mViewFont );
 }
 
 //US ENH: I need a place to load the view dependend settings. Eg. splittersize
 void PwMViewStyle_0::saveSettings(PWMPrefs* prefs)
 {
   //store the size of the listviewcolumns
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp
index 27ad40e..4a7ffd7 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp
@@ -150,12 +150,13 @@ void PwMViewStyle_1::selectCategory(const QString &cat)
 void PwMViewStyle_1::restoreSettings(PWMPrefs* prefs)
 {
   //load and store the size of the listviewcolumns
   lv->restoreLayout(prefs->getConfig(), "listview");
   splitter->setSizes( prefs->mCategorySplitter );
   splitter2->setSizes( prefs->mCommentSplitter );
+  commentBox->setFont( prefs->mViewFont );
 
 }
 
 //US ENH: I need a place to load the view dependend settings. Eg. splittersize
 void PwMViewStyle_1::saveSettings(PWMPrefs* prefs)
 {