fixes

7 files changed, 92 insertions, 36 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 17a1d13..df606d0 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -368,14 +368,18 @@ void KODayMatrix::computeEvent(Event *event, int i )
         mHolidays[i] =holiStr ;
+        eDays.setBit(i);
     }
-    if ( event->isBirthday()) {
-        pDays.setBit(i);
-        if ( !holiStr.isEmpty() )
-            holiStr += "\n";
-        holiStr += i18n("Birthday") + ": "+event->summary();
-        if ( !event->location().isEmpty() )
-            holiStr += " (" + event->location() + ")";
-        bDays.setBit(i);
-        mHolidays[i] =holiStr ;
+    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();
+            if ( !event->location().isEmpty() )
+                holiStr += " (" + event->location() + ")";
+            bDays.setBit(i);
+            mHolidays[i] =holiStr ;
+        }
     }
-    eDays.setBit(i);
+    if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW )
+        eDays.setBit(i);
 }
@@ -390,2 +394,3 @@ void KODayMatrix::updateViewTimed()
 
+   
  int i;
@@ -471,13 +476,45 @@ void KODayMatrix::updateViewTimed()
     }
-
-#if 0
-    // insert due todos
-    QPtrList<Todo> todos = calendar()->todos( );
-    Todo *todo;
-    for(todo = todos.first(); todo; todo = todos.next()) {
-        //insertTodo( todo );
-        if ( todo->hasDueDate() ) {
-            int day = mStartDate.daysTo( todo->dtDue().date() );
+    if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW  ) {
+        bDays.fill( false);
+        // insert due todos
+        QPtrList<Todo> todos = mCalendar->todos( );
+        Todo *todo;
+        for(todo = todos.first(); todo; todo = todos.next()) {
+            //insertTodo( todo );
+            if ( todo->hasDueDate() ) {
+                int day = mStartDate.daysTo( todo->dtDue().date() );
+                if ( day >= 0 && day < timeSpan + 1)  {
+                    int i = day;
+                    QString holiStr = mHolidays[i];
+                    pDays.setBit(i);
+                    if ( !holiStr.isEmpty() )
+                        holiStr += "\n";
+                    holiStr += i18n("Todo") + ": "+todo->summary();
+                    if ( !todo->location().isEmpty() )
+                        holiStr += " (" + todo->location() + ")";
+                    bDays.setBit(i);
+                    mHolidays[i] =holiStr ;
+                    eDays.setBit(i);
+                }
+            }
+        }
+    } 
+    if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW  ) {
+        bDays.fill( false);
+        // insert due todos
+        QPtrList<Journal> todos = mCalendar->journals( );
+        Journal *todo;
+        for(todo = todos.first(); todo; todo = todos.next()) {
+            int day = mStartDate.daysTo( todo->dtStart().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
-                (*cells)[day]->insertTodo( todo );
+                int i = day;
+                QString holiStr = mHolidays[i];
+                pDays.setBit(i);
+                if ( !holiStr.isEmpty() )
+                    holiStr += "\n";
+                holiStr += i18n("Journal");
+                bDays.setBit(i);
+                mHolidays[i] =holiStr ;
+                eDays.setBit(i);
+                
             }
@@ -485,4 +522,2 @@ void KODayMatrix::updateViewTimed()
     }
-#endif
-
 #else
@@ -538,3 +573,5 @@ void KODayMatrix::updateView(QDate actdate)
 {
-   
+    if ( mLastView != KOPrefs::instance()->mCurrentDisplayedView )
+        mRedrawNeeded = true;
+    mLastView = KOPrefs::instance()->mCurrentDisplayedView;
     if ( ! actdate.isValid() ) {
@@ -1054,5 +1091,5 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
                     if ( hDays.testBit(i) )
-                        p.setPen(QColor(Qt::green));
+                        p.setPen(QColor(0,200,0));
                     else
-                        p.setPen(QColor(Qt::green).dark());
+                        p.setPen(QColor(Qt::blue));
                 } else {
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index b686bd7..a3216d6 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -229,2 +229,3 @@ protected:
 private:
+    int mLastView;
     void computeEvent(Event *even, int dayindex );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 843526d..ae61db6 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1559,2 +1559,5 @@ void KOMonthView::updateView()
         } else { // no recur 
+            if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
+                if ( event->uid().left(15) == QString("last-syncEvent-")  )
+                    continue;
             int st =  event->dtStart().date().daysTo( endDate );
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index cb9c272..d9d7924 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -858,6 +858,3 @@ void KOPrefsDialog::setupViewsTab()
   
-  passwdk =
-      addWidBool(i18n("Show Sync Events in WN+Agenda"),
-                 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
-  topLayout->addWidget(passwdk->checkBox(), ii++,0);
+
   passwdk =
@@ -954,3 +951,9 @@ dummy =
   topLayout->setMargin(mMarginHint);
-  ii = 0;
+  ii = 0;  
+
+   dummy  =
+      addWidBool(i18n("Show Sync Events"),
+                 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+
   lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 3aa9b6c..2e5a943 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -319,2 +319,3 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
     mMainView->adaptNavigationUnits();
+    mMainView->updateUnmanagedViews();
 }
@@ -399,2 +400,3 @@ void KOViewManager::showWhatsNextView()
     globalFlagBlockAgenda = 1;
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW;
     showView(mWhatsNextView, true );
@@ -445,2 +447,3 @@ void KOViewManager::showListView()
     }
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
     showView(mListView, KOPrefs::instance()->mFullViewTodo);
@@ -512,2 +515,3 @@ void KOViewManager::showAgendaView( bool fullScreen )
    
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
     showView( mAgendaView, full);
@@ -570,2 +574,3 @@ void KOViewManager::showNextXView()
       
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
     globalFlagBlockAgenda = 1;
@@ -657,2 +662,3 @@ void KOViewManager::showMonthViewWeek()
     createMonthView();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
     globalFlagBlockAgenda = 1;
@@ -685,2 +691,3 @@ void KOViewManager::showMonthView()
      createMonthView();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
     globalFlagBlockAgenda = 1;
@@ -756,2 +763,3 @@ void KOViewManager::showTodoView()
 
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
     globalFlagBlockAgenda = 1;
@@ -774,2 +782,3 @@ void KOViewManager::showJournalView()
 
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
     showView(mJournalView);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 95bef66..87cef20 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -188,3 +188,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         filterToolBar = new QPEToolBar ( this );
-        filterMenubar = new QPEMenuBar( filterToolBar );
+        filterMenubar = new QMenuBar( filterToolBar );
         QFontMetrics fm ( filterMenubar->font() );
@@ -193,7 +193,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
-        QString addTest = "Ax";  
+        QString addTest = "A";  
+        filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
 #ifdef DESKTOP_VERSION
-        addTest = "AAAx"; 
-#endif
-        filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+addTest ) );
+        addTest = "AAABBBCCCx"; 
+#else
+        addTest = "AAx";  
+#endif 
+        filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
         addToolBar (filterToolBar , tbd );
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 45ed04d..8fd3d24 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -125,3 +125,3 @@ class MainWindow : public QMainWindow
     QPEToolBar *filterToolBar;
-    QPEMenuBar *filterMenubar;
+    QMenuBar *filterMenubar;
     QPopupMenu * filterPopupMenu;