-rw-r--r-- | noncore/net/mail/composemail.cpp | 2 | ||||
-rw-r--r-- | noncore/net/mail/nntpgroupsui.ui | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/mail/composemail.cpp b/noncore/net/mail/composemail.cpp index 449fdf1..154c1d5 100644 --- a/noncore/net/mail/composemail.cpp +++ b/noncore/net/mail/composemail.cpp | |||
@@ -183,49 +183,49 @@ void ComposeMail::removeAttachment() | |||
183 | } else { | 183 | } else { |
184 | attList->takeItem( attList->currentItem() ); | 184 | attList->takeItem( attList->currentItem() ); |
185 | } | 185 | } |
186 | } | 186 | } |
187 | 187 | ||
188 | void ComposeMail::accept() | 188 | void ComposeMail::accept() |
189 | { | 189 | { |
190 | if ( checkBoxLater->isChecked() ) { | 190 | if ( checkBoxLater->isChecked() ) { |
191 | odebug << "Send later" << oendl; | 191 | odebug << "Send later" << oendl; |
192 | } | 192 | } |
193 | 193 | ||
194 | #if 0 | 194 | #if 0 |
195 | odebug << "Sending Mail with " | 195 | odebug << "Sending Mail with " |
196 | << smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() << oendl; | 196 | << smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() << oendl; |
197 | #endif | 197 | #endif |
198 | Opie::Core::OSmartPointer<Mail> mail=new Mail; | 198 | Opie::Core::OSmartPointer<Mail> mail=new Mail; |
199 | 199 | ||
200 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); | 200 | SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() ); |
201 | mail->setMail(fromBox->currentText()); | 201 | mail->setMail(fromBox->currentText()); |
202 | 202 | ||
203 | if ( !toLine->text().isEmpty() ) { | 203 | if ( !toLine->text().isEmpty() ) { |
204 | mail->setTo( toLine->text() ); | 204 | mail->setTo( toLine->text() ); |
205 | } else { | 205 | } else { |
206 | QMessageBox::warning(0,tr("Sending mail"), | 206 | QMessageBox::warning(0,tr("Sending mail"), |
207 | tr("No Receiver spezified" ) ); | 207 | tr("No Receiver specified" ) ); |
208 | return; | 208 | return; |
209 | } | 209 | } |
210 | mail->setName(senderNameEdit->text()); | 210 | mail->setName(senderNameEdit->text()); |
211 | mail->setCC( ccLine->text() ); | 211 | mail->setCC( ccLine->text() ); |
212 | mail->setBCC( bccLine->text() ); | 212 | mail->setBCC( bccLine->text() ); |
213 | mail->setReply( replyLine->text() ); | 213 | mail->setReply( replyLine->text() ); |
214 | mail->setSubject( subjectLine->text() ); | 214 | mail->setSubject( subjectLine->text() ); |
215 | if (!m_replyid.isEmpty()) { | 215 | if (!m_replyid.isEmpty()) { |
216 | QStringList ids; | 216 | QStringList ids; |
217 | ids.append(m_replyid); | 217 | ids.append(m_replyid); |
218 | mail->setInreply(ids); | 218 | mail->setInreply(ids); |
219 | } | 219 | } |
220 | QString txt = message->text(); | 220 | QString txt = message->text(); |
221 | if ( !sigMultiLine->text().isEmpty() ) { | 221 | if ( !sigMultiLine->text().isEmpty() ) { |
222 | txt.append( "\n--\n" ); | 222 | txt.append( "\n--\n" ); |
223 | txt.append( sigMultiLine->text() ); | 223 | txt.append( sigMultiLine->text() ); |
224 | } | 224 | } |
225 | mail->setMessage( txt ); | 225 | mail->setMessage( txt ); |
226 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); | 226 | AttachViewItem *it = (AttachViewItem *) attList->firstChild(); |
227 | while ( it != NULL ) { | 227 | while ( it != NULL ) { |
228 | mail->addAttachment( it->getAttachment() ); | 228 | mail->addAttachment( it->getAttachment() ); |
229 | it = (AttachViewItem *) it->nextSibling(); | 229 | it = (AttachViewItem *) it->nextSibling(); |
230 | } | 230 | } |
231 | 231 | ||
diff --git a/noncore/net/mail/nntpgroupsui.ui b/noncore/net/mail/nntpgroupsui.ui index 2902731..374884b 100644 --- a/noncore/net/mail/nntpgroupsui.ui +++ b/noncore/net/mail/nntpgroupsui.ui | |||
@@ -74,49 +74,49 @@ | |||
74 | <name>spacing</name> | 74 | <name>spacing</name> |
75 | <number>6</number> | 75 | <number>6</number> |
76 | </property> | 76 | </property> |
77 | <widget> | 77 | <widget> |
78 | <class>QLabel</class> | 78 | <class>QLabel</class> |
79 | <property stdset="1"> | 79 | <property stdset="1"> |
80 | <name>name</name> | 80 | <name>name</name> |
81 | <cstring>filterlabel</cstring> | 81 | <cstring>filterlabel</cstring> |
82 | </property> | 82 | </property> |
83 | <property stdset="1"> | 83 | <property stdset="1"> |
84 | <name>text</name> | 84 | <name>text</name> |
85 | <string>Groupfilter:</string> | 85 | <string>Groupfilter:</string> |
86 | </property> | 86 | </property> |
87 | </widget> | 87 | </widget> |
88 | <widget> | 88 | <widget> |
89 | <class>QLineEdit</class> | 89 | <class>QLineEdit</class> |
90 | <property stdset="1"> | 90 | <property stdset="1"> |
91 | <name>name</name> | 91 | <name>name</name> |
92 | <cstring>Groupfilteredit</cstring> | 92 | <cstring>Groupfilteredit</cstring> |
93 | </property> | 93 | </property> |
94 | <property> | 94 | <property> |
95 | <name>whatsThis</name> | 95 | <name>whatsThis</name> |
96 | <string>Enter a filter string here. | 96 | <string>Enter a filter string here. |
97 | Then hit "get newsgroup list" again and only groups starting | 97 | Then hit "get newsgroup list" again and only groups starting |
98 | with that filter will be listet.</string> | 98 | with that filter will be listed.</string> |
99 | </property> | 99 | </property> |
100 | </widget> | 100 | </widget> |
101 | </hbox> | 101 | </hbox> |
102 | </widget> | 102 | </widget> |
103 | <widget> | 103 | <widget> |
104 | <class>QPushButton</class> | 104 | <class>QPushButton</class> |
105 | <property stdset="1"> | 105 | <property stdset="1"> |
106 | <name>name</name> | 106 | <name>name</name> |
107 | <cstring>GetNGButton</cstring> | 107 | <cstring>GetNGButton</cstring> |
108 | </property> | 108 | </property> |
109 | <property stdset="1"> | 109 | <property stdset="1"> |
110 | <name>text</name> | 110 | <name>text</name> |
111 | <string>Get newsgroup list from server</string> | 111 | <string>Get newsgroup list from server</string> |
112 | </property> | 112 | </property> |
113 | <property> | 113 | <property> |
114 | <name>whatsThis</name> | 114 | <name>whatsThis</name> |
115 | <string>Retrieve the list of groups from server</string> | 115 | <string>Retrieve the list of groups from server</string> |
116 | </property> | 116 | </property> |
117 | </widget> | 117 | </widget> |
118 | </vbox> | 118 | </vbox> |
119 | </widget> | 119 | </widget> |
120 | <connections> | 120 | <connections> |
121 | <connection> | 121 | <connection> |
122 | <sender>GetNGButton</sender> | 122 | <sender>GetNGButton</sender> |