-rw-r--r-- | kmicromail/opiemail.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index b1992ec..bdbd93a 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -87,129 +87,129 @@ void OpieMail::slotwriteMail2(const QString& namemail ) | |||
87 | if ( !namemail.isEmpty() ) { | 87 | if ( !namemail.isEmpty() ) { |
88 | QString to = namemail; | 88 | QString to = namemail; |
89 | if ( namemail.find( " <") > 1 ) { | 89 | if ( namemail.find( " <") > 1 ) { |
90 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; | 90 | to = "\"" +to.replace( QRegExp( " <"), "\" <") ; |
91 | } else | 91 | } else |
92 | if ( namemail.find( "<") > 1 ) { | 92 | if ( namemail.find( "<") > 1 ) { |
93 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; | 93 | to = "\"" +to.replace( QRegExp( "<"), "\" <") ; |
94 | } | 94 | } |
95 | int sub = to.find( ">:"); | 95 | int sub = to.find( ">:"); |
96 | if ( sub > 0 ) { | 96 | if ( sub > 0 ) { |
97 | compose.setTo( to.left(sub+1) ); | 97 | compose.setTo( to.left(sub+1) ); |
98 | compose.setSubject( to.mid(sub+2) ); | 98 | compose.setSubject( to.mid(sub+2) ); |
99 | } else | 99 | } else |
100 | compose.setTo( to ); | 100 | compose.setTo( to ); |
101 | } | 101 | } |
102 | compose.slotAdjustColumns(); | 102 | compose.slotAdjustColumns(); |
103 | compose.showMaximized(); | 103 | compose.showMaximized(); |
104 | compose.exec(); | 104 | compose.exec(); |
105 | //qDebug("retttich "); | 105 | //qDebug("retttich "); |
106 | } | 106 | } |
107 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 107 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
108 | { | 108 | { |
109 | // qDebug("OpieMail::slotwriteMail "); | 109 | // qDebug("OpieMail::slotwriteMail "); |
110 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); | 110 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); |
111 | if (!email.isEmpty()) | 111 | if (!email.isEmpty()) |
112 | { | 112 | { |
113 | if (!name.isEmpty()) | 113 | if (!name.isEmpty()) |
114 | { | 114 | { |
115 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); | 115 | compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); |
116 | } | 116 | } |
117 | else | 117 | else |
118 | { | 118 | { |
119 | compose.setTo(email); | 119 | compose.setTo(email); |
120 | } | 120 | } |
121 | } | 121 | } |
122 | compose.slotAdjustColumns(); | 122 | compose.slotAdjustColumns(); |
123 | compose.showMaximized(); | 123 | compose.showMaximized(); |
124 | compose.exec(); | 124 | compose.exec(); |
125 | } | 125 | } |
126 | 126 | ||
127 | void OpieMail::slotComposeMail() | 127 | void OpieMail::slotComposeMail() |
128 | { | 128 | { |
129 | slotwriteMail2( QString () ); | 129 | slotwriteMail2( QString () ); |
130 | //slotwriteMail(0l,0l); | 130 | //slotwriteMail(0l,0l); |
131 | } | 131 | } |
132 | 132 | ||
133 | void OpieMail::slotSendQueued() | 133 | void OpieMail::slotSendQueued() |
134 | { | 134 | { |
135 | SMTPaccount *smtp = 0; | 135 | SMTPaccount *smtp = 0; |
136 | 136 | ||
137 | QList<Account> list = settings->getAccounts(); | 137 | QList<Account> list = settings->getAccounts(); |
138 | QList<SMTPaccount> smtpList; | 138 | QList<SMTPaccount> smtpList; |
139 | smtpList.setAutoDelete(false); | 139 | smtpList.setAutoDelete(false); |
140 | Account *it; | 140 | Account *it; |
141 | for ( it = list.first(); it; it = list.next() ) | 141 | for ( it = list.first(); it; it = list.next() ) |
142 | { | 142 | { |
143 | if ( it->getType() == MAILLIB::A_SMTP ) | 143 | if ( it->getType() == MAILLIB::A_SMTP ) |
144 | { | 144 | { |
145 | smtp = static_cast<SMTPaccount *>(it); | 145 | smtp = static_cast<SMTPaccount *>(it); |
146 | smtpList.append(smtp); | 146 | smtpList.append(smtp); |
147 | } | 147 | } |
148 | } | 148 | } |
149 | if (smtpList.count()==0) | 149 | if (smtpList.count()==0) |
150 | { | 150 | { |
151 | QMessageBox::information(0,tr("Info"),tr("Define a smtp account first")); | 151 | QMessageBox::information(0,tr("Info"),tr("Define a smtp account first!\n")); |
152 | return; | 152 | return; |
153 | } | 153 | } |
154 | if (smtpList.count()==1) | 154 | if (smtpList.count()==1) |
155 | { | 155 | { |
156 | smtp = smtpList.at(0); | 156 | smtp = smtpList.at(0); |
157 | } | 157 | } |
158 | else | 158 | else |
159 | { | 159 | { |
160 | smtp = 0; | 160 | smtp = 0; |
161 | selectsmtp selsmtp; | 161 | selectsmtp selsmtp; |
162 | selsmtp.setSelectionlist(&smtpList); | 162 | selsmtp.setSelectionlist(&smtpList); |
163 | selsmtp.showMaximized(); | 163 | selsmtp.showMaximized(); |
164 | if ( selsmtp.exec() == QDialog::Accepted ) | 164 | if ( selsmtp.exec() == QDialog::Accepted ) |
165 | { | 165 | { |
166 | smtp = selsmtp.selected_smtp(); | 166 | smtp = selsmtp.selected_smtp(); |
167 | } | 167 | } |
168 | } | 168 | } |
169 | if (smtp) | 169 | if (smtp) |
170 | { | 170 | { |
171 | SMTPwrapper * wrap = new SMTPwrapper(smtp); | 171 | SMTPwrapper * wrap = new SMTPwrapper(smtp); |
172 | if ( wrap->flushOutbox() ) | 172 | if ( wrap->flushOutbox() ) |
173 | { | 173 | { |
174 | QMessageBox::information(0,tr("Info"),tr("Mail queue flushed")); | 174 | QMessageBox::information(0,tr("Info"),tr("Mail queue flushed")); |
175 | } | 175 | } |
176 | delete wrap; | 176 | delete wrap; |
177 | } | 177 | } |
178 | } | 178 | } |
179 | 179 | ||
180 | void OpieMail::slotSearchMails() | 180 | void OpieMail::slotSearchMails() |
181 | { | 181 | { |
182 | qDebug("OpieMail::slotSearchMails():not implemented "); | 182 | qDebug("OpieMail::slotSearchMails():not implemented "); |
183 | } | 183 | } |
184 | 184 | ||
185 | void OpieMail::slotEditSettings() | 185 | void OpieMail::slotEditSettings() |
186 | { | 186 | { |
187 | SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); | 187 | SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); |
188 | settingsDialog.showMaximized(); | 188 | settingsDialog.showMaximized(); |
189 | settingsDialog.exec(); | 189 | settingsDialog.exec(); |
190 | } | 190 | } |
191 | 191 | ||
192 | void OpieMail::slotEditAccounts() | 192 | void OpieMail::slotEditAccounts() |
193 | { | 193 | { |
194 | EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); | 194 | EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); |
195 | eaDialog.slotAdjustColumns(); | 195 | eaDialog.slotAdjustColumns(); |
196 | eaDialog.showMaximized(); | 196 | eaDialog.showMaximized(); |
197 | eaDialog.exec(); | 197 | eaDialog.exec(); |
198 | if ( settings ) delete settings; | 198 | if ( settings ) delete settings; |
199 | settings = new Settings(); | 199 | settings = new Settings(); |
200 | 200 | ||
201 | folderView->populate( settings->getAccounts() ); | 201 | folderView->populate( settings->getAccounts() ); |
202 | } | 202 | } |
203 | 203 | ||
204 | void OpieMail::displayMail() | 204 | void OpieMail::displayMail() |
205 | { | 205 | { |
206 | QListViewItem*item = mailView->currentItem(); | 206 | QListViewItem*item = mailView->currentItem(); |
207 | if (!item) return; | 207 | if (!item) return; |
208 | RecMailP mail = ((MailListViewItem*)item)->data(); | 208 | RecMailP mail = ((MailListViewItem*)item)->data(); |
209 | RecBodyP body = folderView->fetchBody(mail); | 209 | RecBodyP body = folderView->fetchBody(mail); |
210 | ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp ); | 210 | ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp ); |
211 | readMail.setBody( body ); | 211 | readMail.setBody( body ); |
212 | readMail.setMail( mail ); | 212 | readMail.setMail( mail ); |
213 | readMail.showMaximized(); | 213 | readMail.showMaximized(); |
214 | readMail.exec(); | 214 | readMail.exec(); |
215 | 215 | ||