missing config

11 files changed, 101 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index 68619b9..9656532 100644
--- a/Makefile
+++ b/Makefile
@@ -240,13 +240,14 @@ install:
 dist: 
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *ipk.zip
 	rm -f ../new_$(KDEPIM_VERSION)/*
 	rm -f *~
-	cd ..;mkdir -p new_$(KDEPIM_VERSION)
+	cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
+	cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
 	cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
 	mkipks kmicrokdelibs.control
 	mkipks korganizer.control
 	mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	mkipks kopiemail.control
@@ -260,15 +261,15 @@ dist:
   endif
   ifndef BUILD_NO_PWMANAGER
 	mkipks pwmanager.control
   endif
 	mkipks pimTABicon.control
 	zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
-	mv *.ipk ../new_$(KDEPIM_VERSION)/
-	mv *for_SharpRom.ipk.zip ../new_$(KDEPIM_VERSION)/
-	mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../new_$(KDEPIM_VERSION)/
+	mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
+	mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
+	mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 68619b9..9656532 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -240,13 +240,14 @@ install:
 dist: 
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *ipk.zip
 	rm -f ../new_$(KDEPIM_VERSION)/*
 	rm -f *~
-	cd ..;mkdir -p new_$(KDEPIM_VERSION)
+	cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
+	cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
 	cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
 	mkipks kmicrokdelibs.control
 	mkipks korganizer.control
 	mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	mkipks kopiemail.control
@@ -260,15 +261,15 @@ dist:
   endif
   ifndef BUILD_NO_PWMANAGER
 	mkipks pwmanager.control
   endif
 	mkipks pimTABicon.control
 	zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
-	mv *.ipk ../new_$(KDEPIM_VERSION)/
-	mv *for_SharpRom.ipk.zip ../new_$(KDEPIM_VERSION)/
-	mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../new_$(KDEPIM_VERSION)/
+	mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
+	mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
+	mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
diff --git a/bin/kdepim/kopiemail/germantranslation.txt b/bin/kdepim/kopiemail/germantranslation.txt
index 86819b7..68dc6db 100644
--- a/bin/kdepim/kopiemail/germantranslation.txt
+++ b/bin/kdepim/kopiemail/germantranslation.txt
@@ -255,10 +255,20 @@
 { "Reply to this mail","Beantworte diese Mail" },
 { "Su:","Be:" },
 { "Fr:","Vo:" },
 { "To:","An:" },
 { "Download Mail","Mail runterladen" },
 { "View Source","Zeige Source" },
+{ "Show "To" field in list view","Zeige "An" Feld in Listenansicht" },
+{ "Show info fields at startup","Zeige Info Felder beim Start" },
+{ "Show "Subject" info field","Zeige "Betreff" Info Feld" },
+{ "Show "From" info field","Zeige "Von" Info Feld" },
+{ "Show "To" info field","Zeige "An" Info Feld" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index 2bae5f6..7b1e169 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -62,13 +62,16 @@ KOPrefs::KOPrefs() :
     addItemString("SenderEmail",&mEmail,i18n ("Settings@General TAB") );
     addItemBool("ViewMailAsHtml",&mViewAsHtml,false);
     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);
     fillMailDefaults();
     isDirty = false;
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index f2c4fbb..f2501e3 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -70,11 +70,12 @@ class KOPrefs : public KPimPrefs
     QString mName;
     QString mSendCodec;
     QString mEmail;
     QString mCurrentCodeName;
     int mCurrentCodec;
     bool mSendLater, mViewAsHtml, mUseKapi, isDirty, mShowToField;
+    bool mShowInfoSub, mShowInfoFrom, mShowInfoTo, mShowInfoStart; 
   private:
 
 };
 
 #endif
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 5c8a5a9..4af4a8c 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -147,12 +147,31 @@ void KOPrefsDialog::setupMailTab()
   ttt =  addWidBool(i18n("Send mails later"),
                     &(KOPrefs::instance()->mSendLater),topFrame);
   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);
   topLayout->addMultiCellWidget( new QLabel(0, i18n("Example: iso-8859-15"), topFrame),4,4,0,1);
   */
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 250d114..0794e00 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -16,12 +16,13 @@
 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 "koprefs.h"
 
@@ -81,13 +82,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     connect(showFolders, SIGNAL( toggled(bool) ),
             SLOT( slotShowFolders(bool) ) );
 
     /*
       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);
     deleteMails->addTo( toolBar );
     deleteMails->addTo( mailMenu );
@@ -119,21 +120,37 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     // QWidget *view = new QWidget( wrapperBox );
     KDGanttMinimizeSplitter* splithor = new KDGanttMinimizeSplitter( Qt::Vertical, wrapperBox);
     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" ) );
 
     //layout->addWidget( folderView );
@@ -157,15 +174,18 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     //layout->setStretchFactor( mailView, 2 );
 
     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,
              SLOT( mailLeftClicked(QListViewItem*) ) );
     connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
@@ -224,24 +244,24 @@ 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 )
 { 
     codecMenu->setItemChecked(KOPrefs::instance()->mCurrentCodec, false  );
     //qDebug("codec %d ", codec);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 68f0eb3..f56711d 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -492,19 +492,20 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
             m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
         } else {
             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()) );
         delete m;
     }
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 57623e6..d7ff9f2 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -609,13 +609,13 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
     tempText += ev->uid() + "\">";
     if ( ev->summary().length() > 0 )
         tempText += ev->summary();
     else
         tempText += i18n("-no summary-"); 
     if ( bDay  ) {
-        noc = ev->getNextOccurence( cdt, &ok );
+        noc = ev->getNextOccurence( cdt.addDays(-1), &ok );
         if ( ok ) {
             int years = noc.date().year() - ev->dtStart().date().year();
             tempText += i18n(" (%1 y.)"). arg( years );
         }
     } 
     
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index 567ae54..84edc0d 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -163,12 +163,13 @@ void KDGanttSplitterHandle::toggle()
         _collapsed = true;
     }
     else {
         s->moveSplitter( _origPos, id() );
         _collapsed = false;
     }
+    repaint();
 }
 
 void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
 {
     if ( _activeButton != 0 ) {
         if ( onButton( e->pos() ) == _activeButton )
@@ -477,12 +478,21 @@ void KDGanttMinimizeSplitter::init()
     else
 	setSizePolicy( QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding) );
 }
 #endif
 
 
+void KDGanttMinimizeSplitter::toggle()
+{
+    if ( mFirstHandle  )
+        mFirstHandle->toggle();
+    else
+        qDebug("KDGanttMinimizeSplitter::toggle::sorry, handle not available ");
+        
+}
+
 
 /*!
   \brief the orientation of the splitter
 
   By default the orientation is horizontal (the widgets are side by side).
   The possible orientations are Qt:Vertical and Qt::Horizontal (the default).
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 75e0443..8120d14 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -77,12 +77,14 @@ public:
     QSize minimumSizeHint() const;
 
     QValueList<int> sizes() const;
     void setSizes( QValueList<int> );
     KDGanttSplitterHandle* firstHandle(){ return mFirstHandle;}
     void expandPos( int id, int* min, int* max );
+public slots:
+     void toggle();
 protected:
     void childEvent( QChildEvent * );
 
     bool event( QEvent * );
     void resizeEvent( QResizeEvent * );