fixes

1 files changed, 7 insertions, 0 deletions

diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 406e741..f1f2dd2 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -474,256 +474,263 @@ void KOViewManager::showAgendaView( bool fullScreen )
         connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)),
                 mMainView, SLOT(newEvent(QDateTime)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)),
              mMainView, SLOT(newEvent(QDateTime,QDateTime)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDate)),
                 mMainView, SLOT(newEvent(QDate)));
 
         connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
 
         connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
 
         connect(mAgendaView, SIGNAL( toggleExpand() ),
                 mMainView, SLOT( toggleExpand() ) );
       
         connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cloneIncidence(Incidence *) ) ) ;
         connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cancelIncidence(Incidence *) ) ) ;
         connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); 
         connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView,
                  SLOT( updateTodo( Todo *, int ) ) );  
         connect(  mAgendaView,SIGNAL( todoMoved( Todo *, int )),
                   mMainView, SIGNAL( todoModified( Todo *, int )));
         connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         connect( mAgendaView, SIGNAL( selectWeekNum( int ) ),
                  mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) );
         mAgendaView->readSettings(); 
         mAgendaView->updateConfig(); 
     }
    
     showView( mAgendaView, full);
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
 }
 
 void KOViewManager::showDayView()
 { 
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockLabel = 1;
     globalFlagBlockAgenda = 1;
     if ( mCurrentAgendaView != 1 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;
     mMainView->dateNavigator()->selectDates( 1 );
     mCurrentAgendaView = 1 ;
     
 }
 
 void KOViewManager::showWorkWeekView()
 {
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 5 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;
     mMainView->dateNavigator()->selectWorkWeek();
     mCurrentAgendaView = 5 ;
    
 }
 
 void KOViewManager::showWeekView()
 {
     /*
       globalFlagBlockAgenda = 2;
       qDebug("4globalFlagBlockAgenda = 2; ");
       //globalFlagBlockPainting = true;
       mMainView->dateNavigator()->selectWeek();
       showAgendaView();
     */
 
 
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays = false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 7 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;  
     mMainView->dateNavigator()->selectWeek();
     mCurrentAgendaView = 7 ;
 }
 
 void KOViewManager::showNextXView()
 {
       
     globalFlagBlockAgenda = 1;
     if ( mCurrentAgendaView != 3 )
         mCurrentAgendaView = -1;
     showAgendaView(KOPrefs::instance()->mFullViewMonth);
     globalFlagBlockAgenda = 2;
     mMainView->dateNavigator()->selectDates( QDate::currentDate(),
                                              KOPrefs::instance()->mNextXDays );
     mFlagShowNextxDays = true;
     mCurrentAgendaView = 3 ;
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
 }
 bool KOViewManager::showsNextDays() 
 {
     return mFlagShowNextxDays;
 }
 void KOViewManager::createMonthView()
 {
 if (!mMonthView) {
         mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView");
      
         addView(mMonthView);
         // mMonthView->show();
         // SIGNALS/SLOTS FOR MONTH VIEW
+
+        connect(mMonthView,SIGNAL(showJournalSignal( int, QDate )),SLOT(showDateView( int, QDate )));
+ 
+        connect(mMonthView, SIGNAL(newTodoSignal(QDateTime,bool)),
+                mMainView, SLOT(newTodoDateTime(QDateTime, bool)));
+
+
         connect(mMonthView, SIGNAL(newEventSignal(QDateTime)),
                 mMainView, SLOT(newEvent(QDateTime)));
 
         connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
 
         connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
         connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
 
         connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
                  mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) );
         connect( mMonthView, SIGNAL( selectMonth() ),
                  mMainView->dateNavigator(), SLOT ( selectMonthFromMonthview() ) );
         connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),
                  mMainView, SLOT ( showDay( QDate ) ) );
         connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig()));
         connect( mMonthView, SIGNAL(nextMonth() ),
                  mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) );
         connect( mMonthView, SIGNAL(prevMonth() ),
                  mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousYear() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ),
                  mMainView->dateNavigator(), SLOT( selectNextYear() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ),
                  mMainView->dateNavigator(), SLOT( selectNextMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ),
                  mMainView->dateNavigator(), SLOT( selectNextWeek() ) );
         
         connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
                  mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) );
         
         
         connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ),
                  mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) );
 
     }
 }
 void KOViewManager::showMonthViewWeek()
 {
     createMonthView();
     globalFlagBlockAgenda = 1;
     bool full = true;
     if ( mCurrentView == mMonthView)
         full = mMainView->leftFrame()->isVisible();
     if ( !KOPrefs::instance()->mMonthViewWeek ) {
         mMonthView->switchView();
         if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
             full = false;
         else
             full = true;
     }
     mMainView->dateNavigator()->selectWeek();
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
 }
 
 void KOViewManager::showMonth( const QDate & date )
 {
     mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectDate( date );
     mMainView->dateNavigator()->blockSignals( false );
     showMonthView();
 }
 void KOViewManager::showMonthView()
  {
     
      createMonthView();
     globalFlagBlockAgenda = 1;
     //mFlagShowNextxDays = false;
     bool full = true;
     if ( mCurrentView == mMonthView)
         full = mMainView->leftFrame()->isVisible();
     // if(mMonthView == mCurrentView) return; 
     if ( KOPrefs::instance()->mMonthViewWeek ) {
         mMonthView->switchView();
         if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
             full = false;
         else
             full = true;
     }
     mMainView->dateNavigator()->selectMonth();
 
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
    
 }
 
 void KOViewManager::showTodoView()
 {
     //mFlagShowNextxDays = false;
     if ( !mTodoView ) {
         mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(),
                                     "KOViewManager::TodoView" );
     
         addView( mTodoView ); 
         // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold );
   
         // SIGNALS/SLOTS FOR TODO VIEW
         connect( mTodoView, SIGNAL( newTodoSignal() ),
                  mMainView, SLOT( newTodo() ) );
         connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ),
                  mMainView, SLOT( newSubTodo( Todo *) ) );
         connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ),
                  mMainView, SLOT( showTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ),
                  mMainView, SLOT( editTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ),
                  mMainView, SLOT( deleteTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( purgeCompletedSignal() ),