fixxx

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
@@ -1,34 +1,35 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.2.3 ************
 
 KO/Pi:
 Fixed a problem with (non empty) exception dates in the exception date edit dialog of recurring events for newly created events.
 
 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 ************
 
 KO/Pi:
 Fixed a problem with the sort order of last modified date in list view. 
 KA/Pi:
 Fixed a resource config read problem on windows. 
 
 
 ********** VERSION 2.2.1 ************
 
 KO/Pi:
 Fixed a problem displaying very long allday events in agenda view in single day mode.
 Fixed a problem with the default settings for new todos.
 Added an error message dialog if saving of calendar files is not possible.
 Made it impossible to close KO/Pi if saving fails.
 Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick.
 Added config options for conflict detection.
 
 KA/Pi:
 Added a config option to turn on asking before a contact is deleted.
 Fixed a problem with the default view and view selection at startup.
 Formatted name is now set on import, if formatted name is empty.
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 7b609fc..4bc4441 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -32,48 +32,49 @@
 //#include <opie2/odebug.h>
 #include <kfiledialog.h>
 //#include <qpe/resource.h>
 #include <qpe/global.h>
 //#include <qpe/contact.h>
 
 
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qiconset.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 
 //using namespace Opie::Core;
 //using namespace Opie::Ui;
 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&)),
     //     this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
     settings = sett;
     m_replyid = ""; 
     if ( KOPrefs::instance()->mUseKapi) {
     KConfig config( locateLocal("config", "kabcrc") );
     config.setGroup( "General" );
     QString whoami_uid =  config.readEntry( "WhoAmI" );
 
     if ( whoami_uid.isEmpty() ) {
         QMessageBox::information( 0, i18n( "Hint" ),
                                   i18n( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
                                   i18n( "Ok" ) );
         
        
         fillSettings(); 
     } else
          ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid);
 
  
 #ifdef DESKTOP_VERSION
@@ -202,49 +203,49 @@ void ComposeMail::saveAsDraft()
         }
         QString txt = message->text();
         if ( !sigMultiLine->text().isEmpty() ) {
             txt.append( "\n--\n" );
             txt.append( sigMultiLine->text() );
         }
         mail->setMessage( txt );
         mail->setCharset (mEncoding);
         /* only use the default drafts folder name! */
         Storemail wrapper(AbstractMail::draftFolder());
         wrapper.storeMail(mail);
 
         AttachViewItem *it = (AttachViewItem *) attList->firstChild();
         /* attachments we will ignore! */
         if ( it != 0 ) {
             if ( warnAttach )
             QMessageBox::warning(0,i18n("Store message"),
                 i18n("<center>Attachments will not be stored in \"Draft\" folder</center>"));
             warnAttach = false;
         }
         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 );
     QTimer::singleShot ( 10000, this, SLOT( clearStatus() ) ) ;
 }
 void ComposeMail::pickAddress( )
 {
 
     QLineEdit *line = mPickLineEdit;
     if ( line == 0 )
         return;
 #ifdef DESKTOP_VERSION
     //qDebug(" ComposeMail::pickAddress ");
     QString names ;//= AddressPicker::getNames();
 
     KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
     uint i=0;
     for (i=0; i < list.count(); i++) {
         if ( !list[i].preferredEmail().isEmpty()) {
             if ( ! names.isEmpty() )
                 names+= ",";
             names+=  "\""+list[i].realName() +"\"<" +list[i].preferredEmail() +">";
           
@@ -403,49 +404,49 @@ void ComposeMail::addAttachment()
         (void) new AttachViewItem( attList, att );
     }
 }
 
 void ComposeMail::removeAttachment()
 {
     if ( !attList->currentItem() ) {
         QMessageBox::information( this, i18n( "Error" ),
                                   i18n( "<p>Please select a File.</p>" ),
                                   i18n( "Ok" ) );
     } else {
         attList->takeItem( attList->currentItem() );
     }
 }
 
 void ComposeMail::accept()
 {
     if ( smtpAccountBox->count() == 0 ) { 
        
         reject();
         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"));
         
         if (yesno == 1) {
             return;
         }
     }
 #if 0
     odebug << "Sending Mail with "
            << smtpAccounts.at( smtpAccountBox->currentItem() )->getAccountName() << oendl;
 #endif
     Opie::Core::OSmartPointer<Mail> mail=new Mail;
 
     SMTPaccount *smtp = smtpAccounts.at( smtpAccountBox->currentItem() );
     mail->setMail(fromBox->currentText());
 
     if ( !toLine->text().isEmpty() ) {
         mail->setTo( toLine->text() );
     } else {
         QMessageBox::warning(0,i18n("Sending mail"),
             i18n("No Receiver spezified" ) );
         return;
     }  
diff --git a/kmicromail/mailistviewitem.cpp b/kmicromail/mailistviewitem.cpp
index 5119744..15fa148 100644
--- a/kmicromail/mailistviewitem.cpp
+++ b/kmicromail/mailistviewitem.cpp
@@ -1,69 +1,70 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include "mailistviewitem.h"
 #include <libmailwrapper/abstractmail.h>
 #include <qtextstream.h>
 #include <kiconloader.h>
 #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()
 {
     if ( mail_data->getFlags().testBit( FLAG_ANSWERED ) == true) {
         setPixmap( 0, SmallIcon ( "kmmsgreplied") );
         mKeyMap.insert(0, "r" );
     } else if ( mail_data->getFlags().testBit( FLAG_SEEN ) == true )  {
         /* I think it looks nicer if there are not such a log of icons but only on mails
            replied or new - Alwin*/ 
         //setPixmap( 0,SmallIcon ("kmmsgunseen") );
         mKeyMap.insert(0, "s" );
     } else  {
         setPixmap( 0,SmallIcon ( "kmmsgnew") );
         mKeyMap.insert(0, "u" );
     }
     QString fsize = mail_data->MsgsizeString();
     //  1.23
     // 11.23
     // 111.23
     // 999.23 maxlen
     QString fsort; 
     switch(fsize.length() ) {
     case 6:
         fsort = "00" + fsize ;
         break;
     case 7:
         fsort = "0" + fsize ;
         break;
     default:
         fsort = fsize ;
     break;
     
     }
+    
     setText(3, fsize );
     //qDebug("fsize *%s* ",fsize.latin1() );
     //qDebug("fsort *%s* ",fsort.latin1() );
     if ( fsize.right(2) == "kB" ) {
         mKeyMap.insert(3, "k" + fsort);
     } else {
         mKeyMap.insert(3, "M" +fsort );
     }
     setText(1,mail_data->getSubject());
     setText(2,mail_data->getFrom());
     mKeyMap.insert(4,mail_data->getIsoDate());
     setText(4,mail_data->getDate());
     if ( KOPrefs::instance()->mShowToField )
         setText(5,mail_data->To()[0]);
 }
 
 void MailListViewItem::storeData(const RecMailP&data)
 {
     mail_data = data;
 }
 void MailListViewItem::setSortKey(int column,const QString &key)
 {
     mKeyMap.insert(column,key);
 }
diff --git a/kmicromail/mailistviewitem.h b/kmicromail/mailistviewitem.h
index 0fd44d3..b409c9d 100644
--- a/kmicromail/mailistviewitem.h
+++ b/kmicromail/mailistviewitem.h
@@ -1,27 +1,27 @@
 // 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(){}
 
     void storeData(const RecMailP&data);
     const RecMailP&data()const;
     void showEntry();
     MAILLIB::ATYPE wrapperType();
     QString key(int column, bool) const;
     void setSortKey(int column,const QString &key);
 protected:
     RecMailP mail_data;  
  private:
     QMap<int,QString> mKeyMap;
 };
 
 #endif
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index e3c5ec3..82a915e 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -2,48 +2,49 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 //#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #include <qstatusbar.h> 
 #include <kabc/stdaddressbook.h>
 extern QStatusBar* globalSstatusBarMainWindow;
 #else
 #include <qpe/qpeapplication.h>
 #include <klocale.h>
 #endif
 #include "defines.h"
 #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 )
     : QMainWindow( parent, name ) //, flags )
 {
 #ifdef DESKTOP_VERSION
     globalSstatusBarMainWindow = statusBar();
 #endif
     setCaption( i18n( "KOpieMail/Pi" ) );
     setToolBarsMovable( false ); 
     //KABC::StdAddressBook::self();
     toolBar = new QToolBar( this );
     menuBar = new QPEMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( i18n( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( i18n( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
     QAction* getMail = new QAction( i18n( "Get all new mails" ), SmallIcon("enter"),
                                0, 0, this );
     connect(getMail, SIGNAL( activated() ),
@@ -144,103 +145,105 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
             griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
         }
         if (  KOPrefs::instance()->mShowInfoFrom ) {
             griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
             griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ;
         } 
         if ( KOPrefs::instance()->mShowInfoTo ) {
             griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 );
             griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ;
         } 
         infoBox->setMaximumHeight( infoBox->sizeHint().height() );
         if ( !KOPrefs::instance()->mShowInfoStart ) {
             QTimer::singleShot( 1,splithor, SLOT  ( toggle() ) );
         }
     }
 
 
     folderView = new AccountView( split );
     folderView->header()->hide();
     folderView->setRootIsDecorated( false );
     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);
     mailView->addColumn( i18n( "Date" ),QListView::Manual);
     if ( KOPrefs::instance()->mShowToField )
         mailView->addColumn( i18n( "To" ),QListView::Manual);
     mailView->setAllColumnsShowFocus(true);
     //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 );
 
     slotAdjustLayout();
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
     if ( subLE ) 
         QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
     if ( fromLE ) 
         QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
     if ( toLE ) 
         QPEApplication::setStylusOperation( toLE ,QPEApplication::RightOnHold);
 #endif
     connect( mailView, SIGNAL(  doubleClicked (QListViewItem* )),this,
              SLOT( mailLeftClicked(QListViewItem*) ) );
     connect( mailView, SIGNAL(  returnPressed (QListViewItem* )),this,
              SLOT( mailLeftClicked(QListViewItem*) ) );
     connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
              SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) );
     connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
             this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
 
     connect( mailView, SIGNAL(  currentChanged  (QListViewItem* )),this,
              SLOT( setInfoFields(QListViewItem*) ) );
 
     connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
     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 );
 
     QAction* closeMail = new QAction(i18n("Close"),SmallIcon("exit"), 0, 0, this); 
     connect( closeMail, SIGNAL( activated() ), SLOT( close() ) );
     if ( QApplication::desktop()->width() > 320 )
         closeMail->addTo(toolBar);
         closeMail->addTo(mailMenu);
 
 
    QPopupMenu* helpMenu = new QPopupMenu( menuBar );
    menuBar->insertItem( i18n( "Help" ), helpMenu ); 
    QAction* li = new QAction(i18n("About"), QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showAbout()) );
    li->addTo(helpMenu);
    li = new QAction(i18n("Licence"),QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showLicence()) );
    li->addTo(helpMenu); 
    li = new QAction(i18n("LibEtPan Licence"), QPixmap(), 0, 0, this); 
    connect( li, SIGNAL( activated() ), SLOT( showEtpanLicence()) );
    li->addTo(helpMenu);
    connect( codecMenu, SIGNAL( activated(int) ), this, SLOT( slotSetCodec( int )) );
