6 files changed, 20 insertions, 13 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 6e8a8a7..761fcf7 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,8 +7,9 @@ Fixed a problem with (non empty) exception dates in the exception date edit dial
 
 Fixed usability problem in KA/Pi:
 Now searching works for "all phone numbers and all addresses" if "all fields" is selected as search option. 
 
+Changed some behaviour in OM/Pi mail management to make it more usable.
 
 
 ********** VERSION 2.2.2 ************
 
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 7b609fc..4bc4441 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -52,8 +52,9 @@
 ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, bool modal )
     : ComposeMailUI( parent, name, modal )
 {
 
+    topLevelWidget()->setCaption( i18n("Compose mail - Click OK to send ->") );
     mPickLineEdit = 0;
     mEncoding = KOPrefs::instance()->mCurrentCodeName;
     //managed from opiemail now
     //connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
@@ -222,9 +223,9 @@ void ComposeMail::saveAsDraft()
         setStatus( i18n("Mail saved as draft!") );
 }
 void  ComposeMail::clearStatus()
 {
-    topLevelWidget()->setCaption( i18n("Compose mail") );
+    topLevelWidget()->setCaption( i18n("Compose mail - Click OK to send ->") );
 }
 void  ComposeMail::setStatus( QString status )
 {
     topLevelWidget()->setCaption( status );
@@ -423,9 +424,9 @@ void ComposeMail::accept()
         return;
     }
 
     if (! checkBoxLater->isChecked() ) {
-        int yesno = QMessageBox::warning(0,i18n("Stop editing message"),
+        int yesno = QMessageBox::warning(0, subjectLine->text().left ( 25 ),
                                          i18n("Send this message?"),
                                          i18n("Yes"),
                                          i18n("Cancel"));
         
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index 5119744..15fa148 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -6,9 +6,9 @@
 #include "koprefs.h"
 //#include <qpe/resource.h>
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
-        :QListViewItem(parent,item),mail_data()
+        :KListViewItem(parent,item),mail_data()
 {
 }
 
 void MailListViewItem::showEntry()
@@ -42,8 +42,9 @@ void MailListViewItem::showEntry()
         fsort = fsize ;
     break;
     
     }
+    
     setText(3, fsize );
     //qDebug("fsize *%s* ",fsize.latin1() );
     //qDebug("fsort *%s* ",fsort.latin1() );
     if ( fsize.right(2) == "kB" ) {
diff --git a/kmicromail/mailistviewitem.h b/kmicromail/mailistviewitem.h
index 0fd44d3..b409c9d 100644
--- a/kmicromail/mailistviewitem.h
+++ b/kmicromail/mailistviewitem.h
@@ -1,13 +1,13 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef __MAILLISTVIEWITEM_H
 #define __MAILLISTVIEWITEM_H
 
-#include <qlistview.h>
+#include <klistview.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/maildefines.h>
 
-class MailListViewItem:public QListViewItem
+class MailListViewItem:public KListViewItem
 {
 public:
     MailListViewItem(QListView * parent, MailListViewItem * after );
     virtual ~MailListViewItem(){}
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index e3c5ec3..82a915e 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -22,8 +22,9 @@ extern QStatusBar* globalSstatusBarMainWindow;
 #include "koprefs.h"
 #include "mainwindow.h"
 #include "mailistviewitem.h"
 #include <KDGanttMinimizeSplitter.h>
+#include <libkdepim/kpimglobalprefs.h>
 
 #include "koprefs.h"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
@@ -164,9 +165,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     folderView->addColumn( i18n( "Mailbox" ) );
 
     //layout->addWidget( folderView );
 
-    mailView = new QListView( split );
+    mailView = new KListView( split );
     mailView->addColumn( i18n( " " ) );
     mailView->addColumn( i18n( "Subject" ),QListView::Manual );
     mailView->addColumn( i18n( "Sender" ),QListView::Manual );
     mailView->addColumn( i18n( "Size" ),QListView::Manual);
@@ -177,9 +178,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     //mailView->setSorting(-1);
     mailView->setRootIsDecorated( false );
     statusWidget = new StatusWidget( wrapperBox );
     statusWidget->hide();
-
+    mailView->setSelectionMode( QListView::Multi );   
+    mailView->setMultiSelection( true);
+    mailView->setAlternateBackground(KPimGlobalPrefs::instance()->mAlternateColor );
     //layout->addWidget( mailView );
     //layout->setStretchFactor( folderView, 1 );
     //layout->setStretchFactor( mailView, 2 );
 
@@ -210,17 +213,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
     //mailView->setMultiSelection ( true );
-    mailView->setSelectionMode( QListView::Extended );
+    //mailView->setSelectionMode( QListView::Extended );
     QValueList<int> list;
     int fw = 100;
     if ( QApplication::desktop()->width() > 320 )
         fw = 50;
     list.append( fw );
     list.append( 100 );
     split->setSizes( list );
-    QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
+    QTimer::singleShot( 100, this, SLOT( slotAdjustColumns() ) );
     mailView->setShowSortIndicator ( true ); 
     QLabel *spacer = new QLabel( toolBar );
     spacer->setBackgroundMode( QWidget::PaletteButton );
     toolBar->setStretchableWidget( spacer );
@@ -369,12 +372,13 @@ void MainWindow::slotAdjustColumns()
 
     mailView->setColumnWidth( 0, 10 );
     mailView->setColumnWidth( 1, 100 );
     mailView->setColumnWidth( 2, 100 );
-    mailView->setColumnWidth( 3, 50 );
-    mailView->setColumnWidth( 4, 120 );
+    mailView->setColumnWidth( 3, 70 );
+    mailView->setColumnWidth( 4, 170 );
     if ( KOPrefs::instance()->mShowToField )
         mailView->setColumnWidth( 5, 100 );
+    mailView->setColumnAlignment( 3, AlignRight);
 }
 
 void MainWindow::slotEditSettings()
 {
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 6894039..178d2bb 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -3,9 +3,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
-#include <qlistview.h>
+#include <klistview.h>
 #include <qaction.h>
 #include <qlineedit.h>
 
 #include <qtoolbar.h>
@@ -65,9 +65,9 @@ protected:
     QPopupMenu *mailMenu, *settingsMenu, *codecMenu;
     QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
             *editSettings, *editAccounts, *syncFolders;
     AccountView *folderView;
-    QListView *mailView;
+    KListView *mailView;
     QLineEdit* toLE,*fromLE,*subLE;
     //QBoxLayout *layout;
 };