author | zautrix <zautrix> | 2005-03-22 22:55:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-22 22:55:32 (UTC) |
commit | aa6d19015bc91ae3af021d766d37a473e125278f (patch) (unidiff) | |
tree | f7b1d6b45a3997013318107ca02fa63b4b76913e /kmicromail | |
parent | 53ac6d1f931c50d89a44d9d46daceb7ed9d4ddc6 (diff) | |
download | kdepimpi-aa6d19015bc91ae3af021d766d37a473e125278f.zip kdepimpi-aa6d19015bc91ae3af021d766d37a473e125278f.tar.gz kdepimpi-aa6d19015bc91ae3af021d766d37a473e125278f.tar.bz2 |
fixes
-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 | |||
@@ -40,32 +40,33 @@ | |||
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 | { |
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index 3a41ba0..3bb964e 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp | |||
@@ -1,22 +1,23 @@ | |||
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 | ||
@@ -59,36 +60,38 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
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(); |
diff --git a/kmicromail/viewmailbase.h b/kmicromail/viewmailbase.h index 7ad1eec..7c075eb 100644 --- a/kmicromail/viewmailbase.h +++ b/kmicromail/viewmailbase.h | |||
@@ -1,22 +1,27 @@ | |||
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: |