fixxx

3 files changed, 50 insertions, 28 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 697093e..776cdd3 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -323,196 +323,198 @@ class KOCatPrefs : public QDialog
         addCatBut->setChecked( true );
         QPushButton * ok = new QPushButton( i18n("OK"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 200, 200 );
     }
       
     bool addCat() { return addCatBut->isChecked(); }
 private:
     QRadioButton* addCatBut;
 };
 
 
 
 CalendarView::CalendarView( CalendarResources *calendar,
                             QWidget *parent, const char *name )
     : CalendarViewBase( parent, name ),
       mCalendar( calendar ),
       mResourceManager( calendar->resourceManager() )
 {
 
     mEventEditor = 0;
     mTodoEditor = 0;
  
     init();
 }
 
 CalendarView::CalendarView( Calendar *calendar,
                             QWidget *parent, const char *name )
     : CalendarViewBase( parent, name ),
       mCalendar( calendar ),
       mResourceManager( 0 )
 {
  
     mEventEditor = 0;
     mTodoEditor = 0;
     init();
 }
 
 void CalendarView::init()
 { 
     mNextAlarmDateTime = QDateTime::currentDateTime();
     setFocusPolicy ( NoFocus  ); 
     mViewerCallerIsSearchDialog = false;
     mBlockShowDates = false;
-    beamDialog = new KOBeamPrefs();
+   
     mDatePickerMode = 0;
     mCurrentSyncDevice = "";
-    writeLocale();
     mViewManager = new KOViewManager( this );
     mDialogManager = new KODialogManager( this );
     mEventViewerDialog = 0;
     mModified = false;
     mReadOnly = false;
     mSelectedIncidence = 0;
     mCalPrinter = 0;
     mFilters.setAutoDelete(true);
 
     mCalendar->registerObserver( this );
     // TODO: Make sure that view is updated, when calendar is changed.
 
     mStorage = new FileStorage( mCalendar );
     mNavigator = new DateNavigator( this, "datevav", mViewManager );
 
     QBoxLayout *topLayout = (QBoxLayout*)layout();
 #ifndef KORG_NOSPLITTER
     // create the main layout frames.
     mPanner = new QSplitter(QSplitter::Horizontal,this,"CalendarView::Panner");
     topLayout->addWidget(mPanner);
 
     mLeftSplitter = new QSplitter(QSplitter::Vertical,mPanner,
                                   "CalendarView::LeftFrame");
     mPanner->setResizeMode(mLeftSplitter,QSplitter::KeepSize);
 
     mDateNavigator = new DateNavigatorContainer( mLeftSplitter,
                                                "CalendarView::DateNavigator" );
 
     mLeftSplitter->setResizeMode(mDateNavigator,QSplitter::KeepSize);
     mTodoList = new KOTodoView(mCalendar, mLeftSplitter, "todolist_small2");
     mTodoList->setNavigator( mNavigator );
     mFilterView = new KOFilterView(&mFilters,mLeftSplitter,"CalendarView::FilterView");
 
 #ifdef KORG_NORESOURCEVIEW 
     mResourceView = 0;
 #else
     if ( mResourceManager ) {
         mResourceView = new ResourceView( mResourceManager, mLeftSplitter );
         mResourceView->updateView();
         connect( mResourceView, SIGNAL( resourcesChanged() ),
                  SLOT( updateView() ) );
     } else {
         mResourceView = 0;
     }
 #endif
     QWidget *rightBox = new QWidget( mPanner );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
 
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 1 );
 
     mLeftFrame = mLeftSplitter;
 #else
     //QWidget *mainBox = new QWidget( this );
     //QWidget *leftFrame = new QWidget( mainBox );
     //QBoxLayout * mainBoxLayout;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         //mainBoxLayout  = new QVBoxLayout(mainBox); 
         //leftFrameLayout = new QHBoxLayout(leftFrame ); 
         mMainFrame = new KDGanttMinimizeSplitter( Qt::Vertical, this );
         mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
         mLeftFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, mMainFrame);;
         mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
     } else {
         //mainBoxLayout  = new QHBoxLayout(mainBox);
         //leftFrameLayout = new  QVBoxLayout(leftFrame ); 
         mMainFrame = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
         mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left);
         mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame);
         mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     }
     mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
     //QBoxLayout * leftFrameLayout;