@@ -349,52 +352,53 @@ void MainWindow::appMessage(const QCString &, const QByteArray &)
 
 void MainWindow::slotAdjustLayout() {
 
     /*
   QWidget *d = QApplication::desktop();
 
   if ( d->width() < d->height() ) {
     layout->setDirection( QBoxLayout::TopToBottom );
     } else {
     layout->setDirection( QBoxLayout::LeftToRight );
   }
     */
 }
 
 void MainWindow::slotAdjustColumns()
 {
     bool hidden = folderView->isHidden();
     if ( hidden ) folderView->show();
     folderView->setColumnWidth( 0, folderView->visibleWidth() );
     if ( hidden ) folderView->hide();
 
     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()
 {
 }
 void MainWindow::slotEditGlobalSettings()
 {
 }
 
 void MainWindow::slotShowFolders( bool )
 {
     qDebug("not implemented:  ");
 }
 
 void MainWindow::refreshMailView(const QValueList<RecMailP>&)
 { 
     qDebug("not implemented:  ");
 }
 
 void MainWindow::mailLeftClicked(QListViewItem * )
 {
     qDebug("not implemented:  ");
 }
 
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index 6894039..178d2bb 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -1,31 +1,31 @@
 
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
-#include <qlistview.h>
+#include <klistview.h>
 #include <qaction.h>
 #include <qlineedit.h>
 
 #include <qtoolbar.h>
 #ifdef DESKTOP_VERSION
 #include <qmenubar.h>
 #define QPEMenuBar QMenuBar
 #else
 #include <qpe/qpemenubar.h>
 #endif
 
 #include "accountview.h"
 #include "statuswidget.h"
 
 #include <libmailwrapper/mailtypes.h>
 #include <opie2/osmartpointer.h>
 
 class RecMail;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 public:
@@ -45,30 +45,30 @@ protected slots:
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void displayMail();
     virtual void slotGetMail() = 0;
     virtual void slotGetAllMail() = 0;
     virtual void slotDeleteMail();
     virtual void slotDeleteAllMail() = 0;
     virtual void slotSetCodec(int);
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotAdjustLayout();
     virtual void slotEditSettings();
     virtual void slotEditGlobalSettings();
     virtual void mailLeftClicked( QListViewItem * );
     void showLicence();
     void showAbout();
     void showEtpanLicence(); 
 
 protected:
     QToolBar *toolBar;
     StatusWidget *statusWidget;
     QPEMenuBar *menuBar;
     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;
 };
 
 #endif