| author | zautrix <zautrix> | 2005-03-26 13:13:04 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-03-26 13:13:04 (UTC) |
| commit | 93d1be2c6eead07300e7f90f3b417fcef0f109d3 (patch) (side-by-side diff) | |
| tree | cdcac27cfa1e02c6fa388c252287ed9818b95847 /korganizer | |
| parent | bc8929ccca1ad8cd04f61366c78254803d9c1565 (diff) | |
| download | kdepimpi-93d1be2c6eead07300e7f90f3b417fcef0f109d3.zip kdepimpi-93d1be2c6eead07300e7f90f3b417fcef0f109d3.tar.gz kdepimpi-93d1be2c6eead07300e7f90f3b417fcef0f109d3.tar.bz2 | |
icons added
| -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 @@ -132,12 +132,14 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch) int borderWidth = 2; QFont nFont = p->font(); QFont sFont = nFont; sFont.setPointSize( sFont.pointSize()/2+2 ); if (!KGlobal::locale()->use12Clock()) suffix = "00"; + else + borderWidth = 0; QFontMetrics fmS( sFont ); int sHei = fmS.height(); if ( timeHeight > mCellHeight ) { timeHeight = mCellHeight-1; sHei -= 2; } diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index cf0d4ae..92fcd1c 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -383,13 +383,15 @@ void KOEditorGeneral::setSecrecy( int num ) { mSecrecyCombo->setCurrentItem(num); } void KOEditorGeneral::readIncidence(Incidence *event) { - mAlarmMessage = event->summary(); + mAlarmMessage = event->summary(); + if ( ! event->location().isEmpty() ) + mAlarmMessage += " ("+event->location()+")"; mAlarmIncrCombo->setCurrentItem(0); mSummaryEdit->setEditText(event->summary()); mLocationEdit->setEditText(event->location()); mDescriptionEdit->setText(event->description()); #if 0 |