summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-03-20 19:52:47 (UTC)
committer zautrix <zautrix>2005-03-20 19:52:47 (UTC)
commit64068741e3b82a34c1b8a67da412ac88841b640c (patch) (unidiff)
tree70a665bab53da7aa211f523daebbdbff08136df4 /korganizer
parentd998afaaf0fe1af0b9b5e3d6f4cb504e35e35025 (diff)
downloadkdepimpi-64068741e3b82a34c1b8a67da412ac88841b640c.zip
kdepimpi-64068741e3b82a34c1b8a67da412ac88841b640c.tar.gz
kdepimpi-64068741e3b82a34c1b8a67da412ac88841b640c.tar.bz2
nf
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kodaymatrix.cpp42
1 files changed, 20 insertions, 22 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 507f18e..f864022 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -461,2 +461,4 @@ void KODayMatrix::mousePressEvent (QMouseEvent* e)
461 mSelInit = mSelStart; 461 mSelInit = mSelStart;
462 mSelEnd = mSelStart;
463 repaint(false);
462} 464}
@@ -642,3 +644,3 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
642 int rowModulo = sz.height() % 6; 644 int rowModulo = sz.height() % 6;
643 //qDebug("off %d col %d row %d ",xyOff,colModulo,rowModulo ); 645 qDebug("col %d row %d ",colModulo,rowModulo );
644 646
@@ -678,5 +680,2 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
678 QColor selcol = KOPrefs::instance()->mHighlightColor; 680 QColor selcol = KOPrefs::instance()->mHighlightColor;
679
680
681
682 int addCol = 0; 681 int addCol = 0;
@@ -685,17 +684,2 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
685 int addCol2 = 0; 684 int addCol2 = 0;
686#if 0
687 if ( colModulo ) {
688 if ( col >= 7 - colModulo )
689 addCol = col - 7 + colModulo;
690 }
691 if ( rowModulo ) {
692 if ( row >= 6 - rowModulo )
693 addRow = row - 5 + rowModulo;
694 }
695#endif
696
697
698
699
700
701 if (row == mSelEndT/7) { 685 if (row == mSelEndT/7) {
@@ -794,4 +778,6 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
794 QPen mTodayPen(p.pen()); 778 QPen mTodayPen(p.pen());
795 779 if ( daysize.width() < 20 )
796 mTodayPen.setWidth(mTodayMarginWidth); 780 mTodayPen.setWidth(1);
781 else
782 mTodayPen.setWidth(mTodayMarginWidth);
797 //draw red rectangle for holidays 783 //draw red rectangle for holidays
@@ -810,3 +796,15 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
810 p.setPen(mTodayPen); 796 p.setPen(mTodayPen);
811 p.drawRect(col*dwidth, row*dheight, dwidth, dheight); 797
798
799 int addCol = 0;
800 int addRow = 0;
801 if (rowModulo) {
802 if ( row >= 6 - rowModulo )
803 addRow = row - 5 + rowModulo;
804 }
805 if ( colModulo ) {
806 if ( col >= 7 - colModulo )
807 addCol = col - 6 + colModulo-1;
808 }
809 p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1);
812 p.setPen(tmppen); 810 p.setPen(tmppen);