-rw-r--r-- | kmicromail/opiemail.cpp | 1 | ||||
-rw-r--r-- | kmicromail/viewmailbase.cpp | 9 | ||||
-rw-r--r-- | kmicromail/viewmailbase.h | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index b701446..4436ad6 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -1,119 +1,120 @@ | |||
1 | // CHANGED 2004-09-31 Lutz Rogowski | 1 | // CHANGED 2004-09-31 Lutz Rogowski |
2 | // CHANGED 2004-08-06 Lutz Rogowski | 2 | // CHANGED 2004-08-06 Lutz Rogowski |
3 | 3 | ||
4 | 4 | ||
5 | #define protected public | 5 | #define protected public |
6 | #include <qwidget.h> | 6 | #include <qwidget.h> |
7 | #undef protected | 7 | #undef protected |
8 | #include "koprefsdialog.h" | 8 | #include "koprefsdialog.h" |
9 | #include <kapplication.h> | 9 | #include <kapplication.h> |
10 | #include <libkdepim/externalapphandler.h> | 10 | #include <libkdepim/externalapphandler.h> |
11 | #include <libkdepim/kpimglobalprefs.h> | 11 | #include <libkdepim/kpimglobalprefs.h> |
12 | #ifdef MINIKDE_KDIALOG_H | 12 | #ifdef MINIKDE_KDIALOG_H |
13 | #undef MINIKDE_KDIALOG_H | 13 | #undef MINIKDE_KDIALOG_H |
14 | #endif | 14 | #endif |
15 | #include "settingsdialog.h" | 15 | #include "settingsdialog.h" |
16 | #include "opiemail.h" | 16 | #include "opiemail.h" |
17 | #include "editaccounts.h" | 17 | #include "editaccounts.h" |
18 | #include "composemail.h" | 18 | #include "composemail.h" |
19 | #include "mailistviewitem.h" | 19 | #include "mailistviewitem.h" |
20 | #include "viewmail.h" | 20 | #include "viewmail.h" |
21 | #include "selectstore.h" | 21 | #include "selectstore.h" |
22 | #include "selectsmtp.h" | 22 | #include "selectsmtp.h" |
23 | #include "accountitem.h" | 23 | #include "accountitem.h" |
24 | #include "accountview.h" | 24 | #include "accountview.h" |
25 | #include "klocale.h" | 25 | #include "klocale.h" |
26 | 26 | ||
27 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | #include <qcursor.h> | 29 | #include <qcursor.h> |
30 | #include <qtextbrowser.h> | 30 | #include <qtextbrowser.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | #include <qpe/global.h> | 32 | #include <qpe/global.h> |
33 | 33 | ||
34 | #ifdef DESKTOP_VERSION | 34 | #ifdef DESKTOP_VERSION |
35 | #include <qapplication.h> | 35 | #include <qapplication.h> |
36 | #else | 36 | #else |
37 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
38 | #endif | 38 | #endif |
39 | #include <libmailwrapper/smtpwrapper.h> | 39 | #include <libmailwrapper/smtpwrapper.h> |
40 | #include <libmailwrapper/mailtypes.h> | 40 | #include <libmailwrapper/mailtypes.h> |
41 | #include <libmailwrapper/abstractmail.h> | 41 | #include <libmailwrapper/abstractmail.h> |
42 | #include "koprefs.h" | 42 | #include "koprefs.h" |
43 | 43 | ||
44 | //using namespace Opie::Core; | 44 | //using namespace Opie::Core; |
45 | 45 | ||
46 | OpieMail::OpieMail( QWidget *parent, const char *name ) | 46 | OpieMail::OpieMail( QWidget *parent, const char *name ) |
47 | : MainWindow( parent, name) //, WStyle_ContextHelp ) | 47 | : MainWindow( parent, name) //, WStyle_ContextHelp ) |
48 | { | 48 | { |
49 | mCurrentComposer = 0; | 49 | mCurrentComposer = 0; |
50 | settings = new Settings(); | 50 | settings = new Settings(); |
51 | tb = 0; | 51 | tb = 0; |
52 | setIcon(SmallIcon( "kmicromail" ) ); | 52 | setIcon(SmallIcon( "kmicromail" ) ); |
53 | folderView->populate( settings->getAccounts() ); | 53 | folderView->populate( settings->getAccounts() ); |
54 | connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)), | 54 | connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)), |
55 | this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); | 55 | this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&))); |
56 | folderView->setFocus(); | ||
56 | } | 57 | } |
57 | 58 | ||
58 | OpieMail::~OpieMail() | 59 | OpieMail::~OpieMail() |
59 | { | 60 | { |
60 | if (settings) delete settings; | 61 | if (settings) delete settings; |
61 | if ( tb ) | 62 | if ( tb ) |
62 | delete tb; | 63 | delete tb; |
63 | } | 64 | } |
64 | 65 | ||
65 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 66 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
66 | { | 67 | { |
67 | 68 | ||
68 | } | 69 | } |
69 | #include <stdlib.h> | 70 | #include <stdlib.h> |
70 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 71 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
71 | { | 72 | { |
72 | // copied from old mail2 | 73 | // copied from old mail2 |
73 | static int ii = 0; | 74 | static int ii = 0; |
74 | //qDebug("QCOP CALL ############################# %d ", ii); | 75 | //qDebug("QCOP CALL ############################# %d ", ii); |
75 | //QString mess ( msg ); | 76 | //QString mess ( msg ); |
76 | //qDebug("Message = %s ",mess.latin1()); | 77 | //qDebug("Message = %s ",mess.latin1()); |
77 | ++ii; | 78 | ++ii; |
78 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 79 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
79 | 80 | ||
80 | mPendingEmail = QString::null; | 81 | mPendingEmail = QString::null; |
81 | mPendingName = QString::null; | 82 | mPendingName = QString::null; |
82 | if (msg == "writeMail(QString,QString)") | 83 | if (msg == "writeMail(QString,QString)") |
83 | { | 84 | { |
84 | //qDebug("writeMail(QString,QString) "); | 85 | //qDebug("writeMail(QString,QString) "); |
85 | QDataStream stream(data,IO_ReadOnly); | 86 | QDataStream stream(data,IO_ReadOnly); |
86 | stream >> mPendingName >> mPendingEmail; | 87 | stream >> mPendingName >> mPendingEmail; |
87 | // removing the whitespaces at beginning and end is needed! | 88 | // removing the whitespaces at beginning and end is needed! |
88 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | 89 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
89 | } | 90 | } |
90 | else if (msg == "newMail()") | 91 | else if (msg == "newMail()") |
91 | { | 92 | { |
92 | //qDebug("slotComposeMail() "); | 93 | //qDebug("slotComposeMail() "); |
93 | // we cannot call slotComposeMail(); directly, because may be executing a QCOP call | 94 | // we cannot call slotComposeMail(); directly, because may be executing a QCOP call |
94 | // and a QCOP call does not like a processevents in his execution | 95 | // and a QCOP call does not like a processevents in his execution |
95 | // with the Qtimer we call slotComposeMail() after we reached the main event loop | 96 | // with the Qtimer we call slotComposeMail() after we reached the main event loop |
96 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | 97 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
97 | // slotComposeMail(); | 98 | // slotComposeMail(); |
98 | } | 99 | } |
99 | else if (msg == "newMail(QString)") | 100 | else if (msg == "newMail(QString)") |
100 | { | 101 | { |
101 | //qDebug(" newMail(QString)"); | 102 | //qDebug(" newMail(QString)"); |
102 | QDataStream stream(data,IO_ReadOnly); | 103 | QDataStream stream(data,IO_ReadOnly); |
103 | stream >> mPendingName; | 104 | stream >> mPendingName; |
104 | // the format is | 105 | // the format is |
105 | // NAME <EMAIL>:SUBJECT | 106 | // NAME <EMAIL>:SUBJECT |
106 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | 107 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
107 | } else { | 108 | } else { |
108 | mPendingData = data; | 109 | mPendingData = data; |
109 | mPendingMessage = msg; | 110 | mPendingMessage = msg; |
110 | QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); | 111 | QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); |
111 | } | 112 | } |
112 | 113 | ||
113 | //qDebug("END OpieMail::message "); | 114 | //qDebug("END OpieMail::message "); |
114 | } | 115 | } |
115 | void OpieMail::slotExtAppHandler() | 116 | void OpieMail::slotExtAppHandler() |
116 | { | 117 | { |
117 | ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData ); | 118 | ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData ); |
118 | } | 119 | } |
119 | void OpieMail::slotwriteMail2(const QString& namemail ) | 120 | void OpieMail::slotwriteMail2(const QString& namemail ) |
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index 3a41ba0..3bb964e 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp | |||
@@ -1,106 +1,109 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | #include <qtextbrowser.h> | 2 | #include <qtextbrowser.h> |
3 | #include <qlistview.h> | 3 | #include <qlistview.h> |
4 | #include <qaction.h> | 4 | #include <qaction.h> |
5 | #include <qlabel.h> | 5 | #include <qlabel.h> |
6 | #include <qvbox.h> | 6 | #include <qvbox.h> |
7 | #include <qapplication.h> | ||
7 | 8 | ||
8 | #include <qtoolbar.h> | 9 | #include <qtoolbar.h> |
9 | #include <qmenubar.h> | 10 | #include <qmenubar.h> |
10 | #include <kiconloader.h> | 11 | #include <kiconloader.h> |
11 | //#include <qpe/resource.h> | 12 | //#include <qpe/resource.h> |
12 | #include <klocale.h> | 13 | #include <klocale.h> |
13 | 14 | ||
14 | #include "viewmailbase.h" | 15 | #include "viewmailbase.h" |
15 | //#include "opendiag.h" | 16 | //#include "opendiag.h" |
16 | 17 | ||
17 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | 18 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) |
18 | : QMainWindow(parent, name, fl) | 19 | : QMainWindow(parent, name, fl) |
19 | { | 20 | { |
20 | 21 | ||
21 | setToolBarsMovable(false); | 22 | setToolBarsMovable(false); |
22 | 23 | ||
23 | toolbar = new QToolBar(this); | 24 | toolbar = new QToolBar(this); |
24 | menubar = new QMenuBar( toolbar ); | 25 | menubar = new QMenuBar( toolbar ); |
25 | mailmenu = new QPopupMenu( menubar ); | 26 | mailmenu = new QPopupMenu( menubar ); |
26 | menubar->insertItem( i18n( "Mail" ), mailmenu ); | 27 | menubar->insertItem( i18n( "Mail" ), mailmenu ); |
27 | 28 | ||
28 | toolbar->setHorizontalStretchable(true); | 29 | toolbar->setHorizontalStretchable(true); |
29 | addToolBar(toolbar); | 30 | addToolBar(toolbar); |
30 | 31 | ||
31 | viewSource = new QAction(i18n("View Source"), 0, 0, this); | 32 | viewSource = new QAction(i18n("View Source"), 0, 0, this); |
32 | viewSource->addTo(mailmenu); | 33 | viewSource->addTo(mailmenu); |
33 | 34 | ||
34 | downloadMail= new QAction(i18n("Download Mail"),SmallIcon("add"), 0, 0, this); | 35 | downloadMail= new QAction(i18n("Download Mail"),SmallIcon("add"), 0, 0, this); |
35 | downloadMail->addTo(toolbar); | 36 | downloadMail->addTo(toolbar); |
36 | downloadMail->addTo(mailmenu); | 37 | downloadMail->addTo(mailmenu); |
37 | 38 | ||
38 | 39 | ||
39 | reply = new QAction(i18n("Reply"),SmallIcon("reply"), 0, 0, this); | 40 | reply = new QAction(i18n("Reply"),SmallIcon("reply"), 0, 0, this); |
40 | reply->addTo(toolbar); | 41 | reply->addTo(toolbar); |
41 | reply->addTo(mailmenu); | 42 | reply->addTo(mailmenu); |
42 | 43 | ||
43 | forward = new QAction(i18n("Forward"),SmallIcon("forward"), 0, 0, this); | 44 | forward = new QAction(i18n("Forward"),SmallIcon("forward"), 0, 0, this); |
44 | forward->addTo(toolbar); | 45 | forward->addTo(toolbar); |
45 | forward->addTo(mailmenu); | 46 | forward->addTo(mailmenu); |
46 | 47 | ||
47 | attachbutton = new QAction(i18n("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true); | 48 | attachbutton = new QAction(i18n("Attachments"),SmallIcon("attach"), 0, 0, this, 0, true); |
48 | attachbutton->addTo(toolbar); | 49 | attachbutton->addTo(toolbar); |
49 | attachbutton->addTo(mailmenu); | 50 | attachbutton->addTo(mailmenu); |
50 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); | 51 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); |
51 | 52 | ||
52 | showHtml = new QAction( i18n( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true ); | 53 | showHtml = new QAction( i18n( "Show Html" ), SmallIcon( "html" ), 0, 0, this, 0, true ); |
53 | showHtml->addTo( toolbar ); | 54 | showHtml->addTo( toolbar ); |
54 | showHtml->addTo( mailmenu ); | 55 | showHtml->addTo( mailmenu ); |
55 | 56 | ||
56 | deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this); | 57 | deleteMail = new QAction(i18n("Delete Mail"),SmallIcon("trash"), 0, 0, this); |
57 | deleteMail->addTo(toolbar); | 58 | deleteMail->addTo(toolbar); |
58 | deleteMail->addTo(mailmenu); | 59 | deleteMail->addTo(mailmenu); |
59 | 60 | ||
60 | nextMail = new QAction(i18n("Show next mail"),SmallIcon("enter"), 0, 0, this); | 61 | nextMail = new QAction(i18n("Show next mail"),SmallIcon("enter"), 0, 0, this); |
61 | QLabel *spacer = new QLabel(toolbar); | 62 | QLabel *spacer = new QLabel(toolbar); |
62 | nextMail->addTo(toolbar); | 63 | nextMail->addTo(toolbar); |
63 | nextMail->addTo(mailmenu); | 64 | nextMail->addTo(mailmenu); |
64 | 65 | ||
65 | closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); | 66 | closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); |
66 | //QLabel *spacer = new QLabel(toolbar); | 67 | //QLabel *spacer = new QLabel(toolbar); |
67 | spacer->setBackgroundMode(QWidget::PaletteButton); | 68 | spacer->setBackgroundMode(QWidget::PaletteButton); |
68 | toolbar->setStretchableWidget(spacer); | 69 | toolbar->setStretchableWidget(spacer); |
69 | closeMail->addTo(toolbar); | 70 | closeMail->addTo(toolbar); |
70 | closeMail->addTo(mailmenu); | 71 | closeMail->addTo(mailmenu); |
71 | QVBox *view = new QVBox(this); | 72 | QVBox *view = new QVBox(this); |
72 | setCentralWidget(view); | 73 | setCentralWidget(view); |
73 | 74 | ||
74 | attachments = new QListView(view); | 75 | attachments = new QListView(view); |
75 | attachments->setMinimumHeight(90); | 76 | int fixh = 100; |
76 | attachments->setMaximumHeight(90); | 77 | if ( QApplication::desktop()->width() > 320 ) |
78 | fixh = 200; | ||
79 | attachments->setFixedHeight(fixh); | ||
77 | attachments->setAllColumnsShowFocus(true); | 80 | attachments->setAllColumnsShowFocus(true); |
78 | attachments->addColumn("Mime Type", 60); | 81 | attachments->addColumn("Mime Type", fixh-30); |
79 | attachments->addColumn(i18n("Description"), 100); | 82 | attachments->addColumn(i18n("Description"), 100); |
80 | attachments->addColumn(i18n("Filename"), 80); | 83 | attachments->addColumn(i18n("Filename"), 80); |
81 | attachments->addColumn(i18n("Size"), 80); | 84 | attachments->addColumn(i18n("Size"), 80); |
82 | attachments->setSorting(-1); | 85 | attachments->setSorting(-1); |
83 | attachments->hide(); | 86 | attachments->hide(); |
84 | 87 | ||
85 | browser = new QTextBrowser(view); | 88 | browser = new QTextBrowser(view); |
86 | 89 | ||
87 | //openDiag = new OpenDiag(view); | 90 | //openDiag = new OpenDiag(view); |
88 | //openDiag->hide(); | 91 | //openDiag->hide(); |
89 | 92 | ||
90 | } | 93 | } |
91 | 94 | ||
92 | void ViewMailBase::slotChangeAttachview(bool state) | 95 | void ViewMailBase::slotChangeAttachview(bool state) |
93 | { | 96 | { |
94 | if (state) attachments->show(); | 97 | if (state) attachments->show(); |
95 | else attachments->hide(); | 98 | else attachments->hide(); |
96 | } | 99 | } |
97 | 100 | ||
98 | void ViewMailBase::keyPressEvent ( QKeyEvent * e ) | 101 | void ViewMailBase::keyPressEvent ( QKeyEvent * e ) |
99 | { | 102 | { |
100 | if( e->key()==Qt::Key_Escape ) { | 103 | if( e->key()==Qt::Key_Escape ) { |
101 | close(); | 104 | close(); |
102 | e->accept(); | 105 | e->accept(); |
103 | return; | 106 | return; |
104 | } | 107 | } |
105 | QWidget::keyPressEvent(e); | 108 | QWidget::keyPressEvent(e); |
106 | } | 109 | } |
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h index 7ad1eec..7c075eb 100644 --- a/kmicromail/viewmailbase.h +++ b/kmicromail/viewmailbase.h | |||
@@ -1,39 +1,44 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | #ifndef VIEWMAILBASE_H | 2 | #ifndef VIEWMAILBASE_H |
3 | #define VIEWMAILBASE_H | 3 | #define VIEWMAILBASE_H |
4 | 4 | ||
5 | #include <qmainwindow.h> | 5 | #include <qmainwindow.h> |
6 | 6 | ||
7 | #ifndef DESKTOP_VERSION | ||
8 | #include <qpe/qpemenubar.h> | ||
9 | #define QMenuBar QPEMenuBar | ||
10 | #endif | ||
11 | |||
7 | class QAction; | 12 | class QAction; |
8 | class OpenDiag; | 13 | class OpenDiag; |
9 | class QListView; | 14 | class QListView; |
10 | class QToolBar; | 15 | class QToolBar; |
11 | class QTextBrowser; | 16 | class QTextBrowser; |
12 | class QMenuBar; | 17 | class QMenuBar; |
13 | class QPopupMenu; | 18 | class QPopupMenu; |
14 | 19 | ||
15 | class ViewMailBase : public QMainWindow | 20 | class ViewMailBase : public QMainWindow |
16 | { | 21 | { |
17 | Q_OBJECT | 22 | Q_OBJECT |
18 | 23 | ||
19 | public: | 24 | public: |
20 | ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); | 25 | ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0); |
21 | 26 | ||
22 | protected: | 27 | protected: |
23 | QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail, *downloadMail, *viewSource; | 28 | QAction *reply, *forward, *attachbutton, *deleteMail, *showHtml, *closeMail, *nextMail, *downloadMail, *viewSource; |
24 | QListView *attachments; | 29 | QListView *attachments; |
25 | QToolBar *toolbar; | 30 | QToolBar *toolbar; |
26 | QTextBrowser *browser; | 31 | QTextBrowser *browser; |
27 | OpenDiag *openDiag; | 32 | OpenDiag *openDiag; |
28 | QMenuBar *menubar; | 33 | QMenuBar *menubar; |
29 | QPopupMenu *mailmenu; | 34 | QPopupMenu *mailmenu; |
30 | 35 | ||
31 | protected slots: | 36 | protected slots: |
32 | void slotChangeAttachview(bool state); | 37 | void slotChangeAttachview(bool state); |
33 | virtual void keyPressEvent ( QKeyEvent * e ); | 38 | virtual void keyPressEvent ( QKeyEvent * e ); |
34 | 39 | ||
35 | 40 | ||
36 | }; | 41 | }; |
37 | 42 | ||
38 | #endif | 43 | #endif |
39 | 44 | ||