+    mDateScrollBar = new QScrollBar ( 0, 364, 1,30, 200,QScrollBar::Horizontal, this );
     topLayout->addWidget( mMainFrame );
+    topLayout->addWidget( mDateScrollBar );
     //mainBoxLayout->addWidget (mLeftFrame);  
     mDateNavigator = new DateNavigatorContainer( mLeftFrame,
                                                "CalendarView::DateNavigator" );
 #if 0
     // FIXME
     mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE,
                                         "CalendarView::DateNavigator", QDate::currentDate());
 #endif
     // mDateNavigator->blockSignals( true );
     //leftFrameLayout->addWidget( mDateNavigator  );
     mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
     mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); 
     mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView");
     connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) );
     connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) );
     connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) );
     connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) );
     connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) );
     connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) );
     connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) );
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) );
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) );
+    connect( mDateScrollBar, SIGNAL( valueChanged ( int )  ),this, SLOT( scrollBarValue( int )) );
     mTodoList->setNavigator( mNavigator );
 #if 0
     if (  QApplication::desktop()->width() < 480 ) {
         leftFrameLayout->addWidget(mFilterView);
         leftFrameLayout->addWidget(mTodoList, 2 );
       
     } else {
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
 #endif
     mFilterView->hide();
     mCalEditView->hide();
     QWidget *rightBox = new QWidget( mMainFrame );
     //mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 10 );
 
     //mLeftFrame = (QWidget *)leftFrame;
     if ( KOPrefs::instance()->mVerticalScreen ) {
         //mDateNavigator->setFixedHeight( mDateNavigator->sizeHint().height() );
         //mDateNavigator->setMinimumWidth( mDateNavigator->sizeHint().width() );
         //mTodoList->setFixedHeight( mDateNavigator->sizeHint().height() );
         //leftFrame->setFixedHeight( mDateNavigator->sizeHint().height() );
     } else {
         //mDateNavigator->setFixedWidth( mDateNavigator->sizeHint().width() );
         //mTodoList->setFixedWidth( mDateNavigator->sizeHint().width() );
         //leftFrame->setFixedWidth( mDateNavigator->sizeHint().width() );
     }
     if ( !KOPrefs::instance()->mShowDateNavigator)
         mDateNavigator->hide();
     //qDebug("Calendarview Size %d %d ", width(), height());
 #endif
  
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( showDates( const KCal::DateList & ) ) );
    
     connect( mNavigator, SIGNAL( datesSelected( const KCal::DateList & ) ),
              mDateNavigator, SLOT( selectDates( const KCal::DateList & ) ) );
   
     
     
     connect( mDateNavigator, SIGNAL( showMonth( const QDate & ) ),
              mViewManager, SLOT(  showMonth( const QDate & ) ) );
 
     connect( mDateNavigator, SIGNAL( weekClicked( const QDate & ) ),
              mNavigator, SLOT( selectWeek( const QDate & ) ) );
