1 files changed, 45 insertions, 27 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 6eaac1c..00285a5 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -109,2 +109,3 @@
 #include "incomingdialog.h"
+#include "datenavigatorcontainer.h"
 #include "statusdialog.h"
@@ -269,4 +270,5 @@ void CalendarView::init()
 
-    mDateNavigator = new KDateNavigator(mLeftSplitter, mCalendar, TRUE,
-                                        "CalendarView::DateNavigator", QDate::currentDate() );
+    mDateNavigator = new DateNavigatorContainer( mLeftSplitter,
+                                               "CalendarView::DateNavigator" );
+
     mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize);
@@ -297,23 +299,31 @@ void CalendarView::init()
     QWidget *mainBox = new QWidget( this );
-    QWidget *leftFrame = new QWidget( mainBox );
-
+    //QWidget *leftFrame = new QWidget( mainBox );
     QBoxLayout * mainBoxLayout;
-    QBoxLayout * leftFrameLayout;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         mainBoxLayout  = new QVBoxLayout(mainBox); 
-        leftFrameLayout = new QHBoxLayout(leftFrame ); 
+        //leftFrameLayout = new QHBoxLayout(leftFrame ); 
+        mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mainBox);;
+        mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left );
     } else {
         mainBoxLayout  = new QHBoxLayout(mainBox);
-        leftFrameLayout = new  QVBoxLayout(leftFrame ); 
+        //leftFrameLayout = new  QVBoxLayout(leftFrame ); 
+        mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mainBox);;
+        mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     }
+    //QBoxLayout * leftFrameLayout;
     topLayout->addWidget( mainBox );
-    mainBoxLayout->addWidget (leftFrame);
-    mDateNavigator = new KDateNavigator(leftFrame, mCalendar, TRUE,
+    mainBoxLayout->addWidget (mLeftFrame);  
+    mDateNavigator = new DateNavigatorContainer( mLeftFrame,
+                                               "CalendarView::DateNavigator" );
+#if 0
+    // FIXME
+    mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE,
                                         "CalendarView::DateNavigator", QDate::currentDate());
+#endif
     // mDateNavigator->blockSignals( true );
-    leftFrameLayout->addWidget( mDateNavigator  );
-    mFilterView = new KOFilterView(&mFilters,leftFrame,"CalendarView::FilterView");
-    mTodoList = new KOTodoView(mCalendar, leftFrame, "todolistsmall");
+    //leftFrameLayout->addWidget( mDateNavigator  );
+    mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
+    mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView");
     mTodoList->setNavigator( mNavigator );
-    
+#if 0
     if (  QApplication::desktop()->width() < 480 ) {
@@ -326,2 +336,3 @@ void CalendarView::init()
     } 
+#endif
     mFilterView->hide();
@@ -333,12 +344,15 @@ void CalendarView::init()
 
-    mLeftFrame = leftFrame;
+    //mLeftFrame = (QWidget *)leftFrame;
     if ( KOPrefs::instance()->mVerticalScreen ) {
-        mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
-        leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
+        mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() );
+        //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() );
+        //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
+        //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
     } else {
-        mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
-        leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() );
+        mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() );
+        //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
+        //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() );
     }
     if ( !KOPrefs::instance()->mShowDateNavigator)
-        mDateNavigator->hide();
+        mLeftFrame->toggle();
     //qDebug("Calendarview Size %d %d ", width(), height());
@@ -374,7 +388,7 @@ void CalendarView::init()
              mNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
-
-    connect( mDateNavigator, SIGNAL( eventDropped( Event * ) ),
-             SLOT( eventAdded( Event *) ) );
-
-    connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView()));
+#if 0
+    connect( mDateNavigator, SIGNAL( incidenceDropped( Incidence * ) ),
+             SLOT( incidenceAdded(  Incidence *) ) );
+#endif
+    // connect(mDateNavigator,SIGNAL(dayPassed(QDate)),SLOT(updateView()));
 
@@ -469,3 +483,3 @@ void CalendarView::init()
 #endif
-
+  mDateNavigator->setCalendar( mCalendar );
 }
@@ -3687,3 +3701,3 @@ QWidget *CalendarView::leftFrame()
 {
-    return mLeftFrame;
+    return ( QWidget *)mLeftFrame;
 }
@@ -3697,3 +3711,3 @@ KDateNavigator* CalendarView::dateNavigatorWidget()
 {
-    return mDateNavigator;
+    return mDateNavigator->navigatorView();
 }
@@ -3702,2 +3716,5 @@ void CalendarView::toggleDateNavigatorWidget()
     KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ;
+    mLeftFrame->toggle();
+    // FIXME mShowDateNavigator is not the toggle state of mLeftFrame
+#if 0
     if (!KOPrefs::instance()->mShowDateNavigator )
@@ -3706,2 +3723,3 @@ void CalendarView::toggleDateNavigatorWidget()
         mDateNavigator->show();
+#endif
 }