-rw-r--r-- | noncore/net/mail/opiemail.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index d8b58b6..61e7dc4 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -171,26 +171,33 @@ void OpieMail::slotDeleteMail() | |||
171 | { | 171 | { |
172 | mail.Wrapper()->deleteMail( mail ); | 172 | mail.Wrapper()->deleteMail( mail ); |
173 | folderView->refreshCurrent(); | 173 | folderView->refreshCurrent(); |
174 | } | 174 | } |
175 | } | 175 | } |
176 | 176 | ||
177 | void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) | 177 | void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int ) |
178 | { | 178 | { |
179 | if (!mailView->currentItem()) return; | ||
180 | RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data(); | ||
179 | /* just the RIGHT button - or hold on pda */ | 181 | /* just the RIGHT button - or hold on pda */ |
180 | if (button!=2) {return;} | 182 | if (button!=2) {return;} |
181 | qDebug("Event right/hold"); | 183 | qDebug("Event right/hold"); |
182 | if (!item) return; | 184 | if (!item) return; |
183 | QPopupMenu *m = new QPopupMenu(0); | 185 | QPopupMenu *m = new QPopupMenu(0); |
184 | if (m) | 186 | if (m) |
185 | { | 187 | { |
186 | m->insertItem(tr("Read this mail"),this,SLOT(displayMail())); | 188 | if (mail.Wrapper()->getType()==MAILLIB::A_NNTP) { |
187 | m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail())); | 189 | m->insertItem(tr("Read this posting"),this,SLOT(displayMail())); |
188 | m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail())); | 190 | // m->insertItem(tr("Copy this posting"),this,SLOT(slotMoveCopyMail())); |
191 | } else { | ||
192 | m->insertItem(tr("Read this mail"),this,SLOT(displayMail())); | ||
193 | m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail())); | ||
194 | m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail())); | ||
195 | } | ||
189 | m->setFocus(); | 196 | m->setFocus(); |
190 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); | 197 | m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) ); |
191 | delete m; | 198 | delete m; |
192 | } | 199 | } |
193 | } | 200 | } |
194 | 201 | ||
195 | void OpieMail::slotShowFolders( bool show ) | 202 | void OpieMail::slotShowFolders( bool show ) |
196 | { | 203 | { |