fifi

4 files changed, 51 insertions, 12 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 3ba0841..7214035 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -7,16 +7,21 @@ Added feature for changing alarm settings for many items at once:
 Open list view (or search dialog), select the desired items and choose in
 the popup menu: Set alarm for selected...
 
 Added to the event/todo viewer the option to send an email to 
 all attendees or all selected (with RSVP) attendees. 
 
 Made the week-month mode changing in month view faster.
 
+Made month view better useable with keyboard.
+Now TAB key jumps to next cell with an event/todo.
+Scroll in cell with coursor keys, scroll in time (next week) with
+Shift/Control + coursorkeys.
+
 ********** VERSION 2.0.2 ************
 
 KO/Pi:
 Fixed the layout problem of the day label buttons 
 of the agenda view introduced in version 2.0.1.
 
 Added WhatsThis support for the todo view and the list view.
 
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index f31e50a..c08f44f 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -53,17 +53,17 @@ KDateNavigator::KDateNavigator( QWidget *parent, Calendar *calendar,
 {
   mCalendar = calendar;
 
   setFrameStyle(QFrame::NoFrame);
 
   QGridLayout *topLayout = new QGridLayout(this,8,8);
 
   if (! startDate.isValid()) {
-    kdDebug() << "KDateNavigator::KDateNavigator(): an invalid date was passed as a parameter!" << endl;
+      qDebug("KDateNavigator::invalid startdate ");
     startDate = QDate::currentDate();
   }
 
   mSelectedDates.append(startDate);
   m_MthYr = startDate;
   m_bShowWeekNums = show_week_nums;
   
   setFont( KOPrefs::instance()->mDateNavigatorFont );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index dfa89e2..df5e060 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -95,68 +95,83 @@ QString KNoScrollListBox::getWhatsThisText(QPoint p)
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence());
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
  
     switch(e->key()) {
     case Key_Right:
-        // if ( e->state() == Qt::ControlButton )
+        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
         {
             e->ignore();
             return;
         }
-        scrollBy(4,0);
+        scrollBy(10,0);
         break;
     case Key_Left:
-        //  if ( e->state() == Qt::ControlButton )
+        if (e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
         {
             e->ignore();
             return;
         }
-        scrollBy(-4,0);
+        scrollBy(-10,0);
         break;
     case Key_Up:
-        if(count() < 2)  {
+        if( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         setCurrentItem((currentItem()+count()-1)%count());
         if(!itemVisible(currentItem())) {
             if((unsigned int) currentItem() == (count()-1)) {
                 setTopItem(currentItem()-numItemsVisible()+1);
             } else {
                 setTopItem(topItem()-1);
             }
         }
         break;
     case Key_Down:
-        if(count() < 2)  {
+        if(e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton)  {
             e->ignore();
             break;
         }
         setCurrentItem((currentItem()+1)%count());
         if(!itemVisible(currentItem())) {
             if(currentItem() == 0) {
                 setTopItem(0);
             } else {
                 setTopItem(topItem()+1);
             }
         }
         break;
+    case Key_I:
+        QTimer::singleShot( 11, this, SLOT ( oneDown() ) );
+        e->ignore();
+        break;
     case Key_Shift:
         emit shiftDown();
         break;
     default:
         e->ignore();
         break;
     }
 }
 
+void KNoScrollListBox::oneDown()
+{
+    setCurrentItem((currentItem()+1)%count());
+    if(!itemVisible(currentItem())) {
+        if(currentItem() == 0) {
+            setTopItem(0);
+        } else {
+            setTopItem(topItem()+1);
+        }
+    }
+}
 void KNoScrollListBox::keyReleaseEvent(QKeyEvent *e)
 {
     switch(e->key()) {
     case Key_Shift:
         emit shiftUp();
         break;
     default:
         break;
@@ -277,16 +292,17 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
     QVBoxLayout *topLayout = new QVBoxLayout( this );
 
     // mLabel = new QLabel( this );QPushButton 
     mLabel = new QPushButton( this );
     //mLabel->setFrameStyle( QFrame::Panel | QFrame::Plain );
     //mLabel->setLineWidth( 1 );
     //mLabel->setAlignment( AlignCenter );
     mLabel->setFlat( true );
+    mLabel->setFocusPolicy(NoFocus); 
     mItemList = new KNoScrollListBox( this );
     mItemList->setMinimumSize( 10, 10 );
     mItemList->setFrameStyle( QFrame::Panel | QFrame::Plain );
     mItemList->setLineWidth( 1 );
     topLayout->addWidget( mItemList );
     mLabel->raise();
     // QColor( 0,0,255 )    QColor( 160,1600,255 )
     mStandardPalette = palette();
@@ -396,18 +412,20 @@ void MonthViewCell::clear()
     QApplication::removePostedEvents ( mItemList ); 
     QApplication::removePostedEvents ( mLabel ); 
     QApplication::removePostedEvents ( this ); 
 }
 
 void MonthViewCell::startUpdateCell()
 {
 
+    mItemList->setFocusPolicy(NoFocus); 
     if ( !mMonthView->isUpdatePossible() )
         return;
+
     /*    
           if ( !isVisible() ){
           return;
           }
     */
     // qDebug("MonthViewCell::updateCell() ");
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
@@ -428,16 +446,18 @@ void MonthViewCell::startUpdateCell()
         item->setPalette( mHolidayPalette );
         mItemList->insertItem( item );
         mToolTip += mHolidayString+"\n"; 
     }
 }
 
 void MonthViewCell::insertEvent(Event *event)
 {
+    
+    mItemList->setFocusPolicy(WheelFocus); 
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 return;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     return;
         }
         
@@ -533,17 +553,17 @@ void MonthViewCell::insertTodo(Todo *todo)
 {
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
-        text += i18n("To-Do: %1").arg(todo->summary());
+        text += i18n("Td: %1").arg(todo->summary());
 
         MonthViewItem *item = new MonthViewItem( todo, mDate, text );
         //item->setPalette( mStandardPalette );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = todo->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
@@ -821,30 +841,32 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
         mDayLabelsW.insert( i, label );
     }
 
     bfont.setBold( false );
     mWeekLabels.resize( mNumWeeks+1 );
     mWeekLabelsW.resize( 2 );
     for( i = 0; i < mNumWeeks+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mMonthView );
+        label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabels.insert( i, label );
     }
     mWeekLabels[mNumWeeks]->setText( i18n("W"));
     QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
     
     for( i = 0; i < 1+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mWeekView );
+        label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabelsW.insert( i, label );
@@ -898,26 +920,29 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
 
     emit incidenceSelected( 0 );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
-void KOMonthView::selectDateWeekNum ( int )
-{
 
-}
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();
     emit selectWeekNum ( n );
 }
 
+int KOMonthView::currentWeek()
+{
+    if ( mShowWeekView )
+        return mWeekLabelsW[0]->getWeekNum();
+    return mWeekLabels[0]->getWeekNum();
+}
 void KOMonthView::switchView()
 {
 
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     //emit showNavigator( !mShowWeekView );
@@ -1534,13 +1559,20 @@ void KOMonthView::keyPressEvent ( QKeyEvent * e )
     case Key_Down:
         {
             emit nextMonth();
             mCells[0]->setFocus();
            
         }
         e->accept();
         break;
+    case Key_Return:
+    case Key_Enter:
+        {
+            selectInternalWeekNum ( currentWeek() );
+        }
+        e->accept();
+        break;
     default:
         e->ignore();     
         break;
     }
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 700f098..51eb9e6 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -49,16 +49,17 @@ class KOWeekButton : public QPushButton
     KOWeekButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name) 
     {
       connect( this, SIGNAL( clicked() ),
                SLOT( bottonClicked() )); 
       mNumber = -1;
     }
     void setWeekNum ( int num ) {mNumber = num; setText( QString::number ( num ));}
+    int getWeekNum() { return mNumber;}
     signals:
     void selectWeekNum ( int );
 private:
     int mNumber;
 private slots :
     void bottonClicked() { if ( mNumber > 0 ) emit selectWeekNum ( mNumber ); }
 };
 
@@ -71,16 +72,17 @@ class KNoScrollListBox: public QListBox
     QString getWhatsThisText(QPoint p) ;
 
   signals:
     void shiftDown();
     void shiftUp();
     void rightClick();
 
    protected slots:
+    void oneDown();
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);
     void mousePressEvent(QMouseEvent *);
 
  private:
     KNOWhatsThis * mWT;
 };
 
@@ -236,32 +238,32 @@ class KOMonthView: public KOEventView
 
     void clearSelection();
 
     void showContextMenu( Incidence * );
 
     void setSelectedCell( MonthViewCell * );
 
   protected slots:
-    void selectDateWeekNum ( int );
     void selectInternalWeekNum ( int );
     void switchView();
     void processSelectionChange();
  signals:
     void nextMonth();
     void prevMonth();
     void showNavigator( bool );
     void selectWeekNum ( int );
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
+    int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;