author | zautrix <zautrix> | 2005-03-03 10:31:59 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-03 10:31:59 (UTC) |
commit | 806a806422872b6f31183267c6b084d425458902 (patch) (unidiff) | |
tree | f36f659d6b595f82c918329a0b07476a2300f6e2 | |
parent | 9e0ceaa58a686fb64f8133ffa9e73866e985a464 (diff) | |
download | kdepimpi-806a806422872b6f31183267c6b084d425458902.zip kdepimpi-806a806422872b6f31183267c6b084d425458902.tar.gz kdepimpi-806a806422872b6f31183267c6b084d425458902.tar.bz2 |
pwmpi fixes
-rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 4 | ||||
-rw-r--r-- | pwmanager/pwmanager/commentbox.cpp | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp | 19 | ||||
-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 |
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 | |||
@@ -261,4 +261,6 @@ | |||
261 | { "Category-list left/top","Kategorien links oben" }, | 261 | { "Category-list left/top","Kategorien links oben" }, |
262 | { "<b>Font for Password entries:</b>","<b>Schrift für Passwort Einträge:</b>" }, | 262 | { "Font for Password entries:","Schrift für Passwort Einträge:" }, |
263 | { "Font for Password summary:","Schrift für Passwort Übersicht:" }, | ||
263 | { "Font:","Schriftart:" }, | 264 | { "Font:","Schriftart:" }, |
265 | { "Summary","Übersicht" }, | ||
264 | { "Compression:","Kompression:" }, | 266 | { "Compression:","Kompression:" }, |
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 | |||
@@ -43,2 +43,3 @@ CommentBox::CommentBox(QWidget *_parentWidget) | |||
43 | mode = mode_notSet; | 43 | mode = mode_notSet; |
44 | setFont( prefs->mViewFont ); | ||
44 | } | 45 | } |
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 | |||
@@ -72,9 +72,6 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
72 | 72 | ||
73 | QLabel* lab = new QLabel(i18n("<b>Font for Password entries:</b>"), windowStylePage); | 73 | QLabel* lab = new QLabel(i18n("Font for Password entries:"), windowStylePage); |
74 | windowStyleLayout->addMultiCellWidget( lab,i,i,0,2); | 74 | windowStyleLayout->addMultiCellWidget( lab,i,i,0,2); |
75 | |||
76 | |||
77 | ++i; | 75 | ++i; |
78 | 76 | KPrefsWidFont *selEntrFont = | |
79 | KPrefsWidFont *selEntrFont = | ||
80 | addWidFont(i18n("Password"),i18n("Font:"), | 77 | addWidFont(i18n("Password"),i18n("Font:"), |
@@ -85,2 +82,14 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n | |||
85 | ++i; | 82 | ++i; |
83 | |||
84 | lab = new QLabel(i18n("Font for Password summary:"), windowStylePage); | ||
85 | windowStyleLayout->addMultiCellWidget( lab,i,i,0,2); | ||
86 | ++i; | ||
87 | selEntrFont = | ||
88 | addWidFont(i18n("Summary"),i18n("Font:"), | ||
89 | &(prefs->mViewFont),windowStylePage); | ||
90 | windowStyleLayout->addWidget(selEntrFont->label(),i,0); | ||
91 | windowStyleLayout->addWidget(selEntrFont->preview(),i,1); | ||
92 | windowStyleLayout->addWidget(selEntrFont->button(),i,2); | ||
93 | ++i; | ||
94 | |||
86 | lab = new QLabel(i18n(""), windowStylePage); | 95 | lab = new QLabel(i18n(""), windowStylePage); |
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 | |||
@@ -36,2 +36,3 @@ ListViewPwM::ListViewPwM(QWidget *parent, const char *name) | |||
36 | //setResizeMode(QListView::AllColumns); | 36 | //setResizeMode(QListView::AllColumns); |
37 | setAllColumnsShowFocus (true ); | ||
37 | } | 38 | } |
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 | |||
@@ -45,2 +45,3 @@ PWMPrefs::PWMPrefs() | |||
45 | addItemFont( "entryFont", &mEntryFont,KGlobalSettings::generalFont()); | 45 | addItemFont( "entryFont", &mEntryFont,KGlobalSettings::generalFont()); |
46 | addItemFont( "viewFont", &mViewFont,KGlobalSettings::generalFont()); | ||
46 | addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT ); | 47 | addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT ); |
@@ -122,2 +123,6 @@ QFont PWMPrefs::confGlobEntryFont() | |||
122 | } | 123 | } |
124 | QFont PWMPrefs::confGlobViewFont() | ||
125 | { | ||
126 | return mViewFont; | ||
127 | } | ||
123 | 128 | ||
@@ -236,2 +241,6 @@ void PWMPrefs::confGlobEntryFont(const QFont &e) | |||
236 | } | 241 | } |
242 | void PWMPrefs::confGlobViewFont(const QFont &e) | ||
243 | { | ||
244 | mViewFont = e; | ||
245 | } | ||
237 | 246 | ||
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 | |||
@@ -75,2 +75,3 @@ public: | |||
75 | QFont confGlobEntryFont(); | 75 | QFont confGlobEntryFont(); |
76 | QFont confGlobViewFont(); | ||
76 | int confGlobPwTimeout(); | 77 | int confGlobPwTimeout(); |
@@ -102,2 +103,3 @@ public: | |||
102 | void confGlobEntryFont(const QFont &e); | 103 | void confGlobEntryFont(const QFont &e); |
104 | void confGlobViewFont(const QFont &e); | ||
103 | void confGlobPwTimeout(int e); | 105 | void confGlobPwTimeout(int e); |
@@ -129,2 +131,3 @@ public: | |||
129 | QFont mEntryFont; | 131 | QFont mEntryFont; |
132 | QFont mViewFont; | ||
130 | int mPwTimeout; | 133 | int mPwTimeout; |
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 | |||
@@ -101,3 +101,3 @@ void PwMViewStyle_0::restoreSettings(PWMPrefs* prefs) | |||
101 | splitter1->setSizes( prefs->mCommentSplitter ); | 101 | splitter1->setSizes( prefs->mCommentSplitter ); |
102 | 102 | commentBox->setFont( prefs->mViewFont ); | |
103 | } | 103 | } |
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 | |||
@@ -155,2 +155,3 @@ void PwMViewStyle_1::restoreSettings(PWMPrefs* prefs) | |||
155 | splitter2->setSizes( prefs->mCommentSplitter ); | 155 | splitter2->setSizes( prefs->mCommentSplitter ); |
156 | commentBox->setFont( prefs->mViewFont ); | ||
156 | 157 | ||