fixxx

5 files changed, 19 insertions, 13 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 7b609fc..4bc4441 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -54,4 +54,5 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo
 {
 
+    topLevelWidget()->setCaption( i18n("Compose mail - Click OK to send ->") );
     mPickLineEdit = 0;
     mEncoding = KOPrefs::instance()->mCurrentCodeName;
@@ -224,5 +225,5 @@ void ComposeMail::saveAsDraft()
 void  ComposeMail::clearStatus()
 {
-    topLevelWidget()->setCaption( i18n("Compose mail") );
+    topLevelWidget()->setCaption( i18n("Compose mail - Click OK to send ->") );
 }
 void  ComposeMail::setStatus( QString status )
@@ -425,5 +426,5 @@ void ComposeMail::accept()
 
     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"),
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index 5119744..15fa148 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -8,5 +8,5 @@
 
 MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
-        :QListViewItem(parent,item),mail_data()
+        :KListViewItem(parent,item),mail_data()
 {
 }
@@ -44,4 +44,5 @@ void MailListViewItem::showEntry()
     
     }
+    
     setText(3, fsize );
     //qDebug("fsize *%s* ",fsize.latin1() );
diff --git a/kmicromail/mailistviewitem.h b/kmicromail/mailistviewitem.h
index 0fd44d3..b409c9d 100644
--- a/kmicromail/mailistviewitem.h
+++ b/kmicromail/mailistviewitem.h
@@ -3,9 +3,9 @@
 #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:
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index e3c5ec3..82a915e 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -24,4 +24,5 @@ extern QStatusBar* globalSstatusBarMainWindow;
 #include "mailistviewitem.h"
 #include <KDGanttMinimizeSplitter.h>
+#include <libkdepim/kpimglobalprefs.h>
 
 #include "koprefs.h"
@@ -166,5 +167,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     //layout->addWidget( folderView );
 
-    mailView = new QListView( split );
+    mailView = new KListView( split );
     mailView->addColumn( i18n( " " ) );
     mailView->addColumn( i18n( "Subject" ),QListView::Manual );
@@ -179,5 +180,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     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 );
@@ -212,5 +215,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
     //mailView->setMultiSelection ( true );
-    mailView->setSelectionMode( QListView::Extended );
+    //mailView->setSelectionMode( QListView::Extended );
     QValueList<int> list;
     int fw = 100;
@@ -220,5 +223,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     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 );
@@ -371,8 +374,9 @@ void MainWindow::slotAdjustColumns()
     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);
 }
 
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 6894039..178d2bb 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -5,5 +5,5 @@
 
 #include <qmainwindow.h>
-#include <qlistview.h>
+#include <klistview.h>
 #include <qaction.h>
 #include <qlineedit.h>
@@ -67,5 +67,5 @@ protected:
             *editSettings, *editAccounts, *syncFolders;
     AccountView *folderView;
-    QListView *mailView;
+    KListView *mailView;
     QLineEdit* toLE,*fromLE,*subLE;
     //QBoxLayout *layout;