author | zautrix <zautrix> | 2004-09-08 02:21:24 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-08 02:21:24 (UTC) |
commit | 6650dd66dd13498a6d28844770d9d8c291335ad4 (patch) (unidiff) | |
tree | 249b157ae88e869e7dde6f9a1d3b74d2d804aa06 | |
parent | 858de54fa69a6e93072652a9cb33783ad10a9f0a (diff) | |
download | kdepimpi-6650dd66dd13498a6d28844770d9d8c291335ad4.zip kdepimpi-6650dd66dd13498a6d28844770d9d8c291335ad4.tar.gz kdepimpi-6650dd66dd13498a6d28844770d9d8c291335ad4.tar.bz2 |
Some more fixes
-rw-r--r-- | kmicromail/composemail.cpp | 4 | ||||
-rw-r--r-- | kmicromail/composemail.h | 4 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 8 | ||||
-rw-r--r-- | kmicromail/opiemail.h | 4 |
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 | |||
@@ -25,34 +25,34 @@ | |||
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; |
41 | ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags ) | 41 | ComposeMail::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 |
diff --git a/kmicromail/composemail.h b/kmicromail/composemail.h index 657f665..e20d9e1 100644 --- a/kmicromail/composemail.h +++ b/kmicromail/composemail.h | |||
@@ -5,50 +5,50 @@ | |||
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 | ||
12 | class RecMail; | 12 | class RecMail; |
13 | 13 | ||
14 | #include <opie2/osmartpointer.h> | 14 | #include <opie2/osmartpointer.h> |
15 | #if 0 | 15 | #if 0 |
16 | class AddressPicker : public AddressPickerUI | 16 | class AddressPicker : public AddressPickerUI |
17 | { | 17 | { |
18 | //Q_OBJECT | 18 | //Q_OBJECT |
19 | 19 | ||
20 | public: | 20 | public: |
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 | ||
24 | protected: | 24 | protected: |
25 | QString selectedNames; | 25 | QString selectedNames; |
26 | void accept(); | 26 | void accept(); |
27 | 27 | ||
28 | }; | 28 | }; |
29 | #endif | 29 | #endif |
30 | class RecMail; | 30 | class RecMail; |
31 | 31 | ||
32 | class ComposeMail : public ComposeMailUI | 32 | class ComposeMail : public ComposeMailUI |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | 35 | ||
36 | public: | 36 | public: |
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>¤t); | 41 | void reEditMail(const Opie::Core::OSmartPointer<RecMail>¤t); |
42 | 42 | ||
43 | public slots: | 43 | public 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 | ||
53 | protected slots: | 53 | protected slots: |
54 | void accept(); | 54 | void accept(); |
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index a1c5645..0c581c0 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -10,35 +10,35 @@ | |||
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 | ||
26 | using namespace Opie::Core; | 26 | //using namespace Opie::Core; |
27 | 27 | ||
28 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 28 | OpieMail::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 | ||
37 | OpieMail::~OpieMail() | 37 | OpieMail::~OpieMail() |
38 | { | 38 | { |
39 | if (settings) delete settings; | 39 | if (settings) delete settings; |
40 | } | 40 | } |
41 | 41 | ||
42 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 42 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
43 | { | 43 | { |
44 | 44 | ||
@@ -100,33 +100,33 @@ void OpieMail::slotwriteMail2(const QString& namemail ) | |||
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 | } |
113 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 113 | void 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 | ||
@@ -404,22 +404,22 @@ void OpieMail::slotMoveCopyAllMail() | |||
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 | ||
416 | void OpieMail::reEditMail() | 416 | void 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,34 +1,34 @@ | |||
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 | ||
11 | class OpieMail : public MainWindow | 11 | class OpieMail : public MainWindow |
12 | { | 12 | { |
13 | Q_OBJECT | 13 | Q_OBJECT |
14 | 14 | ||
15 | public: | 15 | public: |
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 | ||
20 | public slots: | 20 | public 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); |
26 | protected slots: | 26 | protected 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); |