author | zautrix <zautrix> | 2005-02-06 13:44:49 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-06 13:44:49 (UTC) |
commit | 26b0c69fb3b11c29475ec02b2cfe52e33eb24e5f (patch) (unidiff) | |
tree | 34c4f5e6b2d77dc1210822e1539d9516842b5691 /korganizer | |
parent | 118f5aab05c9ace5612d5c4fd69e7c5a59bed67b (diff) | |
download | kdepimpi-26b0c69fb3b11c29475ec02b2cfe52e33eb24e5f.zip kdepimpi-26b0c69fb3b11c29475ec02b2cfe52e33eb24e5f.tar.gz kdepimpi-26b0c69fb3b11c29475ec02b2cfe52e33eb24e5f.tar.bz2 |
many small fixes
-rw-r--r-- | korganizer/koeditorgeneraltodo.cpp | 5 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 10 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 61 | ||||
-rw-r--r-- | korganizer/komonthview.h | 6 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 3 |
5 files changed, 44 insertions, 41 deletions
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index cd78f54..ce66863 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp | |||
@@ -151,26 +151,29 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout) | |||
151 | mCompletedLabel = new QLabel(i18n("completed"),parent); | 151 | mCompletedLabel = new QLabel(i18n("completed"),parent); |
152 | topLayout->addWidget(mCompletedLabel); | 152 | topLayout->addWidget(mCompletedLabel); |
153 | 153 | ||
154 | mCompleteDateEdit = new KDateEdit(parent); | 154 | mCompleteDateEdit = new KDateEdit(parent); |
155 | topLayout->addWidget(mCompleteDateEdit ); | 155 | topLayout->addWidget(mCompleteDateEdit ); |
156 | 156 | ||
157 | mCompleteTimeEdit = new KOTimeEdit(parent); | 157 | mCompleteTimeEdit = new KOTimeEdit(parent); |
158 | topLayout->addWidget( mCompleteTimeEdit); | 158 | topLayout->addWidget( mCompleteTimeEdit); |
159 | 159 | ||
160 | mCompletedCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,QSizePolicy::Preferred) ); | 160 | mCompletedCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,QSizePolicy::Preferred) ); |
161 | mCompletedLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred) ); | 161 | mCompletedLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred) ); |
162 | 162 | ||
163 | if ( QApplication::desktop()->width() < 320 ) { | 163 | if ( QApplication::desktop()->width() <= 480 ) { |
164 | if ( QApplication::desktop()->width() < 320 ) | ||
164 | mCompleteDateEdit->setMaximumWidth( 85 ); | 165 | mCompleteDateEdit->setMaximumWidth( 85 ); |
166 | else | ||
167 | mCompleteDateEdit->setMaximumWidth( 130 ); | ||
165 | topLayout->setSpacing( 0 ); | 168 | topLayout->setSpacing( 0 ); |
166 | } | 169 | } |
167 | } | 170 | } |
168 | 171 | ||
169 | void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout) | 172 | void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout) |
170 | { | 173 | { |
171 | 174 | ||
172 | QHBox* h = new QHBox ( parent ); | 175 | QHBox* h = new QHBox ( parent ); |
173 | topLayout->addWidget( h ); | 176 | topLayout->addWidget( h ); |
174 | QLabel *priorityLabel = new QLabel(i18n("Priority:"), h); | 177 | QLabel *priorityLabel = new QLabel(i18n("Priority:"), h); |
175 | // topLayout->addWidget(priorityLabel); | 178 | // topLayout->addWidget(priorityLabel); |
176 | mPriorityCombo = new QComboBox( h ); | 179 | mPriorityCombo = new QComboBox( h ); |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 2faf18f..de11c13 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -412,25 +412,25 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
412 | addTag("p",i18n("<b>Details: </b>")); | 412 | addTag("p",i18n("<b>Details: </b>")); |
413 | addTag("p",event->description()); | 413 | addTag("p",event->description()); |
414 | } | 414 | } |
415 | 415 | ||
416 | formatCategories(event); | 416 | formatCategories(event); |
417 | 417 | ||
418 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 418 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
419 | .arg(QString::number(event->priority()))); | 419 | .arg(QString::number(event->priority()))); |
420 | 420 | ||
421 | formatReadOnly(event); | 421 | formatReadOnly(event); |
422 | formatAttendees(event); | 422 | formatAttendees(event); |
423 | if ( event->relatedTo() ) { | 423 | if ( event->relatedTo() ) { |
424 | addTag("b",i18n("Parent todo: ")); | 424 | addTag("b",i18n("Parent todo:<br>")); |
425 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 425 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); |
426 | } | 426 | } |
427 | QPtrList<Incidence> Relations = event->relations(); | 427 | QPtrList<Incidence> Relations = event->relations(); |
428 | Incidence *to; | 428 | Incidence *to; |
429 | if ( Relations.first() ) | 429 | if ( Relations.first() ) |
430 | addTag("b",i18n("Sub todos:<br>")); | 430 | addTag("b",i18n("Sub todos:<br>")); |
431 | for (to=Relations.first();to;to=Relations.next()) { | 431 | for (to=Relations.first();to;to=Relations.next()) { |
432 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); | 432 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); |
433 | 433 | ||
434 | } | 434 | } |
435 | setText(mText); | 435 | setText(mText); |
436 | } | 436 | } |
@@ -525,57 +525,57 @@ void KOEventViewer::formatAttendees(Incidence *event) | |||
525 | //qDebug("nokabc "); | 525 | //qDebug("nokabc "); |
526 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; | 526 | mText += "<li><a href=\"uid:" + a->uid() + "\">"; |
527 | if (!a->name().isEmpty()) mText += a->name(); | 527 | if (!a->name().isEmpty()) mText += a->name(); |
528 | else mText += a->email(); | 528 | else mText += a->email(); |
529 | mText += "</a>\n"; | 529 | mText += "</a>\n"; |
530 | #endif | 530 | #endif |
531 | 531 | ||
532 | 532 | ||
533 | if (!a->email().isEmpty()) { | 533 | if (!a->email().isEmpty()) { |
534 | if (iconPath) { | 534 | if (iconPath) { |
535 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; | 535 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; |
536 | if ( a->RSVP() ) { | 536 | if ( a->RSVP() ) { |
537 | ++a_count; | 537 | ++a_count_nr; |
538 | mText += "<IMG src=\"" + iconPath + "\">"; | 538 | mText += "<IMG src=\"" + iconPath + "\">"; |
539 | } | 539 | } |
540 | else { | 540 | else { |
541 | ++a_count_nr; | 541 | ++a_count; |
542 | mText += "<IMG src=\"" + NOiconPath + "\">"; | 542 | mText += "<IMG src=\"" + NOiconPath + "\">"; |
543 | } | 543 | } |
544 | mText += "</a>\n"; | 544 | mText += "</a>\n"; |
545 | } | 545 | } |
546 | } | 546 | } |
547 | if (a->status() != Attendee::NeedsAction ) | 547 | if (a->status() != Attendee::NeedsAction ) |
548 | mText +="[" + a->statusStr() + "] "; | 548 | mText +="[" + a->statusStr() + "] "; |
549 | if (a->role() == Attendee::Chair ) | 549 | if (a->role() == Attendee::Chair ) |
550 | mText +="(" + a->roleStr().left(1) + ".)"; | 550 | mText +="(" + a->roleStr().left(1) + ".)"; |
551 | } | 551 | } |
552 | mText.append("</li></ul>"); | 552 | mText.append("</li></ul>"); |
553 | if ( a_count > 1 ) { | 553 | if ( (a_count+a_count_nr) > 1 ) { |
554 | mText += "<a href=\"mailto:ALL\">"; | 554 | mText += "<a href=\"mailto:ALL\">"; |
555 | mText += i18n( "Mail to all" ); | 555 | mText += i18n( "Mail to all" ); |
556 | mText += "</a> ( "; | 556 | mText += "</a> ( "; |
557 | mText += "<IMG src=\"" + iconPath + "\">"; | 557 | mText += "<IMG src=\"" + iconPath + "\">"; |
558 | mText += i18n( " and " ); | 558 | mText += i18n( " and " ); |
559 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; | 559 | mText += "<IMG src=\"" + NOiconPath + "\"> )"; |
560 | mText += "<br>\n"; | 560 | mText += "<br>\n"; |
561 | 561 | ||
562 | 562 | ||
563 | } | 563 | } |
564 | if ( a_count_nr > 1 ) { | 564 | if ( a_count_nr > 1 ) { |
565 | mText += "<a href=\"mailto:RSVP\">"; | 565 | mText += "<a href=\"mailto:RSVP\">"; |
566 | mText += i18n( "Mail to selected" ); | 566 | mText += i18n( "Mail to selected" ); |
567 | mText += "</a> ( "; | 567 | mText += "</a> ( "; |
568 | mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath ); | 568 | mText += i18n( "<IMG src=\"%1\"> only )").arg ( iconPath ); |
569 | mText += "\n"; | 569 | mText += "<br>\n"; |
570 | } | 570 | } |
571 | } | 571 | } |
572 | 572 | ||
573 | } | 573 | } |
574 | void KOEventViewer::appendJournal(Journal *jour, int mode ) | 574 | void KOEventViewer::appendJournal(Journal *jour, int mode ) |
575 | { | 575 | { |
576 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 576 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
577 | if (mode == 0 ) { | 577 | if (mode == 0 ) { |
578 | addTag("h2",i18n("Journal from: ")); | 578 | addTag("h2",i18n("Journal from: ")); |
579 | } | 579 | } |
580 | else { | 580 | else { |
581 | if ( mode == 1 ) { | 581 | if ( mode == 1 ) { |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 65accdc..5926abe 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -786,47 +786,48 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
786 | mMonthView->setSelectedCell( this ); | 786 | mMonthView->setSelectedCell( this ); |
787 | } | 787 | } |
788 | 788 | ||
789 | 789 | ||
790 | // ******************************************************************************* | 790 | // ******************************************************************************* |
791 | // ******************************************************************************* | 791 | // ******************************************************************************* |
792 | // ******************************************************************************* | 792 | // ******************************************************************************* |
793 | 793 | ||
794 | 794 | ||
795 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | 795 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) |
796 | : KOEventView( calendar, parent, name ), | 796 | : KOEventView( calendar, parent, name ), |
797 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), | 797 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), |
798 | mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) | 798 | mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) |
799 | { | 799 | { |
800 | 800 | ignoreResizeEvent = 0; | |
801 | mShortDayLabelsW = false; | ||
802 | mShortDayLabelsM = false; | ||
801 | clPending = true; | 803 | clPending = true; |
802 | mWidStack = new QWidgetStack( this ); | 804 | mWidStack = new QWidgetStack( this ); |
803 | QHBoxLayout* hb = new QHBoxLayout( this ); | 805 | QHBoxLayout* hb = new QHBoxLayout( this ); |
804 | mMonthView = new QWidget( mWidStack ); | 806 | mMonthView = new QWidget( mWidStack ); |
805 | mWeekView = new QWidget( mWidStack ); | 807 | mWeekView = new QWidget( mWidStack ); |
806 | #if QT_VERSION >= 0x030000 | 808 | #if QT_VERSION >= 0x030000 |
807 | mWidStack->addWidget(mMonthView ); | 809 | mWidStack->addWidget(mMonthView ); |
808 | mWidStack->addWidget(mWeekView ); | 810 | mWidStack->addWidget(mWeekView ); |
809 | #else | 811 | #else |
810 | mWidStack->addWidget( mMonthView, 1 ); | 812 | mWidStack->addWidget( mMonthView, 1 ); |
811 | mWidStack->addWidget( mWeekView , 1 ); | 813 | mWidStack->addWidget( mWeekView , 1 ); |
812 | #endif | 814 | #endif |
813 | hb->addWidget( mWidStack ); | 815 | hb->addWidget( mWidStack ); |
814 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); | 816 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); |
815 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; | 817 | mShowWeekView = KOPrefs::instance()->mMonthViewWeek; |
816 | if ( mShowWeekView ) | 818 | if ( mShowWeekView ) |
817 | mWeekStartsMonday = true; | 819 | mWeekStartsMonday = true; |
818 | updatePossible = false; | 820 | updatePossible = false; |
819 | mCells.setAutoDelete( true ); | 821 | mCells.setAutoDelete( true ); |
820 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; | ||
821 | mDayLabels.resize( mDaysPerWeek ); | 822 | mDayLabels.resize( mDaysPerWeek ); |
822 | mDayLabelsW.resize( mDaysPerWeek ); | 823 | mDayLabelsW.resize( mDaysPerWeek ); |
823 | QFont bfont = font(); | 824 | QFont bfont = font(); |
824 | if ( QApplication::desktop()->width() < 650 ) { | 825 | if ( QApplication::desktop()->width() < 650 ) { |
825 | bfont.setPointSize( bfont.pointSize() - 2 ); | 826 | bfont.setPointSize( bfont.pointSize() - 2 ); |
826 | } | 827 | } |
827 | bfont.setBold( true ); | 828 | bfont.setBold( true ); |
828 | int i; | 829 | int i; |
829 | 830 | ||
830 | for( i = 0; i < mDaysPerWeek; i++ ) { | 831 | for( i = 0; i < mDaysPerWeek; i++ ) { |
831 | QLabel *label = new QLabel( mMonthView ); | 832 | QLabel *label = new QLabel( mMonthView ); |
832 | label->setFont(bfont); | 833 | label->setFont(bfont); |
@@ -897,32 +898,28 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | |||
897 | 898 | ||
898 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), | 899 | connect( cell, SIGNAL( defaultAction( Incidence * ) ), |
899 | SLOT( defaultAction( Incidence * ) ) ); | 900 | SLOT( defaultAction( Incidence * ) ) ); |
900 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), | 901 | connect( cell, SIGNAL( newEventSignal( QDateTime ) ), |
901 | SIGNAL( newEventSignal( QDateTime ) ) ); | 902 | SIGNAL( newEventSignal( QDateTime ) ) ); |
902 | connect( cell, SIGNAL( showDaySignal( QDate ) ), | 903 | connect( cell, SIGNAL( showDaySignal( QDate ) ), |
903 | SIGNAL( showDaySignal( QDate ) ) ); | 904 | SIGNAL( showDaySignal( QDate ) ) ); |
904 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); | 905 | cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont ); |
905 | } | 906 | } |
906 | 907 | ||
907 | //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); | 908 | //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) ); |
908 | mContextMenu = eventPopup(); | 909 | mContextMenu = eventPopup(); |
909 | // updateConfig(); //useless here | 910 | updateConfig(); //useless here |
910 | 911 | ||
911 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); | 912 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); |
912 | #if 0 | 913 | |
913 | mWidStack = new QWidgetStack( this ); | ||
914 | mMonthView = new QWidget( mWidStack ); | ||
915 | mWeekView = new QWidget( mWidStack ); | ||
916 | #endif | ||
917 | if ( mShowWeekView ) | 914 | if ( mShowWeekView ) |
918 | mWidStack->raiseWidget( mWeekView ); | 915 | mWidStack->raiseWidget( mWeekView ); |
919 | else | 916 | else |
920 | mWidStack->raiseWidget( mMonthView ); | 917 | mWidStack->raiseWidget( mMonthView ); |
921 | 918 | ||
922 | emit incidenceSelected( 0 ); | 919 | emit incidenceSelected( 0 ); |
923 | } | 920 | } |
924 | 921 | ||
925 | KOMonthView::~KOMonthView() | 922 | KOMonthView::~KOMonthView() |
926 | { | 923 | { |
927 | delete mContextMenu; | 924 | delete mContextMenu; |
928 | } | 925 | } |
@@ -1001,33 +998,30 @@ void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd, | |||
1001 | } | 998 | } |
1002 | 999 | ||
1003 | void KOMonthView::updateConfig() | 1000 | void KOMonthView::updateConfig() |
1004 | { | 1001 | { |
1005 | 1002 | ||
1006 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); | 1003 | mWeekStartsMonday = KGlobal::locale()->weekStartsMonday(); |
1007 | 1004 | ||
1008 | if ( mShowWeekView ) { | 1005 | if ( mShowWeekView ) { |
1009 | mWeekStartsMonday = true; | 1006 | mWeekStartsMonday = true; |
1010 | } | 1007 | } |
1011 | QFontMetrics fontmetric(mDayLabels[0]->font()); | 1008 | QFontMetrics fontmetric(mDayLabels[0]->font()); |
1012 | mWidthLongDayLabel = 0; | 1009 | mWidthLongDayLabel = 0; |
1013 | 1010 | qDebug("KOMonthView::updateConfig() "); | |
1014 | for (int i = 0; i < 7; i++) { | 1011 | for (int i = 0; i < 7; i++) { |
1015 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); | 1012 | int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1)); |
1016 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; | 1013 | if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width; |
1017 | } | 1014 | } |
1018 | bool temp = mShowSatSunComp ; | ||
1019 | mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ; | ||
1020 | if ( ! mShowWeekView ) { | 1015 | if ( ! mShowWeekView ) { |
1021 | if ( temp != KOPrefs::instance()->mMonthViewSatSunTog ) | ||
1022 | computeLayout(); | 1016 | computeLayout(); |
1023 | } | 1017 | } |
1024 | updateDayLabels(); | 1018 | updateDayLabels(); |
1025 | //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks); | 1019 | //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks); |
1026 | //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; | 1020 | //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks; |
1027 | //resizeEvent( 0 ); | 1021 | //resizeEvent( 0 ); |
1028 | for (uint i = 0; i < mCells.count(); ++i) { | 1022 | for (uint i = 0; i < mCells.count(); ++i) { |
1029 | mCells[i]->updateConfig(); | 1023 | mCells[i]->updateConfig(); |
1030 | } | 1024 | } |
1031 | 1025 | ||
1032 | for (uint i = 0; i < mCellsW.count(); ++i) { | 1026 | for (uint i = 0; i < mCellsW.count(); ++i) { |
1033 | mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont); | 1027 | mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont); |
@@ -1039,48 +1033,48 @@ void KOMonthView::updateConfig() | |||
1039 | } | 1033 | } |
1040 | 1034 | ||
1041 | void KOMonthView::updateDayLabels() | 1035 | void KOMonthView::updateDayLabels() |
1042 | { | 1036 | { |
1043 | 1037 | ||
1044 | QPtrVector<QLabel> *mDayLabelsT; | 1038 | QPtrVector<QLabel> *mDayLabelsT; |
1045 | #if 0 | 1039 | #if 0 |
1046 | if (mShowWeekView ) | 1040 | if (mShowWeekView ) |
1047 | mDayLabelsT = &mDayLabelsW; | 1041 | mDayLabelsT = &mDayLabelsW; |
1048 | else | 1042 | else |
1049 | mDayLabelsT = &mDayLabels; | 1043 | mDayLabelsT = &mDayLabels; |
1050 | #endif | 1044 | #endif |
1051 | 1045 | qDebug("updateDayLabels W %d M %d ",mShortDayLabelsW ,mShortDayLabelsM); | |
1052 | mDayLabelsT = &mDayLabelsW; | 1046 | mDayLabelsT = &mDayLabelsW; |
1053 | for (int i = 0; i < 7; i++) { | 1047 | for (int i = 0; i < 7; i++) { |
1054 | if (mWeekStartsMonday) { | 1048 | if (mWeekStartsMonday) { |
1055 | bool show = mShortDayLabels; | 1049 | bool show = mShortDayLabelsW; |
1056 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1050 | if ( i > 4 && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1057 | show = true; | 1051 | show = true; |
1058 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1052 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1059 | } else { | 1053 | } else { |
1060 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); | 1054 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW)); |
1061 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); | 1055 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW)); |
1062 | 1056 | ||
1063 | } | 1057 | } |
1064 | } | 1058 | } |
1065 | mDayLabelsT = &mDayLabels; | 1059 | mDayLabelsT = &mDayLabels; |
1066 | for (int i = 0; i < 7; i++) { | 1060 | for (int i = 0; i < 7; i++) { |
1067 | if (mWeekStartsMonday) { | 1061 | if (mWeekStartsMonday) { |
1068 | bool show = mShortDayLabels; | 1062 | bool show = mShortDayLabelsM; |
1069 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1063 | if ( i > 4 && KOPrefs::instance()->mMonthViewSatSunTog && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1070 | show = true; | 1064 | show = true; |
1071 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1065 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1072 | } else { | 1066 | } else { |
1073 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); | 1067 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM)); |
1074 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); | 1068 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM)); |
1075 | 1069 | ||
1076 | } | 1070 | } |
1077 | } | 1071 | } |
1078 | 1072 | ||
1079 | } | 1073 | } |
1080 | 1074 | ||
1081 | void KOMonthView::showDates(const QDate &start, const QDate &) | 1075 | void KOMonthView::showDates(const QDate &start, const QDate &) |
1082 | { | 1076 | { |
1083 | // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl; | 1077 | // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl; |
1084 | 1078 | ||
1085 | QPtrVector<MonthViewCell> *cells; | 1079 | QPtrVector<MonthViewCell> *cells; |
1086 | QPtrVector<QLabel> *dayLabels; | 1080 | QPtrVector<QLabel> *dayLabels; |
@@ -1260,55 +1254,57 @@ void KOMonthView::updateView() | |||
1260 | 1254 | ||
1261 | //qDebug("KOMonthView::updateView() "); | 1255 | //qDebug("KOMonthView::updateView() "); |
1262 | processSelectionChange(); | 1256 | processSelectionChange(); |
1263 | // qDebug("---------------------------------------------------------------------+ "); | 1257 | // qDebug("---------------------------------------------------------------------+ "); |
1264 | (*cells)[0]->setFocus(); | 1258 | (*cells)[0]->setFocus(); |
1265 | #endif | 1259 | #endif |
1266 | 1260 | ||
1267 | //qDebug("update time %d ", ti.elapsed()); | 1261 | //qDebug("update time %d ", ti.elapsed()); |
1268 | } | 1262 | } |
1269 | 1263 | ||
1270 | void KOMonthView::resizeEvent(QResizeEvent * e) | 1264 | void KOMonthView::resizeEvent(QResizeEvent * e) |
1271 | { | 1265 | { |
1266 | qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height()); | ||
1267 | if ( ignoreResizeEvent ) { | ||
1268 | qDebug("KOMonthView::resizeEvent ignored "); | ||
1269 | --ignoreResizeEvent; | ||
1270 | return; | ||
1271 | } | ||
1272 | if ( e->size().width()+ e->size().height() < 240 ) | ||
1273 | return; | ||
1272 | computeLayout(); | 1274 | computeLayout(); |
1273 | clPending = true; | 1275 | clPending = true; |
1274 | if ( mShowWeekView ) | 1276 | if ( mShowWeekView ) |
1275 | mCellsW[0]->setFocus(); | 1277 | mCellsW[0]->setFocus(); |
1276 | else | 1278 | else |
1277 | mCells[0]->setFocus(); | 1279 | mCells[0]->setFocus(); |
1278 | } | 1280 | } |
1279 | void KOMonthView::computeLayoutWeek() | 1281 | void KOMonthView::computeLayoutWeek() |
1280 | { | 1282 | { |
1281 | 1283 | ||
1282 | int daysToShow; | 1284 | int daysToShow; |
1283 | bool combinedSatSun = false; | ||
1284 | if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) { | ||
1285 | daysToShow = 6; | ||
1286 | combinedSatSun = true; | ||
1287 | } | ||
1288 | int tWid = topLevelWidget()->size().width(); | 1285 | int tWid = topLevelWidget()->size().width(); |
1289 | int tHei = topLevelWidget()->size().height(); | 1286 | int tHei = topLevelWidget()->size().height(); |
1290 | 1287 | ||
1291 | int wid = size().width();//e | 1288 | int wid = size().width();//e |
1292 | int hei = size().height()-1; | 1289 | int hei = size().height()-1; |
1293 | 1290 | ||
1294 | if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei ) | 1291 | if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei ) |
1295 | return; | 1292 | return; |
1296 | 1293 | ||
1297 | if ( wid < hei ) | 1294 | if ( wid < hei ) |
1298 | daysToShow = 2; | 1295 | daysToShow = 2; |
1299 | else | 1296 | else |
1300 | daysToShow = 3; | 1297 | daysToShow = 3; |
1301 | mShowSatSunComp = true; | 1298 | bool combinedSatSun = true; |
1302 | combinedSatSun = true; | ||
1303 | 1299 | ||
1304 | //qDebug("KOMonthView::computeLayout()------------------------------------ "); | 1300 | //qDebug("KOMonthView::computeLayout()------------------------------------ "); |
1305 | QFontMetrics fm ( mWeekLabels[0]->font() ); | 1301 | QFontMetrics fm ( mWeekLabels[0]->font() ); |
1306 | int weeklabelwid = fm.width( "888" ); | 1302 | int weeklabelwid = fm.width( "888" ); |
1307 | wid -= weeklabelwid; | 1303 | wid -= weeklabelwid; |
1308 | 1304 | ||
1309 | int colWid = wid / daysToShow; | 1305 | int colWid = wid / daysToShow; |
1310 | int lastCol = wid - ( colWid*6 ); | 1306 | int lastCol = wid - ( colWid*6 ); |
1311 | int dayLabelHei = mDayLabelsW[0]->sizeHint().height(); | 1307 | int dayLabelHei = mDayLabelsW[0]->sizeHint().height(); |
1312 | int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); | 1308 | int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); |
1313 | int colModulo = wid % daysToShow; | 1309 | int colModulo = wid % daysToShow; |
1314 | int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1; | 1310 | int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1; |
@@ -1371,45 +1367,45 @@ void KOMonthView::computeLayoutWeek() | |||
1371 | x += w; | 1367 | x += w; |
1372 | if ( x + w/2 > wid ) { | 1368 | if ( x + w/2 > wid ) { |
1373 | x = 0; | 1369 | x = 0; |
1374 | y += h+dayLabelHei ; | 1370 | y += h+dayLabelHei ; |
1375 | } | 1371 | } |
1376 | } | 1372 | } |
1377 | y= dayLabelHei; | 1373 | y= dayLabelHei; |
1378 | h = cellHei ; | 1374 | h = cellHei ; |
1379 | mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei); | 1375 | mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei); |
1380 | mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei); | 1376 | mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei); |
1381 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); | 1377 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); |
1382 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); | 1378 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); |
1383 | mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ; | 1379 | mShortDayLabelsW = mDayLabelsW[0]->width() < mWidthLongDayLabel ; |
1384 | updateDayLabels(); | 1380 | updateDayLabels(); |
1385 | bool forceUpdate = !updatePossible; | 1381 | bool forceUpdate = !updatePossible; |
1386 | updatePossible = true; | 1382 | updatePossible = true; |
1387 | //mWeekLabels[mNumWeeks]->setText( i18n("M")); | 1383 | //mWeekLabels[mNumWeeks]->setText( i18n("M")); |
1388 | if ( forceUpdate ) | 1384 | if ( forceUpdate ) |
1389 | updateView(); | 1385 | updateView(); |
1390 | } | 1386 | } |
1391 | void KOMonthView::computeLayout() | 1387 | void KOMonthView::computeLayout() |
1392 | { | 1388 | { |
1393 | // select the appropriate heading string size. E.g. "Wednesday" or "Wed". | 1389 | // select the appropriate heading string size. E.g. "Wednesday" or "Wed". |
1394 | // note this only changes the text if the requested size crosses the | 1390 | // note this only changes the text if the requested size crosses the |
1395 | // threshold between big enough to support the full name and not big | 1391 | // threshold between big enough to support the full name and not big |
1396 | // enough. | 1392 | // enough. |
1397 | if ( mShowWeekView ){ | 1393 | if ( mShowWeekView ){ |
1398 | computeLayoutWeek(); | 1394 | computeLayoutWeek(); |
1399 | return; | 1395 | return; |
1400 | } | 1396 | } |
1401 | int daysToShow = 7; | 1397 | int daysToShow = 7; |
1402 | bool combinedSatSun = false; | 1398 | bool combinedSatSun = false; |
1403 | if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) { | 1399 | if (KOPrefs::instance()->mMonthViewSatSunTog ) { |
1404 | daysToShow = 6; | 1400 | daysToShow = 6; |
1405 | combinedSatSun = true; | 1401 | combinedSatSun = true; |
1406 | } | 1402 | } |
1407 | int tWid = topLevelWidget()->size().width(); | 1403 | int tWid = topLevelWidget()->size().width(); |
1408 | int tHei = topLevelWidget()->size().height(); | 1404 | int tHei = topLevelWidget()->size().height(); |
1409 | 1405 | ||
1410 | int wid = size().width();//e | 1406 | int wid = size().width();//e |
1411 | int hei = size().height()-1; | 1407 | int hei = size().height()-1; |
1412 | 1408 | ||
1413 | if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei ) | 1409 | if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei ) |
1414 | return; | 1410 | return; |
1415 | //qDebug("KOMonthView::computeLayout()------------------------------------ "); | 1411 | //qDebug("KOMonthView::computeLayout()------------------------------------ "); |
@@ -1478,25 +1474,26 @@ void KOMonthView::computeLayout() | |||
1478 | } | 1474 | } |
1479 | y= dayLabelHei; | 1475 | y= dayLabelHei; |
1480 | h = cellHei ; | 1476 | h = cellHei ; |
1481 | for ( i = 0; i < 6; i++) { | 1477 | for ( i = 0; i < 6; i++) { |
1482 | if ( i == (6-rowModulo)) | 1478 | if ( i == (6-rowModulo)) |
1483 | ++h; | 1479 | ++h; |
1484 | mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h); | 1480 | mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h); |
1485 | y += h; | 1481 | y += h; |
1486 | } | 1482 | } |
1487 | mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei); | 1483 | mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei); |
1488 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); | 1484 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); |
1489 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); | 1485 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); |
1490 | mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ; | 1486 | mShortDayLabelsM = mDayLabels[0]->width() < mWidthLongDayLabel ; |
1487 | qDebug("dlwid %d %d ",mDayLabels[0]->width() , mWidthLongDayLabel); | ||
1491 | updateDayLabels(); | 1488 | updateDayLabels(); |
1492 | bool forceUpdate = !updatePossible; | 1489 | bool forceUpdate = !updatePossible; |
1493 | updatePossible = true; | 1490 | updatePossible = true; |
1494 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); | 1491 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); |
1495 | if ( forceUpdate ) | 1492 | if ( forceUpdate ) |
1496 | updateView(); | 1493 | updateView(); |
1497 | } | 1494 | } |
1498 | 1495 | ||
1499 | void KOMonthView::showContextMenu( Incidence *incidence ) | 1496 | void KOMonthView::showContextMenu( Incidence *incidence ) |
1500 | { | 1497 | { |
1501 | mContextMenu->showIncidencePopup(incidence); | 1498 | mContextMenu->showIncidencePopup(incidence); |
1502 | /* | 1499 | /* |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 51eb9e6..9dbe319 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -217,24 +217,25 @@ class KOMonthView: public KOEventView | |||
217 | virtual int currentDateCount(); | 217 | virtual int currentDateCount(); |
218 | 218 | ||
219 | /** returns the currently selected events */ | 219 | /** returns the currently selected events */ |
220 | virtual QPtrList<Incidence> selectedIncidences(); | 220 | virtual QPtrList<Incidence> selectedIncidences(); |
221 | 221 | ||
222 | /** returns dates of the currently selected events */ | 222 | /** returns dates of the currently selected events */ |
223 | virtual DateList selectedDates(); | 223 | virtual DateList selectedDates(); |
224 | 224 | ||
225 | virtual void printPreview(CalPrinter *calPrinter, | 225 | virtual void printPreview(CalPrinter *calPrinter, |
226 | const QDate &, const QDate &); | 226 | const QDate &, const QDate &); |
227 | bool isMonthView() { return true; } | 227 | bool isMonthView() { return true; } |
228 | bool isUpdatePossible() { return updatePossible; } | 228 | bool isUpdatePossible() { return updatePossible; } |
229 | void setIgnoreResizeEvent( int c ) { ignoreResizeEvent = c ;} | ||
229 | 230 | ||
230 | MonthViewCell * selectedCell(); | 231 | MonthViewCell * selectedCell(); |
231 | public slots: | 232 | public slots: |
232 | virtual void updateView(); | 233 | virtual void updateView(); |
233 | virtual void updateConfig(); | 234 | virtual void updateConfig(); |
234 | virtual void showDates(const QDate &start, const QDate &end); | 235 | virtual void showDates(const QDate &start, const QDate &end); |
235 | virtual void showEvents(QPtrList<Event> eventList); | 236 | virtual void showEvents(QPtrList<Event> eventList); |
236 | 237 | ||
237 | void changeEventDisplay(Event *, int); | 238 | void changeEventDisplay(Event *, int); |
238 | 239 | ||
239 | void clearSelection(); | 240 | void clearSelection(); |
240 | 241 | ||
@@ -249,47 +250,48 @@ class KOMonthView: public KOEventView | |||
249 | signals: | 250 | signals: |
250 | void nextMonth(); | 251 | void nextMonth(); |
251 | void prevMonth(); | 252 | void prevMonth(); |
252 | void showNavigator( bool ); | 253 | void showNavigator( bool ); |
253 | void selectWeekNum ( int ); | 254 | void selectWeekNum ( int ); |
254 | void showDaySignal( QDate ); | 255 | void showDaySignal( QDate ); |
255 | protected: | 256 | protected: |
256 | void resizeEvent(QResizeEvent *); | 257 | void resizeEvent(QResizeEvent *); |
257 | void viewChanged(); | 258 | void viewChanged(); |
258 | void updateDayLabels(); | 259 | void updateDayLabels(); |
259 | 260 | ||
260 | private: | 261 | private: |
262 | int ignoreResizeEvent; | ||
261 | int currentWeek(); | 263 | int currentWeek(); |
262 | bool clPending; | 264 | bool clPending; |
263 | QWidgetStack * mWidStack; | 265 | QWidgetStack * mWidStack; |
264 | QWidget* mMonthView; | 266 | QWidget* mMonthView; |
265 | QWidget* mWeekView; | 267 | QWidget* mWeekView; |
266 | bool mShowWeekView; | 268 | bool mShowWeekView; |
267 | bool updatePossible; | 269 | bool updatePossible; |
268 | int mDaysPerWeek; | 270 | int mDaysPerWeek; |
269 | int mNumWeeks; | 271 | int mNumWeeks; |
270 | int mNumCells; | 272 | int mNumCells; |
271 | bool mWeekStartsMonday; | 273 | bool mWeekStartsMonday; |
272 | bool mShowSatSunComp; | ||
273 | void computeLayout(); | 274 | void computeLayout(); |
274 | void computeLayoutWeek(); | 275 | void computeLayoutWeek(); |
275 | 276 | ||
276 | QPtrVector<MonthViewCell> mCells; | 277 | QPtrVector<MonthViewCell> mCells; |
277 | QPtrVector<QLabel> mDayLabels; | 278 | QPtrVector<QLabel> mDayLabels; |
278 | QPtrVector<KOWeekButton> mWeekLabels; | 279 | QPtrVector<KOWeekButton> mWeekLabels; |
279 | QPtrVector<MonthViewCell> mCellsW; | 280 | QPtrVector<MonthViewCell> mCellsW; |
280 | QPtrVector<QLabel> mDayLabelsW; | 281 | QPtrVector<QLabel> mDayLabelsW; |
281 | QPtrVector<KOWeekButton> mWeekLabelsW; | 282 | QPtrVector<KOWeekButton> mWeekLabelsW; |
282 | 283 | ||
283 | bool mShortDayLabels; | 284 | bool mShortDayLabelsM; |
285 | bool mShortDayLabelsW; | ||
284 | int mWidthLongDayLabel; | 286 | int mWidthLongDayLabel; |
285 | 287 | ||
286 | QDate mStartDate; | 288 | QDate mStartDate; |
287 | 289 | ||
288 | MonthViewCell *mSelectedCell; | 290 | MonthViewCell *mSelectedCell; |
289 | 291 | ||
290 | KOEventPopupMenu *mContextMenu; | 292 | KOEventPopupMenu *mContextMenu; |
291 | void keyPressEvent ( QKeyEvent * ) ; | 293 | void keyPressEvent ( QKeyEvent * ) ; |
292 | 294 | ||
293 | }; | 295 | }; |
294 | 296 | ||
295 | #endif | 297 | #endif |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index a74c5fe..dcb51dc 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -113,25 +113,25 @@ void KOViewManager::showDateView( int view, QDate date) | |||
113 | //mCurrentAgendaView = 1 ; | 113 | //mCurrentAgendaView = 1 ; |
114 | lastDate = mMainView->dateNavigator()->selectedDates().first(); | 114 | lastDate = mMainView->dateNavigator()->selectedDates().first(); |
115 | lastCount = mMainView->dateNavigator()->selectedDates().count(); | 115 | lastCount = mMainView->dateNavigator()->selectedDates().count(); |
116 | lastNDMode = savemFlagShowNextxDays; | 116 | lastNDMode = savemFlagShowNextxDays; |
117 | mMainView->showDay( date ); | 117 | mMainView->showDay( date ); |
118 | } else if (view == 4 ) { | 118 | } else if (view == 4 ) { |
119 | mCurrentAgendaView = 7 ; | 119 | mCurrentAgendaView = 7 ; |
120 | mMainView->dateNavigator()->selectDates( date, 7 ); | 120 | mMainView->dateNavigator()->selectDates( date, 7 ); |
121 | } else if (view == 5 ) { | 121 | } else if (view == 5 ) { |
122 | mCurrentAgendaView = 14 ; | 122 | mCurrentAgendaView = 14 ; |
123 | mMainView->dateNavigator()->selectDates( date, 14); | 123 | mMainView->dateNavigator()->selectDates( date, 14); |
124 | } else if (view == 6 ) { | 124 | } else if (view == 6 ) { |
125 | mMainView->dateNavigator()->selectDates( date, 7 ); | 125 | //mMainView->dateNavigator()->selectDates( date, 7 ); |
126 | showMonthView(); | 126 | showMonthView(); |
127 | } else if (view == 7 ) { | 127 | } else if (view == 7 ) { |
128 | mMainView->dateNavigator()->selectDate( date ); | 128 | mMainView->dateNavigator()->selectDate( date ); |
129 | showJournalView(); | 129 | showJournalView(); |
130 | } else if (view == 8 ) { | 130 | } else if (view == 8 ) { |
131 | globalFlagBlockAgenda = 1; | 131 | globalFlagBlockAgenda = 1; |
132 | if ( mCurrentAgendaView != 3 ) | 132 | if ( mCurrentAgendaView != 3 ) |
133 | mCurrentAgendaView = -1; | 133 | mCurrentAgendaView = -1; |
134 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 134 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
135 | globalFlagBlockAgenda = 2; | 135 | globalFlagBlockAgenda = 2; |
136 | mMainView->dateNavigator()->selectDates( date , | 136 | mMainView->dateNavigator()->selectDates( date , |
137 | KOPrefs::instance()->mNextXDays ); | 137 | KOPrefs::instance()->mNextXDays ); |
@@ -214,24 +214,25 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | |||
214 | //mMainView->updateView(); | 214 | //mMainView->updateView(); |
215 | raiseCurrentView( full, true ); | 215 | raiseCurrentView( full, true ); |
216 | mMainView->adaptNavigationUnits(); | 216 | mMainView->adaptNavigationUnits(); |
217 | } | 217 | } |
218 | 218 | ||
219 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) | 219 | void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) |
220 | { | 220 | { |
221 | mCurrentAgendaView = 0; | 221 | mCurrentAgendaView = 0; |
222 | int wid = mMainView->width() ; | 222 | int wid = mMainView->width() ; |
223 | int hei = mMainView->height(); | 223 | int hei = mMainView->height(); |
224 | if ( mCurrentView == mMonthView ) { | 224 | if ( mCurrentView == mMonthView ) { |
225 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { | 225 | if ( true /* !KOPrefs::instance()->mMonthViewWeek*/ ) { |
226 | mMonthView->setIgnoreResizeEvent( 2 ); | ||
226 | mMainView->navigatorBar()->show(); | 227 | mMainView->navigatorBar()->show(); |
227 | hei -= mMainView->navigatorBar()->sizeHint().height(); | 228 | hei -= mMainView->navigatorBar()->sizeHint().height(); |
228 | } | 229 | } |
229 | //mMainView->navigatorBar()->hide(); | 230 | //mMainView->navigatorBar()->hide(); |
230 | } else { | 231 | } else { |
231 | mMainView->navigatorBar()->hide(); | 232 | mMainView->navigatorBar()->hide(); |
232 | } | 233 | } |
233 | if ( fullScreen ) { | 234 | if ( fullScreen ) { |
234 | mMainView->leftFrame()->hide(); | 235 | mMainView->leftFrame()->hide(); |
235 | } else { | 236 | } else { |
236 | mMainView->leftFrame()->show(); | 237 | mMainView->leftFrame()->show(); |
237 | if ( KOPrefs::instance()->mVerticalScreen ) | 238 | if ( KOPrefs::instance()->mVerticalScreen ) |