@@ -597,100 +599,123 @@ void CalendarView::init()
     connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool)));
 
     // kdDebug() << "CalendarView::CalendarView() done" << endl; 
 
     mDateFrame = new QVBox(0,0,WType_Popup);
     //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
     mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
     mDateFrame->setLineWidth(3);
     mDateFrame->hide(); 
     mDateFrame->setCaption( i18n( "Pick a date to display"));
     mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() );
  
     connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate)));
  
     mEventEditor = mDialogManager->getEventEditor();  
     mTodoEditor = mDialogManager->getTodoEditor();  
    
     mFlagEditDescription = false; 
 
     mSuspendTimer = new QTimer( this );
     mAlarmTimer = new QTimer( this );
     mRecheckAlarmTimer = new QTimer( this );
     connect( mRecheckAlarmTimer, SIGNAL(  timeout ()  ), SLOT( recheckTimerAlarm() ) );
     connect( mSuspendTimer, SIGNAL(  timeout ()  ), SLOT( suspendAlarm() ) );
     connect( mAlarmTimer, SIGNAL(  timeout ()  ), SLOT( timerAlarm() ) );
     mAlarmDialog = new AlarmDialog( this );
     connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString &  ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString &  ) ) );
     mAlarmDialog->setServerNotification( false );
     mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime );
 
 
 #ifndef DESKTOP_VERSION
 //US listen for arriving address resultsets
   connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 #endif
   mDateNavigator->setCalendar( mCalendar );
 }
 
 
 CalendarView::~CalendarView()
 {
     // kdDebug() << "~CalendarView()" << endl;
     //qDebug("CalendarView::~CalendarView() ");
     delete mDialogManager;
     delete mViewManager;
     delete mStorage;
     delete mDateFrame ;
-    delete beamDialog;
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
+void CalendarView::setScrollBarStep(int val )
+{
+    mDateScrollBar->setLineStep ( val );
+}
+void CalendarView::scrollBarValue(int val )
+{
+    static bool block = false;
+    if ( block ) return;
+    block = true;
+    val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
+    //qDebug("VAL %d ",val );
+    int count = mNavigator->selectedDates().count();
+    int year =  mNavigator->selectedDates().first().year();
+    int day = mNavigator->selectedDates().first().dayOfYear();
+    if ( val == day -1 ) {
+        block = false;
+        return;
+    }
+    QDate d ( year,1,1 );
+    mNavigator->selectDates( d.addDays( val ), count );
+    block = false;
+
+}
+
 void CalendarView::checkAlarms()
 {
     KConfig *config = KOGlobals::config();
     config->setGroup( "AppRun" );
     QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) );
     int daysto = dt.daysTo( QDate::currentDate() );
     int days = config->readNumEntry( "LatestProgramStopDays" , daysto);
     dt =  dt.addDays( days );
     int secto = dt.secsTo( QDateTime::currentDateTime() );
     int secs = config->readNumEntry( "LatestProgramStopSecs" , secto) - 30;
     //qDebug("KO: Reading program stop %d ", secs);
     //secs -= ( 3600 * 24*3 ); // debug only 
     QDateTime latest = dt.addSecs ( secs );
     qDebug("KO: Last termination on %s ", latest.toString().latin1());
     //qDebug("KO: Current Time %s ",QDateTime::currentDateTime().toString().latin1() );
     QPtrList<Incidence> el = mCalendar->rawIncidences(); 
     QPtrList<Incidence> al;
     Incidence* inL = el.first(); 
     QDateTime cur = QDateTime::currentDateTime().addSecs(-59);
     qDebug("KO: Checking alarm until %s ", cur.toString().latin1());
     while ( inL ) {  
         bool ok = false;
         int offset = 0;
         QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ;
         if ( ok ) {
             //qDebug("OK %s",next.toString().latin1());
             if ( next < cur ) {
                 al.append( inL );
                 //qDebug("found missed alarm: %s ", inL->summary().latin1() );
             }
         }
         inL = el.next();
     }
     if ( al.count() ) {
         QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop  );
         dia->setCaption( i18n("KO/Pi: Missing alarms!") );
         QVBoxLayout* lay = new QVBoxLayout( dia );
         lay->setSpacing( 0 );
         lay->setMargin( 0 );
         MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest );
         connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) ));
         lay->addWidget( matb ); 
         if ( QApplication::desktop()->width() == 480 || QApplication::desktop()->width() == 640 ) {
             int wid = 210;
             int x = QApplication::desktop()->width() - wid - 7;
             int y = QApplication::desktop()->height() - wid - 70;
             dia->setGeometry ( x,y,wid,wid);
         } else {
@@ -2422,206 +2447,189 @@ void CalendarView::writeFilterSettings(KConfig *config)
     //  kdDebug() << "CalendarView::writeFilterSettings()" << endl;
 
     QStringList filterList;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         //    kdDebug() << " fn: " << filter->name() << endl;
         filterList << filter->name();
         config->setGroup("Filter_" + filter->name().utf8());
         config->writeEntry("Criteria",filter->criteria());
         config->writeEntry("CategoryList",filter->categoryList());
         filter = mFilters.next();
     }
     config->setGroup("General");
     config->writeEntry("CalendarFilters",filterList);
 
     config->setGroup("FilterView");
     config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
     config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 
 
 void CalendarView::goToday()
 {
     if ( mViewManager->currentView()->isMonthView() )
         mNavigator->selectTodayMonth();
     else
         mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
     mNavigator->selectNext();
 }
 
 void CalendarView::goPrevious()
 {
     mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
     mNavigator->selectNextMonth();
 }
 
 void CalendarView::goPreviousMonth()
 {
     mNavigator->selectPreviousMonth();
 }
