6 files changed, 25 insertions, 21 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 727921a..9dde910 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1368,6 +1368,6 @@
 { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" },
 { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" },
-{ "Print complete list","Drucke komplette Liste" },
-{ "Hide all selected","Verstecke Selektierte" },
+{ "Print complete list...","Drucke komplette Liste..." },
+{ "Hide all selected","Verstecke Ausgewählte" },
 { "Add items","hinzufügen" },
 { "One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?","Ein (oder mehrere) ausgewähltes\nTodo hat Untertodos!\nMöchten Sie der Auswahlliste\nalle Untertodos von allen\nausgewählten Todos hinzufügen?" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a10e93c..72221fd 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -675,15 +675,21 @@ void CalendarView::scrollBarValue(int val )
     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 ) {
+    int  stepdays = val;
+    if ( mDateScrollBar->lineStep () <= count ) {
+        val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
+        //qDebug("VAL %d ",val );
+        stepdays = (val-day)/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
+        stepdays = day-1+stepdays;
+        if ( stepdays < 0 ) stepdays = 0;
+    }
+    if ( stepdays == day -1 ) {
         block = false;
         return;
     }
+    int year =  mNavigator->selectedDates().first().year();
     QDate d ( year,1,1 );
-    mNavigator->selectDates( d.addDays( val ), count );
+    mNavigator->selectDates( d.addDays(  stepdays) , count );
     block = false;
 #endif
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 0b0fe8e..77322e7 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -62,6 +62,8 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu()
     connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup()));
     connect(mCalPopup,SIGNAL(  activated ( int ) ), this ,SLOT( computeCalPopup( int )));
-    mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
-    mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
+    //mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
+    //mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
+    insertItem (i18n("Categories"),mCatPopup );
+    insertItem (i18n("Calendar"),mCalPopup );
     QValueList<int>::Iterator it;
     for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
@@ -84,8 +86,9 @@ void KOEventPopupMenu::fillCalPopup() // CAL
     mCalPopup->clear();
     if (!mCurrentIncidence) return;
+    bool readO = mCurrentIncidence->isReadOnly()|| isDisabled;
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
         int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
-        if ( kkf->mErrorOnLoad || kkf->isReadOnly )
+        if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO )
             mCalPopup->setItemEnabled( index, false );
         mCalPopup->setItemChecked (index, kkf->mCalNumber == mCurrentIncidence->calID());
@@ -103,4 +106,5 @@ void KOEventPopupMenu::fillCatPopup()
     mCatPopup->clear(); 
     if (!mCurrentIncidence) return;
+    bool readO = mCurrentIncidence->isReadOnly() || isDisabled;
     QStringList checkedCategories = mCurrentIncidence->categories();
     int index = 0;
@@ -112,4 +116,6 @@ void KOEventPopupMenu::fillCatPopup()
             mCatPopup->setItemChecked (index, true);
         }
+        if ( readO )
+            mCatPopup->setItemEnabled( index, false );
         ++index;
     }
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index cec0476..25e599d 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -321,8 +321,10 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 
     selPopup->insertSeparator();
+    QPopupMenu * exportPO = new QPopupMenu ( this );
+    selPopup->insertItem( i18n("Export"),  exportPO );
 #ifdef DESKTOP_VERSION
     mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Print complete list"),this,
+                                  i18n("Print complete list..."),this,
                                   SLOT(printList()),true);
 #endif
@@ -348,6 +350,4 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     QObject::connect(mPopupMenu,SIGNAL(categoryChanged( Incidence * )),this,
                      SLOT( catChanged( Incidence * ) ));
-    QPopupMenu * exportPO = new QPopupMenu ( this );
-    selPopup->insertItem( i18n("Export"),  exportPO );
     exportPO->insertItem( i18n("As iCal (ics) file..."),this,
                                   SLOT(saveToFile()));
@@ -1313,5 +1313,4 @@ KOListViewListView::KOListViewListView(KOListView * lv )
 bool KOListViewListView::hasMultiSelection(QListViewItem* item)
 {
-    int selCount = 0;
     QListViewItem *qitem  = firstChild ();
     while ( qitem ) {
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 792a7b8..ba3bc05 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -556,5 +556,4 @@ void KOViewManager::showDayView()
     mMainView->dateNavigator()->selectDates( 1 );
     mCurrentAgendaView = 1 ;
-    mMainView->setScrollBarStep( 1 );
     
 }
@@ -574,5 +573,4 @@ void KOViewManager::showWorkWeekView()
     mMainView->dateNavigator()->selectWorkWeek();
     mCurrentAgendaView = 5 ;
-    mMainView->setScrollBarStep( 1 );
    
 }
@@ -593,5 +591,4 @@ void KOViewManager::showWeekView()
     mMainView->dateNavigator()->selectWeek();
     mCurrentAgendaView = 7 ;
-    mMainView->setScrollBarStep( 1 );
 }
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7a5f3e5..5d26d35 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -831,8 +831,4 @@ void MainWindow::initActions()
     connect( mCancelAction, SIGNAL( activated() ),
              mView, SLOT( toggleCancelIncidence() ) );
-#ifdef DESKTOP_VERSION
-    actionMenu->insertSeparator();
-#endif
-
 
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );