fixxeess

5 files changed, 64 insertions, 45 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 4251283..e21bb44 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,19 +1,24 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.0.4 ************
 
 KO/Pi:
 Fixed problem loading translations for summary/location edit boxes in event/todo editor.
 
+Added a general "select week number" to the toolbar.
+
+Fixed some small problem of the new features introduced in version 2.0.3.
+
+
 ********** VERSION 2.0.3 ************
 
 KO/Pi:
 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.
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index ce66863..da5ef07 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -155,25 +155,25 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
   topLayout->addWidget(mCompleteDateEdit ); 
 
   mCompleteTimeEdit = new KOTimeEdit(parent);
   topLayout->addWidget( mCompleteTimeEdit); 
 
   mCompletedCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,QSizePolicy::Preferred) );
   mCompletedLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred) );
 
   if (  QApplication::desktop()->width() <= 480 ) {
       if (  QApplication::desktop()->width() < 320 )
           mCompleteDateEdit->setMaximumWidth( 85 );
       else
-          mCompleteDateEdit->setMaximumWidth( 130 );
+          mCompleteDateEdit->setMaximumWidth( 140 );
       topLayout->setSpacing( 0 );
   }
 }
 
 void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout)
 {
 
     QHBox* h = new QHBox ( parent );
     topLayout->addWidget( h );
   QLabel *priorityLabel = new QLabel(i18n("Priority:"), h);
   // topLayout->addWidget(priorityLabel);
   mPriorityCombo = new QComboBox( h );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 5926abe..ffb2e1e 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -83,25 +83,25 @@ KNoScrollListBox::KNoScrollListBox(QWidget *parent,const char *name)
     QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif 
     mWT = new KNOWhatsThis(this);
 }
 KNoScrollListBox::~KNoScrollListBox()
 {
  
 }
 QString KNoScrollListBox::getWhatsThisText(QPoint p) 
 {
     QListBoxItem* item = itemAt ( p );
     if ( ! item ) {
-        return i18n("Click in the cell\nto add an event!");
+         return i18n("Click in the cell\nto add an event!");
     }
     return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence());
 }
 void KNoScrollListBox::keyPressEvent(QKeyEvent *e)
 {
  
     switch(e->key()) {
     case Key_Right:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton  )
         {
             e->ignore();
             return;
@@ -310,25 +310,25 @@ MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
     mStandardPalette.setColor(QColorGroup::Base, mStandardPalette.color( QPalette::Normal, QColorGroup::Background ) );
 
     enableScrollBars( false );
     updateConfig();
     //connect( mLabel, SIGNAL( clicked( )), SLOT( newEvent() ));
     connect( mLabel, SIGNAL( clicked( )), SLOT( showDay() ));
     connect( mItemList, SIGNAL( doubleClicked( QListBoxItem *) ),
              SLOT( defaultAction( QListBoxItem * ) ) );
     connect( mItemList, SIGNAL( rightButtonPressed( QListBoxItem *,
                                                     const QPoint &) ),
              SLOT( contextMenu( QListBoxItem * ) ) );
     connect( mItemList, SIGNAL( highlighted( QListBoxItem *) ),
-             SLOT( selection( QListBoxItem * ) ) );
+           SLOT( selection( QListBoxItem * ) ) );
     connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( cellClicked( QListBoxItem * ) ) );  
     connect( mItemList, SIGNAL( clicked( QListBoxItem * ) ),
              SLOT( selection( QListBoxItem * ) ) ); 
 }
 #ifdef DESKTOP_VERSION
 QToolTipGroup *MonthViewCell::toolTipGroup()
 {
     if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0);
     return mToolTipGroup;
 }
 #endif
@@ -543,61 +543,62 @@ void MonthViewCell::insertEvent(Event *event)
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
 #endif
         mItemList->insertItem( item );
         mToolTip += "\n";
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
-      QString text;
-        if (todo->hasDueDate()) {
-            if (!todo->doesFloat()) {
-                text += KGlobal::locale()->formatTime(todo->dtDue().time());
-                text += " ";
-            }
+    QString text;
+    mItemList->setFocusPolicy(WheelFocus); 
+    if (todo->hasDueDate()) {
+        if (!todo->doesFloat()) {
+            text += KGlobal::locale()->formatTime(todo->dtDue().time());
+            text += " ";
         }
-        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 ) {
-                pal = getPalette();
-                if (cat.isEmpty()) {
-                    pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
-                } else {
-                    pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
-                }
-
+    }
+    text += i18n("T: %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 ) {
+            pal = getPalette();
+            if (cat.isEmpty()) {
+                pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
             } else {
-                if (cat.isEmpty()) {
-                    pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
-                } else {
-                    pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
-                } 
+                pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
             }
-           
+
         } else {
-            pal = mStandardPalette ;
+            if (cat.isEmpty()) {
+                pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
+            } else {
+                pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
+            } 
         }
-        item->setPalette( pal );
-        mItemList->insertItem( item );
-        mToolTip += text+"\n"; 
+           
+    } else {
+        pal = mStandardPalette ;
+    }
+    item->setPalette( pal );
+    mItemList->insertItem( item );
+    mToolTip += text+"\n"; 
 }
 void MonthViewCell::finishUpdateCell()
 {
 #ifdef DESKTOP_VERSION
     if (mToolTip != "")
         QToolTip::add(this,mToolTip,toolTipGroup(),"");
 #endif
     mItemList->sort();
     //setMyPalette(); 
     setMyPalette();
     QString text;
     bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
@@ -773,25 +774,24 @@ void MonthViewCell::cellClicked( QListBoxItem *item )
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
     if ( !item ) return;
   
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) return;
-
     mMonthView->setSelectedCell( this );
 }
 
 
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
@@ -1256,27 +1256,33 @@ void KOMonthView::updateView()
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( ignoreResizeEvent ) {
-        qDebug("KOMonthView::resizeEvent ignored ");
-        --ignoreResizeEvent;
-        return;
+        int diff =  e->size().height() - e->oldSize().height();
+        if ( diff < 0 )
+            diff = diff * (-1);
+        if (  diff == ignoreResizeEventHeight ) {
+            qDebug("KOMonthView::resizeEvent ignored ");
+            --ignoreResizeEvent;
+            return;
+        } 
+        ignoreResizeEvent = 0;
     }
     if ( e->size().width()+ e->size().height() < 240 )
         return;
     computeLayout();
     clPending = true; 
     if ( mShowWeekView )
         mCellsW[0]->setFocus();
     else
         mCells[0]->setFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