-void CalendarView::writeLocale() 
-{
-    //KPimGlobalPrefs::instance()->setGlobalConfig();
-#if 0
-    KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime );
-    KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday );
-    KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate );
-    KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage );
-    QString dummy = KOPrefs::instance()->mUserDateFormatLong;
-    KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
-    dummy = KOPrefs::instance()->mUserDateFormatShort;
-    KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
-    KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving,
-                                          KOPrefs::instance()->mDaylightsavingStart,
-                                          KOPrefs::instance()->mDaylightsavingEnd );
-    KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId );
-#endif
-}
+
 void CalendarView::updateConfig()
 {
-    writeLocale();
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     emit configChanged();
     mTodoList->updateConfig();
     // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont);
     mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
     // To make the "fill window" configurations work
     //mViewManager->raiseCurrentView();
 }
 
 
 void CalendarView::eventChanged(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTEDITED);
     //updateUnmanagedViews();
 }
 
 void CalendarView::eventAdded(Event *event)
 {
     changeEventDisplay(event,KOGlobals::EVENTADDED);
 }
 
 void CalendarView::eventToBeDeleted(Event *)
 {
     kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl;
 }
 
 void CalendarView::eventDeleted()
 {
     changeEventDisplay(0,KOGlobals::EVENTDELETED);
 }
 void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
     changeIncidenceDisplay((Incidence *)which,  action);
     mDateNavigator->updateView(); //LR
     //mDialogManager->updateSearchDialog();
 
     if (which) {
         mViewManager->updateWNview();
         //mTodoList->updateView();
     }
    
 }
 
 void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 {
     updateUnmanagedViews();
     //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++  %d  %d ",which, action );
     if ( action == KOGlobals::EVENTDELETED ) { //delete
         mCalendar->checkAlarmForIncidence( 0, true );
         if ( mEventViewerDialog )
             mEventViewerDialog->hide();
     } 
     else
         mCalendar->checkAlarmForIncidence( which , false );
 }
 
 // most of the changeEventDisplays() right now just call the view's
 // total update mode, but they SHOULD be recoded to be more refresh-efficient.
 void CalendarView::changeEventDisplay(Event *which, int action)
 {
     //  kdDebug() << "CalendarView::changeEventDisplay" << endl;
     changeIncidenceDisplay((Incidence *)which,  action);
     mDateNavigator->updateView();
     //mDialogManager->updateSearchDialog();
 
     if (which) {
         // If there is an event view visible update the display
         mViewManager->currentView()->changeEventDisplay(which,action);
         // TODO: check, if update needed
         //    if (which->getTodoStatus()) {
         mTodoList->updateView();
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
 
 
 void CalendarView::updateTodoViews()
 {
     mTodoList->updateView();
     mViewManager->currentView()->updateView();
  
 }
 
 
 void CalendarView::updateView(const QDate &start, const QDate &end)
 {
+    mDateScrollBar->setValue( start.dayOfYear()-1);
     mTodoList->updateView();
     mViewManager->updateView(start, end);
     //mDateNavigator->updateView();
 }
 
 void CalendarView::clearAllViews()
 {
     mTodoList->clearList();
     mViewManager->clearAllViews();
     SearchDialog * sd = mDialogManager->getSearchDialog();
     if ( sd ) {
         KOListView* kol = sd->listview();
         if ( kol )
             kol->clearList();
     }
 }
 void CalendarView::updateView()
 {
     DateList tmpList = mNavigator->selectedDates();
 
     if ( KOPrefs::instance()->mHideNonStartedTodos ) 
         mTodoList->updateView();
     // We assume that the navigator only selects consecutive days.
     updateView( tmpList.first(), tmpList.last() );
 }
 
 void CalendarView::updateUnmanagedViews()
 {
     mDateNavigator->updateDayMatrix();
 }
 
 int CalendarView::msgItemDelete(const QString name)
 {
     return KMessageBox::warningContinueCancel(this,name +"\n\n"+
                                               i18n("This item will be\npermanently deleted."),
                                               i18n("KO/Pi Confirmation"),i18n("Delete"));
 }
 
 
 void CalendarView::edit_cut()
 {
     Event *anEvent=0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->typeID() == eventID ) {
             anEvent = static_cast<Event *>(incidence);
@@ -2799,133 +2807,135 @@ int CalendarView::addCategories()
 void CalendarView::manageCategories()
 {
     KOCatPrefs* cp = new KOCatPrefs(); 
     cp->show();
     int w =cp->sizeHint().width() ;
     int h = cp->sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
     if ( cp->addCat() ) {
         count = addCategories();
         if ( count ) {
             topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! "));
             writeSettings();
         } else
             topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! "));
     } else {
         removeCategories();
         updateView();
     }
     delete cp;
 }
 
 void CalendarView::beamIncidence(Incidence * Inc) 
 {
     QPtrList<Incidence> delSel ;
     delSel.append(Inc);
     beamIncidenceList( delSel );
 } 
 void CalendarView::beamCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
     //qDebug("beamCalendar()  ");
     beamIncidenceList( delSel );
 }
 void CalendarView::beamFilteredCalendar() 
 {
     QPtrList<Incidence> delSel  = mCalendar->incidences(); 
     //qDebug("beamFilteredCalendar()  ");
     beamIncidenceList( delSel );
 }
 void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
 {
-    if ( beamDialog->exec () == QDialog::Rejected ) 
+    
+    KOBeamPrefs beamDialog;
+    if ( beamDialog.exec () == QDialog::Rejected ) 
         return;
 #ifdef DESKTOP_VERSION
     QString fn =  locateLocal( "tmp", "kopibeamfile" );
 #else
     QString fn = "/tmp/kopibeamfile";
 #endif
     QString mes;
     bool createbup = true;
     if ( createbup ) {
         QString description = "\n";
         CalendarLocal* cal = new CalendarLocal();
-        if ( beamDialog->beamLocal() )
+        if ( beamDialog.beamLocal() )
             cal->setLocalTime();
         else
             cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
         Incidence *incidence = delSel.first();
         bool addText = false;
         if ( delSel.count() < 10 )
             addText = true;
         else {
             description.sprintf(i18n("  %d items?"),delSel.count() );
         }
         while ( incidence ) {
             Incidence *in = incidence->clone();
             if ( ! in->summary().isEmpty() ) {
                 in->setDescription("");
             } else {
                 in->setSummary( in->description().left(20));
                 in->setDescription("");
             }
             if ( addText )
                 description += in->summary() + "\n";
             cal->addIncidence( in );
             incidence = delSel.next();
         }
-        if ( beamDialog->beamVcal() ) {
+        if ( beamDialog.beamVcal() ) {
             fn += ".vcs";
             FileStorage storage( cal, fn, new VCalFormat );
             storage.save();
         } else {
             fn += ".ics";
             FileStorage storage( cal, fn, new ICalFormat( ) );
             storage.save();
         }
         delete cal;
         mes = i18n("KO/Pi: Ready for beaming");
         topLevelWidget()->setCaption(mes); 
         KApplication::convert2latin1( fn );
 #ifndef DESKTOP_VERSION
         Ir *ir = new Ir( this ); 
         connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
         ir->send( fn, description, "text/x-vCalendar" );
 #endif
     }
 }
 void  CalendarView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
     delete ir;
 #endif
     topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
     topLevelWidget()->raise();
 }
 
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
     if ( !inc ) return;
     showDatePickerPopup(); 
     mDatePickerMode = 2;
     mMoveIncidence = inc ;
     QDate da;
     if ( mMoveIncidence->typeID() == todoID ) {
         Todo * to = (Todo *) mMoveIncidence;
             if ( to->hasDueDate() ) 
                 da = to->dtDue().date();
             else
                 da = QDate::currentDate();
     } else {
         da = mMoveIncidence->dtStart().date();
     }
     //PENDING set date for recurring incidence to date of recurrence
     //mMoveIncidenceOldDate;
     mDatePicker->setDate( da );
 }
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index be18e8f..c89bbf7 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -1,80 +1,81 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000, 2001
     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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, 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.
 */
 #ifndef CALENDARVIEW_H
 #define CALENDARVIEW_H
 
 #include <qframe.h>
 #include <qlayout.h>
 #include <qwidget.h>
 #include <qptrlist.h>
 #include <qvbox.h>
 #include <qmap.h>
+#include <qscrollbar.h>
 #ifndef DESKTOP_VERSION
 #include <qtopia/ir.h> 
 #else
 #define Ir char
 #endif
 #include <libkcal/calendar.h>
 #include <libkcal/scheduler.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <KDGanttMinimizeSplitter.h>
 
 #include <korganizer/calendarviewbase.h>
 
 #include <ksyncmanager.h>
 //#include <koprefs.h>
 
 class QWidgetStack;
 class QSplitter;
 class KopiCalendarFile;
 class CalPrinter;
 class KOFilterView;
 class KOCalEditView;
 class KOViewManager;
 class KODialogManager;
 class KOTodoView;
 class KDateNavigator;
 class DateNavigatorContainer;
 class DateNavigator;
 class KOIncidenceEditor;
 class KDatePicker;
 class ResourceView;
 class KOEventEditor;
 class KOTodoEditor ;
 class KOEventViewerDialog;
 class KOBeamPrefs;
 class KSyncProfile;
 class AlarmDialog;
 class KCal::Attendee;
 
 namespace KCal { class FileStorage; }
 
 using namespace KCal;
 
 /**
   This is the main calendar widget. It provides the different vies on t he
   calendar data as well as the date navigator. It also handles synchronisation
   of the different views and controls the different dialogs like preferences,
   event editor, search dialog etc.
@@ -447,158 +448,159 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void goPrevious();
   /** Move to the next date(s) in the current view */
     void goNextMonth();
   
     /** Move to the previous date(s) in the current view */
     void goPreviousMonth();
 
     void toggleExpand();
     void toggleDateNavigatorWidget();
     void toggleAllDaySize();
     void dialogClosing(Incidence *);
   
     /** Look for new messages in the inbox */
     void lookForIncomingMessages();
    /** Look for new messages in the outbox */
     void lookForOutgoingMessages();
 
     void processMainViewSelection( Incidence * );
     void processTodoListSelection( Incidence * );
     
     void processIncidenceSelection( Incidence * );
 
     void purgeCompleted();
     bool removeCompletedSubTodos( Todo* );
     void slotCalendarChanged();
     bool importBday();
     bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
     bool importQtopia( const QString &categoriesFile,
                        const QString &datebookFile,
                        const QString &tasklistFile );
     void syncExternal( int mode );
     void slotSelectPickerDate( QDate ) ;
     void showDatePicker() ;
     void showDatePickerPopup() ;
     void moveIncidence(Incidence *) ;
     void beamIncidence(Incidence *) ;
     void beamCalendar() ;
     void beamFilteredCalendar() ;
     void beamIncidenceList(QPtrList<Incidence>) ;
     void manageCategories();
     int addCategories();
     void removeCategories();
     void setSyncDevice( QString );
     void setSyncName( QString );
     void showDay( QDate );
     void undo_delete();
   protected slots:
     void resetFocus();
+    void scrollBarValue(int);
     void slotViewerClosed();
     void timerAlarm();
     void suspendAlarm();
     void beamDone( Ir *ir );
     /** Select a view or adapt the current view to display the specified dates. */
     void showDates( const KCal::DateList & );
     void selectWeekNum ( int );
   
   public:
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
     int msgCalModified(); 
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
 
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     void setSyncManager(KSyncManager* manager);
     void setLoadedFileVersion(QDateTime);
     bool checkFileVersion(QString fn);
     bool checkAllFileVersions();
     bool checkFileChanged(QString fn);
     Event* getLastSyncEvent();
     /** Adapt navigation units correpsonding to step size of navigation of the
      * current view.
      */
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
     void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
+    void setScrollBarStep(int val );
+
   protected:
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete(const QString name);
     void showEventEditor();
     void showTodoEditor();
-    void writeLocale();
     Todo *selectedTodo();
-
   private:
+    QScrollBar * mDateScrollBar;
     QDateTime mNextAlarmDateTime;
     bool mViewerCallerIsSearchDialog;
     bool mBlockShowDates;
     KSyncManager* mSyncManager;
     AlarmDialog * mAlarmDialog;
     QString mAlarmNotification;
     QString mSuspendAlarmNotification;
     QTimer* mSuspendTimer;
     QTimer* mAlarmTimer;
     QTimer* mRecheckAlarmTimer;
     void computeAlarm( QString );
     void startAlarm( QString, QString );
     void setSyncEventsReadOnly();
     
     QDateTime loadedFileVersion;
     void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
     void checkExternalId( Incidence * inc );
     int mGlobalSyncMode;
     QString  mCurrentSyncDevice;
     QString  mCurrentSyncName;
-    KOBeamPrefs* beamDialog;
     void init();
     int mDatePickerMode;
     bool mFlagEditDescription;
     QDateTime mLastCalendarSync;
     void createPrinter();
 
     void calendarModified( bool, Calendar * );
 
     CalPrinter *mCalPrinter;
 
     QSplitter    *mPanner;
     QSplitter    *mLeftSplitter;
     KDGanttMinimizeSplitter  *mLeftFrame, *mMainFrame;
     QWidgetStack *mRightFrame;
 
     KDatePicker* mDatePicker;
     QVBox* mDateFrame;
 
     DateNavigatorContainer *mDateNavigator;       // widget showing small month view.
 
     KOFilterView *mFilterView;
     KOCalEditView *mCalEditView;
 
     ResourceView *mResourceView;
 
     // calendar object for this viewing instance
     Calendar      *mCalendar;
 
     CalendarResourceManager *mResourceManager;
 
     FileStorage *mStorage;
 
     DateNavigator *mNavigator;
 
     KOViewManager *mViewManager;
     KODialogManager *mDialogManager;
 
     // Calendar filters
     QPtrList<CalFilter> mFilters;
 
     // various housekeeping variables.
     bool            mModified;	   // flag indicating if calendar is modified
     bool            mReadOnly; // flag indicating if calendar is read-only
     QDate mSaveSingleDate;
 
     Incidence *mSelectedIncidence;
     Incidence *mMoveIncidence;
     QDate mMoveIncidenceOldDate;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 7b307f7..bd191d8 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -423,431 +423,441 @@ void KOViewManager::showWhatsNextView()
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW;
 }
 
 void  KOViewManager::slotprintWNV()
 {
     if (!mWhatsNextView) 
         showWhatsNextView();
     emit  printWNV();
 
 }
 void KOViewManager::showListView()
 {
     if (!mListView) {
         mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView");
         addView(mListView);
 
         connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
         connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); 
         connect( mListView, SIGNAL( signalNewEvent() ),
                  mMainView, SLOT( newEvent() ) );
         connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); 
         connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
     }
     // bool temp = mFlagShowNextxDays;
     //globalFlagBlockPainting = true;
     globalFlagBlockAgenda = 1;
     if ( KOPrefs::instance()->mListViewMonthTimespan ) {
         mMainView->setBlockShowDates( true );
         mMainView->dateNavigator()->selectMonth();
         mMainView->setBlockShowDates( false );
     }
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
     showView(mListView, KOPrefs::instance()->mFullViewTodo);
     //mFlagShowNextxDays = temp;
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
+    mMainView->setScrollBarStep( 7 );
 }
 
 void KOViewManager::showAgendaView( bool fullScreen )
 {
 
     mMainView->dialogManager()->hideSearchDialog();
     // qDebug("KOViewManager::showAgendaView ");
     bool full;
     full = fullScreen;
     if (!mAgendaView) {
         full = false; 
         mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); 
         addView(mAgendaView);
 #ifndef DESKTOP_VERSION
         QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold );
 #endif
         connect( mAgendaView, SIGNAL( incidenceChanged(Incidence  *, int )),
                  mMainView, SLOT( changeIncidenceDisplay( Incidence  *, int ) ));
 
         // SIGNALS/SLOTS FOR DAY/WEEK VIEW
 
         connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate )));
 
         connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)),
                 mMainView, SLOT(newTodoDateTime(QDateTime,bool)));
         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(); 
     }
    
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
     showView( mAgendaView, full);
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
+    mMainView->setScrollBarStep( 1 );
 }
 
 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 ;
