fixxxx

2 files changed, 6 insertions, 4 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 4366265..30efbf6 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -158,112 +158,112 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
         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;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index eed023c..3c0259f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -142,97 +142,97 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     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;
@@ -1235,98 +1235,100 @@ void MainWindow::initActions()
         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() )