-rw-r--r-- | pwmanager/pwmanager/commentbox.cpp | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | 17 | ||||
-rw-r--r-- | pwmanager/pwmanager/listviewpwm.cpp | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmprefs.cpp | 9 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmprefs.h | 3 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmviewstyle_0.cpp | 2 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwmviewstyle_1.cpp | 1 |
7 files changed, 29 insertions, 5 deletions
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 @@ -41,6 +41,7 @@ CommentBox::CommentBox(QWidget *_parentWidget) textDta = 0; htmlDta = 0; mode = mode_notSet; + setFont( prefs->mViewFont ); } CommentBox::~CommentBox() 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 @@ -70,12 +70,9 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n 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 = addWidFont(i18n("Password"),i18n("Font:"), &(prefs->mEntryFont),windowStylePage); @@ -83,6 +80,18 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n 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); 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 @@ -34,6 +34,7 @@ ListViewPwM::ListViewPwM(QWidget *parent, const char *name) : KListView(parent, name) { // setResizeMode(QListView::AllColumns); + setAllColumnsShowFocus (true ); } bool ListViewPwM::event(QEvent *e) 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 @@ -43,6 +43,7 @@ PWMPrefs::PWMPrefs() 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 ); @@ -120,6 +121,10 @@ QFont PWMPrefs::confGlobEntryFont() { return mEntryFont; } +QFont PWMPrefs::confGlobViewFont() +{ + return mViewFont; +} int PWMPrefs::confGlobPwTimeout() { @@ -234,6 +239,10 @@ void PWMPrefs::confGlobEntryFont(const QFont &e) { mEntryFont = e; } +void PWMPrefs::confGlobViewFont(const QFont &e) +{ + mViewFont = e; +} void PWMPrefs::confGlobPwTimeout(int 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 @@ -73,6 +73,7 @@ public: QString confGlobBrowserCommand(); QString confGlobXtermCommand(); QFont confGlobEntryFont(); + QFont confGlobViewFont(); int confGlobPwTimeout(); int confGlobLockTimeout(); int confGlobCompression(); @@ -100,6 +101,7 @@ public: 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); @@ -127,6 +129,7 @@ public: QString mBrowserCommand; QString mXTermCommand; QFont mEntryFont; + QFont mViewFont; int mPwTimeout; int mLockTimeout; int mCompression; 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 @@ -99,7 +99,7 @@ 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 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 @@ -153,6 +153,7 @@ void PwMViewStyle_1::restoreSettings(PWMPrefs* prefs) lv->restoreLayout(prefs->getConfig(), "listview"); splitter->setSizes( prefs->mCategorySplitter ); splitter2->setSizes( prefs->mCommentSplitter ); + commentBox->setFont( prefs->mViewFont ); } |