-rw-r--r-- | korganizer/koagendaview.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index b9c7dec..8001c8f 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -136,4 +136,6 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) | |||
136 | if (!KGlobal::locale()->use12Clock()) | 136 | if (!KGlobal::locale()->use12Clock()) |
137 | suffix = "00"; | 137 | suffix = "00"; |
138 | else | ||
139 | borderWidth = 0; | ||
138 | QFontMetrics fmS( sFont ); | 140 | QFontMetrics fmS( sFont ); |
139 | int sHei = fmS.height(); | 141 | int sHei = fmS.height(); |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index cf0d4ae..92fcd1c 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -387,5 +387,7 @@ void KOEditorGeneral::readIncidence(Incidence *event) | |||
387 | { | 387 | { |
388 | 388 | ||
389 | mAlarmMessage = event->summary(); | 389 | mAlarmMessage = event->summary(); |
390 | if ( ! event->location().isEmpty() ) | ||
391 | mAlarmMessage += " ("+event->location()+")"; | ||
390 | mAlarmIncrCombo->setCurrentItem(0); | 392 | mAlarmIncrCombo->setCurrentItem(0); |
391 | mSummaryEdit->setEditText(event->summary()); | 393 | mSummaryEdit->setEditText(event->summary()); |