+    mMainView->setScrollBarStep( 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 ;
+    mMainView->setScrollBarStep( 1 );
    
 }
 
 void KOViewManager::showWeekView()
 {
    
     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 ;
+    mMainView->setScrollBarStep( 1 );
 }
 
 void KOViewManager::showNextXView()
 {
       
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
     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;
+    mMainView->setScrollBarStep( KOPrefs::instance()->mNextXDays );
 }
 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();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
     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 ;
+    mMainView->setScrollBarStep( 7 );
 }
 
 void KOViewManager::showMonth( const QDate & date )
 {
     mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectDate( date );
     mMainView->dateNavigator()->blockSignals( false );
     showMonthView();
 }
 void KOViewManager::showMonthView()
  {
     
      createMonthView();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
     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 ;
+    mMainView->setScrollBarStep( 7 );
    
 }
 
 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() ),
                  mMainView, SLOT( purgeCompleted() ) );
 
         connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
 
         connect( mMainView, SIGNAL( configChanged() ), mTodoView,
                  SLOT( updateConfig() ) ); 
         connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView,
                  SLOT( updateTodo( Todo *, int ) ) );
         connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ),
                  mMainView, SIGNAL ( todoModified( Todo *, int ) ) );
         connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ),
                  mMainView, SLOT ( todo_unsub( Todo * ) ) );
         connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
                  mMainView, SLOT ( todo_resub( Todo *, Todo *) ) );
         connect( mTodoView, SIGNAL( moveTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( beamTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         KConfig *config = KOGlobals::config();
         mTodoView->restoreLayout(config,"Todo View");
         mTodoView->setNavigator( mMainView->dateNavigator() );
     }
 
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
     globalFlagBlockAgenda = 1;
     showView( mTodoView, true );
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
+    mMainView->setScrollBarStep( 7 );
 
 }
 
 void KOViewManager::showJournalView()
 {
     //mFlagShowNextxDays = false;
     if (!mJournalView) {
         mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(),
                                          "KOViewManager::JournalView"); 
         connect( mMainView, SIGNAL( configChanged() ), mJournalView,
                  SLOT( updateConfig() ) );
         connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) );
         addView(mJournalView);
     }
 
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
     showView(mJournalView);
     mMainView->dateNavigator()->selectDates( 1 );
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
+    mMainView->setScrollBarStep( 1 );
 }
 
 void KOViewManager::showTimeSpanView()
 {
     //mFlagShowNextxDays = false;
     if (!mTimeSpanView) {
         mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(),
                                            "KOViewManager::TimeSpanView");
         addView(mTimeSpanView);
 
         mTimeSpanView->readSettings();
     }
 
     showView(mTimeSpanView);
 }
 
 Incidence *KOViewManager::currentSelection()
 {
     if (!mCurrentView) return 0;
     if ( mCurrentView == mListView ) {
         if ( mListView->currentItem() )
             return mListView->currentItem();
     }
     return mCurrentView->selectedIncidences().first();
 }
 
 QDate KOViewManager::currentSelectionDate()
 {
     QDate qd;
     if (mCurrentView) {
         DateList qvl = mCurrentView->selectedDates();
         if (!qvl.isEmpty()) qd = qvl.first();
     }
     return qd;
 }
 
 void KOViewManager::addView(KOrg::BaseView *view)
 {
 #if QT_VERSION >= 0x030000
     mMainView->viewStack()->addWidget( view );
 #else
     mMainView->viewStack()->addWidget( view, 1 );
 #endif
 }
 
 void KOViewManager::setDocumentId( const QString &id )
 {
     if (mTodoView) {