author | zautrix <zautrix> | 2005-04-01 22:32:18 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-01 22:32:18 (UTC) |
commit | 02bdd5a73feb7bd2431c5492c7bbf663f28efbd8 (patch) (unidiff) | |
tree | c87553742dfa351f4d4ae2308d68dd87cc400304 /korganizer | |
parent | efb66afca923f23a94b19da1fa12555956e70844 (diff) | |
download | kdepimpi-02bdd5a73feb7bd2431c5492c7bbf663f28efbd8.zip kdepimpi-02bdd5a73feb7bd2431c5492c7bbf663f28efbd8.tar.gz kdepimpi-02bdd5a73feb7bd2431c5492c7bbf663f28efbd8.tar.bz2 |
nf
-rw-r--r-- | korganizer/koagendaview.cpp | 24 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 6 |
2 files changed, 22 insertions, 8 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 1627dba..2b05d37 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -133,6 +133,10 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) | |||
133 | QFont nFont = p->font(); | 133 | QFont nFont = p->font(); |
134 | 134 | ||
135 | if (!KGlobal::locale()->use12Clock()) | 135 | if (!KGlobal::locale()->use12Clock()) { |
136 | suffix = "00"; | 136 | if ( QApplication::desktop()->width() <= 320 ) |
137 | suffix = ""; | ||
138 | else | ||
139 | suffix = "00"; | ||
140 | } | ||
137 | 141 | ||
138 | if ( timeHeight > mCellHeight ) { | 142 | if ( timeHeight > mCellHeight ) { |
@@ -160,5 +164,4 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) | |||
160 | p->drawLine(cx,y,cw,y); | 164 | p->drawLine(cx,y,cw,y); |
161 | hour.setNum(cell); | 165 | hour.setNum(cell); |
162 | |||
163 | // handle 24h and am/pm time formats | 166 | // handle 24h and am/pm time formats |
164 | if (KGlobal::locale()->use12Clock()) { | 167 | if (KGlobal::locale()->use12Clock()) { |
@@ -214,6 +217,10 @@ void TimeLabels::updateConfig() | |||
214 | if (KGlobal::locale()->use12Clock()) | 217 | if (KGlobal::locale()->use12Clock()) |
215 | test = "pm"; | 218 | test = "pm"; |
216 | else | 219 | else { |
217 | test = "00"; | 220 | if ( QApplication::desktop()->width() <= 320 ) |
221 | test = ""; | ||
222 | else | ||
223 | test = "00"; | ||
224 | } | ||
218 | QFont sFont = font(); | 225 | QFont sFont = font(); |
219 | sFont.setPointSize( sFont.pointSize()/2 ); | 226 | sFont.setPointSize( sFont.pointSize()/2 ); |
@@ -726,5 +733,8 @@ void KOAgendaView::createDayLabels() | |||
726 | dayLabel->setNum( -1 ); | 733 | dayLabel->setNum( -1 ); |
727 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 734 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
728 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 735 | if ( QApplication::desktop()->width() <= 320 ) |
736 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ).left(2) ); | ||
737 | else | ||
738 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | ||
729 | dayLabel->show(); | 739 | dayLabel->show(); |
730 | DateList::ConstIterator dit; | 740 | DateList::ConstIterator dit; |
@@ -833,5 +843,4 @@ void KOAgendaView::createDayLabels() | |||
833 | } | 843 | } |
834 | //dayLabel->hide();//test only | 844 | //dayLabel->hide();//test only |
835 | qDebug("fremwidd %d ", mAgenda->frameWidth()); | ||
836 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ; | 845 | int offset = (mAgenda->width() - mAgenda->verticalScrollBar()->width()- (mAgenda->frameWidth()*2) ) % mSelectedDates.count() ; |
837 | if ( offset < 0 ) offset = 0; | 846 | if ( offset < 0 ) offset = 0; |
@@ -843,4 +852,5 @@ void KOAgendaView::createDayLabels() | |||
843 | dayLabel->setNum( -2 ); | 852 | dayLabel->setNum( -2 ); |
844 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); | 853 | dayLabel->setFixedWidth( mAgenda->verticalScrollBar()->width()+ offset ); |
854 | |||
845 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); | 855 | //qDebug("setToFixed %d ", mAgenda->verticalScrollBar()->width()+ offset+2); |
846 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); | 856 | //mLayoutDayLabels->addSpacing(mAgenda->verticalScrollBar()->width()+ offset+2); |
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 5b5703f..b8a0f09 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -794,6 +794,10 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
794 | addRow = mSelEndT/7 - 5 + rowModulo; | 794 | addRow = mSelEndT/7 - 5 + rowModulo; |
795 | } | 795 | } |
796 | //qDebug("%d %d %d ",selh, row, addRow ); | ||
797 | int addrow2 = addRow-selh+1; | ||
798 | if ( addrow2 < 0 ) | ||
799 | addrow2 = 0; | ||
796 | if (selh > 1) { | 800 | if (selh > 1) { |
797 | p.fillRect(1, (row+1)*dheight, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol); | 801 | p.fillRect(1, (row+1)*dheight+addrow2, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol); |
798 | } | 802 | } |
799 | // draw last block from left to mSelEndT | 803 | // draw last block from left to mSelEndT |