dnc

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
@@ -107,6 +107,7 @@
 #include "kodialogmanager.h"
 #include "outgoingdialog.h"
 #include "incomingdialog.h"
+#include "datenavigatorcontainer.h"
 #include "statusdialog.h"
 #include "kdatenavigator.h"
 #include "kotodoview.h"
@@ -267,8 +268,9 @@ void CalendarView::init()
                                   "CalendarView::LeftFrame");
     mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize);
 
-    mDateNavigator = new KDateNavigator(mLeftSplitter, mCalendar, TRUE,
-                                        "CalendarView::DateNavigator", QDate::currentDate() );
+    mDateNavigator = new DateNavigatorContainer( mLeftSplitter,
+                                               "CalendarView::DateNavigator" );
+
     mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize);
     mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2");
     mTodoList->setNavigator( mNavigator );
@@ -295,27 +297,35 @@ void CalendarView::init()
     mLeftFrame = mLeftSplitter;
 #else
     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 ) {
         leftFrameLayout->addWidget(mFilterView);
         leftFrameLayout->addWidget(mTodoList, 2 );
@@ -324,6 +334,7 @@ void CalendarView::init()
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
+#endif
     mFilterView->hide();
     QWidget *rightBox = new QWidget( mainBox );
     mainBoxLayout->addWidget ( rightBox, 10 );
@@ -331,16 +342,19 @@ void CalendarView::init()
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 10 );
 
-    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());
 #endif
  
@@ -372,11 +386,11 @@ void CalendarView::init()
 
     connect( mDateNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              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()));
 
     connect( this, SIGNAL( configChanged() ),
              mDateNavigator, SLOT( updateConfig() ) );
@@ -467,7 +481,7 @@ void CalendarView::init()
   connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 #endif
-
+  mDateNavigator->setCalendar( mCalendar );
 }
 
 
@@ -3685,7 +3699,7 @@ QWidgetStack *CalendarView::viewStack()
 
 QWidget *CalendarView::leftFrame()
 {
-    return mLeftFrame;
+    return ( QWidget *)mLeftFrame;
 }
 
 DateNavigator *CalendarView::dateNavigator()
@@ -3695,15 +3709,19 @@ DateNavigator *CalendarView::dateNavigator()
 
 KDateNavigator* CalendarView::dateNavigatorWidget()
 {
-    return mDateNavigator;
+    return mDateNavigator->navigatorView();
 }
 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 )
         mDateNavigator->hide();
     else
         mDateNavigator->show();
+#endif
 }
 void CalendarView::addView(KOrg::BaseView *view)
 {