missing config

5 files changed, 68 insertions, 24 deletions

diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 2bae5f6..7b1e169 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -64,9 +64,12 @@ KOPrefs::KOPrefs() :
     addItemBool("SendMailLater",&mSendLater,true);
     addItemBool("ShowToField",&mShowToField,false);
     addItemBool("UseKapi",&mUseKapi,false);
     addItemInt("CurrentCodec",&mCurrentCodec,0);
-    
+    addItemBool("ShowInfoSub",&mShowInfoSub,true);
+    addItemBool("ShowInfoFrom",&mShowInfoFrom,true);
+    addItemBool("ShowInfoTo",&mShowInfoTo,true);
+    addItemBool("ShowInfoStart",&mShowInfoStart,true);
     KPrefs::setCurrentGroup("Fonts");
     addItemFont("Application Font",&mAppFont);
     addItemFont("Compose Font",&mComposeFont);
     addItemFont("Read Font",&mReadFont);
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index f2c4fbb..f2501e3 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -72,8 +72,9 @@ class KOPrefs : public KPimPrefs
     QString mEmail;
     QString mCurrentCodeName;
     int mCurrentCodec;
     bool mSendLater, mViewAsHtml, mUseKapi, isDirty, mShowToField;
+    bool mShowInfoSub, mShowInfoFrom, mShowInfoTo, mShowInfoStart; 
   private:
 
 };
 
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 5c8a5a9..4af4a8c 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -149,8 +149,27 @@ void KOPrefsDialog::setupMailTab()
   topLayout->addMultiCellWidget(ttt->checkBox(),1,1,0,1);
   ttt =  addWidBool(i18n("Show \"To\" field in list view"),
                     &(KOPrefs::instance()->mShowToField),topFrame);
   topLayout->addMultiCellWidget(ttt->checkBox(),2,2,0,1);
+
+  int iii =3;
+  ttt =  addWidBool(i18n("Show info fields at startup"),
+                    &(KOPrefs::instance()->mShowInfoStart),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
+  ttt =  addWidBool(i18n("Show \"Subject\" info field"),
+                    &(KOPrefs::instance()->mShowInfoSub),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
+  ttt =  addWidBool(i18n("Show \"From\" info field"),
+                    &(KOPrefs::instance()->mShowInfoFrom),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
+  ttt =  addWidBool(i18n("Show \"To\" info field"),
+                    &(KOPrefs::instance()->mShowInfoTo),topFrame);
+  topLayout->addMultiCellWidget(ttt->checkBox(),iii,iii,0,1);
+  ++iii;
+
   /*
   mCodecEdit = new QLineEdit(topFrame);
   topLayout->addMultiCellWidget( new QLabel(mCodecEdit, i18n("User defined codec for new mails:"), topFrame),2,2,0,1);
   topLayout->addMultiCellWidget(mCodecEdit,3,3,0,1);
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 250d114..0794e00 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -18,8 +18,9 @@ extern QStatusBar* globalSstatusBarMainWindow;
 #include <qpe/qpeapplication.h>
 #include <klocale.h>
 #endif
 #include "defines.h"
+#include "koprefs.h"
 #include "mainwindow.h"
 #include "mailistviewitem.h"
 #include <KDGanttMinimizeSplitter.h>
 
@@ -83,9 +84,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 
     /*
       searchMails = new QAction( i18n( "Search mails" ), SmallIcon("find") ),
                                0, 0, this );
-    searchMails->addTo( toolBar );
+    searchMails->kopddTo( toolBar );
     searchMails->addTo( mailMenu );
     */
 
     deleteMails = new QAction(i18n("Delete Mail"),  SmallIcon("trash"), 0, 0, this);
@@ -121,17 +122,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     splithor->setMinimizeDirection( KDGanttMinimizeSplitter::Down);
     KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor);
     split->setMinimizeDirection( KDGanttMinimizeSplitter::Left);
     //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
-    QWidget* infoBox = new QWidget( splithor );
-    QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
-    griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
-    griLay->addWidget( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
-    griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,0 );
-    griLay->addWidget( subLE = new QLineEdit( infoBox ),0,1) ;
-    griLay->addWidget( fromLE = new QLineEdit( infoBox ),1,1) ;
-    griLay->addWidget( toLE = new QLineEdit( infoBox ),2,1) ;
-    infoBox->setMaximumHeight( infoBox->sizeHint().height() );
+    subLE = 0;
+    fromLE = 0;
+    toLE = 0;
+    if ( KOPrefs::instance()->mShowInfoSub ||  KOPrefs::instance()->mShowInfoFrom ||  KOPrefs::instance()->mShowInfoTo ) {
+        QWidget* infoBox = new QWidget( splithor );
+        QGridLayout *griLay = new QGridLayout( infoBox, 2,2);
+        if ( KOPrefs::instance()->mShowInfoSub ) {
+            griLay->addWidget( new QLabel ( i18n("Su:"), infoBox ),0,0 );
+            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" ) );
@@ -159,11 +176,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     slotAdjustLayout();
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
-    QPEApplication::setStylusOperation( subLE ,QPEApplication::RightOnHold);
-    QPEApplication::setStylusOperation( fromLE ,QPEApplication::RightOnHold);
-    QPEApplication::setStylusOperation( toLE ,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,
@@ -226,20 +246,20 @@ MainWindow::~MainWindow()
 
 void MainWindow::setInfoFields(QListViewItem* item )
 {
     if ( item == 0) {
-        subLE->setText("");
-        fromLE->setText("");
-        toLE->setText("");
+    if ( subLE ) subLE->setText("");
+    if ( fromLE ) fromLE->setText("");
+    if ( toLE ) toLE->setText("");
         return;
     }
     RecMailP mail = ((MailListViewItem*)item)->data();
-    subLE->setText(mail->getSubject());
-    fromLE->setText(mail->getFrom());
-    toLE->setText(mail->To().join(";" ));
-    subLE->setCursorPosition(0);
-    fromLE->setCursorPosition(0);
-    toLE->setCursorPosition(0);
+    if ( subLE ) subLE->setText(mail->getSubject());
+    if ( fromLE ) fromLE->setText(mail->getFrom());
+    if ( toLE ) toLE->setText(mail->To().join(";" ));
+    if ( subLE ) subLE->setCursorPosition(0);
+    if ( fromLE ) fromLE->setCursorPosition(0);
+    if ( toLE ) toLE->setCursorPosition(0);
 
 }
 void MainWindow::slotSetCodec( int codec )
 { 
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 68f0eb3..f56711d 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -494,15 +494,16 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
             if (folderView->currentisDraft()) {
                 m->insertItem(i18n("Edit this mail"),this,SLOT(reEditMail()));
             }
             m->insertItem(i18n("Reply to this mail"),this,SLOT(replyMail()));
-            m->insertSeparator();
             m->insertItem(i18n("Read this mail"),this,SLOT(displayMail()));
+            m->insertSeparator();
             m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
             m->insertItem(i18n("Delete this mail"),this,SLOT(slotDeleteMail()));
             m->insertSeparator();
             m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
             m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
+            m->insertSeparator();
             m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
         }
         m->setFocus();
         m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );