summaryrefslogtreecommitdiffabout
path: root/kmicromail
authorzautrix <zautrix>2004-10-31 16:54:47 (UTC)
committer zautrix <zautrix>2004-10-31 16:54:47 (UTC)
commit3964a158be731f1bb244ca861262df5fa8d04cf3 (patch) (unidiff)
treefa4a8e9af345c144562be480f21df6e3d8d609c7 /kmicromail
parentbed831cc1a38d38a4c5b9329bf37b1c663142c23 (diff)
downloadkdepimpi-3964a158be731f1bb244ca861262df5fa8d04cf3.zip
kdepimpi-3964a158be731f1bb244ca861262df5fa8d04cf3.tar.gz
kdepimpi-3964a158be731f1bb244ca861262df5fa8d04cf3.tar.bz2
changed showmaximized for desktop
Diffstat (limited to 'kmicromail') (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/accountitem.cpp12
-rw-r--r--kmicromail/accountview.cpp5
-rw-r--r--kmicromail/editaccounts.cpp3
-rw-r--r--kmicromail/opiemail.cpp6
4 files changed, 22 insertions, 4 deletions
diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 567de87..fcb2052 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -295,49 +295,51 @@ RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
295} 295}
296 296
297QPopupMenu * NNTPviewItem::getContextMenu() 297QPopupMenu * NNTPviewItem::getContextMenu()
298{ 298{
299 QPopupMenu *m = new QPopupMenu(0); 299 QPopupMenu *m = new QPopupMenu(0);
300 if (m) 300 if (m)
301 { 301 {
302 if (!account->getOffline()) 302 if (!account->getOffline())
303 { 303 {
304 m->insertItem(i18n("Disconnect"),0); 304 m->insertItem(i18n("Disconnect"),0);
305 m->insertItem(i18n("Set offline"),1); 305 m->insertItem(i18n("Set offline"),1);
306 //m->insertItem(i18n("(Un-)Subscribe groups"),2); 306 //m->insertItem(i18n("(Un-)Subscribe groups"),2);
307 } 307 }
308 else 308 else
309 { 309 {
310 m->insertItem(i18n("Set online"),1); 310 m->insertItem(i18n("Set online"),1);
311 } 311 }
312 } 312 }
313 return m; 313 return m;
314} 314}
315 315
316void NNTPviewItem::subscribeGroups() 316void NNTPviewItem::subscribeGroups()
317{ 317{
318 NNTPGroupsDlg dlg(account); 318 NNTPGroupsDlg dlg(account);
319#ifndef DESKTOP_VERSION
319 dlg.showMaximized(); 320 dlg.showMaximized();
321#endif
320 if ( dlg.exec()== QDialog::Accepted ){ 322 if ( dlg.exec()== QDialog::Accepted ){
321 refresh(); 323 refresh();
322 } 324 }
323} 325}
324 326
325void NNTPviewItem::disconnect() 327void NNTPviewItem::disconnect()
326{ 328{
327 QListViewItem *child = firstChild(); 329 QListViewItem *child = firstChild();
328 while ( child ) 330 while ( child )
329 { 331 {
330 QListViewItem *tmp = child; 332 QListViewItem *tmp = child;
331 child = child->nextSibling(); 333 child = child->nextSibling();
332 delete tmp; 334 delete tmp;
333 } 335 }
334 wrapper->logout(); 336 wrapper->logout();
335} 337}
336 338
337void NNTPviewItem::setOnOffline() 339void NNTPviewItem::setOnOffline()
338{ 340{
339 if (!account->getOffline()) 341 if (!account->getOffline())
340 { 342 {
341 disconnect(); 343 disconnect();
342 } 344 }
343 account->setOffline(!account->getOffline()); 345 account->setOffline(!account->getOffline());
@@ -518,49 +520,51 @@ QPopupMenu * IMAPviewItem::getContextMenu()
518 { 520 {
519 if (!account->getOffline()) 521 if (!account->getOffline())
520 { 522 {
521 m->insertItem(i18n("Get new messages"),GET_NEW_MAILS); 523 m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
522 m->insertItem(i18n("Refresh folder list"),0); 524 m->insertItem(i18n("Refresh folder list"),0);
523 m->insertItem(i18n("Create new folder"),1); 525 m->insertItem(i18n("Create new folder"),1);
524 m->insertSeparator(); 526 m->insertSeparator();
525 m->insertItem(i18n("Disconnect"),2); 527 m->insertItem(i18n("Disconnect"),2);
526 m->insertItem(i18n("Set offline"),3); 528 m->insertItem(i18n("Set offline"),3);
527 m->insertSeparator(); 529 m->insertSeparator();
528 } 530 }
529 else 531 else
530 { 532 {
531 m->insertItem(i18n("Get new messages"),GET_NEW_MAILS); 533 m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
532 m->insertItem(i18n("Set online"),3); 534 m->insertItem(i18n("Set online"),3);
533 } 535 }
534 } 536 }
535 return m; 537 return m;
536} 538}
537 539
538void IMAPviewItem::createNewFolder() 540void IMAPviewItem::createNewFolder()
539{ 541{
540 Newmdirdlg ndirdlg; 542 Newmdirdlg ndirdlg;
541 543
542 ndirdlg.showMaximized(); 544#ifndef DESKTOP_VERSION
545 //ndirdlg.showMaximized();
546#endif
543 if ( ndirdlg.exec() ) 547 if ( ndirdlg.exec() )
544 { 548 {
545 QString ndir = ndirdlg.Newdir(); 549 QString ndir = ndirdlg.Newdir();
546 bool makesubs = ndirdlg.subpossible(); 550 bool makesubs = ndirdlg.subpossible();
547 QString delemiter = "/"; 551 QString delemiter = "/";
548 IMAPfolderItem*item = (IMAPfolderItem*)firstChild(); 552 IMAPfolderItem*item = (IMAPfolderItem*)firstChild();
549 if (item) 553 if (item)
550 { 554 {
551 delemiter = item->Delemiter(); 555 delemiter = item->Delemiter();
552 } 556 }
553 if (wrapper->createMbox(ndir,0,delemiter,makesubs)) 557 if (wrapper->createMbox(ndir,0,delemiter,makesubs))
554 { 558 {
555 refreshFolders(true); 559 refreshFolders(true);
556 } 560 }
557 } 561 }
558} 562}
559 563
560void IMAPviewItem::contextMenuSelected(int id) 564void IMAPviewItem::contextMenuSelected(int id)
561{ 565{
562 566
563 switch (id) 567 switch (id)
564 { 568 {
565 case 0: 569 case 0:
566 refreshFolders(true); 570 refreshFolders(true);
@@ -672,49 +676,49 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
672 if (m) 676 if (m)
673 { 677 {
674 if (folder->may_select()) 678 if (folder->may_select())
675 { 679 {
676 m->insertItem(i18n("Get new messages"),GET_NEW_MAILS); 680 m->insertItem(i18n("Get new messages"),GET_NEW_MAILS);
677 m->insertItem(i18n("Refresh header list"),0); 681 m->insertItem(i18n("Refresh header list"),0);
678 m->insertItem(i18n("Move/Copie all mails"),4); 682 m->insertItem(i18n("Move/Copie all mails"),4);
679 m->insertItem(i18n("Delete all mails"),1); 683 m->insertItem(i18n("Delete all mails"),1);
680 } 684 }
681 if (folder->no_inferior()==false) 685 if (folder->no_inferior()==false)
682 { 686 {
683 m->insertItem(i18n("Create new subfolder"),2); 687 m->insertItem(i18n("Create new subfolder"),2);
684 } 688 }
685 if (folder->getDisplayName().lower()!="inbox") 689 if (folder->getDisplayName().lower()!="inbox")
686 { 690 {
687 m->insertItem(i18n("Delete folder"),3); 691 m->insertItem(i18n("Delete folder"),3);
688 } 692 }
689 } 693 }
690 return m; 694 return m;
691} 695}
692 696
693void IMAPfolderItem::createNewFolder() 697void IMAPfolderItem::createNewFolder()
694{ 698{
695 Newmdirdlg ndirdlg; 699 Newmdirdlg ndirdlg;
696 ndirdlg.showMaximized(); 700 //ndirdlg.showMaximized();
697 if ( ndirdlg.exec() ) 701 if ( ndirdlg.exec() )
698 { 702 {
699 QString ndir = ndirdlg.Newdir(); 703 QString ndir = ndirdlg.Newdir();
700 bool makesubs = ndirdlg.subpossible(); 704 bool makesubs = ndirdlg.subpossible();
701 QString delemiter = Delemiter(); 705 QString delemiter = Delemiter();
702 if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs)) 706 if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs))
703 { 707 {
704 imap->refreshFolders(true); 708 imap->refreshFolders(true);
705 } 709 }
706 } 710 }
707} 711}
708 712
709void IMAPfolderItem::deleteFolder() 713void IMAPfolderItem::deleteFolder()
710{ 714{
711 int yesno = QMessageBox::warning(0,i18n("Delete folder"), 715 int yesno = QMessageBox::warning(0,i18n("Delete folder"),
712 i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()), 716 i18n("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>").arg(folder->getDisplayName()),
713 i18n("Yes"), 717 i18n("Yes"),
714 i18n("No"),QString::null,1,1); 718 i18n("No"),QString::null,1,1);
715 719
716 if (yesno == 0) 720 if (yesno == 0)
717 { 721 {
718 if (imap->getWrapper()->deleteMbox(folder)) 722 if (imap->getWrapper()->deleteMbox(folder))
719 { 723 {
720 QListView*v=listView(); 724 QListView*v=listView();
@@ -848,49 +852,49 @@ void MHviewItem::refresh(bool force)
848} 852}
849 853
850RECBODYP MHviewItem::fetchBody( const RecMailP &mail ) 854RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
851{ 855{
852 856
853 return wrapper->fetchBody( mail ); 857 return wrapper->fetchBody( mail );
854} 858}
855 859
856QPopupMenu * MHviewItem::getContextMenu() 860QPopupMenu * MHviewItem::getContextMenu()
857{ 861{
858 QPopupMenu *m = new QPopupMenu(0); 862 QPopupMenu *m = new QPopupMenu(0);
859 if (m) 863 if (m)
860 { 864 {
861 m->insertItem(i18n("Refresh folder list"),0); 865 m->insertItem(i18n("Refresh folder list"),0);
862 m->insertItem(i18n("Create new folder"),1); 866 m->insertItem(i18n("Create new folder"),1);
863 m->insertItem(i18n("Delete all mails"),2); 867 m->insertItem(i18n("Delete all mails"),2);
864 m->insertItem(i18n("Move/Copie all mails"),3); 868 m->insertItem(i18n("Move/Copie all mails"),3);
865 } 869 }
866 return m; 870 return m;
867} 871}
868 872
869void MHviewItem::createFolder() 873void MHviewItem::createFolder()
870{ 874{
871 Newmdirdlg ndirdlg(0,0,true); 875 Newmdirdlg ndirdlg(0,0,true);
872 ndirdlg.showMaximized(); 876 //ndirdlg.showMaximized();
873 if ( ndirdlg.exec() ) 877 if ( ndirdlg.exec() )
874 { 878 {
875 QString ndir = ndirdlg.Newdir(); 879 QString ndir = ndirdlg.Newdir();
876 if (wrapper->createMbox(ndir)) 880 if (wrapper->createMbox(ndir))
877 { 881 {
878 refresh(true); 882 refresh(true);
879 } 883 }
880 } 884 }
881} 885}
882 886
883void MHviewItem::downloadMails() 887void MHviewItem::downloadMails()
884{ 888{
885 AccountView*bl = accountView(); 889 AccountView*bl = accountView();
886 if (!bl) return; 890 if (!bl) return;
887 bl->downloadMails(folder,getWrapper()); 891 bl->downloadMails(folder,getWrapper());
888} 892}
889 893
890QStringList MHviewItem::subFolders() 894QStringList MHviewItem::subFolders()
891{ 895{
892 return currentFolders; 896 return currentFolders;
893} 897}
894 898
895void MHviewItem::contextMenuSelected(int which) 899void MHviewItem::contextMenuSelected(int which)
896{ 900{
@@ -1000,49 +1004,49 @@ void MHfolderItem::deleteFolder()
1000 1004
1001QPopupMenu * MHfolderItem::getContextMenu() 1005QPopupMenu * MHfolderItem::getContextMenu()
1002{ 1006{
1003 QPopupMenu *m = new QPopupMenu(0); 1007 QPopupMenu *m = new QPopupMenu(0);
1004 if (m) 1008 if (m)
1005 { 1009 {
1006 m->insertItem(i18n("Move/Copie all mails"),2); 1010 m->insertItem(i18n("Move/Copie all mails"),2);
1007 m->insertItem(i18n("Delete all mails"),0); 1011 m->insertItem(i18n("Delete all mails"),0);
1008 m->insertItem(i18n("Create new subfolder"),3); 1012 m->insertItem(i18n("Create new subfolder"),3);
1009 m->insertItem(i18n("Delete folder"),1); 1013 m->insertItem(i18n("Delete folder"),1);
1010 } 1014 }
1011 return m; 1015 return m;
1012} 1016}
1013 1017
1014void MHfolderItem::downloadMails() 1018void MHfolderItem::downloadMails()
1015{ 1019{
1016 AccountView*bl = mbox->accountView(); 1020 AccountView*bl = mbox->accountView();
1017 if (!bl) return; 1021 if (!bl) return;
1018 bl->downloadMails(folder,mbox->getWrapper()); 1022 bl->downloadMails(folder,mbox->getWrapper());
1019} 1023}
1020 1024
1021void MHfolderItem::createFolder() 1025void MHfolderItem::createFolder()
1022{ 1026{
1023 Newmdirdlg ndirdlg(0,0,true); 1027 Newmdirdlg ndirdlg(0,0,true);
1024 ndirdlg.showMaximized(); 1028 //ndirdlg.showMaximized();
1025 if (ndirdlg.exec() ) 1029 if (ndirdlg.exec() )
1026 { 1030 {
1027 QString ndir = ndirdlg.Newdir(); 1031 QString ndir = ndirdlg.Newdir();
1028 if (mbox->getWrapper()->createMbox(ndir,folder)) 1032 if (mbox->getWrapper()->createMbox(ndir,folder))
1029 { 1033 {
1030 QListView*v=listView(); 1034 QListView*v=listView();
1031 MHviewItem * box = mbox; 1035 MHviewItem * box = mbox;
1032 /* be carefull - after that this object is destroyd so don't use 1036 /* be carefull - after that this object is destroyd so don't use
1033 * any member of it after that call!!*/ 1037 * any member of it after that call!!*/
1034 mbox->refresh(true); 1038 mbox->refresh(true);
1035 if (v) 1039 if (v)
1036 { 1040 {
1037 v->setSelected(box,true); 1041 v->setSelected(box,true);
1038 } 1042 }
1039 } 1043 }
1040 } 1044 }
1041} 1045}
1042 1046
1043void MHfolderItem::contextMenuSelected(int which) 1047void MHfolderItem::contextMenuSelected(int which)
1044{ 1048{
1045 switch(which) 1049 switch(which)
1046 { 1050 {
1047 case 0: 1051 case 0:
1048 deleteAllMail(mbox->getWrapper(),folder); 1052 deleteAllMail(mbox->getWrapper(),folder);
diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index c10d384..c9c4a0f 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -102,49 +102,54 @@ void AccountView::refresh(QListViewItem *item)
102void AccountView::refreshCurrent() 102void AccountView::refreshCurrent()
103{ 103{
104 m_currentItem = currentItem(); 104 m_currentItem = currentItem();
105 if ( !m_currentItem ) return; 105 if ( !m_currentItem ) return;
106 QValueList<RecMailP> headerlist; 106 QValueList<RecMailP> headerlist;
107 AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem); 107 AccountViewItem *view = static_cast<AccountViewItem *>(m_currentItem);
108 view->refresh(headerlist); 108 view->refresh(headerlist);
109 emit refreshMailview(headerlist); 109 emit refreshMailview(headerlist);
110} 110}
111 111
112void AccountView::refreshAll() 112void AccountView::refreshAll()
113{ 113{
114} 114}
115 115
116RecBodyP AccountView::fetchBody(const RecMailP&aMail) 116RecBodyP AccountView::fetchBody(const RecMailP&aMail)
117{ 117{
118 QListViewItem*item = selectedItem (); 118 QListViewItem*item = selectedItem ();
119 if (!item) return new RecBody(); 119 if (!item) return new RecBody();
120 AccountViewItem *view = static_cast<AccountViewItem *>(item); 120 AccountViewItem *view = static_cast<AccountViewItem *>(item);
121 return view->fetchBody(aMail); 121 return view->fetchBody(aMail);
122} 122}
123 123
124void AccountView::setupFolderselect(Selectstore*sels) 124void AccountView::setupFolderselect(Selectstore*sels)
125{ 125{
126
127#ifndef DESKTOP_VERSION
126 sels->showMaximized(); 128 sels->showMaximized();
129#else
130 sels->show();
131#endif
127 QStringList sFolders; 132 QStringList sFolders;
128 unsigned int i = 0; 133 unsigned int i = 0;
129 for (i=0; i < mhAccounts.count();++i) 134 for (i=0; i < mhAccounts.count();++i)
130 { 135 {
131 mhAccounts[i]->refresh(false); 136 mhAccounts[i]->refresh(false);
132 sFolders = mhAccounts[i]->subFolders(); 137 sFolders = mhAccounts[i]->subFolders();
133 sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders); 138 sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders);
134 } 139 }
135 for (i=0; i < imapAccounts.count();++i) 140 for (i=0; i < imapAccounts.count();++i)
136 { 141 {
137 if (imapAccounts[i]->offline()) 142 if (imapAccounts[i]->offline())
138 continue; 143 continue;
139 imapAccounts[i]->refreshFolders(false); 144 imapAccounts[i]->refreshFolders(false);
140 sels->addAccounts(imapAccounts[i]->getWrapper(),imapAccounts[i]->subFolders()); 145 sels->addAccounts(imapAccounts[i]->getWrapper(),imapAccounts[i]->subFolders());
141 } 146 }
142} 147}
143void AccountView::downloadMailsInbox(const FolderP&fromFolder,AbstractMail*fromWrapper) 148void AccountView::downloadMailsInbox(const FolderP&fromFolder,AbstractMail*fromWrapper)
144{ 149{
145#if 0 150#if 0
146 AbstractMail*targetMail = 0; 151 AbstractMail*targetMail = 0;
147 QString targetFolder = ""; 152 QString targetFolder = "";
148 Selectstore sels; 153 Selectstore sels;
149 setupFolderselect(&sels); 154 setupFolderselect(&sels);
150 if (!sels.exec()) return; 155 if (!sels.exec()) return;
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index 0d30097..48c3963 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -86,49 +86,52 @@ void EditAccounts::slotFillLists()
86 else 86 else
87 { 87 {
88 (void) new AccountListItem( mailList, it ); 88 (void) new AccountListItem( mailList, it );
89 } 89 }
90 } 90 }
91} 91}
92 92
93void EditAccounts::slotNewMail() 93void EditAccounts::slotNewMail()
94{ 94{
95 QString *selection = new QString(); 95 QString *selection = new QString();
96 SelectMailType selType( selection, this, 0, true ); 96 SelectMailType selType( selection, this, 0, true );
97 selType.show(); 97 selType.show();
98 if ( QDialog::Accepted == selType.exec() ) 98 if ( QDialog::Accepted == selType.exec() )
99 { 99 {
100 slotNewAccount( *selection ); 100 slotNewAccount( *selection );
101 } 101 }
102} 102}
103 103
104void EditAccounts::slotNewAccount( const QString &type ) 104void EditAccounts::slotNewAccount( const QString &type )
105{ 105{
106 if ( type.compare( i18n("IMAP") ) == 0 ) 106 if ( type.compare( i18n("IMAP") ) == 0 )
107 { 107 {
108 IMAPaccount *account = new IMAPaccount(); 108 IMAPaccount *account = new IMAPaccount();
109 IMAPconfig imap( account, this, 0, true ); 109 IMAPconfig imap( account, this, 0, true );
110
111#ifndef DESKTOP_VERSION
110 imap.showMaximized(); 112 imap.showMaximized();
113#endif
111 if ( QDialog::Accepted == imap.exec() ) 114 if ( QDialog::Accepted == imap.exec() )
112 { 115 {
113 settings->addAccount( account ); 116 settings->addAccount( account );
114 account->save(); 117 account->save();
115 slotFillLists(); 118 slotFillLists();
116 } 119 }
117 else 120 else
118 { 121 {
119 account->remove(); 122 account->remove();
120 } 123 }
121 } 124 }
122 else if ( type.compare( i18n("POP3") ) == 0 ) 125 else if ( type.compare( i18n("POP3") ) == 0 )
123 { 126 {
124 POP3account *account = new POP3account(); 127 POP3account *account = new POP3account();
125 POP3config pop3( account, this, 0, true, WStyle_ContextHelp ); 128 POP3config pop3( account, this, 0, true, WStyle_ContextHelp );
126 if ( QDialog::Accepted == KApplication::execDialog( &pop3 ) ) 129 if ( QDialog::Accepted == KApplication::execDialog( &pop3 ) )
127 { 130 {
128 settings->addAccount( account ); 131 settings->addAccount( account );
129 account->save(); 132 account->save();
130 slotFillLists(); 133 slotFillLists();
131 } 134 }
132 else 135 else
133 { 136 {
134 account->remove(); 137 account->remove();
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index fe9df87..8d16ae7 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -104,118 +104,124 @@ void OpieMail::slotExtAppHandler()
104{ 104{
105 ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData ); 105 ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData );
106} 106}
107void OpieMail::slotwriteMail2(const QString& namemail ) 107void OpieMail::slotwriteMail2(const QString& namemail )
108{ 108{
109 //qDebug("OpieMail::slotwriteMail2 "); 109 //qDebug("OpieMail::slotwriteMail2 ");
110 //qApp->processEvents(); 110 //qApp->processEvents();
111 ComposeMail compose( settings, this, 0, true ); 111 ComposeMail compose( settings, this, 0, true );
112 if ( !namemail.isEmpty() ) { 112 if ( !namemail.isEmpty() ) {
113 QString to = namemail; 113 QString to = namemail;
114 if ( namemail.find( " <") > 1 ) { 114 if ( namemail.find( " <") > 1 ) {
115 to = "\"" +to.replace( QRegExp( " <"), "\" <") ; 115 to = "\"" +to.replace( QRegExp( " <"), "\" <") ;
116 } else 116 } else
117 if ( namemail.find( "<") > 1 ) { 117 if ( namemail.find( "<") > 1 ) {
118 to = "\"" +to.replace( QRegExp( "<"), "\" <") ; 118 to = "\"" +to.replace( QRegExp( "<"), "\" <") ;
119 } 119 }
120 int sub = to.find( ">:"); 120 int sub = to.find( ">:");
121 if ( sub > 0 ) { 121 if ( sub > 0 ) {
122 compose.setTo( to.left(sub+1) ); 122 compose.setTo( to.left(sub+1) );
123 compose.setSubject( to.mid(sub+2) ); 123 compose.setSubject( to.mid(sub+2) );
124 } else 124 } else
125 compose.setTo( to ); 125 compose.setTo( to );
126 } 126 }
127 compose.slotAdjustColumns(); 127 compose.slotAdjustColumns();
128#ifndef DESKTOP_VERSION
128 compose.showMaximized(); 129 compose.showMaximized();
130#endif
129 compose.exec(); 131 compose.exec();
130 raise(); 132 raise();
131 //qDebug("retttich "); 133 //qDebug("retttich ");
132} 134}
133void OpieMail::slotwriteMail(const QString&name,const QString&email) 135void OpieMail::slotwriteMail(const QString&name,const QString&email)
134{ 136{
135 // qDebug("OpieMail::slotwriteMail "); 137 // qDebug("OpieMail::slotwriteMail ");
136 ComposeMail compose( settings, this, 0, true ); 138 ComposeMail compose( settings, this, 0, true );
137 if (!email.isEmpty()) 139 if (!email.isEmpty())
138 { 140 {
139 if (!name.isEmpty()) 141 if (!name.isEmpty())
140 { 142 {
141 compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); 143 compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
142 } 144 }
143 else 145 else
144 { 146 {
145 compose.setTo(email); 147 compose.setTo(email);
146 } 148 }
147 } 149 }
148 compose.slotAdjustColumns(); 150 compose.slotAdjustColumns();
151#ifndef DESKTOP_VERSION
149 compose.showMaximized(); 152 compose.showMaximized();
153#endif
150 compose.exec(); 154 compose.exec();
151 raise(); 155 raise();
152} 156}
153 157
154void OpieMail::slotComposeMail() 158void OpieMail::slotComposeMail()
155{ 159{
156 if ( mPendingEmail == QString::null && mPendingName == QString::null) 160 if ( mPendingEmail == QString::null && mPendingName == QString::null)
157 slotwriteMail2( QString () ); 161 slotwriteMail2( QString () );
158 else { 162 else {
159 if ( mPendingEmail == QString::null ) 163 if ( mPendingEmail == QString::null )
160 slotwriteMail2( mPendingName ); 164 slotwriteMail2( mPendingName );
161 else 165 else
162 slotwriteMail( mPendingName, mPendingEmail ); 166 slotwriteMail( mPendingName, mPendingEmail );
163 } 167 }
164 //slotwriteMail(0l,0l); 168 //slotwriteMail(0l,0l);
165} 169}
166 170
167void OpieMail::slotSendQueued() 171void OpieMail::slotSendQueued()
168{ 172{
169 SMTPaccount *smtp = 0; 173 SMTPaccount *smtp = 0;
170 174
171 QList<Account> list = settings->getAccounts(); 175 QList<Account> list = settings->getAccounts();
172 QList<SMTPaccount> smtpList; 176 QList<SMTPaccount> smtpList;
173 smtpList.setAutoDelete(false); 177 smtpList.setAutoDelete(false);
174 Account *it; 178 Account *it;
175 for ( it = list.first(); it; it = list.next() ) 179 for ( it = list.first(); it; it = list.next() )
176 { 180 {
177 if ( it->getType() == MAILLIB::A_SMTP ) 181 if ( it->getType() == MAILLIB::A_SMTP )
178 { 182 {
179 smtp = static_cast<SMTPaccount *>(it); 183 smtp = static_cast<SMTPaccount *>(it);
180 smtpList.append(smtp); 184 smtpList.append(smtp);
181 } 185 }
182 } 186 }
183 if (smtpList.count()==0) 187 if (smtpList.count()==0)
184 { 188 {
185 QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n")); 189 QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n"));
186 return; 190 return;
187 } 191 }
188 if (smtpList.count()==1) 192 if (smtpList.count()==1)
189 { 193 {
190 smtp = smtpList.at(0); 194 smtp = smtpList.at(0);
191 } 195 }
192 else 196 else
193 { 197 {
194 smtp = 0; 198 smtp = 0;
195 selectsmtp selsmtp; 199 selectsmtp selsmtp;
196 selsmtp.setSelectionlist(&smtpList); 200 selsmtp.setSelectionlist(&smtpList);
201#ifndef DESKTOP_VERSION
197 selsmtp.showMaximized(); 202 selsmtp.showMaximized();
203#endif
198 if ( selsmtp.exec() == QDialog::Accepted ) 204 if ( selsmtp.exec() == QDialog::Accepted )
199 { 205 {
200 smtp = selsmtp.selected_smtp(); 206 smtp = selsmtp.selected_smtp();
201 } 207 }
202 } 208 }
203 if (smtp) 209 if (smtp)
204 { 210 {
205 SMTPwrapper * wrap = new SMTPwrapper(smtp); 211 SMTPwrapper * wrap = new SMTPwrapper(smtp);
206 if ( wrap->flushOutbox() ) 212 if ( wrap->flushOutbox() )
207 { 213 {
208 QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed")); 214 QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed"));
209 } 215 }
210 delete wrap; 216 delete wrap;
211 } 217 }
212} 218}
213 219
214void OpieMail::slotSearchMails() 220void OpieMail::slotSearchMails()
215{ 221{
216 qDebug("OpieMail::slotSearchMails():not implemented "); 222 qDebug("OpieMail::slotSearchMails():not implemented ");
217} 223}
218 224
219void OpieMail::slotEditSettings() 225void OpieMail::slotEditSettings()
220{ 226{
221 227