missing config

11 files changed, 91 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index 68619b9..9656532 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,8 @@ dist:
 	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
@@ -263,9 +264,9 @@ dist:
   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) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 68619b9..9656532 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -243,7 +243,8 @@ dist:
 	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
@@ -263,9 +264,9 @@ dist:
   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) \
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
@@ -258,6 +258,16 @@
 { "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
@@ -65,7 +65,10 @@ KOPrefs::KOPrefs() :
     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);
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index f2c4fbb..f2501e3 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -73,6 +73,7 @@ class KOPrefs : public KPimPrefs
     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
@@ -150,6 +150,25 @@ void KOPrefsDialog::setupMailTab()
   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);
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index 250d114..0794e00 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -19,6 +19,7 @@ extern QStatusBar* globalSstatusBarMainWindow;
 #include <klocale.h>
 #endif
 #include "defines.h"
+#include "koprefs.h"
 #include "mainwindow.h"
 #include "mailistviewitem.h"
 #include <KDGanttMinimizeSplitter.h>
@@ -84,7 +85,7 @@ 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 );
     */
 
@@ -122,15 +123,31 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     KDGanttMinimizeSplitter* split = new KDGanttMinimizeSplitter( Qt::Horizontal, splithor);
     split->setMinimizeDirection( KDGanttMinimizeSplitter::Left);
     //layout = new QBoxLayout ( split, QBoxLayout::LeftToRight );
+    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( new QLabel ( i18n("Fr:"), infoBox ),1,0 );
-    griLay->addWidget( new QLabel ( i18n("To:"), infoBox ),2,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 );
@@ -160,8 +177,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 #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,
@@ -227,18 +247,18 @@ 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
@@ -495,13 +495,14 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
                 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();
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 57623e6..d7ff9f2 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -612,7 +612,7 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
     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
@@ -166,6 +166,7 @@ void KDGanttSplitterHandle::toggle()
         s->moveSplitter( _origPos, id() );
         _collapsed = false;
     }
+    repaint();
 }
 
 void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
@@ -480,6 +481,15 @@ void KDGanttMinimizeSplitter::init()
 #endif
 
 
+void KDGanttMinimizeSplitter::toggle()
+{
+    if ( mFirstHandle  )
+        mFirstHandle->toggle();
+    else
+        qDebug("KDGanttMinimizeSplitter::toggle::sorry, handle not available ");
+        
+}
+
 
 /*!
   \brief the orientation of the splitter
diff --git a/microkde/KDGanttMinimizeSplitter.h b/microkde/KDGanttMinimizeSplitter.h
index 75e0443..8120d14 100644
--- a/microkde/KDGanttMinimizeSplitter.h
+++ b/microkde/KDGanttMinimizeSplitter.h
@@ -80,6 +80,8 @@ public:
     void setSizes( QValueList<int> );
     KDGanttSplitterHandle* firstHandle(){ return mFirstHandle;}
     void expandPos( int id, int* min, int* max );
+public slots:
+     void toggle();
 protected:
     void childEvent( QChildEvent * );