summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-02-11 22:27:27 (UTC)
committer harlekin <harlekin>2003-02-11 22:27:27 (UTC)
commitee67394120b5436d955d64a21b8ea707b57ac0c0 (patch) (side-by-side diff)
tree7bff77ad9e116ed103068f69aee19671ec8a1680
parente7ebea116b82577d861cba0650a80b12900b2e24 (diff)
downloadopie-ee67394120b5436d955d64a21b8ea707b57ac0c0.zip
opie-ee67394120b5436d955d64a21b8ea707b57ac0c0.tar.gz
opie-ee67394120b5436d955d64a21b8ea707b57ac0c0.tar.bz2
fix for bugreport #664, show also location in popups in datebooks weekview
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookweek.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index e16f516..ddd41af 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -492,58 +492,66 @@ void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
{
if ( tHide->isActive() )
tHide->stop();
// why would someone use "<"? Oh well, fix it up...
// I wonder what other things may be messed up...
QString strDesc = ev.description();
int where = strDesc.find( "<" );
while ( where != -1 ) {
strDesc.remove( where, 1 );
strDesc.insert( where, "&#60;" );
where = strDesc.find( "<", where );
}
QString strCat;
// ### FIX later...
// QString strCat = ev.category();
// where = strCat.find( "<" );
// while ( where != -1 ) {
// strCat.remove( where, 1 );
// strCat.insert( where, "&#60;" );
// where = strCat.find( "<", where );
// }
+ QString strLocation = ev.location();
+ while ( where != -1 ) {
+ strLocation.remove( where, 1 );
+ strLocation.insert( where, "&#60;" );
+ where = strLocation.find( "<", where );
+ }
+
QString strNote = ev.notes();
where = strNote.find( "<" );
while ( where != -1 ) {
strNote.remove( where, 1 );
strNote.insert( where, "&#60;" );
where = strNote.find( "<", where );
}
- QString str = "<b>" + strDesc + "</b><br>" + "<i>"
- + strCat + "</i>"
+ QString str = "<b>" + strDesc + "</b><br>"
+ + strLocation + "<br>"
+ + "<i>" + strCat + "</i>"
+ "<br>" + TimeString::longDateString( ev.date() )
+ "<br>";
if (ev.event().type() == Event::Normal )
generateNormalTooltext( str, ev );
else
generateAllDayTooltext( str );
str += "<br><br>" + strNote;
lblDesc->setText( str );
lblDesc->resize( lblDesc->sizeHint() );
// move the label so it is "centerd" horizontally...
lblDesc->move( QMAX(0,(width() - lblDesc->width()) / 2), 0 );
lblDesc->show();
}
void DateBookWeek::slotHideEvent()
{
tHide->start( 2000, true );
}
void DateBookWeek::setStartViewTime( int startHere )
{