-rw-r--r-- | kmicromail/koprefs.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp index c0200ff..8143b6f 100644 --- a/kmicromail/koprefs.cpp +++ b/kmicromail/koprefs.cpp | |||
@@ -54,72 +54,66 @@ KOPrefs::KOPrefs() : | |||
54 | { | 54 | { |
55 | mAppFont = QFont("helvetica",12); | 55 | mAppFont = QFont("helvetica",12); |
56 | mComposeFont = QFont("helvetica",12); | 56 | mComposeFont = QFont("helvetica",12); |
57 | mReadFont = QFont("helvetica",12); | 57 | mReadFont = QFont("helvetica",12); |
58 | 58 | ||
59 | KPrefs::setCurrentGroup("General"); | 59 | KPrefs::setCurrentGroup("General"); |
60 | addItemString("SenderName",&mName,i18n ("Please set at") ); | 60 | addItemString("SenderName",&mName,i18n ("Please set at") ); |
61 | addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") ); | 61 | addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") ); |
62 | addItemBool("ViewMailAsHtml",&mViewAsHtml,false); | 62 | addItemBool("ViewMailAsHtml",&mViewAsHtml,false); |
63 | addItemBool("SendMailLater",&mSendLater,true); | 63 | addItemBool("SendMailLater",&mSendLater,true); |
64 | addItemBool("UseKapi",&mUseKapi,false); | 64 | addItemBool("UseKapi",&mUseKapi,false); |
65 | 65 | ||
66 | KPrefs::setCurrentGroup("Fonts"); | 66 | KPrefs::setCurrentGroup("Fonts"); |
67 | addItemFont("Application Font",&mAppFont); | 67 | addItemFont("Application Font",&mAppFont); |
68 | addItemFont("Compose Font",&mComposeFont); | 68 | addItemFont("Compose Font",&mComposeFont); |
69 | addItemFont("Read Font",&mReadFont); | 69 | addItemFont("Read Font",&mReadFont); |
70 | 70 | fillMailDefaults(); | |
71 | 71 | ||
72 | } | 72 | } |
73 | 73 | ||
74 | 74 | ||
75 | KOPrefs::~KOPrefs() | 75 | KOPrefs::~KOPrefs() |
76 | { | 76 | { |
77 | if (mInstance == this) | 77 | if (mInstance == this) |
78 | mInstance = insd.setObject(0); | 78 | mInstance = insd.setObject(0); |
79 | 79 | ||
80 | } | 80 | } |
81 | 81 | ||
82 | 82 | ||
83 | KOPrefs *KOPrefs::instance() | 83 | KOPrefs *KOPrefs::instance() |
84 | { | 84 | { |
85 | if (!mInstance) { | 85 | if (!mInstance) { |
86 | mInstance = insd.setObject(new KOPrefs()); | 86 | mInstance = insd.setObject(new KOPrefs()); |
87 | mInstance->readConfig(); | 87 | mInstance->readConfig(); |
88 | } | 88 | } |
89 | 89 | ||
90 | return mInstance; | 90 | return mInstance; |
91 | } | 91 | } |
92 | 92 | ||
93 | void KOPrefs::usrSetDefaults() | 93 | void KOPrefs::usrSetDefaults() |
94 | { | 94 | { |
95 | 95 | ||
96 | } | 96 | } |
97 | 97 | ||
98 | void KOPrefs::fillMailDefaults() | 98 | void KOPrefs::fillMailDefaults() |
99 | { | 99 | { |
100 | if (mName.isEmpty()) mName = i18n("Anonymous"); | 100 | if (mName.isEmpty()) mName = i18n ("Please set at"); |
101 | if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere"); | 101 | if (mEmail.isEmpty()) mEmail = i18n ("Settings@General TAB"); |
102 | } | 102 | } |
103 | 103 | ||
104 | void KOPrefs::setTimeZoneIdDefault() | ||
105 | { | ||
106 | mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)"); | ||
107 | } | ||
108 | |||
109 | |||
110 | void KOPrefs::usrReadConfig() | 104 | void KOPrefs::usrReadConfig() |
111 | { | 105 | { |
112 | 106 | ||
113 | KPimPrefs::usrReadConfig(); | 107 | KPimPrefs::usrReadConfig(); |
114 | } | 108 | } |
115 | 109 | ||
116 | 110 | ||
117 | void KOPrefs::usrWriteConfig() | 111 | void KOPrefs::usrWriteConfig() |
118 | { | 112 | { |
119 | 113 | ||
120 | KPimPrefs::usrWriteConfig(); | 114 | KPimPrefs::usrWriteConfig(); |
121 | } | 115 | } |
122 | 116 | ||
123 | 117 | ||
124 | 118 | ||
125 | KConfig* KOPrefs::getConfig() | 119 | KConfig* KOPrefs::getConfig() |