-rw-r--r-- | korganizer/komonthview.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 9b9e164..6ae4c6f 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -781,26 +781,28 @@ void MonthViewCell::selection( QListBoxItem *item ) | |||
781 | mMonthView->setSelectedCell( this ); | 781 | mMonthView->setSelectedCell( this ); |
782 | } | 782 | } |
783 | 783 | ||
784 | 784 | ||
785 | // ******************************************************************************* | 785 | // ******************************************************************************* |
786 | // ******************************************************************************* | 786 | // ******************************************************************************* |
787 | // ******************************************************************************* | 787 | // ******************************************************************************* |
788 | 788 | ||
789 | 789 | ||
790 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) | 790 | KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name) |
791 | : KOEventView( calendar, parent, name ), | 791 | : KOEventView( calendar, parent, name ), |
792 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), | 792 | mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), |
793 | mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) | 793 | mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) |
794 | { | 794 | { |
795 | mShortDayLabelsM = false; | ||
796 | mShortDayLabelsW = false; | ||
795 | skipResize = false; | 797 | skipResize = false; |
796 | clPending = true; | 798 | clPending = true; |
797 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" ); | 799 | mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" ); |
798 | mWidStack = new QWidgetStack( this ); | 800 | mWidStack = new QWidgetStack( this ); |
799 | QVBoxLayout* hb = new QVBoxLayout( this ); | 801 | QVBoxLayout* hb = new QVBoxLayout( this ); |
800 | mMonthView = new QWidget( mWidStack ); | 802 | mMonthView = new QWidget( mWidStack ); |
801 | mWeekView = new QWidget( mWidStack ); | 803 | mWeekView = new QWidget( mWidStack ); |
802 | #if QT_VERSION >= 0x030000 | 804 | #if QT_VERSION >= 0x030000 |
803 | mWidStack->addWidget(mMonthView ); | 805 | mWidStack->addWidget(mMonthView ); |
804 | mWidStack->addWidget(mWeekView ); | 806 | mWidStack->addWidget(mWeekView ); |
805 | #else | 807 | #else |
806 | mWidStack->addWidget( mMonthView, 1 ); | 808 | mWidStack->addWidget( mMonthView, 1 ); |
@@ -1041,44 +1043,44 @@ void KOMonthView::updateConfig() | |||
1041 | #endif | 1043 | #endif |
1042 | updateView(); | 1044 | updateView(); |
1043 | } | 1045 | } |
1044 | 1046 | ||
1045 | void KOMonthView::updateDayLabels() | 1047 | void KOMonthView::updateDayLabels() |
1046 | { | 1048 | { |
1047 | 1049 | ||
1048 | QPtrVector<QLabel> *mDayLabelsT; | 1050 | QPtrVector<QLabel> *mDayLabelsT; |
1049 | 1051 | ||
1050 | mDayLabelsT = &mDayLabelsW; | 1052 | mDayLabelsT = &mDayLabelsW; |
1051 | for (int i = 0; i < 7; i++) { | 1053 | for (int i = 0; i < 7; i++) { |
1052 | if (mWeekStartsMonday) { | 1054 | if (mWeekStartsMonday) { |
1053 | bool show = mShortDayLabels; | 1055 | bool show = mShortDayLabelsW; |
1054 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1056 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1055 | show = true; | 1057 | show = true; |
1056 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1058 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1057 | } else { | 1059 | } else { |
1058 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); | 1060 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW)); |
1059 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); | 1061 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW)); |
1060 | 1062 | ||
1061 | } | 1063 | } |
1062 | } | 1064 | } |
1063 | mDayLabelsT = &mDayLabels; | 1065 | mDayLabelsT = &mDayLabels; |
1064 | for (int i = 0; i < 7; i++) { | 1066 | for (int i = 0; i < 7; i++) { |
1065 | if (mWeekStartsMonday) { | 1067 | if (mWeekStartsMonday) { |
1066 | bool show = mShortDayLabels; | 1068 | bool show = mShortDayLabelsM; |
1067 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) | 1069 | if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() ) |
1068 | show = true; | 1070 | show = true; |
1069 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); | 1071 | (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show)); |
1070 | } else { | 1072 | } else { |
1071 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels)); | 1073 | if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM)); |
1072 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels)); | 1074 | else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM)); |
1073 | 1075 | ||
1074 | } | 1076 | } |
1075 | } | 1077 | } |
1076 | 1078 | ||
1077 | } | 1079 | } |
1078 | 1080 | ||
1079 | void KOMonthView::showDates(const QDate &start, const QDate &) | 1081 | void KOMonthView::showDates(const QDate &start, const QDate &) |
1080 | { | 1082 | { |
1081 | // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl; | 1083 | // kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl; |
1082 | 1084 | ||
1083 | QPtrVector<MonthViewCell> *cells; | 1085 | QPtrVector<MonthViewCell> *cells; |
1084 | QPtrVector<QLabel> *dayLabels; | 1086 | QPtrVector<QLabel> *dayLabels; |
@@ -1377,25 +1379,25 @@ void KOMonthView::computeLayoutWeek() | |||
1377 | x += w; | 1379 | x += w; |
1378 | if ( x + w/2 > wid ) { | 1380 | if ( x + w/2 > wid ) { |
1379 | x = 0; | 1381 | x = 0; |
1380 | y += h+dayLabelHei ; | 1382 | y += h+dayLabelHei ; |
1381 | } | 1383 | } |
1382 | } | 1384 | } |
1383 | y= dayLabelHei; | 1385 | y= dayLabelHei; |
1384 | h = cellHei ; | 1386 | h = cellHei ; |
1385 | mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei); | 1387 | mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei); |
1386 | mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei); | 1388 | mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei); |
1387 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); | 1389 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); |
1388 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); | 1390 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); |
1389 | mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ; | 1391 | mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ; |
1390 | updateDayLabels(); | 1392 | updateDayLabels(); |
1391 | //bool forceUpdate = !updatePossible; | 1393 | //bool forceUpdate = !updatePossible; |
1392 | updatePossible = true; | 1394 | updatePossible = true; |
1393 | //mWeekLabels[mNumWeeks]->setText( i18n("M")); | 1395 | //mWeekLabels[mNumWeeks]->setText( i18n("M")); |
1394 | //if ( forceUpdate ) | 1396 | //if ( forceUpdate ) |
1395 | // updateView(); | 1397 | // updateView(); |
1396 | } | 1398 | } |
1397 | void KOMonthView::computeLayout() | 1399 | void KOMonthView::computeLayout() |
1398 | { | 1400 | { |
1399 | 1401 | ||
1400 | 1402 | ||
1401 | static int lastWid = 0; | 1403 | static int lastWid = 0; |
@@ -1493,25 +1495,25 @@ void KOMonthView::computeLayout() | |||
1493 | } | 1495 | } |
1494 | y= dayLabelHei; | 1496 | y= dayLabelHei; |
1495 | h = cellHei ; | 1497 | h = cellHei ; |
1496 | for ( i = 0; i < 6; i++) { | 1498 | for ( i = 0; i < 6; i++) { |
1497 | if ( i == (6-rowModulo)) | 1499 | if ( i == (6-rowModulo)) |
1498 | ++h; | 1500 | ++h; |
1499 | mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h); | 1501 | mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h); |
1500 | y += h; | 1502 | y += h; |
1501 | } | 1503 | } |
1502 | mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei); | 1504 | mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei); |
1503 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); | 1505 | // qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height()); |
1504 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); | 1506 | //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height()); |
1505 | mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ; | 1507 | mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ; |
1506 | updateDayLabels(); | 1508 | updateDayLabels(); |
1507 | //bool forceUpdate = !updatePossible; | 1509 | //bool forceUpdate = !updatePossible; |
1508 | updatePossible = true; | 1510 | updatePossible = true; |
1509 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); | 1511 | //mWeekLabels[mNumWeeks]->setText( i18n("W")); |
1510 | } | 1512 | } |
1511 | 1513 | ||
1512 | void KOMonthView::showContextMenu( Incidence *incidence ) | 1514 | void KOMonthView::showContextMenu( Incidence *incidence ) |
1513 | { | 1515 | { |
1514 | mContextMenu->showIncidencePopup(incidence); | 1516 | mContextMenu->showIncidencePopup(incidence); |
1515 | /* | 1517 | /* |
1516 | if( incidence && incidence->type() == "Event" ) { | 1518 | if( incidence && incidence->type() == "Event" ) { |
1517 | Event *event = static_cast<Event *>(incidence); | 1519 | Event *event = static_cast<Event *>(incidence); |