-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 | |||
@@ -1362,18 +1362,18 @@ | |||
1362 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, | 1362 | { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" }, |
1363 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, | 1363 | { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" }, |
1364 | { "Choose action","Wähle Aktion" }, | 1364 | { "Choose action","Wähle Aktion" }, |
1365 | { "Comment for todo:","Kommentar zum Todo:" }, | 1365 | { "Comment for todo:","Kommentar zum Todo:" }, |
1366 | { "Stop+note","Stop+Notiz" }, | 1366 | { "Stop+note","Stop+Notiz" }, |
1367 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, | 1367 | { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" }, |
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?" }, |
1374 | { "Print List View...","Drucke Listenansicht..." }, | 1374 | { "Print List View...","Drucke Listenansicht..." }, |
1375 | { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." }, | 1375 | { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." }, |
1376 | { "Configure KO/Pi...","Konfiguriere KO/Pi..." }, | 1376 | { "Configure KO/Pi...","Konfiguriere KO/Pi..." }, |
1377 | { "Global Settings...","Globale Einstellungen..." }, | 1377 | { "Global Settings...","Globale Einstellungen..." }, |
1378 | { "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\n" }, | 1378 | { "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\n" }, |
1379 | { "(disabled)","(abgeschaltet)" }, | 1379 | { "(disabled)","(abgeschaltet)" }, |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a10e93c..72221fd 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -669,27 +669,33 @@ void CalendarView::setScrollBarStep(int val ) | |||
669 | } | 669 | } |
670 | void CalendarView::scrollBarValue(int val ) | 670 | void CalendarView::scrollBarValue(int val ) |
671 | { | 671 | { |
672 | #ifdef DESKTOP_VERSION | 672 | #ifdef DESKTOP_VERSION |
673 | if ( QApplication::desktop()->width() < 800 ) return; | 673 | if ( QApplication::desktop()->width() < 800 ) return; |
674 | static bool block = false; | 674 | static bool block = false; |
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 |
690 | 696 | ||
691 | } | 697 | } |
692 | void CalendarView::checkFiles() | 698 | void CalendarView::checkFiles() |
693 | { | 699 | { |
694 | QString message; | 700 | QString message; |
695 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | 701 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; |
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 0b0fe8e..77322e7 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp | |||
@@ -56,18 +56,20 @@ KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() | |||
56 | mCatPopup = new QPopupMenu ( this ); | 56 | mCatPopup = new QPopupMenu ( this ); |
57 | mCatPopup->setCheckable (true); | 57 | mCatPopup->setCheckable (true); |
58 | connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup())); | 58 | connect(mCatPopup,SIGNAL( aboutToShow ()), this ,SLOT( fillCatPopup())); |
59 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT( computeCatPopup( int ))); | 59 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT( computeCatPopup( int ))); |
60 | mCalPopup = new QPopupMenu ( this ); | 60 | mCalPopup = new QPopupMenu ( this ); |
61 | mCalPopup->setCheckable (true); | 61 | mCalPopup->setCheckable (true); |
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 ) { |
68 | mSingleOnlyItems.append(*it); | 70 | mSingleOnlyItems.append(*it); |
69 | } | 71 | } |
70 | 72 | ||
71 | } | 73 | } |
72 | void KOEventPopupMenu::enableDefault( bool enable ) | 74 | void KOEventPopupMenu::enableDefault( bool enable ) |
73 | { | 75 | { |
@@ -78,44 +80,48 @@ void KOEventPopupMenu::enableDefault( bool enable ) | |||
78 | } | 80 | } |
79 | 81 | ||
80 | } | 82 | } |
81 | 83 | ||
82 | void KOEventPopupMenu::fillCalPopup() // CAL | 84 | void KOEventPopupMenu::fillCalPopup() // CAL |
83 | { | 85 | { |
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()); |
92 | kkf = KOPrefs::instance()->mCalendars.next(); | 95 | kkf = KOPrefs::instance()->mCalendars.next(); |
93 | } | 96 | } |
94 | } | 97 | } |
95 | void KOEventPopupMenu::computeCalPopup( int index ) // CAL | 98 | void KOEventPopupMenu::computeCalPopup( int index ) // CAL |
96 | { | 99 | { |
97 | if (!mCurrentIncidence) return; | 100 | if (!mCurrentIncidence) return; |
98 | mCurrentIncidence->setCalID( index ); | 101 | mCurrentIncidence->setCalID( index ); |
99 | emit categoryChanged( mCurrentIncidence ); | 102 | emit categoryChanged( mCurrentIncidence ); |
100 | } | 103 | } |
101 | void KOEventPopupMenu::fillCatPopup() | 104 | void KOEventPopupMenu::fillCatPopup() |
102 | { | 105 | { |
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; |
107 | for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin (); | 111 | for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin (); |
108 | it != KOPrefs::instance()->mCustomCategories.end (); | 112 | it != KOPrefs::instance()->mCustomCategories.end (); |
109 | ++it) { | 113 | ++it) { |
110 | mCatPopup->insertItem (*it, index ); | 114 | mCatPopup->insertItem (*it, index ); |
111 | if (checkedCategories.find (*it) != checkedCategories.end ()) { | 115 | if (checkedCategories.find (*it) != checkedCategories.end ()) { |
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 | } |
116 | } | 122 | } |
117 | void KOEventPopupMenu::computeCatPopup( int index ) | 123 | void KOEventPopupMenu::computeCatPopup( int index ) |
118 | { | 124 | { |
119 | if (!mCurrentIncidence) return; | 125 | if (!mCurrentIncidence) return; |
120 | QStringList categories = mCurrentIncidence->categories(); | 126 | QStringList categories = mCurrentIncidence->categories(); |
121 | QString colcat = categories.first(); | 127 | QString colcat = categories.first(); |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index cec0476..25e599d 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -315,20 +315,22 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
315 | selPopup->insertItem(i18n("Delete selected..."),this, | 315 | selPopup->insertItem(i18n("Delete selected..."),this, |
316 | SLOT(deleteAll())); | 316 | SLOT(deleteAll())); |
317 | mPopupMenu->insertItem(i18n("Selection"), selPopup ); | 317 | mPopupMenu->insertItem(i18n("Selection"), selPopup ); |
318 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 318 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
319 | i18n("Hide all selected"),this, | 319 | i18n("Hide all selected"),this, |
320 | SLOT(hideAll()),true); | 320 | SLOT(hideAll()),true); |
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 |
329 | mCalPopup = new QPopupMenu ( this ); | 331 | mCalPopup = new QPopupMenu ( this ); |
330 | selPopup->insertItem( i18n("Set Calendar"), mCalPopup ); | 332 | selPopup->insertItem( i18n("Set Calendar"), mCalPopup ); |
331 | 333 | ||
332 | selPopup->insertItem(i18n("Set categories")+"...",this, | 334 | selPopup->insertItem(i18n("Set categories")+"...",this, |
333 | SLOT(setCat()) ); | 335 | SLOT(setCat()) ); |
334 | selPopup->insertItem( i18n("Set alarm..."),this, | 336 | selPopup->insertItem( i18n("Set alarm..."),this, |
@@ -342,18 +344,16 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
342 | SLOT(setAlarm()),true); | 344 | SLOT(setAlarm()),true); |
343 | #endif | 345 | #endif |
344 | QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this, | 346 | QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this, |
345 | SLOT( populateCalPopup() )); | 347 | SLOT( populateCalPopup() )); |
346 | QObject::connect(mCalPopup,SIGNAL(activated( int )),this, | 348 | QObject::connect(mCalPopup,SIGNAL(activated( int )),this, |
347 | SLOT( setCalendar( int ) )); | 349 | SLOT( setCalendar( int ) )); |
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())); |
354 | exportPO->insertItem( i18n("As vCal (vcs) file..."),this, | 354 | exportPO->insertItem( i18n("As vCal (vcs) file..."),this, |
355 | SLOT(saveToFileVCS())); | 355 | SLOT(saveToFileVCS())); |
356 | exportPO->insertItem( i18n("Journal/Details..."),this, | 356 | exportPO->insertItem( i18n("Journal/Details..."),this, |
357 | SLOT(saveDescriptionToFile())); | 357 | SLOT(saveDescriptionToFile())); |
358 | // mPopupMenu->insertSeparator(); | 358 | // mPopupMenu->insertSeparator(); |
359 | // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 359 | // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
@@ -1307,17 +1307,16 @@ KOListViewListView::KOListViewListView(KOListView * lv ) | |||
1307 | #ifndef DESKTOP_VERSION | 1307 | #ifndef DESKTOP_VERSION |
1308 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); | 1308 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold ); |
1309 | #endif | 1309 | #endif |
1310 | setSelectionMode( QListView::Multi ); | 1310 | setSelectionMode( QListView::Multi ); |
1311 | setMultiSelection( true); | 1311 | setMultiSelection( true); |
1312 | } | 1312 | } |
1313 | bool KOListViewListView::hasMultiSelection(QListViewItem* item) | 1313 | bool KOListViewListView::hasMultiSelection(QListViewItem* item) |
1314 | { | 1314 | { |
1315 | int selCount = 0; | ||
1316 | QListViewItem *qitem = firstChild (); | 1315 | QListViewItem *qitem = firstChild (); |
1317 | while ( qitem ) { | 1316 | while ( qitem ) { |
1318 | if ( qitem->isSelected() && item != qitem ) | 1317 | if ( qitem->isSelected() && item != qitem ) |
1319 | return true; | 1318 | return true; |
1320 | qitem = qitem->nextSibling(); | 1319 | qitem = qitem->nextSibling(); |
1321 | } | 1320 | } |
1322 | return false; | 1321 | return false; |
1323 | } | 1322 | } |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 792a7b8..ba3bc05 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -550,17 +550,16 @@ void KOViewManager::showDayView() | |||
550 | if ( mCurrentAgendaView != 1 ) | 550 | if ( mCurrentAgendaView != 1 ) |
551 | mCurrentAgendaView = -1; | 551 | mCurrentAgendaView = -1; |
552 | showAgendaView(); | 552 | showAgendaView(); |
553 | qApp->processEvents(); | 553 | qApp->processEvents(); |
554 | globalFlagBlockAgenda = 2; | 554 | globalFlagBlockAgenda = 2; |
555 | globalFlagBlockLabel = 0; | 555 | globalFlagBlockLabel = 0; |
556 | mMainView->dateNavigator()->selectDates( 1 ); | 556 | mMainView->dateNavigator()->selectDates( 1 ); |
557 | mCurrentAgendaView = 1 ; | 557 | mCurrentAgendaView = 1 ; |
558 | mMainView->setScrollBarStep( 1 ); | ||
559 | 558 | ||
560 | } | 559 | } |
561 | 560 | ||
562 | void KOViewManager::showWorkWeekView() | 561 | void KOViewManager::showWorkWeekView() |
563 | { | 562 | { |
564 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 563 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
565 | mFlagShowNextxDays = false; | 564 | mFlagShowNextxDays = false; |
566 | globalFlagBlockAgenda = 1; | 565 | globalFlagBlockAgenda = 1; |
@@ -568,17 +567,16 @@ void KOViewManager::showWorkWeekView() | |||
568 | if ( mCurrentAgendaView != 5 ) | 567 | if ( mCurrentAgendaView != 5 ) |
569 | mCurrentAgendaView = -1; | 568 | mCurrentAgendaView = -1; |
570 | showAgendaView(); | 569 | showAgendaView(); |
571 | qApp->processEvents(); | 570 | qApp->processEvents(); |
572 | globalFlagBlockAgenda = 2; | 571 | globalFlagBlockAgenda = 2; |
573 | globalFlagBlockLabel = 0; | 572 | globalFlagBlockLabel = 0; |
574 | mMainView->dateNavigator()->selectWorkWeek(); | 573 | mMainView->dateNavigator()->selectWorkWeek(); |
575 | mCurrentAgendaView = 5 ; | 574 | mCurrentAgendaView = 5 ; |
576 | mMainView->setScrollBarStep( 1 ); | ||
577 | 575 | ||
578 | } | 576 | } |
579 | 577 | ||
580 | void KOViewManager::showWeekView() | 578 | void KOViewManager::showWeekView() |
581 | { | 579 | { |
582 | 580 | ||
583 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 581 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
584 | mFlagShowNextxDays = false; | 582 | mFlagShowNextxDays = false; |
@@ -587,17 +585,16 @@ void KOViewManager::showWeekView() | |||
587 | if ( mCurrentAgendaView != 7 ) | 585 | if ( mCurrentAgendaView != 7 ) |
588 | mCurrentAgendaView = -1; | 586 | mCurrentAgendaView = -1; |
589 | showAgendaView(); | 587 | showAgendaView(); |
590 | qApp->processEvents(); | 588 | qApp->processEvents(); |
591 | globalFlagBlockAgenda = 2; | 589 | globalFlagBlockAgenda = 2; |
592 | globalFlagBlockLabel = 0; | 590 | globalFlagBlockLabel = 0; |
593 | mMainView->dateNavigator()->selectWeek(); | 591 | mMainView->dateNavigator()->selectWeek(); |
594 | mCurrentAgendaView = 7 ; | 592 | mCurrentAgendaView = 7 ; |
595 | mMainView->setScrollBarStep( 1 ); | ||
596 | } | 593 | } |
597 | 594 | ||
598 | void KOViewManager::showNextXView() | 595 | void KOViewManager::showNextXView() |
599 | { | 596 | { |
600 | 597 | ||
601 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; | 598 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; |
602 | globalFlagBlockAgenda = 1; | 599 | globalFlagBlockAgenda = 1; |
603 | if ( mCurrentAgendaView != 3 ) | 600 | if ( mCurrentAgendaView != 3 ) |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 7a5f3e5..5d26d35 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -825,20 +825,16 @@ void MainWindow::initActions() | |||
825 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); | 825 | mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this ); |
826 | mBeamAction->addTo(mCurrentItemMenu ); | 826 | mBeamAction->addTo(mCurrentItemMenu ); |
827 | connect( mBeamAction, SIGNAL( activated() ), | 827 | connect( mBeamAction, SIGNAL( activated() ), |
828 | mView, SLOT( beamIncidence() ) ); | 828 | mView, SLOT( beamIncidence() ) ); |
829 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); | 829 | mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this ); |
830 | mCancelAction->addTo( mCurrentItemMenu ); | 830 | mCancelAction->addTo( mCurrentItemMenu ); |
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 ); |
839 | ne_action->addTo( actionMenu ); | 835 | ne_action->addTo( actionMenu ); |
840 | connect( ne_action, SIGNAL( activated() ), | 836 | connect( ne_action, SIGNAL( activated() ), |
841 | mView, SLOT( newEvent() ) ); | 837 | mView, SLOT( newEvent() ) ); |
842 | icon = loadPixmap( pathString + "newtodo" ); | 838 | icon = loadPixmap( pathString + "newtodo" ); |
843 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); | 839 | configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); |
844 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); | 840 | QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this ); |