@@ -1502,25 +1508,25 @@ void KOMonthView::showContextMenu( Incidence *incidence )
       mContextMenu->showEventPopup(event);
       } else {
       kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
       }
     */
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
     return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
-    // qDebug("KOMonthView::setSelectedCell ");
+    //qDebug("KOMonthView::setSelectedCell %x ", cell);
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
         mvc->deselect();
     } else 
         mSelectedCell = cell;
     //  if ( mSelectedCell )
     //         mSelectedCell->select();
     if ( !mSelectedCell )
         emit incidenceSelected( 0 );
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
@@ -1541,33 +1547,39 @@ void KOMonthView::clearSelection()
     if ( mSelectedCell ) {
         mSelectedCell->deselect();
         mSelectedCell = 0;
     }
 }
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
     //qDebug("KOMonthView::keyPressEvent ");
     switch(e->key()) {
     case Key_Up: 
         {
             emit prevMonth();
-            mCells[0]->setFocus();
+            if ( mShowWeekView )
+                mCellsW[0]->setFocus();
+            else
+                mCells[0]->setFocus();
         }
         e->accept();
         break;
     case Key_Down:
         {
             emit nextMonth();
-            mCells[0]->setFocus();
-           
+            if ( mShowWeekView )
+                mCellsW[0]->setFocus();
+            else
+                mCells[0]->setFocus();
+            
         }
         e->accept();
         break;
     case Key_Return:
     case Key_Enter:
         {
             selectInternalWeekNum ( currentWeek() );
         }
         e->accept();
         break;
     default:
         e->ignore();     
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 9dbe319..d70cda1 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -217,25 +217,25 @@ class KOMonthView: public KOEventView
     virtual int currentDateCount();
 
     /** returns the currently selected events */
     virtual QPtrList<Incidence> selectedIncidences();
 
     /** returns dates of the currently selected events */
     virtual DateList selectedDates();
 
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     bool isMonthView() { return true; }
     bool isUpdatePossible() { return updatePossible; }
-    void setIgnoreResizeEvent( int c ) {  ignoreResizeEvent = c ;}
+    void setIgnoreResizeEvent( int c, int h ) {  ignoreResizeEvent = c ;ignoreResizeEventHeight = h;}
 
     MonthViewCell * selectedCell();
   public slots:
     virtual void updateView();
     virtual void updateConfig();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
 
     void clearSelection();
 
@@ -251,24 +251,25 @@ class KOMonthView: public KOEventView
     void nextMonth();
     void prevMonth();
     void showNavigator( bool );
     void selectWeekNum ( int );
     void showDaySignal( QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
 
   private:
     int ignoreResizeEvent;
+    int ignoreResizeEventHeight;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     bool mWeekStartsMonday;
     void computeLayout();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index dcb51dc..c35de0a 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -214,25 +214,26 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
     //mMainView->updateView();
     raiseCurrentView( full, true );
     mMainView->adaptNavigationUnits();
 }
 
 void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
     mCurrentAgendaView = 0;
     int wid =  mMainView->width() ;
     int hei  = mMainView->height();
     if ( mCurrentView == mMonthView   ) { 
         if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) {
-            mMonthView->setIgnoreResizeEvent( 2 ); 
+            
+            mMonthView->setIgnoreResizeEvent( 2 ,mMainView->navigatorBar()->height()); 
             mMainView->navigatorBar()->show();
             hei -= mMainView->navigatorBar()->sizeHint().height();
         }
         //mMainView->navigatorBar()->hide();
     } else {
         mMainView->navigatorBar()->hide();
     }
     if ( fullScreen ) {
         mMainView->leftFrame()->hide();
     } else {
         mMainView->leftFrame()->show();
         if ( KOPrefs::instance()->mVerticalScreen )