summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-02 18:47:56 (UTC)
committer zautrix <zautrix>2005-07-02 18:47:56 (UTC)
commit27c100807f471a63d91ee08bdba3549d3a0cff8c (patch) (side-by-side diff)
treee731c6f1891ecf3ea843769a2c91053ee79ed24e /korganizer
parent80fe6533cb7d751aa72ae5ad0871a9fb76fb3d0b (diff)
downloadkdepimpi-27c100807f471a63d91ee08bdba3549d3a0cff8c.zip
kdepimpi-27c100807f471a63d91ee08bdba3549d3a0cff8c.tar.gz
kdepimpi-27c100807f471a63d91ee08bdba3549d3a0cff8c.tar.bz2
fox
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index a42d07b..c055eb8 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -125,13 +125,13 @@ void KOAgendaItem::initColor ()
}
}
QColor BackgroundColor ( mBackgroundColor );
if ( mIncidence->calID() > 1 ) {
- BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() );
+ //BackgroundColor = KOPrefs::instance()->defaultColor( mIncidence->calID() );
}
mColorGroup = QColorGroup( BackgroundColor.light(),
BackgroundColor.dark(),BackgroundColor.light(),
BackgroundColor.dark(),BackgroundColor, black, BackgroundColor) ;
setBackgroundColor( mBackgroundColor );
mWhiteText = (mBackgroundColor.red() + mBackgroundColor.green() + mBackgroundColor.blue() < 250);
@@ -197,12 +197,26 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
int x = pos().x() +3;
int y;
if ( mAllDay )
y = pos().y()+3;
else
y = mCellYTop * ( height() / cellHeight() ) +3;
+
+
+ if ( mIncidence->calID() > 1 ) {
+ p->fillRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x, yOff*( 1 +AGENDA_ICON_SIZE)+y, AGENDA_ICON_SIZE, AGENDA_ICON_SIZE, KOPrefs::instance()->defaultColor( mIncidence->calID() ) );
+ p->drawRect ( xOff*( 1 +AGENDA_ICON_SIZE )+x-1, yOff*( 1 +AGENDA_ICON_SIZE)+y-1, AGENDA_ICON_SIZE+2, AGENDA_ICON_SIZE+2 );
+ if ( horLayout ){
+ ++xOff;
+ ++x;
+ }
+ else {
+ ++yOff;
+ ++y;
+ }
+ }
if (mIncidence->cancelled()) {
int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
int ypos = yOff*( 1 +AGENDA_ICON_SIZE)+y;
p->drawLine( xpos, ypos, xpos+AGENDA_ICON_SIZE-1, ypos+AGENDA_ICON_SIZE-1 );
p->drawLine( xpos, ypos+AGENDA_ICON_SIZE-1, xpos+AGENDA_ICON_SIZE-1, ypos );
if ( horLayout )