author | zautrix <zautrix> | 2004-09-10 15:30:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-10 15:30:01 (UTC) |
commit | 4af018e98a29e859df1b28a437c4965bb9676394 (patch) (unidiff) | |
tree | ac71fa15fdd2eca263730493de378482952d8c80 /kmicromail | |
parent | 14056eb4ec076bc243dcb9f600999eb437fb8afd (diff) | |
download | kdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.zip kdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.tar.gz kdepimpi-4af018e98a29e859df1b28a437c4965bb9676394.tar.bz2 |
path fixes for kopiemail
-rw-r--r-- | kmicromail/kmicromail.desktop | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 2 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/settings.cpp | 20 | ||||
-rw-r--r-- | kmicromail/main.cpp | 8 | ||||
-rw-r--r-- | kmicromail/mainwindow.cpp | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/kmicromail/kmicromail.desktop b/kmicromail/kmicromail.desktop index a23420a..e3efcc6 100644 --- a/kmicromail/kmicromail.desktop +++ b/kmicromail/kmicromail.desktop | |||
@@ -1,15 +1,15 @@ | |||
1 | [Desktop Entry] | 1 | [Desktop Entry] |
2 | CanFastload=1 | 2 | CanFastload=1 |
3 | Comment=OM/PI | 3 | Comment=OM/PI |
4 | Comment[de]=KM/PI | 4 | Comment[de]=KM/PI |
5 | Display=640x480/144dpi,480x640/144dpi | 5 | Display=640x480/144dpi,480x640/144dpi |
6 | Exec=ompi | 6 | Exec=ompi |
7 | GenericName= | 7 | GenericName= |
8 | GenericName[de]= | 8 | GenericName[de]= |
9 | Icon=kdepim/kmicromail/kmicromail | 9 | Icon=kdepim/kopiemail/kmicromail |
10 | MimeType= | 10 | MimeType= |
11 | Name=OM/Pi | 11 | Name=OM/Pi |
12 | StartupNotify=true | 12 | StartupNotify=true |
13 | Terminal=false | 13 | Terminal=false |
14 | TerminalOptions= | 14 | TerminalOptions= |
15 | Type=Application | 15 | Type=Application |
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index 3b0ca1f..cef4e97 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp | |||
@@ -33,193 +33,193 @@ AbstractMail* AbstractMail::getWrapper(NNTPaccount *a) | |||
33 | return new NNTPwrapper(a); | 33 | return new NNTPwrapper(a); |
34 | } | 34 | } |
35 | 35 | ||
36 | AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name) | 36 | AbstractMail* AbstractMail::getWrapper(const QString&a,const QString&name) |
37 | { | 37 | { |
38 | return new MHwrapper(a,name); | 38 | return new MHwrapper(a,name); |
39 | } | 39 | } |
40 | 40 | ||
41 | AbstractMail* AbstractMail::getWrapper(Account*a) | 41 | AbstractMail* AbstractMail::getWrapper(Account*a) |
42 | { | 42 | { |
43 | if (!a) return 0; | 43 | if (!a) return 0; |
44 | switch (a->getType()) { | 44 | switch (a->getType()) { |
45 | case MAILLIB::A_IMAP: | 45 | case MAILLIB::A_IMAP: |
46 | return new IMAPwrapper((IMAPaccount*)a); | 46 | return new IMAPwrapper((IMAPaccount*)a); |
47 | break; | 47 | break; |
48 | case MAILLIB::A_POP3: | 48 | case MAILLIB::A_POP3: |
49 | return new POP3wrapper((POP3account*)a); | 49 | return new POP3wrapper((POP3account*)a); |
50 | break; | 50 | break; |
51 | case MAILLIB::A_NNTP: | 51 | case MAILLIB::A_NNTP: |
52 | return new NNTPwrapper((NNTPaccount*)a); | 52 | return new NNTPwrapper((NNTPaccount*)a); |
53 | break; | 53 | break; |
54 | default: | 54 | default: |
55 | return 0; | 55 | return 0; |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) | 59 | encodedString* AbstractMail::decode_String(const encodedString*text,const QString&enc) |
60 | { | 60 | { |
61 | // odebug << "Decode string start" << oendl; | 61 | // odebug << "Decode string start" << oendl; |
62 | char*result_text; | 62 | char*result_text; |
63 | size_t index = 0; | 63 | size_t index = 0; |
64 | /* reset for recursive use! */ | 64 | /* reset for recursive use! */ |
65 | size_t target_length = 0; | 65 | size_t target_length = 0; |
66 | result_text = 0; | 66 | result_text = 0; |
67 | int mimetype = MAILMIME_MECHANISM_7BIT; | 67 | int mimetype = MAILMIME_MECHANISM_7BIT; |
68 | if (enc.lower()=="quoted-printable") { | 68 | if (enc.lower()=="quoted-printable") { |
69 | mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; | 69 | mimetype = MAILMIME_MECHANISM_QUOTED_PRINTABLE; |
70 | } else if (enc.lower()=="base64") { | 70 | } else if (enc.lower()=="base64") { |
71 | mimetype = MAILMIME_MECHANISM_BASE64; | 71 | mimetype = MAILMIME_MECHANISM_BASE64; |
72 | } else if (enc.lower()=="8bit") { | 72 | } else if (enc.lower()=="8bit") { |
73 | mimetype = MAILMIME_MECHANISM_8BIT; | 73 | mimetype = MAILMIME_MECHANISM_8BIT; |
74 | } else if (enc.lower()=="binary") { | 74 | } else if (enc.lower()=="binary") { |
75 | mimetype = MAILMIME_MECHANISM_BINARY; | 75 | mimetype = MAILMIME_MECHANISM_BINARY; |
76 | } | 76 | } |
77 | 77 | ||
78 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, | 78 | int err = mailmime_part_parse(text->Content(),text->Length(),&index,mimetype, |
79 | &result_text,&target_length); | 79 | &result_text,&target_length); |
80 | 80 | ||
81 | encodedString* result = new encodedString(); | 81 | encodedString* result = new encodedString(); |
82 | if (err == MAILIMF_NO_ERROR) { | 82 | if (err == MAILIMF_NO_ERROR) { |
83 | result->setContent(result_text,target_length); | 83 | result->setContent(result_text,target_length); |
84 | } | 84 | } |
85 | //odebug << "Decode string finished" << oendl; | 85 | //odebug << "Decode string finished" << oendl; |
86 | return result; | 86 | return result; |
87 | } | 87 | } |
88 | 88 | ||
89 | QString AbstractMail::convert_String(const char*text) | 89 | QString AbstractMail::convert_String(const char*text) |
90 | { | 90 | { |
91 | //size_t index = 0; | 91 | //size_t index = 0; |
92 | char*res = 0; | 92 | char*res = 0; |
93 | int err = MAILIMF_NO_ERROR; | 93 | int err = MAILIMF_NO_ERROR; |
94 | 94 | ||
95 | QString result(text); | 95 | QString result(text); |
96 | 96 | ||
97 | /* due a bug in libetpan it isn't usable this moment */ | 97 | /* due a bug in libetpan it isn't usable this moment */ |
98 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", | 98 | /* int err = mailmime_encoded_phrase_parse("iso-8859-1", |
99 | text, strlen(text),&index, "iso-8859-1",&res);*/ | 99 | text, strlen(text),&index, "iso-8859-1",&res);*/ |
100 | //odebug << "Input: " << text << "" << oendl; | 100 | //odebug << "Input: " << text << "" << oendl; |
101 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { | 101 | if (err == MAILIMF_NO_ERROR && res && strlen(res)) { |
102 | // result = QString(res); | 102 | // result = QString(res); |
103 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; | 103 | // odebug << "Res: " << res << ", length: " << strlen(res) << "" << oendl; |
104 | } | 104 | } |
105 | if (res) free(res); | 105 | if (res) free(res); |
106 | return result; | 106 | return result; |
107 | } | 107 | } |
108 | 108 | ||
109 | /* cp & paste from launcher */ | 109 | /* cp & paste from launcher */ |
110 | QString AbstractMail::gen_attachment_id() | 110 | QString AbstractMail::gen_attachment_id() |
111 | { | 111 | { |
112 | QFile file( "/proc/sys/kernel/random/uuid" ); | 112 | QFile file( "/proc/sys/kernel/random/uuid" ); |
113 | if (!file.open(IO_ReadOnly ) ) | 113 | if (!file.open(IO_ReadOnly ) ) |
114 | return QString::null; | 114 | return QString::null; |
115 | 115 | ||
116 | QTextStream stream(&file); | 116 | QTextStream stream(&file); |
117 | 117 | ||
118 | return "{" + stream.read().stripWhiteSpace() + "}"; | 118 | return "{" + stream.read().stripWhiteSpace() + "}"; |
119 | } | 119 | } |
120 | 120 | ||
121 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) | 121 | int AbstractMail::createMbox(const QString&,const FolderP&,const QString& ,bool) |
122 | { | 122 | { |
123 | return 0; | 123 | return 0; |
124 | } | 124 | } |
125 | 125 | ||
126 | QString AbstractMail::defaultLocalfolder() | 126 | QString AbstractMail::defaultLocalfolder() |
127 | { | 127 | { |
128 | // QString f = getenv( "HOME" ); | 128 | // QString f = getenv( "HOME" ); |
129 | QString f = locateLocal( "data", "kmicromail/localmail"); | 129 | QString f = locateLocal( "data", "kopiemail/localmail"); |
130 | // f += "/Applications/opiemail/localmail"; | 130 | // f += "/Applications/opiemail/localmail"; |
131 | return f; | 131 | return f; |
132 | } | 132 | } |
133 | 133 | ||
134 | QString AbstractMail::draftFolder() | 134 | QString AbstractMail::draftFolder() |
135 | { | 135 | { |
136 | return QString("Drafts"); | 136 | return QString("Drafts"); |
137 | } | 137 | } |
138 | 138 | ||
139 | /* temporary - will be removed when implemented in all classes */ | 139 | /* temporary - will be removed when implemented in all classes */ |
140 | void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &) | 140 | void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &) |
141 | { | 141 | { |
142 | } | 142 | } |
143 | void AbstractMail::deleteMailList(const QValueList<RecMailP>&target) | 143 | void AbstractMail::deleteMailList(const QValueList<RecMailP>&target) |
144 | { | 144 | { |
145 | //qDebug("AbstractMail::deleteMailList:: Please reimplement! "); | 145 | //qDebug("AbstractMail::deleteMailList:: Please reimplement! "); |
146 | // this is currently re-implemented in pop3wrapper and imapwrapper | 146 | // this is currently re-implemented in pop3wrapper and imapwrapper |
147 | int iii = 0; | 147 | int iii = 0; |
148 | int count = target.count(); | 148 | int count = target.count(); |
149 | QProgressBar bar( count,0 ); | 149 | QProgressBar bar( count,0 ); |
150 | bar.setCaption (("Removing mails - close to abort!") ); | 150 | bar.setCaption (("Removing mails - close to abort!") ); |
151 | int w = 300; | 151 | int w = 300; |
152 | if ( QApplication::desktop()->width() < 320 ) | 152 | if ( QApplication::desktop()->width() < 320 ) |
153 | w = 220; | 153 | w = 220; |
154 | int h = bar.sizeHint().height() ; | 154 | int h = bar.sizeHint().height() ; |
155 | int dw = QApplication::desktop()->width(); | 155 | int dw = QApplication::desktop()->width(); |
156 | int dh = QApplication::desktop()->height(); | 156 | int dh = QApplication::desktop()->height(); |
157 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 157 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
158 | bar.show(); | 158 | bar.show(); |
159 | int modulo = (count/10)+1; | 159 | int modulo = (count/10)+1; |
160 | int incCounter = 0; | 160 | int incCounter = 0; |
161 | while (iii < count ) { | 161 | while (iii < count ) { |
162 | if ( ! bar.isVisible() ) | 162 | if ( ! bar.isVisible() ) |
163 | return ; | 163 | return ; |
164 | if ( incCounter % modulo == 0 ) | 164 | if ( incCounter % modulo == 0 ) |
165 | bar.setProgress( incCounter ); | 165 | bar.setProgress( incCounter ); |
166 | ++incCounter; | 166 | ++incCounter; |
167 | qApp->processEvents(); | 167 | qApp->processEvents(); |
168 | RecMailP mail = (*target.at( iii )); | 168 | RecMailP mail = (*target.at( iii )); |
169 | deleteMail(mail); | 169 | deleteMail(mail); |
170 | ++iii; | 170 | ++iii; |
171 | } | 171 | } |
172 | } | 172 | } |
173 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, | 173 | void AbstractMail::mvcpAllMails(const FolderP&fromFolder, |
174 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb) | 174 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb) |
175 | { | 175 | { |
176 | QValueList<RecMailP> t; | 176 | QValueList<RecMailP> t; |
177 | listMessages(fromFolder->getName(),t, maxSizeInKb); | 177 | listMessages(fromFolder->getName(),t, maxSizeInKb); |
178 | mvcpMailList( t,targetFolder,targetWrapper,moveit); | 178 | mvcpMailList( t,targetFolder,targetWrapper,moveit); |
179 | 179 | ||
180 | } | 180 | } |
181 | void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, | 181 | void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t, |
182 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) | 182 | const QString&targetFolder,AbstractMail*targetWrapper,bool moveit) |
183 | { | 183 | { |
184 | encodedString*st = 0; | 184 | encodedString*st = 0; |
185 | int iii = 0; | 185 | int iii = 0; |
186 | int count = t.count(); | 186 | int count = t.count(); |
187 | if ( count == 0 ) | 187 | if ( count == 0 ) |
188 | return; | 188 | return; |
189 | 189 | ||
190 | QProgressBar bar( count,0 ); | 190 | QProgressBar bar( count,0 ); |
191 | bar.setCaption (("Copying mails - close to abort!") ); | 191 | bar.setCaption (("Copying mails - close to abort!") ); |
192 | int w = 300; | 192 | int w = 300; |
193 | if ( QApplication::desktop()->width() < 320 ) | 193 | if ( QApplication::desktop()->width() < 320 ) |
194 | w = 220; | 194 | w = 220; |
195 | int h = bar.sizeHint().height() ; | 195 | int h = bar.sizeHint().height() ; |
196 | int dw = QApplication::desktop()->width(); | 196 | int dw = QApplication::desktop()->width(); |
197 | int dh = QApplication::desktop()->height(); | 197 | int dh = QApplication::desktop()->height(); |
198 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 198 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
199 | bar.show(); | 199 | bar.show(); |
200 | int modulo = (count/10)+1; | 200 | int modulo = (count/10)+1; |
201 | int incCounter = 0; | 201 | int incCounter = 0; |
202 | while (iii < count ) { | 202 | while (iii < count ) { |
203 | if ( ! bar.isVisible() ) | 203 | if ( ! bar.isVisible() ) |
204 | return ; | 204 | return ; |
205 | if ( incCounter % modulo == 0 ) | 205 | if ( incCounter % modulo == 0 ) |
206 | bar.setProgress( incCounter ); | 206 | bar.setProgress( incCounter ); |
207 | ++incCounter; | 207 | ++incCounter; |
208 | bar.raise(); | 208 | bar.raise(); |
209 | qApp->processEvents(); | 209 | qApp->processEvents(); |
210 | //qDebug("copy "); | 210 | //qDebug("copy "); |
211 | RecMailP r = (*t.at( iii )); | 211 | RecMailP r = (*t.at( iii )); |
212 | st = fetchRawBody(r); | 212 | st = fetchRawBody(r); |
213 | if (st) { | 213 | if (st) { |
214 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); | 214 | targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder); |
215 | delete st; | 215 | delete st; |
216 | } | 216 | } |
217 | ++iii; | 217 | ++iii; |
218 | } | 218 | } |
219 | bar.hide(); | 219 | bar.hide(); |
220 | if (moveit) { | 220 | if (moveit) { |
221 | deleteMailList( t ); | 221 | deleteMailList( t ); |
222 | //deleteAllMail(fromFolder); | 222 | //deleteAllMail(fromFolder); |
223 | } | 223 | } |
224 | } | 224 | } |
225 | 225 | ||
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp index bdb2a25..b0a539e 100644 --- a/kmicromail/libmailwrapper/settings.cpp +++ b/kmicromail/libmailwrapper/settings.cpp | |||
@@ -1,440 +1,440 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | #include <qdir.h> | 2 | #include <qdir.h> |
3 | 3 | ||
4 | //#include <opie2/odebug.h> | 4 | //#include <opie2/odebug.h> |
5 | #include <qpe/config.h> | 5 | #include <qpe/config.h> |
6 | 6 | ||
7 | #include <kstandarddirs.h> | 7 | #include <kstandarddirs.h> |
8 | #include "settings.h" | 8 | #include "settings.h" |
9 | //#include "defines.h" | 9 | //#include "defines.h" |
10 | 10 | ||
11 | #define IMAP_PORT "143" | 11 | #define IMAP_PORT "143" |
12 | #define IMAP_SSL_PORT "993" | 12 | #define IMAP_SSL_PORT "993" |
13 | #define SMTP_PORT "25" | 13 | #define SMTP_PORT "25" |
14 | #define SMTP_SSL_PORT "465" | 14 | #define SMTP_SSL_PORT "465" |
15 | #define POP3_PORT "110" | 15 | #define POP3_PORT "110" |
16 | #define POP3_SSL_PORT "995" | 16 | #define POP3_SSL_PORT "995" |
17 | #define NNTP_PORT "119" | 17 | #define NNTP_PORT "119" |
18 | #define NNTP_SSL_PORT "563" | 18 | #define NNTP_SSL_PORT "563" |
19 | 19 | ||
20 | 20 | ||
21 | Settings::Settings() | 21 | Settings::Settings() |
22 | : QObject() | 22 | : QObject() |
23 | { | 23 | { |
24 | updateAccounts(); | 24 | updateAccounts(); |
25 | } | 25 | } |
26 | 26 | ||
27 | void Settings::checkDirectory() | 27 | void Settings::checkDirectory() |
28 | { | 28 | { |
29 | qDebug("Settings::checkDirectory() "); | 29 | qDebug("Settings::checkDirectory() "); |
30 | return; | 30 | return; |
31 | locateLocal("data", "kmicromail" ); | 31 | locateLocal("data", "kopiemail" ); |
32 | /* | 32 | /* |
33 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { | 33 | if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) { |
34 | system( "mkdir -p $HOME/Applications/opiemail" ); | 34 | system( "mkdir -p $HOME/Applications/opiemail" ); |
35 | qDebug("$HOME/Applications/opiemail created "); | 35 | qDebug("$HOME/Applications/opiemail created "); |
36 | } | 36 | } |
37 | */ | 37 | */ |
38 | } | 38 | } |
39 | 39 | ||
40 | QList<Account> Settings::getAccounts() | 40 | QList<Account> Settings::getAccounts() |
41 | { | 41 | { |
42 | return accounts; | 42 | return accounts; |
43 | } | 43 | } |
44 | 44 | ||
45 | void Settings::addAccount( Account *account ) | 45 | void Settings::addAccount( Account *account ) |
46 | { | 46 | { |
47 | accounts.append( account ); | 47 | accounts.append( account ); |
48 | } | 48 | } |
49 | 49 | ||
50 | void Settings::delAccount( Account *account ) | 50 | void Settings::delAccount( Account *account ) |
51 | { | 51 | { |
52 | accounts.remove( account ); | 52 | accounts.remove( account ); |
53 | account->remove(); | 53 | account->remove(); |
54 | } | 54 | } |
55 | 55 | ||
56 | void Settings::updateAccounts() | 56 | void Settings::updateAccounts() |
57 | { | 57 | { |
58 | accounts.clear(); | 58 | accounts.clear(); |
59 | QDir dir( locateLocal("data", "kmicromail" ) ); | 59 | QDir dir( locateLocal("data", "kopiemail" ) ); |
60 | QStringList::Iterator it; | 60 | QStringList::Iterator it; |
61 | 61 | ||
62 | QStringList imap = dir.entryList( "imap-*" ); | 62 | QStringList imap = dir.entryList( "imap-*" ); |
63 | for ( it = imap.begin(); it != imap.end(); it++ ) { | 63 | for ( it = imap.begin(); it != imap.end(); it++ ) { |
64 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); | 64 | IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") ); |
65 | accounts.append( account ); | 65 | accounts.append( account ); |
66 | } | 66 | } |
67 | 67 | ||
68 | QStringList pop3 = dir.entryList( "pop3-*" ); | 68 | QStringList pop3 = dir.entryList( "pop3-*" ); |
69 | for ( it = pop3.begin(); it != pop3.end(); it++ ) { | 69 | for ( it = pop3.begin(); it != pop3.end(); it++ ) { |
70 | POP3account *account = new POP3account( (*it).replace(0, 5, "") ); | 70 | POP3account *account = new POP3account( (*it).replace(0, 5, "") ); |
71 | accounts.append( account ); | 71 | accounts.append( account ); |
72 | } | 72 | } |
73 | 73 | ||
74 | QStringList smtp = dir.entryList( "smtp-*" ); | 74 | QStringList smtp = dir.entryList( "smtp-*" ); |
75 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { | 75 | for ( it = smtp.begin(); it != smtp.end(); it++ ) { |
76 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); | 76 | SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") ); |
77 | accounts.append( account ); | 77 | accounts.append( account ); |
78 | } | 78 | } |
79 | 79 | ||
80 | QStringList nntp = dir.entryList( "nntp-*" ); | 80 | QStringList nntp = dir.entryList( "nntp-*" ); |
81 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { | 81 | for ( it = nntp.begin(); it != nntp.end(); it++ ) { |
82 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); | 82 | NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") ); |
83 | accounts.append( account ); | 83 | accounts.append( account ); |
84 | } | 84 | } |
85 | 85 | ||
86 | readAccounts(); | 86 | readAccounts(); |
87 | } | 87 | } |
88 | 88 | ||
89 | void Settings::saveAccounts() | 89 | void Settings::saveAccounts() |
90 | { | 90 | { |
91 | checkDirectory(); | 91 | checkDirectory(); |
92 | Account *it; | 92 | Account *it; |
93 | 93 | ||
94 | for ( it = accounts.first(); it; it = accounts.next() ) { | 94 | for ( it = accounts.first(); it; it = accounts.next() ) { |
95 | it->save(); | 95 | it->save(); |
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | void Settings::readAccounts() | 99 | void Settings::readAccounts() |
100 | { | 100 | { |
101 | checkDirectory(); | 101 | checkDirectory(); |
102 | Account *it; | 102 | Account *it; |
103 | 103 | ||
104 | for ( it = accounts.first(); it; it = accounts.next() ) { | 104 | for ( it = accounts.first(); it; it = accounts.next() ) { |
105 | it->read(); | 105 | it->read(); |
106 | } | 106 | } |
107 | } | 107 | } |
108 | 108 | ||
109 | Account::Account() | 109 | Account::Account() |
110 | { | 110 | { |
111 | accountName = "changeMe"; | 111 | accountName = "changeMe"; |
112 | type = MAILLIB::A_UNDEFINED; | 112 | type = MAILLIB::A_UNDEFINED; |
113 | ssl = false; | 113 | ssl = false; |
114 | connectionType = 1; | 114 | connectionType = 1; |
115 | offline = false; | 115 | offline = false; |
116 | } | 116 | } |
117 | 117 | ||
118 | void Account::remove() | 118 | void Account::remove() |
119 | { | 119 | { |
120 | QFile file( getFileName() ); | 120 | QFile file( getFileName() ); |
121 | file.remove(); | 121 | file.remove(); |
122 | } | 122 | } |
123 | 123 | ||
124 | IMAPaccount::IMAPaccount() | 124 | IMAPaccount::IMAPaccount() |
125 | : Account() | 125 | : Account() |
126 | { | 126 | { |
127 | file = IMAPaccount::getUniqueFileName(); | 127 | file = IMAPaccount::getUniqueFileName(); |
128 | accountName = "New IMAP Account"; | 128 | accountName = "New IMAP Account"; |
129 | ssl = false; | 129 | ssl = false; |
130 | connectionType = 1; | 130 | connectionType = 1; |
131 | type = MAILLIB::A_IMAP; | 131 | type = MAILLIB::A_IMAP; |
132 | port = IMAP_PORT; | 132 | port = IMAP_PORT; |
133 | } | 133 | } |
134 | 134 | ||
135 | IMAPaccount::IMAPaccount( QString filename ) | 135 | IMAPaccount::IMAPaccount( QString filename ) |
136 | : Account() | 136 | : Account() |
137 | { | 137 | { |
138 | file = filename; | 138 | file = filename; |
139 | accountName = "New IMAP Account"; | 139 | accountName = "New IMAP Account"; |
140 | ssl = false; | 140 | ssl = false; |
141 | connectionType = 1; | 141 | connectionType = 1; |
142 | type = MAILLIB::A_IMAP; | 142 | type = MAILLIB::A_IMAP; |
143 | port = IMAP_PORT; | 143 | port = IMAP_PORT; |
144 | } | 144 | } |
145 | 145 | ||
146 | QString IMAPaccount::getUniqueFileName() | 146 | QString IMAPaccount::getUniqueFileName() |
147 | { | 147 | { |
148 | int num = 0; | 148 | int num = 0; |
149 | QString unique; | 149 | QString unique; |
150 | 150 | ||
151 | QDir dir( locateLocal("data", "kmicromail" ) ); | 151 | QDir dir( locateLocal("data", "kopiemail" ) ); |
152 | 152 | ||
153 | QStringList imap = dir.entryList( "imap-*" ); | 153 | QStringList imap = dir.entryList( "imap-*" ); |
154 | do { | 154 | do { |
155 | unique.setNum( num++ ); | 155 | unique.setNum( num++ ); |
156 | } while ( imap.contains( "imap-" + unique ) > 0 ); | 156 | } while ( imap.contains( "imap-" + unique ) > 0 ); |
157 | 157 | ||
158 | return unique; | 158 | return unique; |
159 | } | 159 | } |
160 | 160 | ||
161 | void IMAPaccount::read() | 161 | void IMAPaccount::read() |
162 | { | 162 | { |
163 | Config *conf = new Config( getFileName(), Config::File ); | 163 | Config *conf = new Config( getFileName(), Config::File ); |
164 | conf->setGroup( "IMAP Account" ); | 164 | conf->setGroup( "IMAP Account" ); |
165 | accountName = conf->readEntry( "Account","" ); | 165 | accountName = conf->readEntry( "Account","" ); |
166 | if (accountName.isNull()) accountName = ""; | 166 | if (accountName.isNull()) accountName = ""; |
167 | server = conf->readEntry( "Server","" ); | 167 | server = conf->readEntry( "Server","" ); |
168 | if (server.isNull()) server=""; | 168 | if (server.isNull()) server=""; |
169 | port = conf->readEntry( "Port","" ); | 169 | port = conf->readEntry( "Port","" ); |
170 | if (port.isNull()) port="143"; | 170 | if (port.isNull()) port="143"; |
171 | connectionType = conf->readNumEntry( "ConnectionType" ); | 171 | connectionType = conf->readNumEntry( "ConnectionType" ); |
172 | ssl = conf->readBoolEntry( "SSL",false ); | 172 | ssl = conf->readBoolEntry( "SSL",false ); |
173 | user = conf->readEntry( "User","" ); | 173 | user = conf->readEntry( "User","" ); |
174 | if (user.isNull()) user = ""; | 174 | if (user.isNull()) user = ""; |
175 | password = conf->readEntryCrypt( "Password","" ); | 175 | password = conf->readEntryCrypt( "Password","" ); |
176 | if (password.isNull()) password = ""; | 176 | if (password.isNull()) password = ""; |
177 | prefix = conf->readEntry("MailPrefix",""); | 177 | prefix = conf->readEntry("MailPrefix",""); |
178 | if (prefix.isNull()) prefix = ""; | 178 | if (prefix.isNull()) prefix = ""; |
179 | offline = conf->readBoolEntry("Offline",false); | 179 | offline = conf->readBoolEntry("Offline",false); |
180 | delete conf; | 180 | delete conf; |
181 | } | 181 | } |
182 | 182 | ||
183 | void IMAPaccount::save() | 183 | void IMAPaccount::save() |
184 | { | 184 | { |
185 | qDebug("saving %s ",getFileName().latin1() ); | 185 | qDebug("saving %s ",getFileName().latin1() ); |
186 | Settings::checkDirectory(); | 186 | Settings::checkDirectory(); |
187 | 187 | ||
188 | Config *conf = new Config( getFileName(), Config::File ); | 188 | Config *conf = new Config( getFileName(), Config::File ); |
189 | conf->setGroup( "IMAP Account" ); | 189 | conf->setGroup( "IMAP Account" ); |
190 | conf->writeEntry( "Account", accountName ); | 190 | conf->writeEntry( "Account", accountName ); |
191 | conf->writeEntry( "Server", server ); | 191 | conf->writeEntry( "Server", server ); |
192 | conf->writeEntry( "Port", port ); | 192 | conf->writeEntry( "Port", port ); |
193 | conf->writeEntry( "SSL", ssl ); | 193 | conf->writeEntry( "SSL", ssl ); |
194 | conf->writeEntry( "ConnectionType", connectionType ); | 194 | conf->writeEntry( "ConnectionType", connectionType ); |
195 | conf->writeEntry( "User", user ); | 195 | conf->writeEntry( "User", user ); |
196 | conf->writeEntryCrypt( "Password", password ); | 196 | conf->writeEntryCrypt( "Password", password ); |
197 | conf->writeEntry( "MailPrefix",prefix); | 197 | conf->writeEntry( "MailPrefix",prefix); |
198 | conf->writeEntry( "Offline",offline); | 198 | conf->writeEntry( "Offline",offline); |
199 | conf->write(); | 199 | conf->write(); |
200 | delete conf; | 200 | delete conf; |
201 | } | 201 | } |
202 | 202 | ||
203 | 203 | ||
204 | QString IMAPaccount::getFileName() | 204 | QString IMAPaccount::getFileName() |
205 | { | 205 | { |
206 | return locateLocal("data", "kmicromail" ) +"/imap-" + file; | 206 | return locateLocal("data", "kopiemail" ) +"/imap-" + file; |
207 | } | 207 | } |
208 | 208 | ||
209 | POP3account::POP3account() | 209 | POP3account::POP3account() |
210 | : Account() | 210 | : Account() |
211 | { | 211 | { |
212 | file = POP3account::getUniqueFileName(); | 212 | file = POP3account::getUniqueFileName(); |
213 | accountName = "New POP3 Account"; | 213 | accountName = "New POP3 Account"; |
214 | ssl = false; | 214 | ssl = false; |
215 | connectionType = 1; | 215 | connectionType = 1; |
216 | type = MAILLIB::A_POP3; | 216 | type = MAILLIB::A_POP3; |
217 | port = POP3_PORT; | 217 | port = POP3_PORT; |
218 | } | 218 | } |
219 | 219 | ||
220 | POP3account::POP3account( QString filename ) | 220 | POP3account::POP3account( QString filename ) |
221 | : Account() | 221 | : Account() |
222 | { | 222 | { |
223 | file = filename; | 223 | file = filename; |
224 | accountName = "New POP3 Account"; | 224 | accountName = "New POP3 Account"; |
225 | ssl = false; | 225 | ssl = false; |
226 | connectionType = 1; | 226 | connectionType = 1; |
227 | type = MAILLIB::A_POP3; | 227 | type = MAILLIB::A_POP3; |
228 | port = POP3_PORT; | 228 | port = POP3_PORT; |
229 | } | 229 | } |
230 | 230 | ||
231 | QString POP3account::getUniqueFileName() | 231 | QString POP3account::getUniqueFileName() |
232 | { | 232 | { |
233 | int num = 0; | 233 | int num = 0; |
234 | QString unique; | 234 | QString unique; |
235 | 235 | ||
236 | QDir dir( locateLocal("data", "kmicromail" ) ); | 236 | QDir dir( locateLocal("data", "kopiemail" ) ); |
237 | 237 | ||
238 | QStringList imap = dir.entryList( "pop3-*" ); | 238 | QStringList imap = dir.entryList( "pop3-*" ); |
239 | do { | 239 | do { |
240 | unique.setNum( num++ ); | 240 | unique.setNum( num++ ); |
241 | } while ( imap.contains( "pop3-" + unique ) > 0 ); | 241 | } while ( imap.contains( "pop3-" + unique ) > 0 ); |
242 | 242 | ||
243 | return unique; | 243 | return unique; |
244 | } | 244 | } |
245 | 245 | ||
246 | void POP3account::read() | 246 | void POP3account::read() |
247 | { | 247 | { |
248 | Config *conf = new Config( getFileName(), Config::File ); | 248 | Config *conf = new Config( getFileName(), Config::File ); |
249 | conf->setGroup( "POP3 Account" ); | 249 | conf->setGroup( "POP3 Account" ); |
250 | accountName = conf->readEntry( "Account" ); | 250 | accountName = conf->readEntry( "Account" ); |
251 | server = conf->readEntry( "Server" ); | 251 | server = conf->readEntry( "Server" ); |
252 | port = conf->readEntry( "Port" ); | 252 | port = conf->readEntry( "Port" ); |
253 | ssl = conf->readBoolEntry( "SSL" ); | 253 | ssl = conf->readBoolEntry( "SSL" ); |
254 | connectionType = conf->readNumEntry( "ConnectionType" ); | 254 | connectionType = conf->readNumEntry( "ConnectionType" ); |
255 | user = conf->readEntry( "User" ); | 255 | user = conf->readEntry( "User" ); |
256 | password = conf->readEntryCrypt( "Password" ); | 256 | password = conf->readEntryCrypt( "Password" ); |
257 | offline = conf->readBoolEntry("Offline",false); | 257 | offline = conf->readBoolEntry("Offline",false); |
258 | delete conf; | 258 | delete conf; |
259 | } | 259 | } |
260 | 260 | ||
261 | void POP3account::save() | 261 | void POP3account::save() |
262 | { | 262 | { |
263 | Settings::checkDirectory(); | 263 | Settings::checkDirectory(); |
264 | 264 | ||
265 | Config *conf = new Config( getFileName(), Config::File ); | 265 | Config *conf = new Config( getFileName(), Config::File ); |
266 | conf->setGroup( "POP3 Account" ); | 266 | conf->setGroup( "POP3 Account" ); |
267 | conf->writeEntry( "Account", accountName ); | 267 | conf->writeEntry( "Account", accountName ); |
268 | conf->writeEntry( "Server", server ); | 268 | conf->writeEntry( "Server", server ); |
269 | conf->writeEntry( "Port", port ); | 269 | conf->writeEntry( "Port", port ); |
270 | conf->writeEntry( "SSL", ssl ); | 270 | conf->writeEntry( "SSL", ssl ); |
271 | conf->writeEntry( "ConnectionType", connectionType ); | 271 | conf->writeEntry( "ConnectionType", connectionType ); |
272 | conf->writeEntry( "User", user ); | 272 | conf->writeEntry( "User", user ); |
273 | conf->writeEntryCrypt( "Password", password ); | 273 | conf->writeEntryCrypt( "Password", password ); |
274 | conf->writeEntry( "Offline",offline); | 274 | conf->writeEntry( "Offline",offline); |
275 | conf->write(); | 275 | conf->write(); |
276 | delete conf; | 276 | delete conf; |
277 | } | 277 | } |
278 | 278 | ||
279 | 279 | ||
280 | QString POP3account::getFileName() | 280 | QString POP3account::getFileName() |
281 | { | 281 | { |
282 | return locateLocal("data", "kmicromail" ) +"/pop3-" + file; | 282 | return locateLocal("data", "kopiemail" ) +"/pop3-" + file; |
283 | } | 283 | } |
284 | 284 | ||
285 | SMTPaccount::SMTPaccount() | 285 | SMTPaccount::SMTPaccount() |
286 | : Account() | 286 | : Account() |
287 | { | 287 | { |
288 | file = SMTPaccount::getUniqueFileName(); | 288 | file = SMTPaccount::getUniqueFileName(); |
289 | accountName = "New SMTP Account"; | 289 | accountName = "New SMTP Account"; |
290 | ssl = false; | 290 | ssl = false; |
291 | connectionType = 1; | 291 | connectionType = 1; |
292 | login = false; | 292 | login = false; |
293 | useCC = false; | 293 | useCC = false; |
294 | useBCC = false; | 294 | useBCC = false; |
295 | useReply = false; | 295 | useReply = false; |
296 | type = MAILLIB::A_SMTP; | 296 | type = MAILLIB::A_SMTP; |
297 | port = SMTP_PORT; | 297 | port = SMTP_PORT; |
298 | } | 298 | } |
299 | 299 | ||
300 | SMTPaccount::SMTPaccount( QString filename ) | 300 | SMTPaccount::SMTPaccount( QString filename ) |
301 | : Account() | 301 | : Account() |
302 | { | 302 | { |
303 | file = filename; | 303 | file = filename; |
304 | accountName = "New SMTP Account"; | 304 | accountName = "New SMTP Account"; |
305 | ssl = false; | 305 | ssl = false; |
306 | connectionType = 1; | 306 | connectionType = 1; |
307 | login = false; | 307 | login = false; |
308 | type = MAILLIB::A_SMTP; | 308 | type = MAILLIB::A_SMTP; |
309 | port = SMTP_PORT; | 309 | port = SMTP_PORT; |
310 | } | 310 | } |
311 | 311 | ||
312 | QString SMTPaccount::getUniqueFileName() | 312 | QString SMTPaccount::getUniqueFileName() |
313 | { | 313 | { |
314 | int num = 0; | 314 | int num = 0; |
315 | QString unique; | 315 | QString unique; |
316 | 316 | ||
317 | QDir dir( locateLocal("data", "kmicromail" ) ); | 317 | QDir dir( locateLocal("data", "kopiemail" ) ); |
318 | 318 | ||
319 | QStringList imap = dir.entryList( "smtp-*" ); | 319 | QStringList imap = dir.entryList( "smtp-*" ); |
320 | do { | 320 | do { |
321 | unique.setNum( num++ ); | 321 | unique.setNum( num++ ); |
322 | } while ( imap.contains( "smtp-" + unique ) > 0 ); | 322 | } while ( imap.contains( "smtp-" + unique ) > 0 ); |
323 | 323 | ||
324 | return unique; | 324 | return unique; |
325 | } | 325 | } |
326 | 326 | ||
327 | void SMTPaccount::read() | 327 | void SMTPaccount::read() |
328 | { | 328 | { |
329 | Config *conf = new Config( getFileName(), Config::File ); | 329 | Config *conf = new Config( getFileName(), Config::File ); |
330 | conf->setGroup( "SMTP Account" ); | 330 | conf->setGroup( "SMTP Account" ); |
331 | accountName = conf->readEntry( "Account" ); | 331 | accountName = conf->readEntry( "Account" ); |
332 | server = conf->readEntry( "Server" ); | 332 | server = conf->readEntry( "Server" ); |
333 | port = conf->readEntry( "Port" ); | 333 | port = conf->readEntry( "Port" ); |
334 | ssl = conf->readBoolEntry( "SSL" ); | 334 | ssl = conf->readBoolEntry( "SSL" ); |
335 | connectionType = conf->readNumEntry( "ConnectionType" ); | 335 | connectionType = conf->readNumEntry( "ConnectionType" ); |
336 | login = conf->readBoolEntry( "Login" ); | 336 | login = conf->readBoolEntry( "Login" ); |
337 | user = conf->readEntry( "User" ); | 337 | user = conf->readEntry( "User" ); |
338 | password = conf->readEntryCrypt( "Password" ); | 338 | password = conf->readEntryCrypt( "Password" ); |
339 | delete conf; | 339 | delete conf; |
340 | } | 340 | } |
341 | 341 | ||
342 | void SMTPaccount::save() | 342 | void SMTPaccount::save() |
343 | { | 343 | { |
344 | Settings::checkDirectory(); | 344 | Settings::checkDirectory(); |
345 | 345 | ||
346 | Config *conf = new Config( getFileName(), Config::File ); | 346 | Config *conf = new Config( getFileName(), Config::File ); |
347 | conf->setGroup( "SMTP Account" ); | 347 | conf->setGroup( "SMTP Account" ); |
348 | conf->writeEntry( "Account", accountName ); | 348 | conf->writeEntry( "Account", accountName ); |
349 | conf->writeEntry( "Server", server ); | 349 | conf->writeEntry( "Server", server ); |
350 | conf->writeEntry( "Port", port ); | 350 | conf->writeEntry( "Port", port ); |
351 | conf->writeEntry( "SSL", ssl ); | 351 | conf->writeEntry( "SSL", ssl ); |
352 | conf->writeEntry( "ConnectionType", connectionType ); | 352 | conf->writeEntry( "ConnectionType", connectionType ); |
353 | conf->writeEntry( "Login", login ); | 353 | conf->writeEntry( "Login", login ); |
354 | conf->writeEntry( "User", user ); | 354 | conf->writeEntry( "User", user ); |
355 | conf->writeEntryCrypt( "Password", password ); | 355 | conf->writeEntryCrypt( "Password", password ); |
356 | conf->write(); | 356 | conf->write(); |
357 | delete conf; | 357 | delete conf; |
358 | } | 358 | } |
359 | 359 | ||
360 | 360 | ||
361 | QString SMTPaccount::getFileName() | 361 | QString SMTPaccount::getFileName() |
362 | { | 362 | { |
363 | return locateLocal("data", "kmicromail" ) +"/smtp-" + file; | 363 | return locateLocal("data", "kopiemail" ) +"/smtp-" + file; |
364 | } | 364 | } |
365 | 365 | ||
366 | NNTPaccount::NNTPaccount() | 366 | NNTPaccount::NNTPaccount() |
367 | : Account() | 367 | : Account() |
368 | { | 368 | { |
369 | file = NNTPaccount::getUniqueFileName(); | 369 | file = NNTPaccount::getUniqueFileName(); |
370 | accountName = "New NNTP Account"; | 370 | accountName = "New NNTP Account"; |
371 | ssl = false; | 371 | ssl = false; |
372 | login = false; | 372 | login = false; |
373 | type = MAILLIB::A_NNTP; | 373 | type = MAILLIB::A_NNTP; |
374 | port = NNTP_PORT; | 374 | port = NNTP_PORT; |
375 | } | 375 | } |
376 | 376 | ||
377 | NNTPaccount::NNTPaccount( QString filename ) | 377 | NNTPaccount::NNTPaccount( QString filename ) |
378 | : Account() | 378 | : Account() |
379 | { | 379 | { |
380 | file = filename; | 380 | file = filename; |
381 | accountName = "New NNTP Account"; | 381 | accountName = "New NNTP Account"; |
382 | ssl = false; | 382 | ssl = false; |
383 | login = false; | 383 | login = false; |
384 | type = MAILLIB::A_NNTP; | 384 | type = MAILLIB::A_NNTP; |
385 | port = NNTP_PORT; | 385 | port = NNTP_PORT; |
386 | } | 386 | } |
387 | 387 | ||
388 | QString NNTPaccount::getUniqueFileName() | 388 | QString NNTPaccount::getUniqueFileName() |
389 | { | 389 | { |
390 | int num = 0; | 390 | int num = 0; |
391 | QString unique; | 391 | QString unique; |
392 | 392 | ||
393 | QDir dir( locateLocal("data", "kmicromail" ) ); | 393 | QDir dir( locateLocal("data", "kopiemail" ) ); |
394 | 394 | ||
395 | QStringList imap = dir.entryList( "nntp-*" ); | 395 | QStringList imap = dir.entryList( "nntp-*" ); |
396 | do { | 396 | do { |
397 | unique.setNum( num++ ); | 397 | unique.setNum( num++ ); |
398 | } while ( imap.contains( "nntp-" + unique ) > 0 ); | 398 | } while ( imap.contains( "nntp-" + unique ) > 0 ); |
399 | 399 | ||
400 | return unique; | 400 | return unique; |
401 | } | 401 | } |
402 | 402 | ||
403 | void NNTPaccount::read() | 403 | void NNTPaccount::read() |
404 | { | 404 | { |
405 | Config *conf = new Config( getFileName(), Config::File ); | 405 | Config *conf = new Config( getFileName(), Config::File ); |
406 | conf->setGroup( "NNTP Account" ); | 406 | conf->setGroup( "NNTP Account" ); |
407 | accountName = conf->readEntry( "Account" ); | 407 | accountName = conf->readEntry( "Account" ); |
408 | server = conf->readEntry( "Server" ); | 408 | server = conf->readEntry( "Server" ); |
409 | port = conf->readEntry( "Port" ); | 409 | port = conf->readEntry( "Port" ); |
410 | ssl = conf->readBoolEntry( "SSL" ); | 410 | ssl = conf->readBoolEntry( "SSL" ); |
411 | login = conf->readBoolEntry( "Login" ); | 411 | login = conf->readBoolEntry( "Login" ); |
412 | user = conf->readEntry( "User" ); | 412 | user = conf->readEntry( "User" ); |
413 | password = conf->readEntryCrypt( "Password" ); | 413 | password = conf->readEntryCrypt( "Password" ); |
414 | subscribedGroups = conf->readListEntry( "Subscribed", ',' ); | 414 | subscribedGroups = conf->readListEntry( "Subscribed", ',' ); |
415 | delete conf; | 415 | delete conf; |
416 | } | 416 | } |
417 | 417 | ||
418 | void NNTPaccount::save() | 418 | void NNTPaccount::save() |
419 | { | 419 | { |
420 | Settings::checkDirectory(); | 420 | Settings::checkDirectory(); |
421 | 421 | ||
422 | Config *conf = new Config( getFileName(), Config::File ); | 422 | Config *conf = new Config( getFileName(), Config::File ); |
423 | conf->setGroup( "NNTP Account" ); | 423 | conf->setGroup( "NNTP Account" ); |
424 | conf->writeEntry( "Account", accountName ); | 424 | conf->writeEntry( "Account", accountName ); |
425 | conf->writeEntry( "Server", server ); | 425 | conf->writeEntry( "Server", server ); |
426 | conf->writeEntry( "Port", port ); | 426 | conf->writeEntry( "Port", port ); |
427 | conf->writeEntry( "SSL", ssl ); | 427 | conf->writeEntry( "SSL", ssl ); |
428 | conf->writeEntry( "Login", login ); | 428 | conf->writeEntry( "Login", login ); |
429 | conf->writeEntry( "User", user ); | 429 | conf->writeEntry( "User", user ); |
430 | conf->writeEntryCrypt( "Password", password ); | 430 | conf->writeEntryCrypt( "Password", password ); |
431 | conf->writeEntry( "Subscribed" , subscribedGroups, ',' ); | 431 | conf->writeEntry( "Subscribed" , subscribedGroups, ',' ); |
432 | conf->write(); | 432 | conf->write(); |
433 | delete conf; | 433 | delete conf; |
434 | } | 434 | } |
435 | 435 | ||
436 | 436 | ||
437 | QString NNTPaccount::getFileName() | 437 | QString NNTPaccount::getFileName() |
438 | { | 438 | { |
439 | return locateLocal("data", "kmicromail" ) +"/nntp-" + file; | 439 | return locateLocal("data", "kopiemail" ) +"/nntp-" + file; |
440 | } | 440 | } |
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp index 30637e2..db29ff3 100644 --- a/kmicromail/main.cpp +++ b/kmicromail/main.cpp | |||
@@ -1,61 +1,61 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | 2 | ||
3 | 3 | ||
4 | #ifndef DESKTOP_VERSION | 4 | #ifndef DESKTOP_VERSION |
5 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
6 | #include <libkdepim/externalapphandler.h> | 6 | #include <libkdepim/externalapphandler.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #else | 8 | #else |
9 | #include <qapplication.h> | 9 | #include <qapplication.h> |
10 | #include <qstring.h> | 10 | #include <qstring.h> |
11 | #include <qwindowsstyle.h> | 11 | #include <qwindowsstyle.h> |
12 | #include <qplatinumstyle.h> | 12 | #include <qplatinumstyle.h> |
13 | #include <qsgistyle.h> | 13 | #include <qsgistyle.h> |
14 | #endif | 14 | #endif |
15 | #include "opiemail.h" | 15 | #include "opiemail.h" |
16 | #include <qdir.h> | 16 | #include <qdir.h> |
17 | #include <kstandarddirs.h> | 17 | #include <kstandarddirs.h> |
18 | #include <kglobal.h> | 18 | #include <kglobal.h> |
19 | #include <stdio.h> | 19 | #include <stdio.h> |
20 | #include "mainwindow.h" | 20 | #include "mainwindow.h" |
21 | 21 | ||
22 | //using namespace Opie::Core; | 22 | //using namespace Opie::Core; |
23 | int main( int argc, char **argv ) { | 23 | int main( int argc, char **argv ) { |
24 | 24 | ||
25 | #ifndef DESKTOP_VERSION | 25 | #ifndef DESKTOP_VERSION |
26 | QPEApplication a( argc, argv ); | 26 | QPEApplication a( argc, argv ); |
27 | a.setKeepRunning (); | 27 | a.setKeepRunning (); |
28 | #else | 28 | #else |
29 | QApplication a( argc, argv ); | 29 | QApplication a( argc, argv ); |
30 | QApplication::setStyle( new QPlatinumStyle ()); | 30 | QApplication::setStyle( new QPlatinumStyle ()); |
31 | #endif | 31 | #endif |
32 | 32 | ||
33 | KGlobal::setAppName( "kmicromail" ); | 33 | KGlobal::setAppName( "kopiemail" ); |
34 | QString fileName ; | 34 | QString fileName ; |
35 | #ifndef DESKTOP_VERSION | 35 | #ifndef DESKTOP_VERSION |
36 | fileName = getenv("QPEDIR"); | 36 | fileName = getenv("QPEDIR"); |
37 | if ( QApplication::desktop()->width() > 320 ) | 37 | if ( QApplication::desktop()->width() > 320 ) |
38 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/"); | 38 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/icons22/"); |
39 | else | 39 | else |
40 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/"); | 40 | KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kopiemail/"); |
41 | #else | 41 | #else |
42 | fileName = qApp->applicationDirPath () + "/kdepim/kmicromail/"; | 42 | fileName = qApp->applicationDirPath () + "/kdepim/kopiemail/"; |
43 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); | 43 | KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName)); |
44 | #endif | 44 | #endif |
45 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); | 45 | KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kopiemail"))); |
46 | OpieMail mw; | 46 | OpieMail mw; |
47 | #ifndef DESKTOP_VERSION | 47 | #ifndef DESKTOP_VERSION |
48 | //qDebug("CONNECT "); | 48 | //qDebug("CONNECT "); |
49 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); | 49 | QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message( const QCString&, const QByteArray& ))); |
50 | // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 50 | // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
51 | a.showMainWidget(&mw ); | 51 | a.showMainWidget(&mw ); |
52 | #else | 52 | #else |
53 | a.setMainWidget(&mw ); | 53 | a.setMainWidget(&mw ); |
54 | mw.show(); | 54 | mw.show(); |
55 | //m.resize( 800, 600 ); | 55 | //m.resize( 800, 600 ); |
56 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); | 56 | QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit())); |
57 | #endif | 57 | #endif |
58 | int rv = a.exec(); | 58 | int rv = a.exec(); |
59 | return rv; | 59 | return rv; |
60 | 60 | ||
61 | } | 61 | } |
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp index 5793a58..21edfd2 100644 --- a/kmicromail/mainwindow.cpp +++ b/kmicromail/mainwindow.cpp | |||
@@ -114,179 +114,179 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
114 | statusWidget->hide(); | 114 | statusWidget->hide(); |
115 | 115 | ||
116 | //layout->addWidget( mailView ); | 116 | //layout->addWidget( mailView ); |
117 | //layout->setStretchFactor( folderView, 1 ); | 117 | //layout->setStretchFactor( folderView, 1 ); |
118 | //layout->setStretchFactor( mailView, 2 ); | 118 | //layout->setStretchFactor( mailView, 2 ); |
119 | 119 | ||
120 | slotAdjustLayout(); | 120 | slotAdjustLayout(); |
121 | #ifndef DESKTOP_VERSION | 121 | #ifndef DESKTOP_VERSION |
122 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); | 122 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); |
123 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); | 123 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); |
124 | #endif | 124 | #endif |
125 | connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this, | 125 | connect( mailView, SIGNAL( doubleClicked (QListViewItem* )),this, |
126 | SLOT( mailLeftClicked(QListViewItem*) ) ); | 126 | SLOT( mailLeftClicked(QListViewItem*) ) ); |
127 | connect( mailView, SIGNAL( returnPressed (QListViewItem* )),this, | 127 | connect( mailView, SIGNAL( returnPressed (QListViewItem* )),this, |
128 | SLOT( mailLeftClicked(QListViewItem*) ) ); | 128 | SLOT( mailLeftClicked(QListViewItem*) ) ); |
129 | connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, | 129 | connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, |
130 | SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); | 130 | SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); |
131 | connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), | 131 | connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), |
132 | this,SLOT(refreshMailView(const QValueList<RecMailP>&))); | 132 | this,SLOT(refreshMailView(const QValueList<RecMailP>&))); |
133 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); | 133 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); |
134 | connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); | 134 | connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); |
135 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); | 135 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); |
136 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); | 136 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); |
137 | //mailView->setMultiSelection ( true ); | 137 | //mailView->setMultiSelection ( true ); |
138 | mailView->setSelectionMode( QListView::Extended ); | 138 | mailView->setSelectionMode( QListView::Extended ); |
139 | QValueList<int> list; | 139 | QValueList<int> list; |
140 | int fw = 100; | 140 | int fw = 100; |
141 | if ( QApplication::desktop()->width() > 320 ) | 141 | if ( QApplication::desktop()->width() > 320 ) |
142 | fw = 50; | 142 | fw = 50; |
143 | list.append( fw ); | 143 | list.append( fw ); |
144 | list.append( 100 ); | 144 | list.append( 100 ); |
145 | split->setSizes( list ); | 145 | split->setSizes( list ); |
146 | QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); | 146 | QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); |
147 | mailView->setShowSortIndicator ( true ); | 147 | mailView->setShowSortIndicator ( true ); |
148 | QLabel *spacer = new QLabel( toolBar ); | 148 | QLabel *spacer = new QLabel( toolBar ); |
149 | spacer->setBackgroundMode( QWidget::PaletteButton ); | 149 | spacer->setBackgroundMode( QWidget::PaletteButton ); |
150 | toolBar->setStretchableWidget( spacer ); | 150 | toolBar->setStretchableWidget( spacer ); |
151 | 151 | ||
152 | QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this); | 152 | QAction* closeMail = new QAction(tr("Close"),SmallIcon("exit"), 0, 0, this); |
153 | connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); | 153 | connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); |
154 | closeMail->addTo(toolBar); | 154 | closeMail->addTo(toolBar); |
155 | closeMail->addTo(mailMenu); | 155 | closeMail->addTo(mailMenu); |
156 | 156 | ||
157 | 157 | ||
158 | QPopupMenu* helpMenu = new QPopupMenu( menuBar ); | 158 | QPopupMenu* helpMenu = new QPopupMenu( menuBar ); |
159 | menuBar->insertItem( tr( "Help" ), helpMenu ); | 159 | menuBar->insertItem( tr( "Help" ), helpMenu ); |
160 | QAction* li = new QAction(tr("About"), QPixmap(), 0, 0, this); | 160 | QAction* li = new QAction(tr("About"), QPixmap(), 0, 0, this); |
161 | connect( li, SIGNAL( activated() ), SLOT( showAbout()) ); | 161 | connect( li, SIGNAL( activated() ), SLOT( showAbout()) ); |
162 | li->addTo(helpMenu); | 162 | li->addTo(helpMenu); |
163 | li = new QAction(tr("Licence"),QPixmap(), 0, 0, this); | 163 | li = new QAction(tr("Licence"),QPixmap(), 0, 0, this); |
164 | connect( li, SIGNAL( activated() ), SLOT( showLicence()) ); | 164 | connect( li, SIGNAL( activated() ), SLOT( showLicence()) ); |
165 | li->addTo(helpMenu); | 165 | li->addTo(helpMenu); |
166 | li = new QAction(tr("LibEtPan Licence"), QPixmap(), 0, 0, this); | 166 | li = new QAction(tr("LibEtPan Licence"), QPixmap(), 0, 0, this); |
167 | connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) ); | 167 | connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) ); |
168 | li->addTo(helpMenu); | 168 | li->addTo(helpMenu); |
169 | } | 169 | } |
170 | 170 | ||
171 | MainWindow::~MainWindow() | 171 | MainWindow::~MainWindow() |
172 | { | 172 | { |
173 | } | 173 | } |
174 | 174 | ||
175 | void MainWindow::showLicence() | 175 | void MainWindow::showLicence() |
176 | { | 176 | { |
177 | KApplication::showLicence(); | 177 | KApplication::showLicence(); |
178 | } | 178 | } |
179 | void MainWindow::showAbout() | 179 | void MainWindow::showAbout() |
180 | { | 180 | { |
181 | QString version; | 181 | QString version; |
182 | #include <../version> | 182 | #include <../version> |
183 | 183 | ||
184 | QString cap = "About KOpieMail/Pi"; | 184 | QString cap = "About KOpieMail/Pi"; |
185 | QString text =i18n("KOpieMail/Platform-independent\n") + | 185 | QString text =i18n("KOpieMail/Platform-independent\n") + |
186 | "(OM/Pi) " + version + " - " | 186 | "(OM/Pi) " + version + " - " |
187 | 187 | ||
188 | #ifdef DESKTOP_VERSION | 188 | #ifdef DESKTOP_VERSION |
189 | "Desktop Edition\n" | 189 | "Desktop Edition\n" |
190 | #else | 190 | #else |
191 | "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n" | 191 | "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n" |
192 | #endif | 192 | #endif |
193 | "www.pi-sync.net\n\n" | 193 | "www.pi-sync.net\n\n" |
194 | 194 | ||
195 | 195 | ||
196 | 196 | ||
197 | "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n" | 197 | "Copyright (c) 2004 Lutz Rogowski <lutz@pi-sync.net>\n" |
198 | "KOpieMail/Pi is based on Opie Mail\n" | 198 | "KOpieMail/Pi is based on Opie Mail\n" |
199 | "Copyright (c) Rajko Albrecht and the Opie team\n" | 199 | "Copyright (c) Rajko Albrecht and the Opie team\n" |
200 | "KOpieMail/Pi is licensed under the GPL\n" | 200 | "KOpieMail/Pi is licensed under the GPL\n" |
201 | "\n" | 201 | "\n" |
202 | "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" | 202 | "KOpieMail/Pi uses LibEtPan - a mail stuff library\n" |
203 | "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" | 203 | "Copyright (C) 2001, 2002 - DINH Viet Hoa\n" |
204 | "libEtPan has its own licence - see LibEtPan licence\n"; | 204 | "libEtPan has its own licence - see LibEtPan licence\n"; |
205 | 205 | ||
206 | KApplication::showText( cap, text ); | 206 | KApplication::showText( cap, text ); |
207 | } | 207 | } |
208 | void MainWindow::showEtpanLicence() | 208 | void MainWindow::showEtpanLicence() |
209 | { | 209 | { |
210 | KApplication::showFile( "LibEtPan licence", "kdepim/kmicromail/COPYRIGHTlibetpan" ); | 210 | KApplication::showFile( "LibEtPan licence", "kdepim/kopiemail/COPYRIGHTlibetpan" ); |
211 | 211 | ||
212 | } | 212 | } |
213 | void MainWindow::appMessage(const QCString &, const QByteArray &) | 213 | void MainWindow::appMessage(const QCString &, const QByteArray &) |
214 | { | 214 | { |
215 | qDebug("appMessage implemented by subclass"); | 215 | qDebug("appMessage implemented by subclass"); |
216 | } | 216 | } |
217 | 217 | ||
218 | void MainWindow::slotAdjustLayout() { | 218 | void MainWindow::slotAdjustLayout() { |
219 | 219 | ||
220 | /* | 220 | /* |
221 | QWidget *d = QApplication::desktop(); | 221 | QWidget *d = QApplication::desktop(); |
222 | 222 | ||
223 | if ( d->width() < d->height() ) { | 223 | if ( d->width() < d->height() ) { |
224 | layout->setDirection( QBoxLayout::TopToBottom ); | 224 | layout->setDirection( QBoxLayout::TopToBottom ); |
225 | } else { | 225 | } else { |
226 | layout->setDirection( QBoxLayout::LeftToRight ); | 226 | layout->setDirection( QBoxLayout::LeftToRight ); |
227 | } | 227 | } |
228 | */ | 228 | */ |
229 | } | 229 | } |
230 | 230 | ||
231 | void MainWindow::slotAdjustColumns() | 231 | void MainWindow::slotAdjustColumns() |
232 | { | 232 | { |
233 | bool hidden = folderView->isHidden(); | 233 | bool hidden = folderView->isHidden(); |
234 | if ( hidden ) folderView->show(); | 234 | if ( hidden ) folderView->show(); |
235 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); | 235 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); |
236 | if ( hidden ) folderView->hide(); | 236 | if ( hidden ) folderView->hide(); |
237 | 237 | ||
238 | mailView->setColumnWidth( 0, 10 ); | 238 | mailView->setColumnWidth( 0, 10 ); |
239 | mailView->setColumnWidth( 1, 100 ); | 239 | mailView->setColumnWidth( 1, 100 ); |
240 | mailView->setColumnWidth( 2, 100 ); | 240 | mailView->setColumnWidth( 2, 100 ); |
241 | mailView->setColumnWidth( 3, 50 ); | 241 | mailView->setColumnWidth( 3, 50 ); |
242 | mailView->setColumnWidth( 4, 120 ); | 242 | mailView->setColumnWidth( 4, 120 ); |
243 | } | 243 | } |
244 | 244 | ||
245 | void MainWindow::slotEditSettings() | 245 | void MainWindow::slotEditSettings() |
246 | { | 246 | { |
247 | } | 247 | } |
248 | 248 | ||
249 | void MainWindow::slotShowFolders( bool ) | 249 | void MainWindow::slotShowFolders( bool ) |
250 | { | 250 | { |
251 | qDebug("not implemented: "); | 251 | qDebug("not implemented: "); |
252 | } | 252 | } |
253 | 253 | ||
254 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) | 254 | void MainWindow::refreshMailView(const QValueList<RecMailP>&) |
255 | { | 255 | { |
256 | qDebug("not implemented: "); | 256 | qDebug("not implemented: "); |
257 | } | 257 | } |
258 | 258 | ||
259 | void MainWindow::mailLeftClicked(QListViewItem * ) | 259 | void MainWindow::mailLeftClicked(QListViewItem * ) |
260 | { | 260 | { |
261 | qDebug("not implemented: "); | 261 | qDebug("not implemented: "); |
262 | } | 262 | } |
263 | 263 | ||
264 | void MainWindow::displayMail() | 264 | void MainWindow::displayMail() |
265 | { | 265 | { |
266 | qDebug("not implemented: "); | 266 | qDebug("not implemented: "); |
267 | } | 267 | } |
268 | 268 | ||
269 | void MainWindow::slotDeleteMail() | 269 | void MainWindow::slotDeleteMail() |
270 | { | 270 | { |
271 | qDebug("not implemented: "); | 271 | qDebug("not implemented: "); |
272 | } | 272 | } |
273 | 273 | ||
274 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) | 274 | void MainWindow::mailHold(int, QListViewItem *,const QPoint&,int ) |
275 | { | 275 | { |
276 | qDebug("not implemented: "); | 276 | qDebug("not implemented: "); |
277 | } | 277 | } |
278 | 278 | ||
279 | void MainWindow::slotSendQueued() | 279 | void MainWindow::slotSendQueued() |
280 | { | 280 | { |
281 | qDebug("not implemented: "); | 281 | qDebug("not implemented: "); |
282 | } | 282 | } |
283 | 283 | ||
284 | void MainWindow::slotEditAccounts() | 284 | void MainWindow::slotEditAccounts() |
285 | { | 285 | { |
286 | qDebug("not implemented: "); | 286 | qDebug("not implemented: "); |
287 | } | 287 | } |
288 | 288 | ||
289 | void MainWindow::slotComposeMail() | 289 | void MainWindow::slotComposeMail() |
290 | { | 290 | { |
291 | qDebug("not implemented: "); | 291 | qDebug("not implemented: "); |
292 | } | 292 | } |