-rw-r--r-- | kmicromail/koprefs.cpp | 12 | ||||
-rw-r--r-- | kmicromail/koprefs.h | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp index c0200ff..8143b6f 100644 --- a/kmicromail/koprefs.cpp +++ b/kmicromail/koprefs.cpp | |||
@@ -46,83 +46,77 @@ | |||
46 | #include "mainwindow.h" | 46 | #include "mainwindow.h" |
47 | 47 | ||
48 | 48 | ||
49 | KOPrefs *KOPrefs::mInstance = 0; | 49 | KOPrefs *KOPrefs::mInstance = 0; |
50 | static KStaticDeleter<KOPrefs> insd; | 50 | static KStaticDeleter<KOPrefs> insd; |
51 | 51 | ||
52 | KOPrefs::KOPrefs() : | 52 | KOPrefs::KOPrefs() : |
53 | KPimPrefs("kopiemailrc") | 53 | KPimPrefs("kopiemailrc") |
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() |
126 | { | 120 | { |
127 | return config(); | 121 | return config(); |
128 | } | 122 | } |
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h index c42d787..a47642b 100644 --- a/kmicromail/koprefs.h +++ b/kmicromail/koprefs.h | |||
@@ -31,51 +31,49 @@ class KConfig; | |||
31 | class QFont; | 31 | class QFont; |
32 | class QColor; | 32 | class QColor; |
33 | class QStringList; | 33 | class QStringList; |
34 | 34 | ||
35 | class KOPrefs : public KPimPrefs | 35 | class KOPrefs : public KPimPrefs |
36 | { | 36 | { |
37 | public: | 37 | public: |
38 | virtual ~KOPrefs(); | 38 | virtual ~KOPrefs(); |
39 | 39 | ||
40 | /** Get instance of KOPrefs. It is made sure that there is only one | 40 | /** Get instance of KOPrefs. It is made sure that there is only one |
41 | instance. */ | 41 | instance. */ |
42 | static KOPrefs *instance(); | 42 | static KOPrefs *instance(); |
43 | 43 | ||
44 | /** Set preferences to default values */ | 44 | /** Set preferences to default values */ |
45 | void usrSetDefaults(); | 45 | void usrSetDefaults(); |
46 | 46 | ||
47 | /** Read preferences from config file */ | 47 | /** Read preferences from config file */ |
48 | void usrReadConfig(); | 48 | void usrReadConfig(); |
49 | 49 | ||
50 | /** Write preferences to config file */ | 50 | /** Write preferences to config file */ |
51 | void usrWriteConfig(); | 51 | void usrWriteConfig(); |
52 | void setCategoryDefaults(){;}; | 52 | void setCategoryDefaults(){;}; |
53 | 53 | ||
54 | protected: | 54 | protected: |
55 | void setTimeZoneIdDefault(); | ||
56 | 55 | ||
57 | /** Fill empty mail fields with default values. */ | 56 | /** Fill empty mail fields with default values. */ |
58 | void fillMailDefaults(); | 57 | void fillMailDefaults(); |
59 | 58 | ||
60 | private: | 59 | private: |
61 | /** Constructor disabled for public. Use instance() to create a KOPrefs | 60 | /** Constructor disabled for public. Use instance() to create a KOPrefs |
62 | object. */ | 61 | object. */ |
63 | KOPrefs(); | 62 | KOPrefs(); |
64 | 63 | ||
65 | static KOPrefs *mInstance; | 64 | static KOPrefs *mInstance; |
66 | QDict<QString> *mLocaleDict; | 65 | QDict<QString> *mLocaleDict; |
67 | public: | 66 | public: |
68 | // preferences data | 67 | // preferences data |
69 | KConfig* getConfig(); | 68 | KConfig* getConfig(); |
70 | QFont mAppFont; | 69 | QFont mAppFont; |
71 | QFont mComposeFont; | 70 | QFont mComposeFont; |
72 | QFont mReadFont; | 71 | QFont mReadFont; |
73 | QFont mTimeZoneId; | ||
74 | QString mName; | 72 | QString mName; |
75 | QString mEmail; | 73 | QString mEmail; |
76 | bool mSendLater, mViewAsHtml, mUseKapi; | 74 | bool mSendLater, mViewAsHtml, mUseKapi; |
77 | private: | 75 | private: |
78 | 76 | ||
79 | }; | 77 | }; |
80 | 78 | ||
81 | #endif | 79 | #endif |