-rw-r--r-- | noncore/net/mail/editaccounts.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.cpp | 10 | ||||
-rw-r--r-- | noncore/net/mail/pop3configui.ui | 121 | ||||
-rw-r--r-- | noncore/net/mail/viewmail.h | 2 |
4 files changed, 47 insertions, 100 deletions
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp index 439b619..0c0ecaf 100644 --- a/noncore/net/mail/editaccounts.cpp +++ b/noncore/net/mail/editaccounts.cpp | |||
@@ -73,38 +73,38 @@ void EditAccounts::slotNewAccount( const QString &type ) | |||
73 | } else { | 73 | } else { |
74 | account->remove(); | 74 | account->remove(); |
75 | } | 75 | } |
76 | } else if ( type.compare( "POP3" ) == 0 ) { | 76 | } else if ( type.compare( "POP3" ) == 0 ) { |
77 | qDebug( "-> config POP3" ); | 77 | qDebug( "-> config POP3" ); |
78 | POP3account *account = new POP3account(); | 78 | POP3account *account = new POP3account(); |
79 | POP3config pop3( account, this, 0, true ); | 79 | POP3config pop3( account, this, 0, true, WStyle_ContextHelp ); |
80 | pop3.showMaximized(); | 80 | pop3.showMaximized(); |
81 | if ( QDialog::Accepted == pop3.exec() ) { | 81 | if ( QDialog::Accepted == pop3.exec() ) { |
82 | settings->addAccount( account ); | 82 | settings->addAccount( account ); |
83 | account->save(); | 83 | account->save(); |
84 | slotFillLists(); | 84 | slotFillLists(); |
85 | } else { | 85 | } else { |
86 | account->remove(); | 86 | account->remove(); |
87 | } | 87 | } |
88 | } else if ( type.compare( "SMTP" ) == 0 ) { | 88 | } else if ( type.compare( "SMTP" ) == 0 ) { |
89 | qDebug( "-> config SMTP" ); | 89 | qDebug( "-> config SMTP" ); |
90 | SMTPaccount *account = new SMTPaccount(); | 90 | SMTPaccount *account = new SMTPaccount(); |
91 | SMTPconfig smtp( account, this, 0, true ); | 91 | SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp ); |
92 | smtp.showMaximized(); | 92 | smtp.showMaximized(); |
93 | if ( QDialog::Accepted == smtp.exec() ) { | 93 | if ( QDialog::Accepted == smtp.exec() ) { |
94 | settings->addAccount( account ); | 94 | settings->addAccount( account ); |
95 | account->save(); | 95 | account->save(); |
96 | slotFillLists(); | 96 | slotFillLists(); |
97 | 97 | ||
98 | } else { | 98 | } else { |
99 | account->remove(); | 99 | account->remove(); |
100 | } | 100 | } |
101 | } else if ( type.compare( "NNTP" ) == 0 ) { | 101 | } else if ( type.compare( "NNTP" ) == 0 ) { |
102 | qDebug( "-> config NNTP" ); | 102 | qDebug( "-> config NNTP" ); |
103 | NNTPaccount *account = new NNTPaccount(); | 103 | NNTPaccount *account = new NNTPaccount(); |
104 | NNTPconfig nntp( account, this, 0, true ); | 104 | NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp ); |
105 | nntp.showMaximized(); | 105 | nntp.showMaximized(); |
106 | if ( QDialog::Accepted == nntp.exec() ) { | 106 | if ( QDialog::Accepted == nntp.exec() ) { |
107 | settings->addAccount( account ); | 107 | settings->addAccount( account ); |
108 | account->save(); | 108 | account->save(); |
109 | slotFillLists(); | 109 | slotFillLists(); |
110 | } else { | 110 | } else { |
@@ -114,34 +114,34 @@ void EditAccounts::slotNewAccount( const QString &type ) | |||
114 | } | 114 | } |
115 | 115 | ||
116 | void EditAccounts::slotEditAccount( Account *account ) | 116 | void EditAccounts::slotEditAccount( Account *account ) |
117 | { | 117 | { |
118 | if ( account->getType().compare( "IMAP" ) == 0 ) { | 118 | if ( account->getType().compare( "IMAP" ) == 0 ) { |
119 | IMAPaccount *imapAcc = static_cast<IMAPaccount *>(account); | 119 | IMAPaccount *imapAcc = static_cast<IMAPaccount *>(account); |
120 | IMAPconfig imap( imapAcc, this, 0, true ); | 120 | IMAPconfig imap( imapAcc, this, 0, true, WStyle_ContextHelp ); |
121 | imap.showMaximized(); | 121 | imap.showMaximized(); |
122 | if ( QDialog::Accepted == imap.exec() ) { | 122 | if ( QDialog::Accepted == imap.exec() ) { |
123 | slotFillLists(); | 123 | slotFillLists(); |
124 | } | 124 | } |
125 | } else if ( account->getType().compare( "POP3" ) == 0 ) { | 125 | } else if ( account->getType().compare( "POP3" ) == 0 ) { |
126 | POP3account *pop3Acc = static_cast<POP3account *>(account); | 126 | POP3account *pop3Acc = static_cast<POP3account *>(account); |
127 | POP3config pop3( pop3Acc, this, 0, true ); | 127 | POP3config pop3( pop3Acc, this, 0, true, WStyle_ContextHelp ); |
128 | pop3.showMaximized(); | 128 | pop3.showMaximized(); |
129 | if ( QDialog::Accepted == pop3.exec() ) { | 129 | if ( QDialog::Accepted == pop3.exec() ) { |
130 | slotFillLists(); | 130 | slotFillLists(); |
131 | } | 131 | } |
132 | } else if ( account->getType().compare( "SMTP" ) == 0 ) { | 132 | } else if ( account->getType().compare( "SMTP" ) == 0 ) { |
133 | SMTPaccount *smtpAcc = static_cast<SMTPaccount *>(account); | 133 | SMTPaccount *smtpAcc = static_cast<SMTPaccount *>(account); |
134 | SMTPconfig smtp( smtpAcc, this, 0, true ); | 134 | SMTPconfig smtp( smtpAcc, this, 0, true, WStyle_ContextHelp ); |
135 | smtp.showMaximized(); | 135 | smtp.showMaximized(); |
136 | if ( QDialog::Accepted == smtp.exec() ) { | 136 | if ( QDialog::Accepted == smtp.exec() ) { |
137 | slotFillLists(); | 137 | slotFillLists(); |
138 | } | 138 | } |
139 | } else if ( account->getType().compare( "NNTP" ) == 0 ) { | 139 | } else if ( account->getType().compare( "NNTP" ) == 0 ) { |
140 | NNTPaccount *nntpAcc = static_cast<NNTPaccount *>(account); | 140 | NNTPaccount *nntpAcc = static_cast<NNTPaccount *>(account); |
141 | NNTPconfig nntp( nntpAcc, this, 0, true ); | 141 | NNTPconfig nntp( nntpAcc, this, 0, true, WStyle_ContextHelp ); |
142 | nntp.showMaximized(); | 142 | nntp.showMaximized(); |
143 | if ( QDialog::Accepted == nntp.exec() ) { | 143 | if ( QDialog::Accepted == nntp.exec() ) { |
144 | slotFillLists(); | 144 | slotFillLists(); |
145 | } | 145 | } |
146 | } | 146 | } |
147 | } | 147 | } |
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index dee3f70..39e3a64 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -11,13 +11,13 @@ | |||
11 | #include <libmailwrapper/mailtypes.h> | 11 | #include <libmailwrapper/mailtypes.h> |
12 | #include "mailistviewitem.h" | 12 | #include "mailistviewitem.h" |
13 | #include "viewmail.h" | 13 | #include "viewmail.h" |
14 | #include "selectstore.h" | 14 | #include "selectstore.h" |
15 | 15 | ||
16 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 16 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) |
17 | : MainWindow( parent, name, flags ) | 17 | : MainWindow( parent, name, WStyle_ContextHelp ) |
18 | { | 18 | { |
19 | settings = new Settings(); | 19 | settings = new Settings(); |
20 | 20 | ||
21 | folderView->populate( settings->getAccounts() ); | 21 | folderView->populate( settings->getAccounts() ); |
22 | } | 22 | } |
23 | 23 | ||
@@ -39,13 +39,13 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | |||
39 | slotComposeMail(); | 39 | slotComposeMail(); |
40 | } | 40 | } |
41 | } | 41 | } |
42 | 42 | ||
43 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 43 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
44 | { | 44 | { |
45 | ComposeMail compose( settings, this, 0 , true ); | 45 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); |
46 | if (!email.isEmpty()) { | 46 | if (!email.isEmpty()) { |
47 | if (!name.isEmpty()) { | 47 | if (!name.isEmpty()) { |
48 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); | 48 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); |
49 | } else { | 49 | } else { |
50 | compose.setTo(email); | 50 | compose.setTo(email); |
51 | } | 51 | } |
@@ -88,21 +88,21 @@ void OpieMail::slotSearchMails() | |||
88 | { | 88 | { |
89 | qDebug( "Search Mails" ); | 89 | qDebug( "Search Mails" ); |
90 | } | 90 | } |
91 | 91 | ||
92 | void OpieMail::slotEditSettings() | 92 | void OpieMail::slotEditSettings() |
93 | { | 93 | { |
94 | SettingsDialog settingsDialog( this, 0, true ); | 94 | SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); |
95 | settingsDialog.showMaximized(); | 95 | settingsDialog.showMaximized(); |
96 | settingsDialog.exec(); | 96 | settingsDialog.exec(); |
97 | } | 97 | } |
98 | 98 | ||
99 | void OpieMail::slotEditAccounts() | 99 | void OpieMail::slotEditAccounts() |
100 | { | 100 | { |
101 | qDebug( "Edit Accounts" ); | 101 | qDebug( "Edit Accounts" ); |
102 | EditAccounts eaDialog( settings, this, 0, true ); | 102 | EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); |
103 | eaDialog.showMaximized(); | 103 | eaDialog.showMaximized(); |
104 | eaDialog.slotAdjustColumns(); | 104 | eaDialog.slotAdjustColumns(); |
105 | eaDialog.exec(); | 105 | eaDialog.exec(); |
106 | if ( settings ) delete settings; | 106 | if ( settings ) delete settings; |
107 | settings = new Settings(); | 107 | settings = new Settings(); |
108 | 108 | ||
@@ -112,13 +112,13 @@ void OpieMail::slotEditAccounts() | |||
112 | void OpieMail::displayMail() | 112 | void OpieMail::displayMail() |
113 | { | 113 | { |
114 | QListViewItem*item = mailView->currentItem(); | 114 | QListViewItem*item = mailView->currentItem(); |
115 | if (!item) return; | 115 | if (!item) return; |
116 | RecMail mail = ((MailListViewItem*)item)->data(); | 116 | RecMail mail = ((MailListViewItem*)item)->data(); |
117 | RecBody body = folderView->fetchBody(mail); | 117 | RecBody body = folderView->fetchBody(mail); |
118 | ViewMail readMail( this ); | 118 | ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp ); |
119 | readMail.setBody( body ); | 119 | readMail.setBody( body ); |
120 | readMail.setMail( mail ); | 120 | readMail.setMail( mail ); |
121 | readMail.showMaximized(); | 121 | readMail.showMaximized(); |
122 | readMail.exec(); | 122 | readMail.exec(); |
123 | 123 | ||
124 | if ( readMail.deleted ) { | 124 | if ( readMail.deleted ) { |
diff --git a/noncore/net/mail/pop3configui.ui b/noncore/net/mail/pop3configui.ui index 95cbdc2..1014ef4 100644 --- a/noncore/net/mail/pop3configui.ui +++ b/noncore/net/mail/pop3configui.ui | |||
@@ -8,41 +8,41 @@ | |||
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>232</width> | 14 | <width>314</width> |
15 | <height>320</height> | 15 | <height>410</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
19 | <name>caption</name> | 19 | <name>caption</name> |
20 | <string>Configure POP3</string> | 20 | <string>Configure POP3</string> |
21 | </property> | 21 | </property> |
22 | <property> | 22 | <property> |
23 | <name>layoutMargin</name> | 23 | <name>layoutMargin</name> |
24 | </property> | 24 | </property> |
25 | <property> | 25 | <property> |
26 | <name>layoutSpacing</name> | 26 | <name>layoutSpacing</name> |
27 | </property> | 27 | </property> |
28 | <vbox> | ||
29 | <property stdset="1"> | ||
30 | <name>margin</name> | ||
31 | <number>3</number> | ||
32 | </property> | ||
33 | <property stdset="1"> | ||
34 | <name>spacing</name> | ||
35 | <number>3</number> | ||
36 | </property> | ||
28 | <widget> | 37 | <widget> |
29 | <class>QLayoutWidget</class> | 38 | <class>QLayoutWidget</class> |
30 | <property stdset="1"> | 39 | <property stdset="1"> |
31 | <name>name</name> | 40 | <name>name</name> |
32 | <cstring>Layout12</cstring> | 41 | <cstring>Layout12</cstring> |
33 | </property> | 42 | </property> |
34 | <property stdset="1"> | ||
35 | <name>geometry</name> | ||
36 | <rect> | ||
37 | <x>3</x> | ||
38 | <y>3</y> | ||
39 | <width>226</width> | ||
40 | <height>32</height> | ||
41 | </rect> | ||
42 | </property> | ||
43 | <hbox> | 43 | <hbox> |
44 | <property stdset="1"> | 44 | <property stdset="1"> |
45 | <name>margin</name> | 45 | <name>margin</name> |
46 | <number>0</number> | 46 | <number>0</number> |
47 | </property> | 47 | </property> |
48 | <property stdset="1"> | 48 | <property stdset="1"> |
@@ -77,40 +77,22 @@ | |||
77 | <class>Line</class> | 77 | <class>Line</class> |
78 | <property stdset="1"> | 78 | <property stdset="1"> |
79 | <name>name</name> | 79 | <name>name</name> |
80 | <cstring>line1</cstring> | 80 | <cstring>line1</cstring> |
81 | </property> | 81 | </property> |
82 | <property stdset="1"> | 82 | <property stdset="1"> |
83 | <name>geometry</name> | ||
84 | <rect> | ||
85 | <x>3</x> | ||
86 | <y>38</y> | ||
87 | <width>226</width> | ||
88 | <height>16</height> | ||
89 | </rect> | ||
90 | </property> | ||
91 | <property stdset="1"> | ||
92 | <name>orientation</name> | 83 | <name>orientation</name> |
93 | <enum>Horizontal</enum> | 84 | <enum>Horizontal</enum> |
94 | </property> | 85 | </property> |
95 | </widget> | 86 | </widget> |
96 | <widget> | 87 | <widget> |
97 | <class>QLayoutWidget</class> | 88 | <class>QLayoutWidget</class> |
98 | <property stdset="1"> | 89 | <property stdset="1"> |
99 | <name>name</name> | 90 | <name>name</name> |
100 | <cstring>Layout11</cstring> | 91 | <cstring>Layout11</cstring> |
101 | </property> | 92 | </property> |
102 | <property stdset="1"> | ||
103 | <name>geometry</name> | ||
104 | <rect> | ||
105 | <x>3</x> | ||
106 | <y>44</y> | ||
107 | <width>226</width> | ||
108 | <height>70</height> | ||
109 | </rect> | ||
110 | </property> | ||
111 | <hbox> | 93 | <hbox> |
112 | <property stdset="1"> | 94 | <property stdset="1"> |
113 | <name>margin</name> | 95 | <name>margin</name> |
114 | <number>0</number> | 96 | <number>0</number> |
115 | </property> | 97 | </property> |
116 | <property stdset="1"> | 98 | <property stdset="1"> |
@@ -192,21 +174,12 @@ | |||
192 | <widget> | 174 | <widget> |
193 | <class>QLayoutWidget</class> | 175 | <class>QLayoutWidget</class> |
194 | <property stdset="1"> | 176 | <property stdset="1"> |
195 | <name>name</name> | 177 | <name>name</name> |
196 | <cstring>Layout13</cstring> | 178 | <cstring>Layout13</cstring> |
197 | </property> | 179 | </property> |
198 | <property stdset="1"> | ||
199 | <name>geometry</name> | ||
200 | <rect> | ||
201 | <x>3</x> | ||
202 | <y>117</y> | ||
203 | <width>226</width> | ||
204 | <height>64</height> | ||
205 | </rect> | ||
206 | </property> | ||
207 | <vbox> | 180 | <vbox> |
208 | <property stdset="1"> | 181 | <property stdset="1"> |
209 | <name>margin</name> | 182 | <name>margin</name> |
210 | <number>0</number> | 183 | <number>0</number> |
211 | </property> | 184 | </property> |
212 | <property stdset="1"> | 185 | <property stdset="1"> |
@@ -231,25 +204,38 @@ | |||
231 | <cstring>ComboBox1</cstring> | 204 | <cstring>ComboBox1</cstring> |
232 | </property> | 205 | </property> |
233 | </widget> | 206 | </widget> |
234 | </vbox> | 207 | </vbox> |
235 | </widget> | 208 | </widget> |
236 | <widget> | 209 | <widget> |
237 | <class>QLayoutWidget</class> | 210 | <class>QLineEdit</class> |
238 | <property stdset="1"> | 211 | <property stdset="1"> |
239 | <name>name</name> | 212 | <name>name</name> |
240 | <cstring>Layout6</cstring> | 213 | <cstring>CommandEdit</cstring> |
241 | </property> | 214 | </property> |
242 | <property stdset="1"> | 215 | <property stdset="1"> |
243 | <name>geometry</name> | 216 | <name>text</name> |
244 | <rect> | 217 | <string>ssh $SERVER exec imapd</string> |
245 | <x>3</x> | 218 | </property> |
246 | <y>223</y> | 219 | </widget> |
247 | <width>226</width> | 220 | <widget> |
248 | <height>70</height> | 221 | <class>Line</class> |
249 | </rect> | 222 | <property stdset="1"> |
223 | <name>name</name> | ||
224 | <cstring>line2</cstring> | ||
225 | </property> | ||
226 | <property stdset="1"> | ||
227 | <name>orientation</name> | ||
228 | <enum>Horizontal</enum> | ||
229 | </property> | ||
230 | </widget> | ||
231 | <widget> | ||
232 | <class>QLayoutWidget</class> | ||
233 | <property stdset="1"> | ||
234 | <name>name</name> | ||
235 | <cstring>Layout6</cstring> | ||
250 | </property> | 236 | </property> |
251 | <hbox> | 237 | <hbox> |
252 | <property stdset="1"> | 238 | <property stdset="1"> |
253 | <name>margin</name> | 239 | <name>margin</name> |
254 | <number>0</number> | 240 | <number>0</number> |
255 | </property> | 241 | </property> |
@@ -351,52 +337,13 @@ | |||
351 | <size> | 337 | <size> |
352 | <width>20</width> | 338 | <width>20</width> |
353 | <height>20</height> | 339 | <height>20</height> |
354 | </size> | 340 | </size> |
355 | </property> | 341 | </property> |
356 | </spacer> | 342 | </spacer> |
357 | <widget> | 343 | </vbox> |
358 | <class>QLineEdit</class> | ||
359 | <property stdset="1"> | ||
360 | <name>name</name> | ||
361 | <cstring>CommandEdit</cstring> | ||
362 | </property> | ||
363 | <property stdset="1"> | ||
364 | <name>geometry</name> | ||
365 | <rect> | ||
366 | <x>0</x> | ||
367 | <y>180</y> | ||
368 | <width>226</width> | ||
369 | <height>30</height> | ||
370 | </rect> | ||
371 | </property> | ||
372 | <property stdset="1"> | ||
373 | <name>text</name> | ||
374 | <string>ssh $SERVER exec imapd</string> | ||
375 | </property> | ||
376 | </widget> | ||
377 | <widget> | ||
378 | <class>Line</class> | ||
379 | <property stdset="1"> | ||
380 | <name>name</name> | ||
381 | <cstring>line2</cstring> | ||
382 | </property> | ||
383 | <property stdset="1"> | ||
384 | <name>geometry</name> | ||
385 | <rect> | ||
386 | <x>3</x> | ||
387 | <y>204</y> | ||
388 | <width>226</width> | ||
389 | <height>16</height> | ||
390 | </rect> | ||
391 | </property> | ||
392 | <property stdset="1"> | ||
393 | <name>orientation</name> | ||
394 | <enum>Horizontal</enum> | ||
395 | </property> | ||
396 | </widget> | ||
397 | </widget> | 344 | </widget> |
398 | <tabstops> | 345 | <tabstops> |
399 | <tabstop>accountLine</tabstop> | 346 | <tabstop>accountLine</tabstop> |
400 | <tabstop>serverLine</tabstop> | 347 | <tabstop>serverLine</tabstop> |
401 | <tabstop>portLine</tabstop> | 348 | <tabstop>portLine</tabstop> |
402 | <tabstop>userLine</tabstop> | 349 | <tabstop>userLine</tabstop> |
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h index 2d0e024..abbd5b3 100644 --- a/noncore/net/mail/viewmail.h +++ b/noncore/net/mail/viewmail.h | |||
@@ -28,13 +28,13 @@ private: | |||
28 | 28 | ||
29 | class ViewMail : public ViewMailBase | 29 | class ViewMail : public ViewMailBase |
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | 32 | ||
33 | public: | 33 | public: |
34 | ViewMail( QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal); | 34 | ViewMail( QWidget *parent = 0, const char *name = 0, WFlags fl = 0); |
35 | ~ViewMail(); | 35 | ~ViewMail(); |
36 | 36 | ||
37 | void hide(); | 37 | void hide(); |
38 | void exec(); | 38 | void exec(); |
39 | void setMail( RecMail mail ); | 39 | void setMail( RecMail mail ); |
40 | void setBody( RecBody body ); | 40 | void setBody( RecBody body ); |