-rw-r--r-- | korganizer/koagendaview.cpp | 41 | ||||
-rw-r--r-- | korganizer/koagendaview.h | 1 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 8 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 41 |
4 files changed, 48 insertions, 43 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index aa36553..8c27c43 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -616,121 +616,127 @@ void KOAgendaView::slotDaylabelClicked() | |||
616 | QDate firstDate = mSelectedDates.first(); | 616 | QDate firstDate = mSelectedDates.first(); |
617 | if ( cap == "0" ) | 617 | if ( cap == "0" ) |
618 | emit showDateView( 6, firstDate ); | 618 | emit showDateView( 6, firstDate ); |
619 | else if ( cap != "last" ) { | 619 | else if ( cap != "last" ) { |
620 | if ( mSelectedDates.count() == 1) | 620 | if ( mSelectedDates.count() == 1) |
621 | emit showDateView( 9, firstDate.addDays( cap.toInt()-1 ) ); | 621 | emit showDateView( 9, firstDate.addDays( cap.toInt()-1 ) ); |
622 | else | 622 | else |
623 | emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) ); | 623 | emit showDateView( 3, firstDate.addDays( cap.toInt()-1 ) ); |
624 | } | 624 | } |
625 | else | 625 | else |
626 | showDateView( 10, firstDate.addDays(1 ) ); | 626 | showDateView( 10, firstDate.addDays(1 ) ); |
627 | } | 627 | } |
628 | |||
629 | QPushButton* KOAgendaView::getNewDaylabel() | ||
630 | { | ||
631 | |||
632 | QPushButton * dayLabel = new QPushButton(mDayLabels); | ||
633 | dayLabel->setFlat( true ); | ||
634 | connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); | ||
635 | dayLabel->setFocusPolicy(NoFocus); | ||
636 | dayLabel->setSizePolicy(QSizePolicy( QSizePolicy::Expanding ,QSizePolicy::Expanding )); | ||
637 | mDayLabelsList.append( dayLabel ); | ||
638 | mLayoutDayLabels->addWidget(dayLabel); | ||
639 | //mLayoutDayLabels->setStretchFactor(dayLabel, 100); | ||
640 | return dayLabel ; | ||
641 | } | ||
642 | |||
628 | void KOAgendaView::createDayLabels() | 643 | void KOAgendaView::createDayLabels() |
629 | { | 644 | { |
630 | 645 | ||
631 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { | 646 | if ( mBlockUpdating || globalFlagBlockLabel == 1) { |
632 | // qDebug(" KOAgendaView::createDayLabels() blocked "); | 647 | // qDebug(" KOAgendaView::createDayLabels() blocked "); |
633 | return; | 648 | return; |
634 | 649 | ||
635 | } | 650 | } |
636 | int newHight; | 651 | int newHight; |
637 | 652 | ||
638 | // ### Before deleting and recreating we could check if mSelectedDates changed... | 653 | // ### Before deleting and recreating we could check if mSelectedDates changed... |
639 | // It would remove some flickering and gain speed (since this is called by | 654 | // It would remove some flickering and gain speed (since this is called by |
640 | // each updateView() call) | 655 | // each updateView() call) |
641 | 656 | ||
642 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; | 657 | int maxWid = mUpcomingWidth - mTimeLabels->width()- mAgenda->verticalScrollBar()->width() - 2; |
643 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); | 658 | mDayLabelsFrame->setMaximumWidth( mUpcomingWidth ); |
644 | if ( maxWid < 0 ) | 659 | if ( maxWid < 0 ) |
645 | maxWid = 20; | 660 | maxWid = 20; |
646 | 661 | ||
647 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; | 662 | QFont dlf = KOPrefs::instance()->mTimeLabelsFont; |
648 | QFontMetrics fm ( dlf ); | 663 | QFontMetrics fm ( dlf ); |
649 | int selCount = mSelectedDates.count(); | 664 | int selCount = mSelectedDates.count(); |
650 | QString dayTest = "Mon 20"; | 665 | QString dayTest = "Mon 20"; |
651 | int wid = fm.width( dayTest ); | 666 | int wid = fm.width( dayTest ); |
652 | maxWid -= ( selCount * 3 ); | 667 | //maxWid -= ( selCount * 3 ); //working for QLabels |
668 | maxWid -= ( selCount * 5 ); //working for QPushButton | ||
653 | if ( maxWid < 0 ) | 669 | if ( maxWid < 0 ) |
654 | maxWid = 20; | 670 | maxWid = 20; |
655 | int needWid = wid * selCount; | 671 | int needWid = wid * selCount; |
656 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); | 672 | //qDebug("++++++++Needed : %d MaxWidth: %d", needWid, maxWid ); |
657 | //if ( needWid > maxWid ) | 673 | //if ( needWid > maxWid ) |
658 | // qDebug("DAYLABELS TOOOOOOO BIG "); | 674 | // qDebug("DAYLABELS TOOOOOOO BIG "); |
659 | while ( needWid > maxWid ) { | 675 | while ( needWid > maxWid ) { |
660 | dayTest = dayTest.left( dayTest.length() - 1 ); | 676 | dayTest = dayTest.left( dayTest.length() - 1 ); |
661 | wid = fm.width( dayTest ); | 677 | wid = fm.width( dayTest ); |
662 | needWid = wid * selCount; | 678 | needWid = wid * selCount; |
663 | } | 679 | } |
664 | int maxLen = dayTest.length(); | 680 | int maxLen = dayTest.length(); |
665 | int fontPoint = dlf.pointSize(); | 681 | int fontPoint = dlf.pointSize(); |
666 | if ( maxLen < 2 ) { | 682 | if ( maxLen < 2 ) { |
667 | int fontPoint = dlf.pointSize(); | 683 | int fontPoint = dlf.pointSize(); |
668 | while ( fontPoint > 4 ) { | 684 | while ( fontPoint > 4 ) { |
669 | --fontPoint; | 685 | --fontPoint; |
670 | dlf.setPointSize( fontPoint ); | 686 | dlf.setPointSize( fontPoint ); |
671 | QFontMetrics f( dlf ); | 687 | QFontMetrics f( dlf ); |
672 | wid = f.width( "20" ); | 688 | wid = f.width( "20" )+2; |
673 | needWid = wid * selCount; | 689 | needWid = wid * selCount; |
674 | if ( needWid < maxWid ) | 690 | if ( needWid < maxWid ) |
675 | break; | 691 | break; |
676 | } | 692 | } |
677 | maxLen = 2; | 693 | maxLen = 2; |
678 | } | 694 | } |
679 | //qDebug("Max len %d ", dayTest.length() ); | 695 | //qDebug("Max len %d ", dayTest.length() ); |
680 | 696 | ||
681 | QFontMetrics tempF( dlf ); | 697 | QFontMetrics tempF( dlf ); |
682 | newHight = tempF.height(); | 698 | newHight = tempF.height(); |
683 | mDayLabels->setFont( dlf ); | 699 | mDayLabels->setFont( dlf ); |
684 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; | 700 | // mLayoutDayLabels = new QHBoxLayout(mDayLabels);; |
685 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); | 701 | // mLayoutDayLabels->addSpacing(mTimeLabels->width()); |
686 | //mLayoutDayLabels->addSpacing( 2 ); | 702 | //mLayoutDayLabels->addSpacing( 2 ); |
687 | // QFont lFont = dlf; | 703 | // QFont lFont = dlf; |
688 | bool appendLabels = false; | 704 | bool appendLabels = false; |
689 | QPushButton *dayLabel; | 705 | QPushButton *dayLabel; |
690 | dayLabel = mDayLabelsList.first(); | 706 | dayLabel = mDayLabelsList.first(); |
691 | if ( !dayLabel ) { | 707 | if ( !dayLabel ) { |
692 | appendLabels = true; | 708 | appendLabels = true; |
693 | dayLabel = new QPushButton(mDayLabels); | 709 | dayLabel = getNewDaylabel(); |
694 | dayLabel->setFlat( true ); | ||
695 | connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); | ||
696 | dayLabel->setFocusPolicy(NoFocus); | ||
697 | mDayLabelsList.append( dayLabel ); | ||
698 | mLayoutDayLabels->addWidget(dayLabel); | ||
699 | } | 710 | } |
700 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); | 711 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); |
701 | dayLabel->setFont( dlf ); | 712 | dayLabel->setFont( dlf ); |
702 | dayLabel->setCaption("0"); | 713 | dayLabel->setCaption("0"); |
703 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 714 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
704 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 715 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); |
705 | dayLabel->show(); | 716 | dayLabel->show(); |
706 | DateList::ConstIterator dit; | 717 | DateList::ConstIterator dit; |
707 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); | 718 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); |
708 | int counter = 0; | 719 | int counter = 0; |
709 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 720 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
710 | ++counter; | 721 | ++counter; |
711 | QDate date = *dit; | 722 | QDate date = *dit; |
712 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); | 723 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); |
713 | if ( ! appendLabels ) { | 724 | if ( ! appendLabels ) { |
714 | dayLabel = mDayLabelsList.next(); | 725 | dayLabel = mDayLabelsList.next(); |
715 | if ( !dayLabel ) | 726 | if ( !dayLabel ) |
716 | appendLabels = true; | 727 | appendLabels = true; |
717 | } | 728 | } |
718 | if ( appendLabels ) { | 729 | if ( appendLabels ) { |
719 | dayLabel = new QPushButton(mDayLabels); | 730 | dayLabel = getNewDaylabel(); |
720 | dayLabel->setFlat( true ); | ||
721 | connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); | ||
722 | dayLabel->setFocusPolicy(NoFocus); | ||
723 | mDayLabelsList.append( dayLabel ); | ||
724 | mLayoutDayLabels->addWidget(dayLabel); | ||
725 | } | 731 | } |
726 | dayLabel->setMinimumWidth( 1 ); | 732 | dayLabel->setMinimumWidth( 1 ); |
727 | dayLabel->setMaximumWidth( 2048 ); | 733 | dayLabel->setMaximumWidth( 2048 ); |
728 | dayLabel->setFont( dlf ); | 734 | dayLabel->setFont( dlf ); |
729 | dayLabel->show(); | 735 | dayLabel->show(); |
730 | dayLabel->setCaption(QString::number( counter )); | 736 | dayLabel->setCaption(QString::number( counter )); |
731 | QString str; | 737 | QString str; |
732 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); | 738 | int dW = KOGlobals::self()->calendarSystem()->dayOfWeek(date); |
733 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); | 739 | QString dayName = KOGlobals::self()->calendarSystem()->weekDayName( dW, true ); |
734 | switch ( maxLen ) { | 740 | switch ( maxLen ) { |
735 | case 2: | 741 | case 2: |
736 | str = QString::number( date.day() ); | 742 | str = QString::number( date.day() ); |
@@ -798,30 +804,25 @@ void KOAgendaView::createDayLabels() | |||
798 | // wid->setHeight(20); | 804 | // wid->setHeight(20); |
799 | dayLayout->addWidget(wid); | 805 | dayLayout->addWidget(wid); |
800 | } | 806 | } |
801 | } | 807 | } |
802 | #endif | 808 | #endif |
803 | } | 809 | } |
804 | if ( ! appendLabels ) { | 810 | if ( ! appendLabels ) { |
805 | dayLabel = mDayLabelsList.next(); | 811 | dayLabel = mDayLabelsList.next(); |
806 | if ( !dayLabel ) | 812 | if ( !dayLabel ) |
807 | appendLabels = true; | 813 | appendLabels = true; |
808 | } | 814 | } |
809 | if ( appendLabels ) { | 815 | if ( appendLabels ) { |
810 | dayLabel = new QPushButton(mDayLabels); | 816 | dayLabel = getNewDaylabel(); |
811 | dayLabel->setFlat( true ); | ||
812 | connect( dayLabel, SIGNAL( clicked() ), this, SLOT ( slotDaylabelClicked() ) ); | ||
813 | dayLabel->setFocusPolicy(NoFocus); | ||
814 | mDayLabelsList.append( dayLabel ); | ||
815 | mLayoutDayLabels->addWidget(dayLabel); | ||
816 | } | 817 | } |
817 | //dayLabel->hide();//test only | 818 | //dayLabel->hide();//test only |
818 | 819 | ||
819 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; | 820 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()-3 ) % mSelectedDates.count() ; |
820 | if ( offset < 0 ) offset = 0; | 821 | if ( offset < 0 ) offset = 0; |
821 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); | 822 | //qDebug("mLayoutDayLabels->addSpacing %d ", mAgenda->verticalScrollBar()->width()+offset+2 ); |
822 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); | 823 | dayLabel->setText(">");//QString::number ( mSelectedDates.first().month() ) ); |
823 | dayLabel->setFont( dlf ); | 824 | dayLabel->setFont( dlf ); |
824 | dayLabel->show(); | 825 | dayLabel->show(); |
825 | dayLabel->setCaption("last"); | 826 | dayLabel->setCaption("last"); |
826 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); | 827 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); |
827 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); | 828 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); |
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index fd0a7af..cbe86b6 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h | |||
@@ -181,24 +181,25 @@ class KOAgendaView : public KOEventView { | |||
181 | void scrollOneHourDown(); | 181 | void scrollOneHourDown(); |
182 | void addToCalSlot(Incidence *, Incidence *); | 182 | void addToCalSlot(Incidence *, Incidence *); |
183 | 183 | ||
184 | signals: | 184 | signals: |
185 | void showDateView( int, QDate ); | 185 | void showDateView( int, QDate ); |
186 | void newTodoSignal( QDateTime ,bool ); | 186 | void newTodoSignal( QDateTime ,bool ); |
187 | void toggleExpand(); | 187 | void toggleExpand(); |
188 | void todoMoved( Todo *, int ); | 188 | void todoMoved( Todo *, int ); |
189 | void incidenceChanged(Incidence * , int ); | 189 | void incidenceChanged(Incidence * , int ); |
190 | // void cloneIncidenceSignal(Incidence *); | 190 | // void cloneIncidenceSignal(Incidence *); |
191 | 191 | ||
192 | protected: | 192 | protected: |
193 | QPushButton* getNewDaylabel(); | ||
193 | bool mBlockUpdating; | 194 | bool mBlockUpdating; |
194 | int mUpcomingWidth; | 195 | int mUpcomingWidth; |
195 | /** Fill agenda beginning with date startDate */ | 196 | /** Fill agenda beginning with date startDate */ |
196 | void fillAgenda(const QDate &startDate); | 197 | void fillAgenda(const QDate &startDate); |
197 | void resizeEvent( QResizeEvent* e ); | 198 | void resizeEvent( QResizeEvent* e ); |
198 | /** Fill agenda using the current set value for the start date */ | 199 | /** Fill agenda using the current set value for the start date */ |
199 | void fillAgenda(); | 200 | void fillAgenda(); |
200 | 201 | ||
201 | /** Create labels for the selected dates. */ | 202 | /** Create labels for the selected dates. */ |
202 | void createDayLabels(); | 203 | void createDayLabels(); |
203 | 204 | ||
204 | /** | 205 | /** |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index dd83d48..989f758 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -331,64 +331,64 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e) | |||
331 | } | 331 | } |
332 | 332 | ||
333 | void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) | 333 | void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) |
334 | { | 334 | { |
335 | 335 | ||
336 | int tmp = getDayIndexFrom(e->x(), e->y()); | 336 | int tmp = getDayIndexFrom(e->x(), e->y()); |
337 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; | 337 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; |
338 | 338 | ||
339 | if (mSelInit > tmp) { | 339 | if (mSelInit > tmp) { |
340 | mSelEnd = mSelInit; | 340 | mSelEnd = mSelInit; |
341 | if (tmp != mSelStart) { | 341 | if (tmp != mSelStart) { |
342 | mSelStart = tmp; | 342 | mSelStart = tmp; |
343 | repaint(); | 343 | repaint(false); |
344 | } | 344 | } |
345 | } else { | 345 | } else { |
346 | mSelStart = mSelInit; | 346 | mSelStart = mSelInit; |
347 | 347 | ||
348 | //repaint only if selection has changed | 348 | //repaint only if selection has changed |
349 | if (tmp != mSelEnd) { | 349 | if (tmp != mSelEnd) { |
350 | mSelEnd = tmp; | 350 | mSelEnd = tmp; |
351 | repaint(); | 351 | repaint(false); |
352 | } | 352 | } |
353 | } | 353 | } |
354 | 354 | ||
355 | DateList daylist; | 355 | DateList daylist; |
356 | if ( mSelStart < 0 ) | 356 | if ( mSelStart < 0 ) |
357 | mSelStart = 0; | 357 | mSelStart = 0; |
358 | for (int i = mSelStart; i <= mSelEnd; i++) { | 358 | for (int i = mSelStart; i <= mSelEnd; i++) { |
359 | daylist.append(days[i]); | 359 | daylist.append(days[i]); |
360 | } | 360 | } |
361 | emit selected((const DateList)daylist); | 361 | emit selected((const DateList)daylist); |
362 | 362 | ||
363 | } | 363 | } |
364 | 364 | ||
365 | void KODayMatrix::mouseMoveEvent (QMouseEvent* e) | 365 | void KODayMatrix::mouseMoveEvent (QMouseEvent* e) |
366 | { | 366 | { |
367 | int tmp = getDayIndexFrom(e->x(), e->y()); | 367 | int tmp = getDayIndexFrom(e->x(), e->y()); |
368 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; | 368 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; |
369 | 369 | ||
370 | if (mSelInit > tmp) { | 370 | if (mSelInit > tmp) { |
371 | mSelEnd = mSelInit; | 371 | mSelEnd = mSelInit; |
372 | if (tmp != mSelStart) { | 372 | if (tmp != mSelStart) { |
373 | mSelStart = tmp; | 373 | mSelStart = tmp; |
374 | repaint(); | 374 | repaint(false); |
375 | } | 375 | } |
376 | } else { | 376 | } else { |
377 | mSelStart = mSelInit; | 377 | mSelStart = mSelInit; |
378 | 378 | ||
379 | //repaint only if selection has changed | 379 | //repaint only if selection has changed |
380 | if (tmp != mSelEnd) { | 380 | if (tmp != mSelEnd) { |
381 | mSelEnd = tmp; | 381 | mSelEnd = tmp; |
382 | repaint(); | 382 | repaint(false); |
383 | } | 383 | } |
384 | } | 384 | } |
385 | } | 385 | } |
386 | 386 | ||
387 | // ---------------------------------------------------------------------------- | 387 | // ---------------------------------------------------------------------------- |
388 | // D R A G ' N D R O P H A N D L I N G | 388 | // D R A G ' N D R O P H A N D L I N G |
389 | // ---------------------------------------------------------------------------- | 389 | // ---------------------------------------------------------------------------- |
390 | 390 | ||
391 | void KODayMatrix::dragEnterEvent(QDragEnterEvent *e) | 391 | void KODayMatrix::dragEnterEvent(QDragEnterEvent *e) |
392 | { | 392 | { |
393 | #ifndef KORG_NODND | 393 | #ifndef KORG_NODND |
394 | if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) { | 394 | if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) { |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 188ad23..7e126d9 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -89,38 +89,40 @@ void KOViewManager::readSettings(KConfig *config) | |||
89 | QString view = config->readEntry("Current View"); | 89 | QString view = config->readEntry("Current View"); |
90 | if (view == "WhatsNext") showWhatsNextView(); | 90 | if (view == "WhatsNext") showWhatsNextView(); |
91 | else if (view == "Month") showMonthView(); | 91 | else if (view == "Month") showMonthView(); |
92 | else if (view == "List") showListView(); | 92 | else if (view == "List") showListView(); |
93 | else if (view == "Journal") showJournalView(); | 93 | else if (view == "Journal") showJournalView(); |
94 | else if (view == "TimeSpan") showTimeSpanView(); | 94 | else if (view == "TimeSpan") showTimeSpanView(); |
95 | else if (view == "Todo") showTodoView(); | 95 | else if (view == "Todo") showTodoView(); |
96 | else { | 96 | else { |
97 | showAgendaView(); | 97 | showAgendaView(); |
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
101 | |||
102 | void KOViewManager::showDateView( int view, QDate date) | 101 | void KOViewManager::showDateView( int view, QDate date) |
103 | { | 102 | { |
104 | 103 | static int lastMode = 0; | |
104 | static int lastCount = 0; | ||
105 | static bool lastNDMode = false; | ||
106 | static QDate lastDate; | ||
105 | //qDebug("date %d %s", view, date.toString().latin1()); | 107 | //qDebug("date %d %s", view, date.toString().latin1()); |
106 | #if 0 | 108 | |
107 | mNewItemPopup->insertItem ( SmallIcon( pathString +"day" ), i18n("Day view"),3 ); | 109 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); |
108 | mNewItemPopup->insertItem ( SmallIcon( pathString +"week" ), i18n("Next Week"),4 ); | 110 | bool savemFlagShowNextxDays = mFlagShowNextxDays; |
109 | mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Two Weeks"),5 ); | 111 | mFlagShowNextxDays = false; |
110 | mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Month"),6 ); | ||
111 | mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 ); | ||
112 | #endif | ||
113 | if ( view == 3 ) { | 112 | if ( view == 3 ) { |
114 | //mCurrentAgendaView = 1 ; | 113 | //mCurrentAgendaView = 1 ; |
114 | lastDate = mMainView->dateNavigator()->selectedDates().first(); | ||
115 | lastCount = mMainView->dateNavigator()->selectedDates().count(); | ||
116 | lastNDMode = savemFlagShowNextxDays; | ||
115 | mMainView->showDay( date ); | 117 | mMainView->showDay( date ); |
116 | } else if (view == 4 ) { | 118 | } else if (view == 4 ) { |
117 | mCurrentAgendaView = 7 ; | 119 | mCurrentAgendaView = 7 ; |
118 | mMainView->dateNavigator()->selectDates( date, 7 ); | 120 | mMainView->dateNavigator()->selectDates( date, 7 ); |
119 | } else if (view == 5 ) { | 121 | } else if (view == 5 ) { |
120 | mCurrentAgendaView = 14 ; | 122 | mCurrentAgendaView = 14 ; |
121 | mMainView->dateNavigator()->selectDates( date, 14); | 123 | mMainView->dateNavigator()->selectDates( date, 14); |
122 | } else if (view == 6 ) { | 124 | } else if (view == 6 ) { |
123 | mMainView->dateNavigator()->blockSignals( true ); | 125 | mMainView->dateNavigator()->blockSignals( true ); |
124 | showMonthView(); | 126 | showMonthView(); |
125 | mMainView->dateNavigator()->selectMonthByDate( date ); | 127 | mMainView->dateNavigator()->selectMonthByDate( date ); |
126 | mMainView->dateNavigator()->blockSignals( false ); | 128 | mMainView->dateNavigator()->blockSignals( false ); |
@@ -129,37 +131,38 @@ void KOViewManager::showDateView( int view, QDate date) | |||
129 | mMainView->dateNavigator()->selectDate( date ); | 131 | mMainView->dateNavigator()->selectDate( date ); |
130 | showJournalView(); | 132 | showJournalView(); |
131 | } else if (view == 8 ) { | 133 | } else if (view == 8 ) { |
132 | globalFlagBlockAgenda = 1; | 134 | globalFlagBlockAgenda = 1; |
133 | if ( mCurrentAgendaView != 3 ) | 135 | if ( mCurrentAgendaView != 3 ) |
134 | mCurrentAgendaView = -1; | 136 | mCurrentAgendaView = -1; |
135 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 137 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
136 | globalFlagBlockAgenda = 2; | 138 | globalFlagBlockAgenda = 2; |
137 | mMainView->dateNavigator()->selectDates( date , | 139 | mMainView->dateNavigator()->selectDates( date , |
138 | KOPrefs::instance()->mNextXDays ); | 140 | KOPrefs::instance()->mNextXDays ); |
139 | mFlagShowNextxDays = true; | 141 | mFlagShowNextxDays = true; |
140 | mCurrentAgendaView = 3 ; | 142 | mCurrentAgendaView = 3 ; |
141 | } if (view == 9) { | 143 | } if (view == 9) { // return behaviour, for getting back from mode == 3 (single day mode ) |
142 | showWeekView(); | 144 | if ( lastMode ) { |
145 | mCurrentAgendaView = lastCount ; | ||
146 | mMainView->dateNavigator()->selectDates( lastDate, lastCount); | ||
147 | mFlagShowNextxDays = lastNDMode; | ||
148 | if ( mFlagShowNextxDays ) { | ||
149 | mCurrentAgendaView = 3 ; | ||
150 | } | ||
151 | } else | ||
152 | showWeekView(); | ||
143 | } else if (view == 10) { | 153 | } else if (view == 10) { |
144 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); | 154 | mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() ); |
145 | } | 155 | } |
146 | 156 | lastMode = view; | |
147 | #if 0 | ||
148 | dateNavigator()->blockSignals( true ); | ||
149 | dateNavigator()->selectDate( d ); | ||
150 | dateNavigator()->blockSignals( false ); | ||
151 | mViewManager->showDayView(); | ||
152 | #endif | ||
153 | |||
154 | } | 157 | } |
155 | 158 | ||
156 | 159 | ||
157 | 160 | ||
158 | void KOViewManager::writeSettings(KConfig *config) | 161 | void KOViewManager::writeSettings(KConfig *config) |
159 | { | 162 | { |
160 | config->setGroup("General"); | 163 | config->setGroup("General"); |
161 | 164 | ||
162 | QString view; | 165 | QString view; |
163 | if (mCurrentView == mWhatsNextView) view = "WhatsNext"; | 166 | if (mCurrentView == mWhatsNextView) view = "WhatsNext"; |
164 | else if (mCurrentView == mMonthView) view = "Month"; | 167 | else if (mCurrentView == mMonthView) view = "Month"; |
165 | else if (mCurrentView == mListView) view = "List"; | 168 | else if (mCurrentView == mListView) view = "List"; |