fixes

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 @@
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 #include "koprefs.h"
 
 //using namespace Opie::Core;
 
 OpieMail::OpieMail( QWidget *parent, const char *name )
     : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
     mCurrentComposer = 0;
     settings = new Settings();
     tb = 0;
     setIcon(SmallIcon( "kmicromail" )  );
     folderView->populate( settings->getAccounts() );
    connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
        this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
+   folderView->setFocus(); 
 }
 
 OpieMail::~OpieMail()
 {
     if (settings) delete settings;
     if ( tb )
         delete tb;
 }
 
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     
 }
 #include <stdlib.h>
 void OpieMail::message(const QCString &msg, const QByteArray &data)
 {
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 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qtextbrowser.h>
 #include <qlistview.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
+#include <qapplication.h>
 
 #include <qtoolbar.h>
 #include <qmenubar.h>
 #include <kiconloader.h>
 //#include <qpe/resource.h>
 #include <klocale.h>
 
 #include "viewmailbase.h"
 //#include "opendiag.h"
 
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 
 	setToolBarsMovable(false);
 
@@ -59,36 +60,38 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 
     nextMail = new QAction(i18n("Show next mail"),SmallIcon("enter"), 0, 0, this);
 	QLabel *spacer = new QLabel(toolbar);
 	nextMail->addTo(toolbar);
 	nextMail->addTo(mailmenu);
 
   	closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this);
 	//QLabel *spacer = new QLabel(toolbar);
 	spacer->setBackgroundMode(QWidget::PaletteButton);
 	toolbar->setStretchableWidget(spacer);
 	closeMail->addTo(toolbar);
 	closeMail->addTo(mailmenu);
 	QVBox *view = new QVBox(this);
 	setCentralWidget(view);
 
 	attachments = new QListView(view);
-	attachments->setMinimumHeight(90);
-	attachments->setMaximumHeight(90);
+    int fixh = 100;
+    if ( QApplication::desktop()->width() > 320 )
+        fixh = 200;
+	attachments->setFixedHeight(fixh);
 	attachments->setAllColumnsShowFocus(true);
-	attachments->addColumn("Mime Type", 60);
+	attachments->addColumn("Mime Type", fixh-30);
 	attachments->addColumn(i18n("Description"), 100);
 	attachments->addColumn(i18n("Filename"), 80);
     attachments->addColumn(i18n("Size"), 80);
     attachments->setSorting(-1);
 	attachments->hide();
 
 	browser = new QTextBrowser(view);
 
 //	openDiag = new OpenDiag(view);
 //	openDiag->hide();
 
 }
 
 void ViewMailBase::slotChangeAttachview(bool state)
 {
 	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 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef VIEWMAILBASE_H
 #define VIEWMAILBASE_H
 
 #include <qmainwindow.h>
 
+#ifndef DESKTOP_VERSION
+#include <qpe/qpemenubar.h>
+#define QMenuBar QPEMenuBar
+#endif
+
 class QAction;
 class OpenDiag;
 class QListView;
 class QToolBar;
 class QTextBrowser;
 class QMenuBar;
 class QPopupMenu;
 
 class ViewMailBase : public QMainWindow
 {
 	Q_OBJECT
 
 public:
 	ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 
 protected: