summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/koagendaview.cpp32
-rw-r--r--korganizer/koeditorgeneral.cpp34
3 files changed, 32 insertions, 36 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index c6cd0ae..a8035d4 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1106,3 +1106,3 @@
1106{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" }, 1106{ "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
1107{ "% completed","% komplett" }, 1107{ "% completed","% erledigt" },
1108{ "%d item(s) found.","%d Item(s) gefunden." }, 1108{ "%d item(s) found.","%d Item(s) gefunden." },
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 5508210..f287216 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -129,2 +129,13 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
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
@@ -133,3 +144,2 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
133 hour.setNum(cell); 144 hour.setNum(cell);
134 suffix = "am";
135 145
@@ -138,6 +148,6 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
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 }
@@ -145,3 +155,3 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
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
@@ -149,7 +159,9 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
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
@@ -882,4 +894,2 @@ void KOAgendaView::updateConfig()
882 894
883
884
885 // update config for children 895 // update config for children
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 4ee5292..cf0d4ae 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -230,8 +230,4 @@ void KOEditorGeneral::pickAlarmSound()
230 if (!mAlarmSoundButton->isOn()) { 230 if (!mAlarmSoundButton->isOn()) {
231 //mAlarmSound = ""; 231 mAlarmSoundButton->setOn(true);
232 QToolTip::remove(mAlarmSoundButton); 232 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
233 QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
234 mAlarmProgramButton->setOn(true);
235 mAlarmSoundButton->setOn(false);
236 pickAlarmProgram();
237 } else { 233 } else {
@@ -252,3 +248,3 @@ void KOEditorGeneral::pickAlarmSound()
252 } 248 }
253 249#if 0
254 if (mAlarmProgramButton->isOn()) 250 if (mAlarmProgramButton->isOn())
@@ -257,2 +253,3 @@ void KOEditorGeneral::pickAlarmSound()
257 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); 253 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
254#endif
258} 255}
@@ -262,8 +259,4 @@ void KOEditorGeneral::pickAlarmProgram()
262 if (!mAlarmProgramButton->isOn()) { 259 if (!mAlarmProgramButton->isOn()) {
263 //mAlarmProgram = ""; 260 mAlarmProgramButton->setOn(true);
264 QToolTip::remove(mAlarmProgramButton); 261 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
265 QToolTip::add(mAlarmProgramButton, i18n("No program set"));
266 mAlarmProgramButton->setOn(false);
267 mAlarmSoundButton->setOn(true);
268 pickAlarmSound();
269 } else { 262 } else {
@@ -282,2 +275,3 @@ void KOEditorGeneral::pickAlarmProgram()
282 } 275 }
276#if 0
283 if (mAlarmProgramButton->isOn()) 277 if (mAlarmProgramButton->isOn())
@@ -286,2 +280,3 @@ void KOEditorGeneral::pickAlarmProgram()
286 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); 280 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
281#endif
287} 282}
@@ -316,13 +311,4 @@ void KOEditorGeneral::enableAlarmEdit(bool enable)
316 } 311 }
317 if (mAlarmProgramButton->isOn())
318 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
319 if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
320 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
321 }
322 else {
323 ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
324 //((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Edit item: ") + mSummaryEdit->currentText());
325
326
327 } 312 }
313 ((QWidget*)parent())->topLevelWidget()->setCaption(mAlarmMessage);
328 mAlarmTimeEdit->setEnabled(enable); 314 mAlarmTimeEdit->setEnabled(enable);
@@ -402,3 +388,3 @@ void KOEditorGeneral::readIncidence(Incidence *event)
402 388
403 mAlarmMessage = i18n("Edit") +" "+event->summary(); 389 mAlarmMessage = event->summary();
404 mAlarmIncrCombo->setCurrentItem(0); 390 mAlarmIncrCombo->setCurrentItem(0);