| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
| -rw-r--r-- | korganizer/calendarview.cpp | 16 | ||||
| -rw-r--r-- | korganizer/koeventpopupmenu.cpp | 12 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 7 | ||||
| -rw-r--r-- | korganizer/koviewmanager.cpp | 3 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 4 |
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 @@ -1369,4 +1369,4 @@ { "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" }, diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a10e93c..72221fd 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -676,8 +676,13 @@ void CalendarView::scrollBarValue(int val ) 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; @@ -685,4 +690,5 @@ void CalendarView::scrollBarValue(int val ) } + 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; diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 0b0fe8e..77322e7 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -63,4 +63,6 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() 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; @@ -85,2 +87,3 @@ void KOEventPopupMenu::fillCalPopup() // CAL if (!mCurrentIncidence) return; + bool readO = mCurrentIncidence->isReadOnly()|| isDisabled; KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); @@ -88,3 +91,3 @@ void KOEventPopupMenu::fillCalPopup() // CAL int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); - if ( kkf->mErrorOnLoad || kkf->isReadOnly ) + if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO ) mCalPopup->setItemEnabled( index, false ); @@ -104,2 +107,3 @@ void KOEventPopupMenu::fillCatPopup() if (!mCurrentIncidence) return; + bool readO = mCurrentIncidence->isReadOnly() || isDisabled; QStringList checkedCategories = mCurrentIncidence->categories(); @@ -113,2 +117,4 @@ void KOEventPopupMenu::fillCatPopup() } + 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 @@ -322,2 +322,4 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, selPopup->insertSeparator(); + QPopupMenu * exportPO = new QPopupMenu ( this ); + selPopup->insertItem( i18n("Export"), exportPO ); #ifdef DESKTOP_VERSION @@ -325,3 +327,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), - i18n("Print complete list"),this, + i18n("Print complete list..."),this, SLOT(printList()),true); @@ -349,4 +351,2 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, SLOT( catChanged( Incidence * ) )); - QPopupMenu * exportPO = new QPopupMenu ( this ); - selPopup->insertItem( i18n("Export"), exportPO ); exportPO->insertItem( i18n("As iCal (ics) file..."),this, @@ -1314,3 +1314,2 @@ bool KOListViewListView::hasMultiSelection(QListViewItem* item) { - int selCount = 0; QListViewItem *qitem = firstChild (); diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 792a7b8..ba3bc05 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -557,3 +557,2 @@ void KOViewManager::showDayView() mCurrentAgendaView = 1 ; - mMainView->setScrollBarStep( 1 ); @@ -575,3 +574,2 @@ void KOViewManager::showWorkWeekView() mCurrentAgendaView = 5 ; - mMainView->setScrollBarStep( 1 ); @@ -594,3 +592,2 @@ void KOViewManager::showWeekView() 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 @@ -832,6 +832,2 @@ void MainWindow::initActions() mView, SLOT( toggleCancelIncidence() ) ); -#ifdef DESKTOP_VERSION - actionMenu->insertSeparator(); -#endif - |