fixes

8 files changed, 109 insertions, 33 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 1a24887..9720f43 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -241,5 +241,5 @@ void KOAgenda::init()
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next week"),4 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ),  i18n("Next two weeks"),5 );   
-    mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("Next month"),6 );  
+    mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ),  i18n("This month"),6 );  
     mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ),  i18n("Journal view"),7 ); 
 #ifndef _WIN32_
@@ -755,6 +755,5 @@ void KOAgenda::newItem( int item )
         } else 
             {
-                QDate day = mSelectedDates[mStartCellX];
-                emit showDateView( item, day );
+                emit showDateView( item, mStartCellX );
                 // 3Day view
                 // 4Week view
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 3d33ae5..35c08b6 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -146,5 +146,5 @@ class KOAgenda : public QScrollView
 
   signals:
-    void showDateView( int, QDate );
+    void showDateView( int, int);
     void newEventSignal();
     void newEventSignal(int gx,int gy);
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b9909d6..2996acb 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -489,6 +489,6 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
             SLOT(setContentsPos(int)));
 
-    connect(mAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate )));
-    connect(mAllDayAgenda,SIGNAL(showDateView( int, QDate )),SIGNAL(showDateView( int, QDate )));
+    connect(mAgenda,SIGNAL(showDateView( int, int)),SLOT(slotShowDateView( int, int )));
+    connect(mAllDayAgenda,SIGNAL(showDateView( int, int )), SLOT(slotShowDateView( int, int ) ));
 
     // Create/Show/Edit/Delete Event
@@ -1311,4 +1311,15 @@ void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 // }
 
+void KOAgendaView::slotShowDateView( int mode , int d )
+{
+    if ( d >= mSelectedDates.count() ) {
+        qDebug("KOAgendaView::slotShowDateView datecounterror %d d ", d, mSelectedDates.count() );
+
+    } else {
+        QDate day = mSelectedDates[d];
+        emit showDateView(mode , day );
+    }
+
+}
 void KOAgendaView::newEvent(int gx, int gy)
 {
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 57b4e46..6dc81c6 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -207,4 +207,5 @@ class KOAgendaView : public KOEventView {
     void scrollOneHourDown();
     void addToCalSlot(Incidence *, Incidence *);
+    void slotShowDateView( int, int );
 
   signals:
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index b9ce4f4..ab9a4b6 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -938,5 +938,9 @@ void MonthViewCell::resizeEvent ( QResizeEvent * e )
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
-    if ( !item ) return;
+    if ( !item ) {
+        QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
+        emit newEventSignal( dt );
+        return;
+    }
 
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
@@ -1372,4 +1376,5 @@ void KOMonthView::changeEventDisplay(Event *, int)
     // this should be re-written to be much more efficient, but this
     // quick-and-dirty-hack gets the job done for right now.
+    qDebug("KOMonthView::changeEventDisplay ");
     updateView();
 }
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index e008625..ccc4b01 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -265,7 +265,22 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
 #endif
 }
+void KOTodoListView::keyReleaseEvent ( QKeyEvent *e ) 
+{
+    if ( !e->isAutoRepeat() ) {
+        mFlagKeyPressed = false;
+    }
+}
+
+
 void KOTodoListView::keyPressEvent ( QKeyEvent * e )
 {
-    
+    qApp->processEvents();
+    if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
+        e->ignore();
+        // qDebug("  ignore  %d",e->isAutoRepeat()  );
+        return;
+    }
+    if (! e->isAutoRepeat() )
+        mFlagKeyPressed = true;
     QListViewItem* cn;
     if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) {
@@ -290,5 +305,4 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
     }
    
-    //  qDebug("KOTodoListView::keyPressEvent  ");
     if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall"  ) {
         switch ( e->key() ) {
@@ -599,7 +613,9 @@ void KOTodoView::updateView()
        return;
     }
+    storeCurrentItem();
     //qDebug("KOTodoView::updateView() %x", this);
     if ( isFlatDisplay ) {
         displayAllFlat();
+        resetCurrentItem();
         return;
     }
@@ -607,8 +623,5 @@ void KOTodoView::updateView()
 //  kdDebug() << "KOTodoView::updateView()" << endl;
     QFont fo = KOPrefs::instance()->mTodoViewFont;
-    Incidence* oldInc = 0;
-    mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
-    if (mActiveItem)
-        oldInc = mActiveItem->todo();
+   
 
     mTodoListView->clear();
@@ -692,25 +705,64 @@ void KOTodoView::updateView()
   if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
   mTodoListView->blockSignals( false );
-  mTodoListView->setFocus();
-  if ( mTodoListView->firstChild ()  ) {
-      if ( oldInc ) {
-          KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild ();
-          while ( item  ) {
-              if ( item->todo() == oldInc ) {
-                  mTodoListView->setCurrentItem( item ); 
-                  mTodoListView->ensureItemVisible( item );
-                  break;
-              }
-              item = (KOTodoViewItem*)item->itemBelow();
-          }
-          if ( ! item )
-              mTodoListView->setCurrentItem( mTodoListView->firstChild () );
-      } else {
-          mTodoListView->setCurrentItem( mTodoListView->firstChild () );
-      }
-  }
+  resetCurrentItem();
   processSelectionChange();
 }
 
+void KOTodoView::storeCurrentItem()
+{
+    mCurItem = 0;
+    mCurItemRootParent = 0;
+    mCurItemAbove = 0; 
+    mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
+    if (mActiveItem) {
+        mCurItem = mActiveItem->todo();
+        KOTodoViewItem* activeItemAbove =  (KOTodoViewItem*)mActiveItem->itemAbove ();
+        if ( activeItemAbove )
+            mCurItemAbove = activeItemAbove->todo();
+        while ( mActiveItem->parent() != 0 )
+            mActiveItem = (KOTodoViewItem*)mActiveItem->parent();
+        mCurItemRootParent = mActiveItem->todo();
+    }
+    mActiveItem = 0;
+}
+
+void KOTodoView::resetCurrentItem()
+{
+    mTodoListView->setFocus();
+    KOTodoViewItem* foundItem = 0; 
+    KOTodoViewItem* foundItemRoot = 0; 
+    KOTodoViewItem* foundItemAbove = 0; 
+    if ( mTodoListView->firstChild ()  ) {
+        if ( mCurItem ) {
+            KOTodoViewItem* item = (KOTodoViewItem*)mTodoListView->firstChild ();
+            while ( item  ) {
+                if ( item->todo() ==  mCurItem ) {
+                    foundItem = item; 
+                    break;
+                } else if ( item->todo() ==  mCurItemAbove ) {
+                    foundItemAbove = item;
+
+                } else if ( item->todo() ==  mCurItemRootParent ) {
+                    foundItemRoot = item;
+                }
+                item = (KOTodoViewItem*)item->itemBelow();
+            }
+            if ( ! foundItem ) {
+                if ( foundItemAbove )
+                    foundItem = foundItemAbove;
+                else
+                    foundItem = foundItemRoot;
+            }  
+        } 
+        if ( foundItem ) {
+            mTodoListView->setCurrentItem( foundItem ); 
+            mTodoListView->ensureItemVisible(  foundItem );
+        } else {
+            mTodoListView->setCurrentItem( mTodoListView->firstChild () );
+        }
+    }
+    mTodoListView->setFocus();
+}
+//Incidence * mCurItem, *mCurItemRootParent,*mCurItemAbove; 
 bool KOTodoView::checkTodo( Todo * todo )
 {
@@ -1240,6 +1292,7 @@ void KOTodoView::addQuickTodo()
   updateView();
 }
+
 void KOTodoView::keyPressEvent ( QKeyEvent * e )
-{
+{  
     //    e->ignore();
     //return;
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index eab0754..e553d0e 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -87,5 +87,7 @@ class KOTodoListView : public KListView
     bool mMousePressed;
     QListViewItem *mOldCurrent;
+    bool  mFlagKeyPressed;
     void keyPressEvent ( QKeyEvent * ) ;
+    void keyReleaseEvent ( QKeyEvent * ) ;
 };
 
@@ -253,4 +255,7 @@ class KOTodoView : public KOrg::BaseView
     KOTodoViewItem * pendingSubtodo;
     DateNavigator* mNavigator;
+    void storeCurrentItem();
+    void resetCurrentItem();
+    Incidence * mCurItem, *mCurItemRootParent,*mCurItemAbove; 
 };
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index f97aa98..c442d0b 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -139,5 +139,5 @@ void KOViewManager::showDateView( int view, QDate date)
         mMainView->dateNavigator()->selectDates( date, 14);
     } else if (view == 6 ) {
-        //mMainView->dateNavigator()->selectDates( date, 7 );
+        resetDateSilent( date,1);
         showMonthView();
     } else if (view == 7 ) {
@@ -390,4 +390,6 @@ void KOViewManager::updateWNview()
     if ( mCurrentView == mWhatsNextView && mWhatsNextView )
         mWhatsNextView->updateView();
+    if ( mCurrentView == mMonthView && mMonthView )
+        mMonthView->updateView();
         
 }