summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt4
-rw-r--r--korganizer/calendarview.cpp16
-rw-r--r--korganizer/koeventpopupmenu.cpp12
-rw-r--r--korganizer/kolistview.cpp7
-rw-r--r--korganizer/koviewmanager.cpp3
-rw-r--r--korganizer/mainwindow.cpp4
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 @@
1368{ "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" }, 1368{ "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" },
1369{ "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" }, 1369{ "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" },
1370{ "Print complete list","Drucke komplette Liste" }, 1370{ "Print complete list...","Drucke komplette Liste..." },
1371{ "Hide all selected","Verstecke Selektierte" }, 1371{ "Hide all selected","Verstecke Ausgewählte" },
1372{ "Add items","hinzufügen" }, 1372{ "Add items","hinzufügen" },
1373{ "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?" }, 1373{ "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 )
675 if ( block ) return; 675 if ( block ) return;
676 block = true; 676 block = true;
677 val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
678 //qDebug("VAL %d ",val );
679 int count = mNavigator->selectedDates().count(); 677 int count = mNavigator->selectedDates().count();
680 int year = mNavigator->selectedDates().first().year();
681 int day = mNavigator->selectedDates().first().dayOfYear(); 678 int day = mNavigator->selectedDates().first().dayOfYear();
682 if ( val == day -1 ) { 679 int stepdays = val;
680 if ( mDateScrollBar->lineStep () <= count ) {
681 val = val/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
682 //qDebug("VAL %d ",val );
683 stepdays = (val-day)/mDateScrollBar->lineStep ()*mDateScrollBar->lineStep();
684 stepdays = day-1+stepdays;
685 if ( stepdays < 0 ) stepdays = 0;
686 }
687 if ( stepdays == day -1 ) {
683 block = false; 688 block = false;
684 return; 689 return;
685 } 690 }
691 int year = mNavigator->selectedDates().first().year();
686 QDate d ( year,1,1 ); 692 QDate d ( year,1,1 );
687 mNavigator->selectDates( d.addDays( val ), count ); 693 mNavigator->selectDates( d.addDays( stepdays) , count );
688 block = false; 694 block = false;
689#endif 695#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()
62 connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup())); 62 connect(mCalPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCalPopup()));
63 connect(mCalPopup,SIGNAL( activated ( int ) ), this ,SLOT( computeCalPopup( int ))); 63 connect(mCalPopup,SIGNAL( activated ( int ) ), this ,SLOT( computeCalPopup( int )));
64 mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup )); 64 //mEditOnlyItems.append(insertItem (i18n("Categories"),mCatPopup ));
65 mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup )); 65 //mEditOnlyItems.append(insertItem (i18n("Calendar"),mCalPopup ));
66 insertItem (i18n("Categories"),mCatPopup );
67 insertItem (i18n("Calendar"),mCalPopup );
66 QValueList<int>::Iterator it; 68 QValueList<int>::Iterator it;
67 for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) { 69 for( it = mEditOnlyItems.begin(); it != mEditOnlyItems.end(); ++it ) {
@@ -84,8 +86,9 @@ void KOEventPopupMenu::fillCalPopup() // CAL
84 mCalPopup->clear(); 86 mCalPopup->clear();
85 if (!mCurrentIncidence) return; 87 if (!mCurrentIncidence) return;
88 bool readO = mCurrentIncidence->isReadOnly()|| isDisabled;
86 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first(); 89 KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
87 while ( kkf ) { 90 while ( kkf ) {
88 int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber); 91 int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
89 if ( kkf->mErrorOnLoad || kkf->isReadOnly ) 92 if ( kkf->mErrorOnLoad || kkf->isReadOnly || readO )
90 mCalPopup->setItemEnabled( index, false ); 93 mCalPopup->setItemEnabled( index, false );
91 mCalPopup->setItemChecked (index, kkf->mCalNumber == mCurrentIncidence->calID()); 94 mCalPopup->setItemChecked (index, kkf->mCalNumber == mCurrentIncidence->calID());
@@ -103,4 +106,5 @@ void KOEventPopupMenu::fillCatPopup()
103 mCatPopup->clear(); 106 mCatPopup->clear();
104 if (!mCurrentIncidence) return; 107 if (!mCurrentIncidence) return;
108 bool readO = mCurrentIncidence->isReadOnly() || isDisabled;
105 QStringList checkedCategories = mCurrentIncidence->categories(); 109 QStringList checkedCategories = mCurrentIncidence->categories();
106 int index = 0; 110 int index = 0;
@@ -112,4 +116,6 @@ void KOEventPopupMenu::fillCatPopup()
112 mCatPopup->setItemChecked (index, true); 116 mCatPopup->setItemChecked (index, true);
113 } 117 }
118 if ( readO )
119 mCatPopup->setItemEnabled( index, false );
114 ++index; 120 ++index;
115 } 121 }
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,
321 321
322 selPopup->insertSeparator(); 322 selPopup->insertSeparator();
323 QPopupMenu * exportPO = new QPopupMenu ( this );
324 selPopup->insertItem( i18n("Export"), exportPO );
323#ifdef DESKTOP_VERSION 325#ifdef DESKTOP_VERSION
324 mPopupMenu->insertSeparator(); 326 mPopupMenu->insertSeparator();
325 mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), 327 mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
326 i18n("Print complete list"),this, 328 i18n("Print complete list..."),this,
327 SLOT(printList()),true); 329 SLOT(printList()),true);
328#endif 330#endif
@@ -348,6 +350,4 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
348 QObject::connect(mPopupMenu,SIGNAL(categoryChanged( Incidence * )),this, 350 QObject::connect(mPopupMenu,SIGNAL(categoryChanged( Incidence * )),this,
349 SLOT( catChanged( Incidence * ) )); 351 SLOT( catChanged( Incidence * ) ));
350 QPopupMenu * exportPO = new QPopupMenu ( this );
351 selPopup->insertItem( i18n("Export"), exportPO );
352 exportPO->insertItem( i18n("As iCal (ics) file..."),this, 352 exportPO->insertItem( i18n("As iCal (ics) file..."),this,
353 SLOT(saveToFile())); 353 SLOT(saveToFile()));
@@ -1313,5 +1313,4 @@ KOListViewListView::KOListViewListView(KOListView * lv )
1313bool KOListViewListView::hasMultiSelection(QListViewItem* item) 1313bool KOListViewListView::hasMultiSelection(QListViewItem* item)
1314{ 1314{
1315 int selCount = 0;
1316 QListViewItem *qitem = firstChild (); 1315 QListViewItem *qitem = firstChild ();
1317 while ( qitem ) { 1316 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()
556 mMainView->dateNavigator()->selectDates( 1 ); 556 mMainView->dateNavigator()->selectDates( 1 );
557 mCurrentAgendaView = 1 ; 557 mCurrentAgendaView = 1 ;
558 mMainView->setScrollBarStep( 1 );
559 558
560} 559}
@@ -574,5 +573,4 @@ void KOViewManager::showWorkWeekView()
574 mMainView->dateNavigator()->selectWorkWeek(); 573 mMainView->dateNavigator()->selectWorkWeek();
575 mCurrentAgendaView = 5 ; 574 mCurrentAgendaView = 5 ;
576 mMainView->setScrollBarStep( 1 );
577 575
578} 576}
@@ -593,5 +591,4 @@ void KOViewManager::showWeekView()
593 mMainView->dateNavigator()->selectWeek(); 591 mMainView->dateNavigator()->selectWeek();
594 mCurrentAgendaView = 7 ; 592 mCurrentAgendaView = 7 ;
595 mMainView->setScrollBarStep( 1 );
596} 593}
597 594
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()
831 connect( mCancelAction, SIGNAL( activated() ), 831 connect( mCancelAction, SIGNAL( activated() ),
832 mView, SLOT( toggleCancelIncidence() ) ); 832 mView, SLOT( toggleCancelIncidence() ) );
833#ifdef DESKTOP_VERSION
834 actionMenu->insertSeparator();
835#endif
836
837 833
838 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this ); 834 QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );