summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-22 16:30:29 (UTC)
committer zautrix <zautrix>2005-08-22 16:30:29 (UTC)
commite011ace92e07174effca53b7dde20b9a5b695af0 (patch) (side-by-side diff)
tree6e4e4da6b64aae85158ebbf9637f5980aef18448
parent18780cc2342097b343ee2fa50c649f425ddaed34 (diff)
downloadkdepimpi-e011ace92e07174effca53b7dde20b9a5b695af0.zip
kdepimpi-e011ace92e07174effca53b7dde20b9a5b695af0.tar.gz
kdepimpi-e011ace92e07174effca53b7dde20b9a5b695af0.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp1
-rw-r--r--korganizer/koagendaitem.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 81681df..b416115 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -579,25 +579,24 @@ void KOAgendaItem::computeText()
if ( mAllDay ) {
if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
if ( mIncidence->doesRecur() ) {
mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")";
} else {
int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() );
mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) + " ("+QString::number( dur )+i18n(" days") +")" ;
}
}
}
}
-
if ( !mIncidence->location().isEmpty() ) {
if ( mAllDay )
mDisplayedText += " (";
else
mDisplayedText += "\n(";
mDisplayedText += mIncidence->location() +")";
}
#ifdef DESKTOP_VERSION
QString tipText = mIncidence->summary();
if ( !mIncidence->doesFloat() ) {
if ( mIncidence->typeID() == eventID ) {
if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) {
diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h
index 37d89a6..27ee720 100644
--- a/korganizer/koagendaitem.h
+++ b/korganizer/koagendaitem.h
@@ -100,25 +100,25 @@ class KOAgendaItem : public QWidget
void setConflictItems(QPtrList<KOAgendaItem>);
void addConflictItem(KOAgendaItem *ci);
void paintMe( bool, QPainter* painter = 0 );
void repaintMe();
static QPixmap * paintPix();
static QPixmap * paintPixAllday();
void updateItem();
void computeText();
void recreateIncidence();
bool checkLayout();
void initColor ();
bool isAllDay() { return mAllDay; }
- int resizeMe( int grid, int wid, int hei, bool invalidHei = false );
+ int resizeMe( int grid, int wid, int hei, bool invalidWidth = false );
public slots:
bool updateIcons( QPainter *, bool );
void select(bool=true);
void repaintItem();
protected:
void dragEnterEvent(QDragEnterEvent *e);
void dropEvent(QDropEvent *e);
void paintEvent ( QPaintEvent * );
void resizeEvent ( QResizeEvent *ev );
private: