fixxxx

3 files changed, 42 insertions, 6 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 9c40142..a4f3579 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -360,404 +360,438 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
 
   connect( mXXPortManager, SIGNAL( modified() ),
            SLOT( setModified() ) );
 
   connect( mJumpButtonBar, SIGNAL( jumpToLetter( const QString& ) ),
            SLOT( incrementalSearchJump( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( fieldChanged() ),
            mJumpButtonBar, SLOT( recreateButtons() ) );
 
   connect( mDetails, SIGNAL( sendEmail( const QString& ) ),
            SLOT( sendMail( const QString& ) ) );
 
 
   connect( ExternalAppHandler::instance(), SIGNAL (requestForNameEmailUidList(const QString&, const QString&)),this, SLOT(requestForNameEmailUidList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)),this, SLOT(requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (requestForBirthdayList(const QString&, const QString&)),this, SLOT(requestForBirthdayList(const QString&, const QString&)));
   connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
   connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
 
 
 #ifndef KAB_EMBEDDED
   connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
            mXXPortManager, SLOT( importVCard( const KURL& ) ) );
 
   connect( mDetails, SIGNAL( browse( const QString& ) ),
            SLOT( browse( const QString& ) ) );
 
 
   mAddressBookService = new KAddressBookService( this );
 
 #endif //KAB_EMBEDDED
 
   mMessageTimer = new QTimer( this ); 
   connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) );
   mEditorDialog = 0;
   createAddresseeEditorDialog( this );
   setModified( false );  
   mBRdisabled = false;
 #ifndef DESKTOP_VERSION
   infrared  = 0;
 #endif
   //toggleBeamReceive( );
   mMainWindow->toolBar()->show();
   // we have a toolbar repainting error on the Zaurus when starting KA/Pi
     QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
 }
 
 void KABCore::updateToolBar()
 {
     static int iii = 0;
     ++iii;
     mMainWindow->toolBar()->repaintMe();
     if ( iii < 4 )
         QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); 
 }
 KABCore::~KABCore()
 {
     //  save();
     //saveSettings();
     //KABPrefs::instance()->writeConfig();
     delete AddresseeConfig::instance();
     mAddressBook = 0;
     KABC::StdAddressBook::close();
     
     delete syncManager;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
 }
 void KABCore::receive( const QCString& cmsg, const QByteArray& data )
 {
     //qDebug("KA: QCOP message received: %s ", cmsg.data()  );
     if ( cmsg == "setDocument(QString)" ) {
         QDataStream stream( data, IO_ReadOnly );
         QString fileName;
         stream >> fileName;
         recieve( fileName );
         return;
     }
 }
 void KABCore::toggleBeamReceive( )
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
         qDebug("KA: AB disable BeamReceive ");
         delete infrared;
         infrared = 0;
         mActionBR->setChecked(false);
         return;
     } 
     qDebug("KA: AB enable BeamReceive ");
     mActionBR->setChecked(true);
 
     infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive(  const QCString&, const QByteArray& )));
 #endif
 }
 
 
 void KABCore::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive( );
         }
         mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
             //toggleBeamReceive( );
         }
     }
 #endif
 
 }
 void KABCore::recieve( QString fn  )
 {
     //qDebug("KABCore::recieve ");
     int count = mAddressBook->importFromFile( fn, true );
     if ( count )
         setModified( true );
     mViewManager->refreshView();
     message(i18n("%1 contact(s) received!").arg( count ));
     topLevelWidget()->showMaximized();
     topLevelWidget()->raise();
 }
 void KABCore::restoreSettings()
 {
   mMultipleViewsAtOnce = KABPrefs::instance()->mMultipleViewsAtOnce;
 
   bool state;
 
   if (mMultipleViewsAtOnce)
     state = KABPrefs::instance()->mDetailsPageVisible;
   else
     state = false;
 
   mActionDetails->setChecked( state );
   setDetailsVisible( state );
 
   state = KABPrefs::instance()->mJumpButtonBarVisible;
 
   mActionJumpBar->setChecked( state );
   setJumpButtonBarVisible( state );
 /*US
  QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
   mMiniSplitter->setSizes( splitterSize );
   if (  mExtensionBarSplitter ) {
   splitterSize = KABPrefs::instance()->mExtensionsSplitter;
   if ( splitterSize.count() == 0 ) {
     splitterSize.append( width() / 2 );
     splitterSize.append( width() / 2 );
   }
   mExtensionBarSplitter->setSizes( splitterSize );
 
   }
 */
   mViewManager->restoreSettings();
   mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
   mExtensionManager->restoreSettings();
 #ifdef DESKTOP_VERSION
   int wid = width();
   if ( wid < 10 )
       wid = 400;
 #else
   int wid = QApplication::desktop()->width();
   if ( wid < 640 )
       wid = QApplication::desktop()->height();
 #endif
   QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
   if ( true /*splitterSize.count() == 0*/ ) {
       splitterSize.append( wid / 2 );
       splitterSize.append( wid / 2 );
   }
   mMiniSplitter->setSizes( splitterSize );
   if (  mExtensionBarSplitter ) {
       //splitterSize = KABPrefs::instance()->mExtensionsSplitter;
       if ( true /*splitterSize.count() == 0*/ ) {
           splitterSize.append( wid / 2 );
           splitterSize.append( wid / 2 );
       }
       mExtensionBarSplitter->setSizes( splitterSize );
 
   }
-
-
+#ifdef DESKTOP_VERSION
+  KConfig *config = KABPrefs::instance()->getConfig();
+  config->setGroup("WidgetLayout");
+  QStringList list;
+  list = config->readListEntry("MainLayout");
+  int x,y,w,h;
+  if ( ! list.isEmpty() ) {
+      x = list[0].toInt();
+      y = list[1].toInt();
+      w = list[2].toInt();
+      h = list[3].toInt(); 
+      KApplication::testCoords( &x,&y,&w,&h );
+      topLevelWidget()->setGeometry(x,y,w,h);
+      
+  } else {
+      topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
+  }
+#endif
 }
 
 void KABCore::saveSettings()
 {
   KABPrefs::instance()->mJumpButtonBarVisible = mActionJumpBar->isChecked();
   if ( mExtensionBarSplitter )
     KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
   KABPrefs::instance()->mDetailsPageVisible = mActionDetails->isChecked();
   KABPrefs::instance()->mDetailsSplitter = mMiniSplitter->sizes();
 #ifndef KAB_EMBEDDED
 
   KABPrefs::instance()->mExtensionsSplitter = mExtensionBarSplitter->sizes();
   KABPrefs::instance()->mDetailsSplitter = mDetailsSplitter->sizes();
 #endif //KAB_EMBEDDED
   mExtensionManager->saveSettings();
   mViewManager->saveSettings();
 
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
+#ifdef DESKTOP_VERSION
+  KConfig *config = KABPrefs::instance()->getConfig();
+  config->setGroup("WidgetLayout");
+  QStringList list ;//= config->readListEntry("MainLayout");
+  int x,y,w,h;
+  QWidget* wid;
+  wid = topLevelWidget();
+  x = wid->geometry().x();
+  y = wid->geometry().y();
+  w = wid->width();
+  h = wid->height();
+  list.clear();
+  list << QString::number( x );
+  list << QString::number( y );
+  list << QString::number( w );
+  list << QString::number( h );
+  config->writeEntry("MainLayout",list );
+#endif
   KABPrefs::instance()->writeConfig();
   qDebug("KA: KABCore::saveSettings() ");
 }
 
 KABC::AddressBook *KABCore::addressBook() const
 {
   return mAddressBook;
 }
 
 KConfig *KABCore::config()
 {
 #ifndef KAB_EMBEDDED
   return KABPrefs::instance()->config();
 #else //KAB_EMBEDDED
   return KABPrefs::instance()->getConfig();
 #endif //KAB_EMBEDDED
 }
 
 KActionCollection *KABCore::actionCollection() const
 {
   return mGUIClient->actionCollection();
 }
 
 KABC::Field *KABCore::currentSearchField() const
 {
    if (mIncSearchWidget)
     return mIncSearchWidget->currentField();
   else
     return 0;
 }
 
 QStringList KABCore::selectedUIDs() const
 {
   return mViewManager->selectedUids();
 }
 
 KABC::Resource *KABCore::requestResource( QWidget *parent )
 {
   QPtrList<KABC::Resource> kabcResources = addressBook()->resources();
 
   QPtrList<KRES::Resource> kresResources;
   QPtrListIterator<KABC::Resource> resIt( kabcResources );
   KABC::Resource *resource;
   while ( ( resource = resIt.current() ) != 0 ) {
     ++resIt;
     if ( !resource->readOnly() ) {
       KRES::Resource *res = static_cast<KRES::Resource*>( resource );
       if ( res )
         kresResources.append( res );
     }
   }
 
   KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
   return static_cast<KABC::Resource*>( res );
 }
 
 #ifndef KAB_EMBEDDED
 KAboutData *KABCore::createAboutData()
 #else //KAB_EMBEDDED
 void KABCore::createAboutData()
 #endif //KAB_EMBEDDED
 {
 
 
   QString version;
 #include <../version>
     QMessageBox::about( this, "About KAddressbook/Pi",
                         "KAddressbook/Platform-independent\n"
                         "(KA/Pi) " +version + " - " +
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                         "PDA-Edition\n"
                         "for: Zaurus 5500 / 7x0 / 8x0\n"
 #endif
 
                         "(c) 2004 Ulf Schenk\n"
                         "(c) 2004-2005 Lutz Rogowski\nrogowski@kde.org\n"
                         "(c) 1997-2003, The KDE PIM Team\n"
   "Tobias Koenig Maintainer\n"
   "Don Sanders Original author\n"
   "Cornelius Schumacher Co-maintainer\n"
   "Mike Pilone GUI and framework redesign\n"
   "Greg Stern DCOP interface\n"
   "Mark Westcot Contact pinning\n"
   "Michel Boyer de la Giroday LDAP Lookup\n"
   "Steffen Hansen LDAP Lookup"
 #ifdef _WIN32_
  "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n"
 #endif
  );
 }
 
 void KABCore::setContactSelected( const QString &uid )
 {
   KABC::Addressee addr = mAddressBook->findByUid( uid );
   if ( !mDetails->isHidden() )
     mDetails->setAddressee( addr );
 
   if ( !addr.isEmpty() ) {
     emit contactSelected( addr.formattedName() );
     KABC::Picture pic = addr.photo();
     if ( pic.isIntern() ) {
 //US      emit contactSelected( pic.data() );
 //US instead use:
       QPixmap px;
       if (pic.data().isNull() != true)
       {
         px.convertFromImage(pic.data());
       }
 
       emit contactSelected( px );
     }
   }
 
 
   mExtensionManager->setSelectionChanged();
 
   // update the actions
   bool selected = !uid.isEmpty();
 
   if ( mReadWrite ) {
     mActionCut->setEnabled( selected );
     mActionPaste->setEnabled( selected );
   }
 
   mActionCopy->setEnabled( selected );
   mActionDelete->setEnabled( selected );
   mActionEditAddressee->setEnabled( selected );
   mActionMail->setEnabled( selected );
   mActionMailVCard->setEnabled( selected );
   //if (mActionBeam)
   //mActionBeam->setEnabled( selected );
   mActionWhoAmI->setEnabled( selected );
 }
 
 void KABCore::sendMail()
 {
   sendMail( mViewManager->selectedEmails().join( ", " ) );
 }
 
 void KABCore::sendMail( const QString& emaillist )
 {
   // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... "
   if (emaillist.contains(",") > 0)
     ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null );
   else
     ExternalAppHandler::instance()->mailToOneContact( emaillist );
 }
 
 
 
 void KABCore::mailVCard()
 {
   QStringList uids = mViewManager->selectedUids();
   if ( !uids.isEmpty() )
     mailVCard( uids );
 }
 
 void KABCore::mailVCard( const QStringList& uids )
 {
   QStringList urls;
 
 //  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
 
   QString dirName = "/tmp/" + KApplication::randomString( 8 );
 
 
 
   QDir().mkdir( dirName, true );
 
   for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
     KABC::Addressee a = mAddressBook->findByUid( *it );
 
     if ( a.isEmpty() )
       continue;
 
     QString name = a.givenName() + "_" + a.familyName() + ".vcf";
 
     QString fileName = dirName + "/" + name;
 
     QFile outFile(fileName);
 
     if ( outFile.open(IO_WriteOnly) ) {  // file opened successfully
       KABC::VCardConverter converter;
       QString vcard;
 
       converter.addresseeToVCard( a, vcard );
 
       QTextStream t( &outFile );  // use a text stream
       t.setEncoding( QTextStream::UnicodeUTF8 );
       t << vcard;
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 4366265..30efbf6 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -14,400 +14,400 @@
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source ode for Qt in the source distribution.
 */
 
 #include <qevent.h>
 #include <qpainter.h>
 #include <qptrlist.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include <kcalendarsystem.h>
 
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "kodaymatrix.h"
 
 // ============================================================================
 //  D Y N A M I C   T I P
 // ============================================================================
 
 DynamicTip::DynamicTip( QWidget * parent )
     : QToolTip( parent )
 {
     matrix = (KODayMatrix*)parent;
 }
 
 class KODaymatrixWhatsThis :public QWhatsThis
 {
 public:
     KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
     ~KODaymatrixWhatsThis() { ;  };
 
 protected:
   virtual QString text( const QPoint& p )
   {
     return _view->getWhatsThisText( p ) ;
   }
 private:
   KODayMatrix * _view;
 };
 
 void DynamicTip::maybeTip( const QPoint &pos )
 {
   //calculate which cell of the matrix the mouse is in
   QRect sz = matrix->frameRect();
   int dheight = sz.height()*7 / 42;
   int dwidth = sz.width() / 7;
   int row = pos.y()/dheight;
   int col = pos.x()/dwidth;
 
   QRect rct(col*dwidth, row*dheight, dwidth, dheight);
 
 //  kdDebug() << "DynamicTip::maybeTip matrix cell index [" <<
 //                col << "][" << row << "] => " <<(col+row*7) << endl;
 
   //show holiday names only
   QString str = matrix->getHolidayLabel(col+row*7);
   if (str.isEmpty()) return;
   tip(rct, str);
 }
 
 
 // ============================================================================
 //  K O D A Y M A T R I X
 // ============================================================================
 
 const int KODayMatrix::NOSELECTION = -1000;
 const int KODayMatrix::NUMDAYS = 42;
 
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
     : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
 
 
 { 
     mLastView = -1;
     oldW = 0;
     oldH = 0;
     myPix.resize( 150, 120 );
     mRedrawNeeded = true;
   mKODaymatrixWhatsThis =  new KODaymatrixWhatsThis(this);
   mPendingUpdateBeforeRepaint = false;
   mouseDown = false;
   // initialize dynamic arrays
   bDays.resize ( NUMDAYS );
   pDays.resize ( NUMDAYS );
   hDays.resize ( NUMDAYS );
   eDays.resize ( NUMDAYS );
   days = new QDate[NUMDAYS];
   daylbls = new QString[NUMDAYS];
   //events = new int[NUMDAYS];
   mToolTip = new DynamicTip(this);
 
   // set default values used for drawing the matrix
   mDefaultBackColor = palette().active().base();
   mDefaultTextColor = palette().active().foreground();
   mDefaultTextColorShaded = getShadedColor(mDefaultTextColor);
   mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor);
   mSelectedDaysColor = QColor("white");
   mTodayMarginWidth = 2;
   mSelEnd = mSelStart = NOSELECTION;
 
   setAcceptDrops(true);
   //setFont( QFont("Arial", 10) );
 
   mUpdateTimer = new QTimer( this );
   connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() ));
   mRepaintTimer = new QTimer( this );
   connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() ));
   mDayChanged = false;
   updateView();
 }
 QString KODayMatrix::getWhatsThisText( QPoint p )
 {
 
     int tmp = getDayIndexFrom(p.x(), p.y());
     if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar )
         return QString();
     QDate mDate = days[tmp];
     QPtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
     QStringList mToolTip;
     for(event=eventlist.first();event != 0;event=eventlist.next()) {
         QString mToolTipText;
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( deTag( mToolTipText ) );
     }
+    mToolTip.sort();
     if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         QPtrList<Todo> todolist = mCalendar->todos(mDate);
         Todo  *todo;
         for(todo=todolist.first();todo != 0;todo=todolist.next()) { 
             QString mToolTipText;
             if ( !todo->doesFloat() )
                 mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" ";
             mToolTipText +=  todo->summary();
             if ( !todo->location().isEmpty() )
                 mToolTipText += " (" + todo->location() + ")";
             mToolTipText = deTag( mToolTipText);
             mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText;
             mToolTip.append(  mToolTipText );
         }               
     }
-    mToolTip.sort();
     if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
         Journal *j = mCalendar->journal( mDate );
         if ( j ) {
             QString mToolTipText = j->description().left(100);
             if ( j->description().length() > 100 )
                 mToolTipText += " ...";
             mToolTipText = deTag( mToolTipText);
             mToolTipText = "<b>" + i18n("Journal: ") + "</b>"+ mToolTipText;
             mToolTip.append(  mToolTipText );    
         }
     }
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
 }
 
 
 QString KODayMatrix::deTag( QString mToolTipText  )
 {
 
 #if QT_VERSION >= 0x030000
     mToolTipText.replace( '<' , "&lt;" );
     mToolTipText.replace( '>' , "&gt;" );
 #else
     if ( mToolTipText.find ('<') >= 0 ) {
         mToolTipText.replace( QRegExp("<") , "&lt;" );
     }
     if ( mToolTipText.find ('>') >= 0 ) {
         mToolTipText.replace( QRegExp(">") , "&gt;" );
     }
 #endif
     return mToolTipText;
 }
 void KODayMatrix::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
 
   setAcceptDrops( mCalendar );
 
   updateEvents();
 }
 
 QColor KODayMatrix::getShadedColor(QColor color)
 {
   QColor shaded;
   int h=0;
   int s=0;
   int v=0;
   color.hsv(&h,&s,&v);
   s = s/4;
   v = 192+v/4;
   shaded.setHsv(h,s,v);
 
   return shaded;
 }
 
 KODayMatrix::~KODayMatrix()
 {
 #if QT_VERSION >= 0x030000
 
 #else
    delete mKODaymatrixWhatsThis;
 #endif 
 
     //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   //delete [] events;
   delete mToolTip;
 }
 
 /*
 void KODayMatrix::setStartDate(QDate start)
 {
   updateView(start);
 }
 */
 
 void KODayMatrix::addSelectedDaysTo(DateList& selDays)
 {
  
   if (mSelStart == NOSELECTION) {
     return;
   }
 
   //cope with selection being out of matrix limits at top (< 0)
   int i0 = mSelStart;
   if (i0 < 0) {
     for (int i = i0; i < 0; i++) {
       selDays.append(days[0].addDays(i));
     }
     i0 = 0;
   }
 
   //cope with selection being out of matrix limits at bottom (> NUMDAYS-1)
   if (mSelEnd > NUMDAYS-1) {
     for (int i = i0; i <= NUMDAYS-1; i++) {
       selDays.append(days[i]);
     }
     for (int i = NUMDAYS; i < mSelEnd; i++) {
       selDays.append(days[0].addDays(i));
     }
 
   // apply normal routine to selection being entirely within matrix limits
   } else {
     for (int i = i0; i <= mSelEnd; i++) {
       selDays.append(days[i]);
     }
   }
 }
 
 bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
 {  
     mRedrawNeeded = true;
     bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
   mSelStart = startdate.daysTo(start);
   if ( mSelStart < 0 )
       mSelStart = 0;
   mSelEnd = startdate.daysTo(end);
   if ( mSelEnd  > NUMDAYS-1 )
       mSelEnd = NUMDAYS-1;
   if ( mSelEnd < 0 || mSelStart >  NUMDAYS-1 ) {
       clearSelection();
       if ( noSel )
           return false;
   }
  
   return true;
 }
 void KODayMatrix::clearSelection()
 {
     mSelEnd = mSelStart = NOSELECTION;
 }
 
 
 void KODayMatrix::recalculateToday()
 {
     today = -1;
     for (int i=0; i<NUMDAYS; i++) {
         //events[i] = 0;
       days[i] = startdate.addDays(i);
       daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
       
       // if today is in the currently displayed month, hilight today
       if (days[i].year() == QDate::currentDate().year() &&
           days[i].month() == QDate::currentDate().month() &&
           days[i].day() == QDate::currentDate().day()) {
         today = i;
       }
     }
     // qDebug(QString("Today is visible at %1.").arg(today));
 }
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 void KODayMatrix::repaintViewTimed()
 { 
     mRedrawNeeded = true;
     // bDays.fill( false);
     //pDays.fill( false);
     //hDays.fill( false);
     //eDays.fill( false);
     mRepaintTimer->stop(); 
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     int i;
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
     repaint(false);
 }
 void KODayMatrix::computeEvent(Event *event, int i )
 {
     QString holiStr = mHolidays[i];
     if ( event->isHoliday()) {
         pDays.setBit(i);
         hDays.setBit(i);
         if ( !holiStr.isEmpty() )
             holiStr += "\n";
         holiStr += event->summary();
         if ( !event->location().isEmpty() )
             holiStr += " (" + event->location() + ")";
         mHolidays[i] =holiStr ;
         eDays.setBit(i);
     }
     if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) {
         if ( event->isBirthday()) {
             pDays.setBit(i);
             if ( !holiStr.isEmpty() )
                 holiStr += "\n";
             holiStr += i18n("Birthday") + ": "+event->summary();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index eed023c..3c0259f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,382 +1,382 @@
 #include <stdlib.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qpainter.h>
 #include <qwhatsthis.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapp.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qmap.h>
 #include <qwmatrix.h>
 #include <qtextbrowser.h>
 #include <qtextstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qtopia/alarmserver.h>
 #include <qtopia/qcopenvelope_qws.h>
 #include <unistd.h> // for sleep
 #else
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 //#include <resource.h>
 
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/phoneformat.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/phoneaccess.h>
 #include <libkcal/kincidenceformatter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "datenavigator.h"
 #include "koagendaview.h"
 #include "koagenda.h"
 #include "kodialogmanager.h"
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "ktoolbar.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "externalapphandler.h"
 #include <kglobalsettings.h>
 
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #ifdef _OL_IMPORT_
 #include "koimportoldialog.h"
 #endif
 #endif
 #include "mainwindow.h"
 
 
 class KOex2phonePrefs : public QDialog
 {
   public:
     KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QHBox* temphb;
         temphb = new QHBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
         mWriteBackFuture->setChecked( true );
         lay->addWidget( mWriteBackFuture );
         temphb = new QHBox( this );
         new QLabel( i18n("Max. weeks in future: ") , temphb );
         mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
         mWriteBackFutureWeeks->setValue( 8 );
         lay->addWidget( temphb );  
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
         qApp->processEvents();
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         move( (dw-width())/2, (dh - height() )/2 );
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
 };
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QMainWindow( parent, name )
 {
 
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
     p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
             tbd = Bottom;
         else
             tbd = Top;
     }
     else {
         if ( p->mToolBarUp )
             tbd = Right;
         else
             tbd = Left;
     }
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
 
 #ifdef DESKTOP_VERSION
     if ( KOPrefs::instance()->mShowIconFilter ) 
 #else
     if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 
 #endif
 
 {
         if ( p->mToolBarHorF ) {
             if ( p->mToolBarUpF )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpF )
             tbd = Right;
             else
                 tbd = Left;
         }
         filterToolBar = new QPEToolBar ( this );
-        filterMenubar = new QMenuBar( filterToolBar );
+        filterMenubar = new QMenuBar( 0 );
         QFontMetrics fm ( filterMenubar->font() );
             
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         QString addTest = "A";  
         filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
 #ifdef DESKTOP_VERSION
         addTest = "AAABBBCCCx"; 
 #else
         addTest = "AAx";  
 #endif 
         filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
         addToolBar (filterToolBar , tbd );
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
         if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
             filterToolBar->hide();
     } else {
         filterToolBar = 0;
         filterMenubar  = 0;
         filterPopupMenu = 0;
     }
     if ( p->mShowIconOnetoolbar ) {
         viewToolBar = iconToolBar ;
         navigatorToolBar = iconToolBar ;
     } else {
 #ifndef DESKTOP_VERSION
         setToolBarsMovable( false );
 #endif
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpV )
                 tbd = Right;
             else
                 tbd = Left;
         }
         viewToolBar = new QPEToolBar( this );
         addToolBar (viewToolBar , tbd );
         if ( p->mToolBarHorN ) {
             if ( p->mToolBarUpN )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpN )
                 tbd = Right;
             else
                 tbd = Left;
         }
         navigatorToolBar = new QPEToolBar( this );
         addToolBar (navigatorToolBar , tbd );
     }
 
   
 
     mCalendarModifiedFlag = false;
     QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
     splash->setAlignment ( AlignCenter );
     setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
     showMaximized();
 #endif
 
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
     setDefaultPreferences();
     mCalendar = new CalendarLocal();
     mView = new CalendarView( mCalendar, this,"mCalendar " );
     mView->hide();
     //mView->resize(splash->size() );
     initActions(); 
     mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
     mSyncManager->setBlockSave(false);
     mView->setSyncManager(mSyncManager);
 #ifndef DESKTOP_VERSION
     iconToolBar->show();
     qApp->processEvents();
 #endif
     //qDebug("Splashwidget x %d y %d w %d  h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
     int vh = height() ;
     int vw = width();
     //qDebug("Toolbar hei %d ",iconToolBar->height() );
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         vh -=  iconToolBar->height();
     } else {
         vw -= iconToolBar->height();
     }
     //mView->setMaximumSize( splash->size() );
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
             mView->openCalendar( oldFile );
             qApp->processEvents();
         } else {
             oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
             finfo.setFile( oldFile );
             if (finfo.exists() ) {
                 KMessageBox::information( this, message);
                 mView->openCalendar( oldFile );
                 qApp->processEvents();
             }
         }
         mView->saveCalendar( defaultFileName() );
         newFile = true;
     }
 
     QTime neededSaveTime = QDateTime::currentDateTime().time();
     mView->openCalendar( defaultFileName() );
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
         int count = mView->addCategories();
     }
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processIncidenceSelection( Incidence * ) ) );
     connect( mView, SIGNAL( modifiedChanged( bool ) ),
              SLOT( slotModifiedChanged( bool ) ) );
 
 
     connect( mView, SIGNAL( tempDisableBR(bool) ),
              SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     mView->setModified( false );
     mBlockAtStartup = false;
     mView->setModified( false );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
     mView->show();
     delete splash;
     if ( newFile )
         mView->updateConfig();
     // qApp->processEvents();
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     //fillSyncMenu();
    
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
     connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     mSyncManager->fillSyncMenu();
 
 
 
     mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
     if ( showWarning ) {
         KMessageBox::information( this,
                          "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
         qApp->processEvents();
         mView->dialogManager()->showSyncOptions();
     }
 
   //US listen for result adressed from Ka/Pi
 #ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
 #ifndef DESKTOP_VERSION
     infrared = 0;
 #endif
     updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
     //toggleBeamReceive();
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
 #ifndef DESKTOP_VERSION
@@ -1091,386 +1091,388 @@ void MainWindow::initActions()
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( keyBindings() ) ); 
     action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( storagehowto() ) ); 
     action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( timetrackinghowto() ) );
     action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( synchowto() ) );
     action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( kdesynchowto() ) );
     action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( multisynchowto() ) );
     action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutAutoSaving() ) );
     action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutKnownBugs() ) );
     action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( usertrans() ) );
     action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( faq() ) );
     action = new QAction( "licence", i18n("Licence..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( licence() ) );
     action = new QAction( "about", i18n("About..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( about() ) );
     //menuBar->insertSeparator();
 
     // ******************************************************
     // menubar icons
 
 
     
     //menuBar->insertItem( iconToolBar );
     //xdays_action
     if (p-> mShowIconNewEvent)
         ne_action->addTo( iconToolBar  );
     if (p->mShowIconNewTodo )
         nt_action->addTo( iconToolBar  );
     if (p-> mShowIconSearch)
         search_action->addTo( iconToolBar  );
     if (p-> mShowIconWhatsThis)
         QWhatsThis::whatsThisButton (  iconToolBar );
     if (p-> mShowIconNext)
         whatsnext_action->addTo( viewToolBar  );
     if (p-> mShowIconNextDays)
         xdays_action->addTo( viewToolBar  );
     if (p-> mShowIconJournal)
         viewjournal_action->addTo( viewToolBar  );
     if (p-> mShowIconDay1)
         day1_action->addTo( viewToolBar  );
     if (p-> mShowIconDay5)
         day5_action->addTo( viewToolBar  );
     if (p-> mShowIconDay7)
         day7_action->addTo( viewToolBar  );
     if (p-> mShowIconDay6)
         day6_action->addTo( viewToolBar  );
     if (p-> mShowIconMonth)
         month_action->addTo( viewToolBar  ); 
     if (p-> mShowIconList)
         showlist_action->addTo( viewToolBar  );
     if (p-> mShowIconTodoview)
         todoview_action->addTo( viewToolBar  );   
    
     icon = loadPixmap( pathString + "2leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200);
     if (p-> mShowIconBackFast) {
         action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPreviousMonth() ) );
         action->addTo( navigatorToolBar  );
     }
     icon = loadPixmap( pathString + "1leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210);
     if (p-> mShowIconBack) {
         action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPrevious() ) );
         action->addTo( navigatorToolBar  );
     } 
     icon = loadPixmap( pathString + "today" );
     configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
     if (p-> mShowIconToday)
         today_action->addTo( navigatorToolBar  );
     icon = loadPixmap( pathString + "1rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
     if (p-> mShowIconForward) {
         action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNext() ) );
         action->addTo( navigatorToolBar  );
     }
     icon = loadPixmap( pathString + "2rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
     if (p-> mShowIconForwardFast) {
         action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNextMonth() ) );
         action->addTo( navigatorToolBar  );
     }
 
 
     configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6);
 
 
     if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true);
     if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true);
     if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true);
     if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true);
 
     if (p-> mShowIconNewEvent)
         configureToolBarMenu->setItemChecked( 10, true );
     if (p->mShowIconNewTodo )
         configureToolBarMenu->setItemChecked( 20, true );
     if (p-> mShowIconSearch)
         configureToolBarMenu->setItemChecked( 120, true );
     if (p-> mShowIconList)
         configureToolBarMenu->setItemChecked( 30, true );
     if (p-> mShowIconDay1)
         configureToolBarMenu->setItemChecked( 40, true );
     if (p-> mShowIconDay5)
         configureToolBarMenu->setItemChecked( 50, true );
     if (p-> mShowIconDay6)
         configureToolBarMenu->setItemChecked( 75, true );
     if (p-> mShowIconDay7)
         configureToolBarMenu->setItemChecked( 60, true );
     if (p-> mShowIconMonth)
         configureToolBarMenu->setItemChecked( 70, true );
     if (p-> mShowIconTodoview)
         configureToolBarMenu->setItemChecked( 80, true );
     if (p-> mShowIconBackFast)
         configureToolBarMenu->setItemChecked( 200, true );
     if (p-> mShowIconBack)
         configureToolBarMenu->setItemChecked( 210, true );
     if (p-> mShowIconToday)
         configureToolBarMenu->setItemChecked( 130, true );
     if (p-> mShowIconForward)
         configureToolBarMenu->setItemChecked( 220, true );
     if (p-> mShowIconForwardFast)
         configureToolBarMenu->setItemChecked( 230, true );
     if (p-> mShowIconNextDays)
         configureToolBarMenu->setItemChecked( 100, true );
     if (p-> mShowIconNext)
         configureToolBarMenu->setItemChecked( 110, true );
     if (p-> mShowIconJournal)
         configureToolBarMenu->setItemChecked( 90, true );
     if (p-> mShowIconWhatsThis)
         configureToolBarMenu->setItemChecked( 300, true );
     if (p-> mShowIconWeekNum)
         configureToolBarMenu->setItemChecked( 400, true );
     if (!p-> mShowIconStretch) {
         QLabel* dummy = new QLabel( iconToolBar );
         dummy->setBackgroundColor( iconToolBar->backgroundColor() );
         dummy->setMinimumWidth( 0 );
         iconToolBar->setStretchableWidget ( dummy ) ;
     }
     else {
         iconToolBar->setHorizontalStretchable (true );
         viewToolBar->setHorizontalStretchable (true );
         navigatorToolBar->setHorizontalStretchable (true );
         iconToolBar->setVerticalStretchable (true );
         viewToolBar->setVerticalStretchable (true );
         navigatorToolBar->setVerticalStretchable (true );
         configureToolBarMenu->setItemChecked( 5, true );
     }
     if (p-> mShowIconFilter) 
         configureToolBarMenu->setItemChecked( 7, true );
     if (p-> mShowIconOnetoolbar) 
         configureToolBarMenu->setItemChecked( 6, true );
    
 
-    if ( filterMenubar )
-         connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
+    if ( filterMenubar ) {
+        filterMenubar->reparent(filterToolBar,0,QPoint(0,0) );
+        connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
+    }
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
     configureAgenda( p->mHourSize );
     connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
 
 void MainWindow::exportToPhone( int mode )
 {
 
     //ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     //ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     KOex2phonePrefs ex2phone; 
 
     ex2phone.mPhoneConnection->setText( KPimGlobalPrefs::instance()->mEx2PhoneConnection );
     ex2phone.mPhoneDevice->setText( KPimGlobalPrefs::instance()->mEx2PhoneDevice );
     ex2phone.mPhoneModel->setText( KPimGlobalPrefs::instance()->mEx2PhoneModel );
     if ( mode == 1 )
         ex2phone.setCaption(i18n("Export complete calendar")); 
     if ( mode == 2 )
         ex2phone.setCaption(i18n("Export filtered calendar")); 
 
     if ( !ex2phone.exec() ) {
         return;
     }
     KPimGlobalPrefs::instance()->mEx2PhoneConnection  = ex2phone.mPhoneConnection->text();
     KPimGlobalPrefs::instance()->mEx2PhoneDevice = ex2phone.mPhoneDevice->text();
     KPimGlobalPrefs::instance()->mEx2PhoneModel = ex2phone.mPhoneModel->text();
 
     int inFuture = 0;
     if ( ex2phone.mWriteBackFuture->isChecked() )
         inFuture =  ex2phone.mWriteBackFutureWeeks->value();
     QPtrList<Incidence> delSel;
     if ( mode == 1 )
         delSel  = mCalendar->rawIncidences(); 
     if ( mode == 2 )
         delSel  = mCalendar->incidences(); 
     CalendarLocal* cal = new CalendarLocal();
     cal->setLocalTime();
     Incidence *incidence = delSel.first();
     QDateTime cur = QDateTime::currentDateTime().addDays( -7 );
     QDateTime end = cur.addDays( ( inFuture +1 ) *7 );
     while ( incidence ) {
         if ( incidence->type() != "Journal" ) {
             bool add = true;
             if ( inFuture ) {
                 QDateTime dt;
                 if ( incidence->type() == "Todo" ) {
                     Todo * t = (Todo*)incidence;
                     if ( t->hasDueDate() )
                         dt = t->dtDue();
                     else
                         dt = cur.addSecs( 62 );
                 }
                 else  {
                     bool ok;
                     dt =  incidence->getNextOccurence( cur, &ok );
                     if ( !ok )
                         dt = cur.addSecs( -62 );
                 }
                 if ( dt < cur || dt > end ) {
                     add = false;
                 }
             }
             if ( add ) {
                 Incidence *in = incidence->clone();
                 cal->addIncidence( in );
             }
         }
         incidence = delSel.next();
     } 
     PhoneAccess::writeConfig( KPimGlobalPrefs::instance()->mEx2PhoneDevice,
                               KPimGlobalPrefs::instance()->mEx2PhoneConnection,
                               KPimGlobalPrefs::instance()->mEx2PhoneModel );
 
     setCaption( i18n("Writing to phone..."));
     if ( PhoneFormat::writeToPhone( cal ) )
         setCaption( i18n("Export to phone successful!"));
     else
         setCaption( i18n("Error exporting to phone!"));
     delete cal;
 }
 
 
 void MainWindow::setDefaultPreferences()
 {
     KOPrefs *p = KOPrefs::instance();
 
     p->mCompactDialogs = true;
     p->mConfirm = true;
     // p->mEnableQuickTodo = false;
 
 }
 
 QString MainWindow::resourcePath()
 {
     return KGlobal::iconLoader()->iconPath();
 }
 
 void MainWindow::displayText( QString text ,QString cap  )
 {
     QDialog dia( this, "name", true ); ;
     dia.setCaption( cap );
     QVBoxLayout* lay = new QVBoxLayout( &dia );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QTextBrowser tb ( &dia );
     lay->addWidget( &tb );
     tb.setText( text );
 #ifdef DESKTOP_VERSION
     dia.resize( 640, 480);
 #else
     dia.showMaximized();
 #endif
     dia.exec();
 }
 
 void MainWindow::features()
 {
 
     KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" );
 }
 
 void MainWindow::usertrans()
 {
 
     KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" );
 }
 
 void MainWindow::storagehowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" );
 }
 void MainWindow::timetrackinghowto()
 {
     KApplication::showFile( "KO/Pi Timetracking HowTo", "kdepim/timetrackerhowto.txt" );
 }
 void MainWindow::kdesynchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
 }
 void MainWindow::multisynchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
 }
 void MainWindow::synchowto()
 {
     KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 void  MainWindow::faq()
 {
     KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" );
 
 }
 void  MainWindow::whatsNew()
 {
     KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" );
 
 }
 void  MainWindow::licence()
 {
     KApplication::showLicence();
 
 }
 void MainWindow::about()
 {
     QString version;
 #include <../version>
     QMessageBox::about( this, i18n("About KOrganizer/Pi"),
                         i18n("KOrganizer/Platform-independent\n") +
                         "(KO/Pi) " + version + " - " +
 
 #ifdef DESKTOP_VERSION
                         i18n("Desktop Edition\n") +
 #else
                         i18n("PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n") +
 #endif
                         i18n("(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!") );
 }
 void MainWindow::keyBindings()
 {
     QString cap = i18n("KO/Pi Keys + Colors");
     QString text =  i18n("<p><h2>KO/Pi key shortcuts:</h2></p>\n") +
         i18n("<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n")+
         i18n("<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n") +
         i18n("<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n") +
         i18n("<p><b>I</b>: Show info for selected event/todo</p>\n") +
         i18n("<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n")+
         i18n("<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n")+
         i18n("<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n")+
         i18n("<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n")+
         i18n("<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ")+
         i18n("<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n")+
         i18n("<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n")+