summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-03 10:31:59 (UTC)
committer zautrix <zautrix>2005-03-03 10:31:59 (UTC)
commit806a806422872b6f31183267c6b084d425458902 (patch) (unidiff)
treef36f659d6b595f82c918329a0b07476a2300f6e2
parent9e0ceaa58a686fb64f8133ffa9e73866e985a464 (diff)
downloadkdepimpi-806a806422872b6f31183267c6b084d425458902.zip
kdepimpi-806a806422872b6f31183267c6b084d425458902.tar.gz
kdepimpi-806a806422872b6f31183267c6b084d425458902.tar.bz2
pwmpi fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/pwmanager/germantranslation.txt4
-rw-r--r--pwmanager/pwmanager/commentbox.cpp1
-rw-r--r--pwmanager/pwmanager/kcmconfigs/pwmconfigwidget.cpp19
-rw-r--r--pwmanager/pwmanager/listviewpwm.cpp1
-rw-r--r--pwmanager/pwmanager/pwmprefs.cpp9
-rw-r--r--pwmanager/pwmanager/pwmprefs.h3
-rw-r--r--pwmanager/pwmanager/pwmviewstyle_0.cpp2
-rw-r--r--pwmanager/pwmanager/pwmviewstyle_1.cpp1
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
@@ -259,8 +259,10 @@
259{ "Window-style:","Window-Stil:" }, 259{ "Window-style:","Window-Stil:" },
260{ "Category on top","Kategorien oben" }, 260{ "Category on top","Kategorien oben" },
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:" },
265{ "gzip","gzip" }, 267{ "gzip","gzip" },
266{ "Encryption:","Verschlüsselung:" }, 268{ "Encryption:","Verschlüsselung:" },
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)
41 textDta = 0; 41 textDta = 0;
42 htmlDta = 0; 42 htmlDta = 0;
43 mode = mode_notSet; 43 mode = mode_notSet;
44 setFont( prefs->mViewFont );
44} 45}
45 46
46CommentBox::~CommentBox() 47CommentBox::~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,19 +70,28 @@ PWMConfigWidget::PWMConfigWidget(PWMPrefs *prefs, QWidget *parent, const char *n
70 windowStyleLayout->addMultiCellWidget( (QWidget*)windowStyle->groupBox(),i,i,0,2); 70 windowStyleLayout->addMultiCellWidget( (QWidget*)windowStyle->groupBox(),i,i,0,2);
71 ++i; 71 ++i;
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:"),
81 &(prefs->mEntryFont),windowStylePage); 78 &(prefs->mEntryFont),windowStylePage);
82 windowStyleLayout->addWidget(selEntrFont->label(),i,0); 79 windowStyleLayout->addWidget(selEntrFont->label(),i,0);
83 windowStyleLayout->addWidget(selEntrFont->preview(),i,1); 80 windowStyleLayout->addWidget(selEntrFont->preview(),i,1);
84 windowStyleLayout->addWidget(selEntrFont->button(),i,2); 81 windowStyleLayout->addWidget(selEntrFont->button(),i,2);
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);
87 windowStyleLayout->addMultiCellWidget( lab,i,i,0,2); 96 windowStyleLayout->addMultiCellWidget( lab,i,i,0,2);
88 97
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)
34 : KListView(parent, name) 34 : KListView(parent, name)
35{ 35{
36 //setResizeMode(QListView::AllColumns); 36 //setResizeMode(QListView::AllColumns);
37 setAllColumnsShowFocus (true );
37} 38}
38 39
39bool ListViewPwM::event(QEvent *e) 40bool 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()
43 addItemString( "browserCommand", &mBrowserCommand, "" ); 43 addItemString( "browserCommand", &mBrowserCommand, "" );
44 addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND); 44 addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND);
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 );
47 addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT ); 48 addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT );
48 addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION ); 49 addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION );
@@ -120,6 +121,10 @@ QFont PWMPrefs::confGlobEntryFont()
120{ 121{
121 return mEntryFont; 122 return mEntryFont;
122} 123}
124QFont PWMPrefs::confGlobViewFont()
125{
126 return mViewFont;
127}
123 128
124int PWMPrefs::confGlobPwTimeout() 129int PWMPrefs::confGlobPwTimeout()
125{ 130{
@@ -234,6 +239,10 @@ void PWMPrefs::confGlobEntryFont(const QFont &e)
234{ 239{
235 mEntryFont = e; 240 mEntryFont = e;
236} 241}
242void PWMPrefs::confGlobViewFont(const QFont &e)
243{
244 mViewFont = e;
245}
237 246
238void PWMPrefs::confGlobPwTimeout(int e) 247void PWMPrefs::confGlobPwTimeout(int e)
239{ 248{
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:
73 QString confGlobBrowserCommand(); 73 QString confGlobBrowserCommand();
74 QString confGlobXtermCommand(); 74 QString confGlobXtermCommand();
75 QFont confGlobEntryFont(); 75 QFont confGlobEntryFont();
76 QFont confGlobViewFont();
76 int confGlobPwTimeout(); 77 int confGlobPwTimeout();
77 int confGlobLockTimeout(); 78 int confGlobLockTimeout();
78 int confGlobCompression(); 79 int confGlobCompression();
@@ -100,6 +101,7 @@ public:
100 void confGlobBrowserCommand(const QString &e); 101 void confGlobBrowserCommand(const QString &e);
101 void confGlobXtermCommand(const QString &e); 102 void confGlobXtermCommand(const QString &e);
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);
104 void confGlobLockTimeout(int e); 106 void confGlobLockTimeout(int e);
105 void confGlobCompression(int e); 107 void confGlobCompression(int e);
@@ -127,6 +129,7 @@ public:
127 QString mBrowserCommand; 129 QString mBrowserCommand;
128 QString mXTermCommand; 130 QString mXTermCommand;
129 QFont mEntryFont; 131 QFont mEntryFont;
132 QFont mViewFont;
130 int mPwTimeout; 133 int mPwTimeout;
131 int mLockTimeout; 134 int mLockTimeout;
132 int mCompression; 135 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)
99 //load and store the size of the listviewcolumns 99 //load and store the size of the listviewcolumns
100 lv->restoreLayout(prefs->getConfig(), "listview"); 100 lv->restoreLayout(prefs->getConfig(), "listview");
101 splitter1->setSizes( prefs->mCommentSplitter ); 101 splitter1->setSizes( prefs->mCommentSplitter );
102 102 commentBox->setFont( prefs->mViewFont );
103} 103}
104 104
105//US ENH: I need a place to load the view dependend settings. Eg. splittersize 105//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)
153 lv->restoreLayout(prefs->getConfig(), "listview"); 153 lv->restoreLayout(prefs->getConfig(), "listview");
154 splitter->setSizes( prefs->mCategorySplitter ); 154 splitter->setSizes( prefs->mCategorySplitter );
155 splitter2->setSizes( prefs->mCommentSplitter ); 155 splitter2->setSizes( prefs->mCommentSplitter );
156 commentBox->setFont( prefs->mViewFont );
156 157
157} 158}
158 159