summaryrefslogtreecommitdiffabout
path: root/korganizer/koagendaview.cpp
Unidiff
Diffstat (limited to 'korganizer/koagendaview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp32
1 files changed, 21 insertions, 11 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 5508210..f287216 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -127,31 +127,43 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
127 QString suffix; 127 QString suffix;
128 QString fullTime; 128 QString fullTime;
129 int tW = fm.width("24:00i"); 129 int tW = fm.width("24:00i");
130 int timeHeight = fm.height();
131 if ( timeHeight > mCellHeight )
132 timeHeight = mCellHeight-1;
133 int borderWidth = 5;
134 QFont nFont = p->font();
135 QFont sFont = nFont;
136 sFont.setPointSize( sFont.pointSize()/2+2 );
137 if (!KGlobal::locale()->use12Clock())
138 suffix = "00";
139 QFontMetrics fmS( sFont );
140 int sHei = fmS.height();
130 141
131 while (y < cy + ch) { 142 while (y < cy + ch) {
132 p->drawLine(cx,y,cx+tW,y); 143 p->drawLine(cx,y,cx+tW,y);
133 hour.setNum(cell); 144 hour.setNum(cell);
134 suffix = "am";
135 145
136 // handle 24h and am/pm time formats 146 // handle 24h and am/pm time formats
137 if (KGlobal::locale()->use12Clock()) { 147 if (KGlobal::locale()->use12Clock()) {
138 if (cell > 11) suffix = "pm"; 148 if (cell > 11) suffix = "pm";
149 else
150 suffix = "am";
139 if (cell == 0) hour.setNum(12); 151 if (cell == 0) hour.setNum(12);
140 if (cell > 12) hour.setNum(cell - 12); 152 if (cell > 12) hour.setNum(cell - 12);
141 } else {
142 suffix = ":00";
143 } 153 }
144 154
145 // create string in format of "XX:XX" or "XXpm/am" 155 // create string in format of "XX:XX" or "XXpm/am"
146 fullTime = hour + suffix; 156 fullTime = hour;// + suffix;
147 157
148 // center and draw the time label 158 // center and draw the time label
149 int timeWidth = fm.width(fullTime+"i"); 159 int timeWidth = fm.width(fullTime+"i");
150 int offset = this->width() - timeWidth; 160 int tw2 = fm.width(suffix);
151 int borderWidth = 5; 161 int offset = this->width() - timeWidth - tw2;
152 int timeHeight = fm.height(); 162 p->setFont( nFont );
153 timeHeight = timeHeight + 2 - ( timeHeight / 4 ); 163 p->drawText(cx - borderWidth + offset, y+ timeHeight, fullTime);
154 p->drawText(cx -borderWidth + offset, y+ timeHeight, fullTime); 164 p->setFont( sFont );
165 offset += timeWidth;
166 p->drawText(cx - borderWidth + offset, y+ sHei, suffix);
155 167
156 // increment indices 168 // increment indices
157 y += mCellHeight; 169 y += mCellHeight;
@@ -880,8 +892,6 @@ void KOAgendaView::updateConfig()
880 if ( mBlockUpdating ) 892 if ( mBlockUpdating )
881 return; 893 return;
882 894
883
884
885 // update config for children 895 // update config for children
886 mTimeLabels->updateConfig(); 896 mTimeLabels->updateConfig();
887 mAgenda->storePosition(); 897 mAgenda->storePosition();