2 files changed, 6 insertions, 2 deletions

diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 946fc0d..3d9e690 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -1,469 +1,470 @@
 /*
     This file is part of libkdepim.
 
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qapplication.h>
 #include <qevent.h>
 #include <qlineedit.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 
 #include <kdatepicker.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <qpalette.h>
 
 #include "kdateedit.h"
 //#include "kdateedit.moc"
 
 KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
   : QHBox(parent, name)
 {
   dateFormShort = true;
   withoutDp = withoutDP;
   mDateEdit = new QLineEdit(this);
   mDateEdit->setText(KGlobal::locale()->formatDate(QDate::currentDate(),dateFormShort));
   setFocusProxy(mDateEdit);
   mDateEdit->installEventFilter(this);
 
   // Highlight Background and Textcolor
   QPalette palette = QWidget::palette();
   unsigned char red, green, blue;
   red = palette.color( QPalette::Normal , QColorGroup::Background ).red() - 10;
   green = palette.color( QPalette::Normal , QColorGroup::Background ).green() - 10;
   blue = palette.color( QPalette::Normal , QColorGroup::Background ).blue() - 10;
   palette.setColor( QColorGroup::Highlight, QColor(red,green,blue) );
   palette.setColor( QColorGroup::HighlightedText, palette.color( QPalette::Normal , QColorGroup::Foreground ) );
   mDateEdit->setPalette( palette );
 
   if ( withoutDP ) {
       mDateFrame = 0;
       mDateButton = 0;
       mDatePicker = 0;
   } else {
       QPixmap pixmap = SmallIcon("smallcal");
       mDateButton = new QPushButton(this);
       mDateButton->setPixmap(pixmap);
 
       mDateFrame = new QVBox(0,0,WType_Popup);
       // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
       mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
       mDateFrame->setLineWidth(3);
       mDateFrame->hide();
 
       mDatePicker = new KDatePicker(mDateFrame,QDate::currentDate());
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),mDateFrame,SLOT(hide()));
       connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker()));
       mDateButton->setFocusPolicy( QWidget::NoFocus ); 
+      mDateButton->setAutoDefault( false ); 
       //mDateFrame->resize( 400, 300 );
       
   }
       connect(mDateEdit,SIGNAL(returnPressed()),SLOT(lineEnterPressed()));
       connect(mDateEdit,SIGNAL(textChanged(const QString &)),
               SLOT(textChanged(const QString &)));
 
   // Create the keyword list. This will be used to match against when the user
   // enters information.
   mKeywordMap[i18n("tomorrow")] = 1;
   mKeywordMap[i18n("today")] = 0;
   mKeywordMap[i18n("yesterday")] = -1;
 
   /*
    * This loop uses some math tricks to figure out the offset in days
    * to the next date the given day of the week occurs. There
    * are two cases, that the new day is >= the current day, which means
    * the new day has not occured yet or that the new day < the current day,
    * which means the new day is already passed (so we need to find the
    * day in the next week).
    */
   QString dayName;
   int currentDay = QDate::currentDate().dayOfWeek();
   for (int i = 1; i <= 7; ++i)
   {
     dayName = KGlobal::locale()->weekDayName(i).lower();
     if (i >= currentDay)
       mKeywordMap[dayName] = i - currentDay;
     else
       mKeywordMap[dayName] = 7 - currentDay + i;
   }
 
   mTextChanged = false;
   mHandleInvalid = false;
   // QWidget::setTabOrder( mDateEdit, mDateButton );
 }
 
 KDateEdit::~KDateEdit()
 {
   delete mDateFrame;
 }
 void KDateEdit::clear()
 {
   bool b = mDateEdit->signalsBlocked();
   mDateEdit->blockSignals(true);
   mDateEdit->setText("");
   mDateEdit->blockSignals(b);
 }
 void KDateEdit::setDate(QDate newDate)
 {
   if (!newDate.isValid() && !mHandleInvalid)
     return;
   if ( readDate() ==  newDate )
       return;
   QString dateString = "";
   if(newDate.isValid())
     dateString = KGlobal::locale()->formatDate( newDate, dateFormShort );
 
   mTextChanged = false;
 
   // We do not want to generate a signal here, since we explicity setting
   // the date
   bool b = mDateEdit->signalsBlocked();
   mDateEdit->blockSignals(true);
   mDateEdit->setText(dateString);
   mDateEdit->blockSignals(b);
 }
 
 void KDateEdit::setDate( QDate date,int *cpos,const int key ,const bool dateFormShort)
 {
   QString dateForm = dateFormShort ?
                      KGlobal::locale()->dateFormatShort() :
                      KGlobal::locale()->dateFormat();
 
   int begin = dateForm.find("%");
   int space = 0;
   int allStrLength = 0;
   int strLength = 0;
   int repeat = 0;
 
   // witch? Day, Month or Year switch?
   while(1){
     switch ( dateForm.at(begin + 1).latin1() )
     {
     case 'd':// 16 (month day)
       strLength = 2; //Ok
       break;
     case 'm':// 01 (month)
       strLength = 2; //Ok
       break;
     case 'a':// Mon (Weekday)
       strLength = KGlobal::locale()->weekDayName(date.dayOfWeek(), true).length();
       break;
     case 'A':// Monday (Weekday)
       strLength = KGlobal::locale()->weekDayName(date.dayOfWeek(), false).length();
       break;
     case 'b':// Jan (monthName)
       strLength = KGlobal::locale()->monthName(date.month(), true).length();
       break;
     case 'B':// January (monthName)
       strLength = KGlobal::locale()->monthName(date.month(), false).length();
       break;
     case 'y':// 04 (year short)
       strLength = 2; //Ok
       break;
     case 'Y':// 2004 (year)
       strLength = 4; //Ok
       break;
     default:
       break;
     }
     space = begin - (repeat++ * 2);
     // all select? then dayswitch
     if( (mDateEdit->text().length() == mDateEdit->markedText().length() ) &&
                                ( (dateForm.at(begin + 1).latin1() == 'd') ||
                                  (dateForm.at(begin + 1).latin1() == 'a') ||
                                  (dateForm.at(begin + 1).latin1() == 'A') ) ) {
       break;
     }
     // mDateEdit-StringPos == CursorPosition(cpos) then break and set date
     if( ( (space + allStrLength) <= *cpos && *cpos <= (space + allStrLength + strLength) ) || *cpos < begin ) {
       break;
     }
     allStrLength += strLength;
     begin = dateForm.find("%", begin +1);
   }
 
   // set date
   switch ( dateForm.at(begin + 1).latin1() ) {
     case 'd':
     case 'a':
     case 'A':
       if(key == Key_Up) {
         setDate( date.addDays( 1 ) );
       }
       else if(key == Key_Down) {
         setDate( date.addDays( -1 ) );
       }
       maxDay = readDate().day();
       break;
     case 'm':
     case 'b':
     case 'B':
       if(key == Key_Up) {
           int year = ((date.month()+1)>12)?date.year()+1:date.year();
           int month = ((date.month()+1)>12)?1:date.month()+1;
           int day = (QDate(year,month,1).daysInMonth()<maxDay)?QDate(year,month,1).daysInMonth():maxDay;
           setDate( QDate( year, month, day ) );
       } else if(key == Key_Down) {
           int year = ((date.month()-1)<1)?date.year()-1:date.year();
           int month = ((date.month()-1)<1)?12:date.month()-1;
           int day = (QDate(year,month,1).daysInMonth()<maxDay)?QDate(year,month,1).daysInMonth():maxDay;
           setDate( QDate( year, month, day ) );
       }
       break;
     case 'y':
     case 'Y':
       if(key == Key_Up) {
         setDate( QDate( date.year() + 1, date.month() , date.day()) );
       }
       else if(key == Key_Down) {
         setDate( QDate( date.year() - 1, date.month() , date.day()) );
       }
       break;
 /*    default:
       if(key == Key_Up) {
         setDate( date.addDays( 1 ) );
       } else if(key == Key_Down) {
         setDate( date.addDays( -1 ) );
       }
       break;*/
   }
 
   date = readDate();
   begin = dateForm.find("%");
   int allSelectStrLength = 0;
   int selectStrLength = 0;
 
   // set selection do new date an set cursor at end of selection
   for(int i = 0; i < repeat; i++){
     switch ( dateForm.at(begin + 1).latin1() )
     {
     case 'd':// 16 (month day)
       selectStrLength = 2; //Ok
       break;
     case 'm':// 01 (month)
       selectStrLength = 2; //Ok
       break;
     case 'a':// Mon (Weekday short)
       selectStrLength = KGlobal::locale()->weekDayName(date.dayOfWeek(), true).length();
       break;
     case 'A':// Monday (Weekday)
       selectStrLength = KGlobal::locale()->weekDayName(date.dayOfWeek(), false).length();
       break;
     case 'b':// Jan (monthName short)
       selectStrLength = KGlobal::locale()->monthName(date.month(), true).length();
       break;
     case 'B':// January (monthName)
       selectStrLength = KGlobal::locale()->monthName(date.month(), false).length();
       break;
     case 'y':// 04 (year short)
       selectStrLength = 2; //Ok
       break;
     case 'Y':// 2004 (year)
       selectStrLength = 4; //Ok
       break;
     default:
       break;
     }
     space = begin - (i * 2);
     allSelectStrLength += selectStrLength;
     begin = dateForm.find("%", begin +1);
   }
   // set selection from begin of date
   setSelect(  space + allSelectStrLength - selectStrLength , selectStrLength);
   *cpos = space + allSelectStrLength;
   emit(dateChanged(date));
 
   return;
 }
 
 void KDateEdit::setHandleInvalid(bool handleInvalid)
 {
   mHandleInvalid = handleInvalid;
 }
 
 void KDateEdit::setEnabled(bool on)
 {
   mDateEdit->setEnabled(on);
   mDateButton->setEnabled(on);
 }
 
 QDate KDateEdit::date() const
 {
   QDate date = readDate();
 
   if (date.isValid() || mHandleInvalid) {
     return date;
   } else {
     KNotifyClient::beep();
     return QDate::currentDate();
   }
 }
 
 void KDateEdit::keyPressEvent(QKeyEvent *e)
 {
   QDate date = readDate();
   int cpos = mDateEdit->cursorPosition();
 
   switch(e->key())
   {
   case Key_Escape:
       mDateEdit->deselect();
   case Key_Tab:
       QHBox::keyPressEvent(e);
       break;
   case Key_Up:
       // when date invalid then set to currend and return
       if(!date.isValid()) {
         date = QDate::currentDate();
         setDate(date);
         mDateEdit->setCursorPosition(cpos);
         emit(dateChanged(date));
         QString text = i18n( "You entered an invalid date!\n Date changed  to current date." );
         KMessageBox::information( 0, text );
         return;
       }
       setDate(date, &cpos, Key_Up, dateFormShort);
       break;
   case Key_Down:
       // when date invalid then set to current and return
       if(!date.isValid()) {
         date = QDate::currentDate();
         setDate(date);
         mDateEdit->setCursorPosition(cpos);
         emit(dateChanged(date));
         QString text = i18n( "You entered an invalid date!\n Date changed  to current date." );
         KMessageBox::information( 0, text );
         return;
       }
       setDate(date, &cpos, Key_Down, dateFormShort);
       break;
   default:
       QHBox::keyPressEvent(e);
       break;
   } // switch
   mDateEdit->setCursorPosition(cpos);
 }
 
 void KDateEdit::setSelect( int from, int to )
 {
 //    return;
     mDateEdit->setSelection( from , to );
 }
 
 void KDateEdit::toggleDatePicker()
 {
   if( mDateFrame->isVisible() ) {
     mDateFrame->hide();
   } else {
     QPoint tmpPoint = mapToGlobal(mDateButton->geometry().bottomRight());
     QSize datepickersize = mDatePicker->sizeHint();
 
     if ( tmpPoint.x() < 7+datepickersize.width() ) tmpPoint.setX( 7+datepickersize.width() );
 
     int h = QApplication::desktop()->height();
 
     if ( tmpPoint.y() + datepickersize.height() > h ) tmpPoint.setY( h - datepickersize.height() );
 
     mDateFrame->setGeometry(tmpPoint.x()-datepickersize.width()-7, tmpPoint.y(),
      datepickersize.width()+2*mDateFrame->lineWidth(), datepickersize.height()+2*mDateFrame->lineWidth());
 
     QDate date = readDate();
     if(date.isValid()) {
       mDatePicker->setDate(date);
     } else {
       mDatePicker->setDate(QDate::currentDate());
     }
     mDateFrame->show();
   }
 }
 
 
 void KDateEdit::lineEnterPressed()
 {
     QDate date = readDate();
 
     if(date.isValid())
         {
             // Update the edit. This is needed if the user has entered a
             // word rather than the actual date.
             setDate(date);
             emit(dateChanged(date));
             emit returnPressed();
         }
     else
       {
           if ( withoutDp ) {
               KNotifyClient::beep();
           } else {
               if ( !mDateEdit->text().isEmpty() ) {
                   mTextChanged = false;
                   QString text = i18n( "You entered an invalid date!\n Will use current date instead." );
                   if ( isVisible() )
                       if ( KMessageBox::warningContinueCancel( 0, text ) == KMessageBox::Continue ) {
                           setDate( QDate::currentDate() );
                           emit dateChanged( QDate::currentDate() );
                       }
               }
           }
       }
 }
 
 bool KDateEdit::inputIsValid()
 {
   return readDate().isValid();
 }
 
 QDate KDateEdit::readDate() const
 {
   QString text = mDateEdit->text();
   QDate date;
 
   if (mKeywordMap.contains(text.lower()))
   {
     date = QDate::currentDate().addDays(mKeywordMap[text.lower()]);
   }
   else
   {
     date = KGlobal::locale()->readDate(text);
   }
 
   return date;
 }
 
 bool KDateEdit::eventFilter(QObject *, QEvent *e)
 {
   // We only process the focus out event if the text has changed
   // since we got focus
   if ((e->type() == QEvent::FocusOut) )
   {
       if ( mTextChanged ) {
           lineEnterPressed();
           mTextChanged = false;
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index d1f7630..801094a 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -1,289 +1,292 @@
 #include <qtabwidget.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qframe.h>
 
 
 #include "klocale.h"
 #include "kdebug.h"
 
 #include "kdialogbase.h"
 
 KDialogBase::KDialogBase()
 {
 }
 
 KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
              const QString &caption,
              int buttonMask, ButtonCode defaultButton,
              bool separator,
              const QString &user1,
              const QString &user2,
              const QString &user3) :
     KDialog( parent, name, modal )
 {
   init( caption, buttonMask, user1, user2 );
-  if (findButton( defaultButton ) )
-  (findButton( defaultButton ) )->setFocus();
+  if (findButton( defaultButton ) ) {
+      (findButton( defaultButton ) )->setFocus();
+      (findButton( defaultButton ) )->setDefault( true );
+  }
 
 }
 
 KDialogBase::KDialogBase( int dialogFace, const QString &caption,
              int buttonMask, ButtonCode defaultButton,
              QWidget *parent, const char *name, bool modal,
              bool separator,
              const QString &user1,
              const QString &user2,
              const QString &user3) :
     KDialog( parent, name, modal )
 {
     init( caption, buttonMask, user1, user2 );
   if (findButton( defaultButton ) )
   (findButton( defaultButton ) )->setFocus();
 
 }
 
 KDialogBase::~KDialogBase()
 {
 }
 
 void KDialogBase::init( const QString &caption, int buttonMask,
                         const QString &user1 ,const QString &user2 )
 {
   mMainWidget = 0;
   mTabWidget = 0;
   mPlainPage = 0;
   mTopLayout = 0;
   if ( !caption.isEmpty() ) {
     setCaption( caption );
   }
 
   if ( buttonMask & User1 ) {
     mUser1Button = new QPushButton( user1, this );
     connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) );
   } else {
     mUser1Button = 0;
   }
   if ( buttonMask & User2 ) {
     mUser2Button = new QPushButton( user2, this );
     connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) );
   } else {
     mUser2Button = 0;
   }
 
   if ( buttonMask & Ok ) {
     mOkButton = new QPushButton( i18n("Ok"), this );
     connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
+    mOkButton->setDefault( true );
   } else {
     mOkButton = 0;
   }
   if ( buttonMask & Default ) {
     mDefaultButton = new QPushButton( i18n("Default"), this );
     connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) );
   } else {
     mDefaultButton = 0;
   }
 
   if ( buttonMask & Apply ) {
     mApplyButton = new QPushButton( i18n("Apply"), this );
     connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) );
   } else {
     mApplyButton = 0;
   }
 
   if ( buttonMask & Cancel ) {
     mCancelButton = new QPushButton( i18n("Cancel"), this );
     connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) );
   } else {
     mCancelButton = 0;
   }
 
   if ( buttonMask & Close ) {
     mCloseButton = new QPushButton( i18n("Close"), this );
     connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) );
   } else {
     mCloseButton = 0;
   }
 }
 
 QTabWidget *KDialogBase::tabWidget()
 {
   if ( !mTabWidget ) {
     mTabWidget = new QTabWidget( this );
     setMainWidget( mTabWidget );
   }
   return mTabWidget;
 }
 
 void KDialogBase::hideButtons()
 {
     if ( mUser1Button ) mUser1Button->hide() ;
     if ( mUser2Button ) mUser2Button->hide() ;
     if ( mOkButton ) mOkButton->hide()  ;
     if ( mApplyButton )  mApplyButton->hide()  ;
     if ( mDefaultButton ) mDefaultButton->hide();
     if ( mCancelButton ) mCancelButton->hide()  ;
     if ( mCloseButton ) mCloseButton->hide()  ;
 
 }
 void KDialogBase::initLayout()
 {
 
   delete mTopLayout;
   mTopLayout = new QVBoxLayout( this );
   mTopLayout->setMargin( marginHint() );
   mTopLayout->setSpacing( spacingHint() );
 
   mTopLayout->addWidget( mMainWidget );
 
   QBoxLayout *buttonLayout = new QHBoxLayout;
   mTopLayout->addLayout( buttonLayout );
 
   if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
   if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
   if ( mOkButton ) buttonLayout->addWidget( mOkButton );
   if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
   if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton );
   if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
   if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
 }
 
 QFrame *KDialogBase::addPage( const QString &name )
 {
 //  kdDebug() << "KDialogBase::addPage(): " << name << endl;
   QFrame *frame = new QFrame( tabWidget() );
   tabWidget()->addTab( frame, name );
   return frame;
 }
 
 QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
 {
   return addPage( name );
 }
 
 
 void KDialogBase::setMainWidget( QWidget *widget )
 {
   kdDebug() << "KDialogBase::setMainWidget()" << endl;
 
   mMainWidget = widget;
   initLayout();
 }
 
 void KDialogBase::setButtonText( ButtonCode id, const QString &text )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     button->setText( text );
   }
 }
 
 void KDialogBase::enableButton( ButtonCode id, bool state )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     button->setEnabled( state );
   }
 }
 
 QPushButton *KDialogBase::findButton( ButtonCode id )
 {
   QPushButton *button = 0;
   switch ( id ) {
     case Ok:
       button = mOkButton;
       break;
     case Apply:
       button = mApplyButton;
       break;
     case User1:
       button = mUser1Button;
       break;
     case User2:
       button = mUser2Button;
       break;
     case Cancel:
       button = mCancelButton;
       break;
     case Default:
       button = mDefaultButton;
       break;
     case Close:
       button = mCloseButton;
       break;
     default:
       break;
   }
   return button;
 }
 
 void KDialogBase::enableButtonOK( bool state )
 {
   enableButton( Ok, state );
 }
 
 void KDialogBase::enableButtonApply( bool state )
 {
   enableButton( Apply, state );
 }
 
 void KDialogBase::showButton( ButtonCode id, bool show )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     if ( show ) button->show();
     else button->hide();
   }
 }
 
 int KDialogBase::pageIndex( QWidget *widget ) const
 {
   return 0;
 }
 
 
 bool KDialogBase::showPage( int index )
 {
     tabWidget()->setCurrentPage( index );return false;
 }
 
 QFrame *KDialogBase::plainPage()
 {
   if ( !mPlainPage ) {
     mPlainPage = new QFrame( this );
     setMainWidget( mPlainPage );
   }
   return mPlainPage;
 }
 
 void KDialogBase::slotOk()
 {
   emit okClicked();
   accept();
 }
 
 void KDialogBase::slotApply()
 {
   emit applyClicked();
 }
 
 void KDialogBase::slotCancel()
 {
   emit cancelClicked();
   reject();
 }
 
 void KDialogBase::slotClose()
 {
   emit closeClicked();
   reject();
 }
 
 void KDialogBase::slotUser1()
 {
   emit user1Clicked();
 }
 void KDialogBase::slotUser2()
 {
   emit user2Clicked();
 }