summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/composemail.cpp4
-rw-r--r--kmicromail/composemail.h4
-rw-r--r--kmicromail/opiemail.cpp8
-rw-r--r--kmicromail/opiemail.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 14feeee..01dd406 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -17,50 +17,50 @@
17//#include <qpe/contact.h> 17//#include <qpe/contact.h>
18 18
19 19
20#include <qcombobox.h> 20#include <qcombobox.h>
21#include <qcheckbox.h> 21#include <qcheckbox.h>
22#include <qtimer.h> 22#include <qtimer.h>
23#include <qmessagebox.h> 23#include <qmessagebox.h>
24#include <qpushbutton.h> 24#include <qpushbutton.h>
25#include <qmultilineedit.h> 25#include <qmultilineedit.h>
26#include <qlabel.h> 26#include <qlabel.h>
27#include <qtabwidget.h> 27#include <qtabwidget.h>
28#include <qlistview.h> 28#include <qlistview.h>
29#include <kabc/addresseedialog.h> 29#include <kabc/addresseedialog.h>
30#include <kabc/stdaddressbook.h> 30#include <kabc/stdaddressbook.h>
31#include <kabc/addressee.h> 31#include <kabc/addressee.h>
32#ifdef DESKTOP_VERSION 32#ifdef DESKTOP_VERSION
33#include <kabc/addresseedialog.h> 33#include <kabc/addresseedialog.h>
34#else //DESKTOP_VERSION 34#else //DESKTOP_VERSION
35#include <libkdepim/externalapphandler.h> 35#include <libkdepim/externalapphandler.h>
36#endif //DESKTOP_VERSION 36#endif //DESKTOP_VERSION
37 37
38 38
39//using namespace Opie::Core; 39//using namespace Opie::Core;
40//using namespace Opie::Ui; 40//using namespace Opie::Ui;
41ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) 41ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal )
42 : ComposeMailUI( parent, name, modal, flags ) 42 : ComposeMailUI( parent, name, modal )
43{ 43{
44 44
45 mPickLineEdit = 0; 45 mPickLineEdit = 0;
46 connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)), 46 connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
47 this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); 47 this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
48 settings = s; 48 settings = s;
49 m_replyid = ""; 49 m_replyid = "";
50 KConfig config( locateLocal("config", "kabcrc") ); 50 KConfig config( locateLocal("config", "kabcrc") );
51 config.setGroup( "General" ); 51 config.setGroup( "General" );
52 QString whoami_uid = config.readEntry( "WhoAmI" ); 52 QString whoami_uid = config.readEntry( "WhoAmI" );
53 if ( whoami_uid.isEmpty() ) { 53 if ( whoami_uid.isEmpty() ) {
54 QMessageBox::information( 0, tr( "Hint" ), 54 QMessageBox::information( 0, tr( "Hint" ),
55 tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), 55 tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
56 tr( "Ok" ) ); 56 tr( "Ok" ) );
57 57
58 } else 58 } else
59 bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid); 59 bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid);
60#ifdef DESKTOP_VERSION 60#ifdef DESKTOP_VERSION
61 KABC::Addressee con = KABC::StdAddressBook::self()->whoAmI( ); 61 KABC::Addressee con = KABC::StdAddressBook::self()->whoAmI( );
62 QStringList mails = con.emails(); 62 QStringList mails = con.emails();
63 QString defmail = con.preferredEmail(); 63 QString defmail = con.preferredEmail();
64 if ( mails.count() == 0) 64 if ( mails.count() == 0)
65 QMessageBox::information( 0, tr( "Hint" ), 65 QMessageBox::information( 0, tr( "Hint" ),
66 tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ), 66 tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
diff --git a/kmicromail/composemail.h b/kmicromail/composemail.h
index 657f665..e20d9e1 100644
--- a/kmicromail/composemail.h
+++ b/kmicromail/composemail.h
@@ -1,62 +1,62 @@
1#ifndef COMPOSEMAIL_H 1#ifndef COMPOSEMAIL_H
2#define COMPOSEMAIL_H 2#define COMPOSEMAIL_H
3 3
4#include <qlineedit.h> 4#include <qlineedit.h>
5#include <qlistview.h> 5#include <qlistview.h>
6 6
7#include "composemailui.h" 7#include "composemailui.h"
8//#include "addresspickerui.h" 8//#include "addresspickerui.h"
9#include <libmailwrapper/settings.h> 9#include <libmailwrapper/settings.h>
10#include <libmailwrapper/mailwrapper.h> 10#include <libmailwrapper/mailwrapper.h>
11 11
12class RecMail; 12class RecMail;
13 13
14#include <opie2/osmartpointer.h> 14#include <opie2/osmartpointer.h>
15#if 0 15#if 0
16class AddressPicker : public AddressPickerUI 16class AddressPicker : public AddressPickerUI
17{ 17{
18 //Q_OBJECT 18 //Q_OBJECT
19 19
20public: 20public:
21 AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); 21 AddressPicker( QWidget *parent = 0, const char *name = 0, bool modal = false );
22 static QString getNames(); 22 static QString getNames();
23 23
24protected: 24protected:
25 QString selectedNames; 25 QString selectedNames;
26 void accept(); 26 void accept();
27 27
28}; 28};
29#endif 29#endif
30class RecMail; 30class RecMail;
31 31
32class ComposeMail : public ComposeMailUI 32class ComposeMail : public ComposeMailUI
33{ 33{
34 Q_OBJECT 34 Q_OBJECT
35 35
36public: 36public:
37 37
38 ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false, WFlags flags = 0 ); 38 ComposeMail( Settings *s, QWidget *parent = 0, const char *name = 0, bool modal = false );
39 virtual ~ComposeMail(); 39 virtual ~ComposeMail();
40 40
41 void reEditMail(const Opie::Core::OSmartPointer<RecMail>&current); 41 void reEditMail(const Opie::Core::OSmartPointer<RecMail>&current);
42 42
43public slots: 43public slots:
44 void slotAdjustColumns(); 44 void slotAdjustColumns();
45 45
46 void setTo( const QString & to ); 46 void setTo( const QString & to );
47 void setSubject( const QString & subject ); 47 void setSubject( const QString & subject );
48 void setInReplyTo( const QString & messageId ); 48 void setInReplyTo( const QString & messageId );
49 void setMessage( const QString & text ); 49 void setMessage( const QString & text );
50 void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist); 50 void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist);
51 51
52 52
53protected slots: 53protected slots:
54 void accept(); 54 void accept();
55 void reject(); 55 void reject();
56 56
57private slots: 57private slots:
58 void fillValues( int current ); 58 void fillValues( int current );
59 void pickAddress(); 59 void pickAddress();
60 void pickAddressTo(); 60 void pickAddressTo();
61 void pickAddressCC(); 61 void pickAddressCC();
62 void pickAddressBCC(); 62 void pickAddressBCC();
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index a1c5645..0c581c0 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -2,51 +2,51 @@
2// CHANGED 2004-08-06 Lutz Rogowski 2// CHANGED 2004-08-06 Lutz Rogowski
3 3
4#include "settingsdialog.h" 4#include "settingsdialog.h"
5#include "opiemail.h" 5#include "opiemail.h"
6#include "editaccounts.h" 6#include "editaccounts.h"
7#include "composemail.h" 7#include "composemail.h"
8#include "mailistviewitem.h" 8#include "mailistviewitem.h"
9#include "viewmail.h" 9#include "viewmail.h"
10#include "selectstore.h" 10#include "selectstore.h"
11#include "selectsmtp.h" 11#include "selectsmtp.h"
12 12
13#include <qmessagebox.h> 13#include <qmessagebox.h>
14#include <libkdepim/externalapphandler.h> 14#include <libkdepim/externalapphandler.h>
15 15
16#include <qpe/qpeapplication.h> 16#include <qpe/qpeapplication.h>
17#include <libmailwrapper/smtpwrapper.h> 17#include <libmailwrapper/smtpwrapper.h>
18#include <libmailwrapper/mailtypes.h> 18#include <libmailwrapper/mailtypes.h>
19#include <libmailwrapper/abstractmail.h> 19#include <libmailwrapper/abstractmail.h>
20/* OPIE */ 20/* OPIE */
21//#include <qpe/resource.h> 21//#include <qpe/resource.h>
22//#include <qpe/qpeapplication.h> 22//#include <qpe/qpeapplication.h>
23 23
24/* QT */ 24/* QT */
25 25
26using namespace Opie::Core; 26//using namespace Opie::Core;
27 27
28OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) 28OpieMail::OpieMail( QWidget *parent, const char *name )
29 : MainWindow( parent, name) //, WStyle_ContextHelp ) 29 : MainWindow( parent, name) //, WStyle_ContextHelp )
30{ 30{
31 settings = new Settings(); 31 settings = new Settings();
32 32
33 folderView->populate( settings->getAccounts() ); 33 folderView->populate( settings->getAccounts() );
34 34
35} 35}
36 36
37OpieMail::~OpieMail() 37OpieMail::~OpieMail()
38{ 38{
39 if (settings) delete settings; 39 if (settings) delete settings;
40} 40}
41 41
42void OpieMail::appMessage(const QCString &msg, const QByteArray &data) 42void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
43{ 43{
44 44
45} 45}
46#include <stdlib.h> 46#include <stdlib.h>
47void OpieMail::message(const QCString &msg, const QByteArray &data) 47void OpieMail::message(const QCString &msg, const QByteArray &data)
48{ 48{
49 // copied from old mail2 49 // copied from old mail2
50 static int ii = 0; 50 static int ii = 0;
51 qDebug("call ############################# %d ", ii); 51 qDebug("call ############################# %d ", ii);
52 // block second call 52 // block second call
@@ -92,49 +92,49 @@ void OpieMail::slotwriteMail2(const QString& namemail )
92 if ( !namemail.isEmpty() ) { 92 if ( !namemail.isEmpty() ) {
93 QString to = namemail; 93 QString to = namemail;
94 if ( namemail.find( " <") > 1 ) { 94 if ( namemail.find( " <") > 1 ) {
95 to = "\"" +to.replace( QRegExp( " <"), "\" <") ; 95 to = "\"" +to.replace( QRegExp( " <"), "\" <") ;
96 } else 96 } else
97 if ( namemail.find( "<") > 1 ) { 97 if ( namemail.find( "<") > 1 ) {
98 to = "\"" +to.replace( QRegExp( "<"), "\" <") ; 98 to = "\"" +to.replace( QRegExp( "<"), "\" <") ;
99 } 99 }
100 int sub = to.find( ">:"); 100 int sub = to.find( ">:");
101 if ( sub > 0 ) { 101 if ( sub > 0 ) {
102 compose.setTo( to.left(sub+1) ); 102 compose.setTo( to.left(sub+1) );
103 compose.setSubject( to.mid(sub+2) ); 103 compose.setSubject( to.mid(sub+2) );
104 } else 104 } else
105 compose.setTo( to ); 105 compose.setTo( to );
106 } 106 }
107 compose.slotAdjustColumns(); 107 compose.slotAdjustColumns();
108 compose.showMaximized(); 108 compose.showMaximized();
109 compose.exec(); 109 compose.exec();
110 raise(); 110 raise();
111 //qDebug("retttich "); 111 //qDebug("retttich ");
112} 112}
113void OpieMail::slotwriteMail(const QString&name,const QString&email) 113void OpieMail::slotwriteMail(const QString&name,const QString&email)
114{ 114{
115 // qDebug("OpieMail::slotwriteMail "); 115 // qDebug("OpieMail::slotwriteMail ");
116 ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); 116 ComposeMail compose( settings, this, 0, true );
117 if (!email.isEmpty()) 117 if (!email.isEmpty())
118 { 118 {
119 if (!name.isEmpty()) 119 if (!name.isEmpty())
120 { 120 {
121 compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">"); 121 compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
122 } 122 }
123 else 123 else
124 { 124 {
125 compose.setTo(email); 125 compose.setTo(email);
126 } 126 }
127 } 127 }
128 compose.slotAdjustColumns(); 128 compose.slotAdjustColumns();
129 compose.showMaximized(); 129 compose.showMaximized();
130 compose.exec(); 130 compose.exec();
131} 131}
132 132
133void OpieMail::slotComposeMail() 133void OpieMail::slotComposeMail()
134{ 134{
135 slotwriteMail2( QString () ); 135 slotwriteMail2( QString () );
136 //slotwriteMail(0l,0l); 136 //slotwriteMail(0l,0l);
137} 137}
138 138
139void OpieMail::slotSendQueued() 139void OpieMail::slotSendQueued()
140{ 140{
@@ -396,30 +396,30 @@ void OpieMail::slotMoveCopyAllMail()
396 targetMail = sels.currentMail(); 396 targetMail = sels.currentMail();
397 targetFolder = sels.currentFolder(); 397 targetFolder = sels.currentFolder();
398 if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) || 398 if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
399 targetFolder.isEmpty()) 399 targetFolder.isEmpty())
400 { 400 {
401 return; 401 return;
402 } 402 }
403 if (sels.newFolder() && !targetMail->createMbox(targetFolder)) 403 if (sels.newFolder() && !targetMail->createMbox(targetFolder))
404 { 404 {
405 QMessageBox::critical(0,tr("Error creating new Folder"), 405 QMessageBox::critical(0,tr("Error creating new Folder"),
406 tr("<center>Error while creating<br>new folder - breaking.</center>")); 406 tr("<center>Error while creating<br>new folder - breaking.</center>"));
407 return; 407 return;
408 } 408 }
409 sels.hide(); 409 sels.hide();
410 qApp->processEvents(); 410 qApp->processEvents();
411 //qDebug("hiding sels "); 411 //qDebug("hiding sels ");
412 mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails()); 412 mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails());
413 folderView->refreshCurrent(); 413 folderView->refreshCurrent();
414} 414}
415 415
416void OpieMail::reEditMail() 416void OpieMail::reEditMail()
417{ 417{
418 if (!mailView->currentItem()) return; 418 if (!mailView->currentItem()) return;
419 419
420 ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); 420 ComposeMail compose( settings, this, 0, true );
421 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data()); 421 compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
422 compose.slotAdjustColumns(); 422 compose.slotAdjustColumns();
423 compose.showMaximized(); 423 compose.showMaximized();
424 compose.exec(); 424 compose.exec();
425} 425}
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 934f232..7434e59 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -1,42 +1,42 @@
1// CHANGED 2004-09-31 Lutz Rogowski 1// CHANGED 2004-09-31 Lutz Rogowski
2#ifndef OPIEMAIL_H 2#ifndef OPIEMAIL_H
3#define OPIEMAIL_H 3#define OPIEMAIL_H
4 4
5#include "mainwindow.h" 5#include "mainwindow.h"
6#include <libmailwrapper/settings.h> 6#include <libmailwrapper/settings.h>
7 7
8#include <opie2/osmartpointer.h> 8#include <opie2/osmartpointer.h>
9#include <libmailwrapper/mailtypes.h> 9#include <libmailwrapper/mailtypes.h>
10 10
11class OpieMail : public MainWindow 11class OpieMail : public MainWindow
12{ 12{
13 Q_OBJECT 13 Q_OBJECT
14 14
15public: 15public:
16 OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); 16 OpieMail( QWidget *parent = 0, const char *name = 0 );
17 virtual ~OpieMail(); 17 virtual ~OpieMail();
18 static QString appName() { return QString::fromLatin1("opiemail"); } 18 static QString appName() { return QString::fromLatin1("kopiemail"); }
19 19
20public slots: 20public slots:
21 virtual void slotwriteMail(const QString&name,const QString&email); 21 virtual void slotwriteMail(const QString&name,const QString&email);
22 virtual void slotwriteMail2(const QString&nameemail); 22 virtual void slotwriteMail2(const QString&nameemail);
23 virtual void slotComposeMail(); 23 virtual void slotComposeMail();
24 virtual void appMessage(const QCString &msg, const QByteArray &data); 24 virtual void appMessage(const QCString &msg, const QByteArray &data);
25 virtual void message(const QCString &msg, const QByteArray &data); 25 virtual void message(const QCString &msg, const QByteArray &data);
26protected slots: 26protected slots:
27 virtual void slotSendQueued(); 27 virtual void slotSendQueued();
28 virtual void slotSearchMails(); 28 virtual void slotSearchMails();
29 virtual void slotEditSettings(); 29 virtual void slotEditSettings();
30 virtual void slotEditAccounts(); 30 virtual void slotEditAccounts();
31 virtual void displayMail(); 31 virtual void displayMail();
32 virtual void slotDeleteMail(); 32 virtual void slotDeleteMail();
33 virtual void slotDeleteAllMail(); 33 virtual void slotDeleteAllMail();
34 virtual void mailHold(int, QListViewItem *,const QPoint&,int); 34 virtual void mailHold(int, QListViewItem *,const QPoint&,int);
35 virtual void slotShowFolders( bool show ); 35 virtual void slotShowFolders( bool show );
36 virtual void refreshMailView(const QValueList<RecMailP>&); 36 virtual void refreshMailView(const QValueList<RecMailP>&);
37 virtual void mailLeftClicked( QListViewItem * ); 37 virtual void mailLeftClicked( QListViewItem * );
38 virtual void slotMoveCopyMail(); 38 virtual void slotMoveCopyMail();
39 virtual void slotMoveCopyAllMail(); 39 virtual void slotMoveCopyAllMail();
40 virtual void reEditMail(); 40 virtual void reEditMail();
41 void clearSelection(); 41 void clearSelection();
42 42