Diffstat (limited to 'noncore/net/mailit/writemail.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/mailit/writemail.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp index 0298cb3..26b9660 100644 --- a/noncore/net/mailit/writemail.cpp +++ b/noncore/net/mailit/writemail.cpp | |||
@@ -109,33 +109,33 @@ void WriteMail::init() | |||
109 | QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here")); | 109 | QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here")); |
110 | 110 | ||
111 | ccInput = new QLineEdit( widget, "ccInput" ); | 111 | ccInput = new QLineEdit( widget, "ccInput" ); |
112 | ccInput->hide(); | 112 | ccInput->hide(); |
113 | grid->addWidget( ccInput, 0, 1 ); | 113 | grid->addWidget( ccInput, 0, 1 ); |
114 | QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here")); | 114 | QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here")); |
115 | 115 | ||
116 | addressButton = new QToolButton( widget, "addressButton" ); | 116 | addressButton = new QToolButton( widget, "addressButton" ); |
117 | addressButton->setPixmap( Resource::loadPixmap("AddressBook") ); | 117 | addressButton->setPixmap( Resource::loadPixmap("AddressBook") ); |
118 | addressButton->setToggleButton(TRUE); | 118 | addressButton->setToggleButton(TRUE); |
119 | grid->addWidget( addressButton, 0, 2 ); | 119 | grid->addWidget( addressButton, 0, 2 ); |
120 | connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) ); | 120 | connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) ); |
121 | QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your OPIE addressbook")); | 121 | QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your Opie addressbook")); |
122 | 122 | ||
123 | emailInput = new QMultiLineEdit( widget, "emailInput" ); | 123 | emailInput = new QMultiLineEdit( widget, "emailInput" ); |
124 | grid->addMultiCellWidget( emailInput, 2, 2, 0, 2); | 124 | grid->addMultiCellWidget( emailInput, 2, 2, 0, 2); |
125 | QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here")); | 125 | QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here")); |
126 | 126 | ||
127 | addressView = new QListView( widget, "addressView"); | 127 | addressView = new QListView( widget, "addressView"); |
128 | addressView->addColumn("Name"); | 128 | addressView->addColumn(tr("Name")); |
129 | addressView->addColumn("EMail"); | 129 | addressView->addColumn(tr("EMail") ); |
130 | addressView->setAllColumnsShowFocus(TRUE); | 130 | addressView->setAllColumnsShowFocus(TRUE); |
131 | addressView->setMultiSelection(TRUE); | 131 | addressView->setMultiSelection(TRUE); |
132 | addressView->hide(); | 132 | addressView->hide(); |
133 | grid->addMultiCellWidget( addressView, 3, 3, 0, 2); | 133 | grid->addMultiCellWidget( addressView, 3, 3, 0, 2); |
134 | QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list")); | 134 | QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list")); |
135 | 135 | ||
136 | okButton = new QToolButton(bar, "ok"); | 136 | okButton = new QToolButton(bar, "ok"); |
137 | okButton->setPixmap( Resource::loadPixmap("enter") ); | 137 | okButton->setPixmap( Resource::loadPixmap("enter") ); |
138 | okButton->hide(); | 138 | okButton->hide(); |
139 | connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) ); | 139 | connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) ); |
140 | QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here")); | 140 | QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here")); |
141 | 141 | ||
@@ -274,33 +274,33 @@ void WriteMail::reply(Email replyMail, bool replyAll) | |||
274 | QString citation=mail.fromMail; | 274 | QString citation=mail.fromMail; |
275 | citation.append(tr(" wrote on ")); | 275 | citation.append(tr(" wrote on ")); |
276 | citation.append(mail.date); | 276 | citation.append(mail.date); |
277 | citation.append(":\n"); | 277 | citation.append(":\n"); |
278 | 278 | ||
279 | 279 | ||
280 | //mail.body.insert(0,tr("On")); | 280 | //mail.body.insert(0,tr("On")); |
281 | pos = 0; | 281 | pos = 0; |
282 | mail.body.insert(pos, ">"); | 282 | mail.body.insert(pos, ">"); |
283 | while (pos != -1) { | 283 | while (pos != -1) { |
284 | pos = mail.body.find('\n', pos); | 284 | pos = mail.body.find('\n', pos); |
285 | if (pos != -1) | 285 | if (pos != -1) |
286 | mail.body.insert(++pos, ">>"); | 286 | mail.body.insert(++pos, ">"); |
287 | } | 287 | } |
288 | mail.body.insert(0,citation); | 288 | mail.body.insert(0,citation); |
289 | emailInput->setText(mail.body); | 289 | emailInput->setText(mail.body); |
290 | } | 290 | } |
291 | 291 | ||
292 | void WriteMail::forward(Email forwMail) | 292 | void WriteMail::forward(Email forwMail) |
293 | { | 293 | { |
294 | int pos=0; | 294 | // int pos=0; |
295 | 295 | ||
296 | QString fwdBody=tr("======forwarded message from "); | 296 | QString fwdBody=tr("======forwarded message from "); |
297 | fwdBody.append(forwMail.fromMail); | 297 | fwdBody.append(forwMail.fromMail); |
298 | fwdBody.append(tr(" starts======\n\n")); | 298 | fwdBody.append(tr(" starts======\n\n")); |
299 | 299 | ||
300 | mail=forwMail; | 300 | mail=forwMail; |
301 | toInput->setText(""); | 301 | toInput->setText(""); |
302 | ccInput->setText(""); | 302 | ccInput->setText(""); |
303 | subjectInput->setText(tr("FWD: ") + mail.subject); | 303 | subjectInput->setText(tr("FWD: ") + mail.subject); |
304 | 304 | ||
305 | fwdBody+=mail.body; | 305 | fwdBody+=mail.body; |
306 | fwdBody+=QString(tr("======end of forwarded message======\n\n")); | 306 | fwdBody+=QString(tr("======end of forwarded message======\n\n")); |