fixx

2 files changed, 25 insertions, 16 deletions

diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 30efbf6..3468657 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -874,130 +874,130 @@ void KODayMatrix::dropEvent(QDropEvent *e)
     start.setDate(days[idx]);
     end.setDate(days[idx].addDays(duration));
 
     event->setDtStart(start);
     event->setDtEnd(end);
     mCalendar->addEvent(event);
 
     emit eventDropped(event);
   } else {
 //    kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl;
     e->ignore();
   }
 #endif
 }
 
 // ----------------------------------------------------------------------------
 //  P A I N T   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
   
     if ( width() <= 0  || height() <= 0 )
         return;
     if ( mPendingUpdateBeforeRepaint ) {
         updateViewTimed();
         mPendingUpdateBeforeRepaint = false;
     }
 #if 0
     if ( myPix.width() != width() || myPix.height()!=height() ) {
         myPix.resize(size() );
         mRedrawNeeded = true;
     }
 #endif 
     if ( oldW != width() || oldH !=height() )
         mRedrawNeeded = true;
     
     oldH = height() ;
     oldW = width();
     if ( myPix.width() < width() || myPix.height() < height() ) {
         myPix.resize(size() );
         mRedrawNeeded = true;
         
     }
     
     if ( mRedrawNeeded ) {
         //qDebug("REDRAW ");
         QPainter p(&myPix);
         p.setFont(font());
 
 
         int dheight = daysize.height();
         int dwidth = daysize.width();
         int row,col;
         int selw, selh;
         int xyOff = frameWidth();
         int colModulo = (width()-2)  % 7;
         int rowModulo = (height()-2)  % 6;
         //qDebug("col %d  row %d ",colModulo,rowModulo  );
   
         bool isRTL = KOGlobals::self()->reverseLayout();
 
         // draw background and topleft frame
         p.fillRect(0,0,width(),height(), mDefaultBackColor);
-        p.setPen(mDefaultTextColor);
-        p.drawRect(0, 0, width(), height());
+        //p.setPen(mDefaultTextColor);
+        //p.drawRect(0, 0, width(), height());
         int mSelStartT = mSelStart;
         int mSelEndT = mSelEnd;
         if ( mSelEndT >=  NUMDAYS )
             mSelEndT = NUMDAYS-1;
         // draw selected days with highlighted background color
         if (mSelStart != NOSELECTION) {
             bool skip = false;
             if ( ! mouseDown ) {
                 int mo = days[20].month();
                 //qDebug("--  %d %d ", mSelStartT, mSelEndT);
                 //qDebug("%d %d %d - d %d", mo,  days[mSelStartT].month() , days[mSelEndT].month(),  days[mSelEndT].day() );
                 int startMo = days[mSelStartT].month();
                 int endMo = days[mSelEndT].month();
                 if ( startMo == 12 && mo == 1 && endMo <= 2 )
                     startMo = 1;
                 if ( endMo == 1 && mo == 12 )
                     endMo = 12;
                 if ( mo == 12 && startMo == 1 )
                     startMo = 13;
                 if ( (startMo > mo || endMo < mo) ) {
                     skip = true;
                 } else {
                     if ( days[mSelStartT].month() != mo ) {
                         int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day();
                         mSelStartT += add +1;
                     }
                     if ( days[mSelEndT].month() != mo ) {
                         int sub = days[mSelEndT].day();
                         mSelEndT -= sub ;
                     }
                 }
             }
             //qDebug("SKIP %d ", skip);
             if ( ! skip ) {
                 row = mSelStartT/7;
                 col = mSelStartT -row*7;
                 QColor selcol = KOPrefs::instance()->mHighlightColor;
                 int addCol = 0;
                 int addRow = 0; 
                 int addRow2 = 0; 
                 int addCol2 = 0;
                 if (row == mSelEndT/7) { 
                     if ( rowModulo ) {
                         if ( row >= 6 - rowModulo )
                             addRow = row - 5 + rowModulo;
                     }  
                     if ( colModulo ) {
                         int colt1 = mSelEndT%7;
                         //qDebug("colt1 %d ", colt1 );
                         if ( colt1 >= 7 - colModulo )
                             addCol =  colt1 - 7 + colModulo+1; 
                         int colt = mSelStartT%7;
                         if ( colt >= 7 - colModulo )
                             addCol2 =  colt - 7 + colModulo;
                         addCol -= addCol2;
                         //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 );
                     }
                     // Single row selection
                     //if ( row == 0)
                     //  addRow = 1;
                     p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2,
                                row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
                 } else {
                     // draw first row to the right
@@ -1111,93 +1111,95 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent)
                 addCol += 1;
                 if ( row == 0 )
                     addRow = 1;
                 p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1);
                 p.setPen(tmppen);
             }
 
             // if any events are on that day then draw it using a bold font
             if ( eDays.testBit(i) ) {
                 QFont myFont = font();
                 myFont.setBold(true);
                 p.setFont(myFont);
             }
 
             // if it is a holiday then use the default holiday color
             if ( pDays.testBit(i)) {
                 if (  bDays.testBit(i) ) {
                     if ( hDays.testBit(i) )
                         p.setPen(QColor(0,200,0));
                     else
                         p.setPen(QColor(Qt::blue));
                 } else {
                     if (actcol == mDefaultTextColor ) { 
                         p.setPen(KOPrefs::instance()->mHolidayColor);
                     } else {
                         p.setPen(mHolidayColorShaded);
                     }
                 }
             }
 
             // draw selected days with special color
             // DO NOT specially highlight holidays in selection !
             if (i >= mSelStartT && i <= mSelEndT) {
                 ;//p.setPen(mSelectedDaysColor);
             }
 
             int addCol = 0;
             int addRow = 0;
             if ( colModulo ) {
                 if ( col >= 7 - colModulo )
                     addCol = col - 7 + colModulo;
             }
             if ( rowModulo ) {
                 if ( row >= 6 - rowModulo )
                     addRow = row - 5 + rowModulo;
             }
             //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
             ++addCol;//++addCol;
             if ( row == 0)
                 addRow = 1;
             p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,
                        Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
 
             // reset color to actual color
             if (pDays.testBit(i)) {
                 p.setPen(actcol);
             }
             // reset bold font to plain font
             if ( eDays.testBit(i)) {
                 QFont myFont = font();
                 myFont.setBold(false);
                 p.setFont(myFont);
             }
         }
+        p.setPen(mDefaultTextColor);
+        p.drawRect(0, 0, width(), height());
     } else {
         //qDebug("NO  redraw ");
     }
     
     bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP);
     mRedrawNeeded = false;
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::resizeEvent(QResizeEvent *)
 {
   QRect sz = frameRect();
   daysize.setHeight(sz.height()*7 / NUMDAYS);
   daysize.setWidth(sz.width() / 7);
 }
 
 QSize KODayMatrix::sizeHint() const
 {
 
   QFontMetrics fm ( font() );
   int wid = fm.width( "30") *7+3;
   int hei = fm.height() * 6+3;
   //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei);
   return   QSize ( wid, hei );
 
 }
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index bb88386..ea53043 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -168,201 +168,208 @@ void KOCalEditView::selectStdCal( int id, bool b )
 }
 
 void KOCalEditView::selectCalAlarm(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b;
     emit alarmEnabled ( id , b );
     emit needsUpdate();
 }
 void KOCalEditView::selectReadOnly(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isReadOnly = b;
     emit calendarReadonly ( id , b );
     if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) {
         KOPrefs::instance()->getCalendar( id )->isStandard = false;
         KOPrefs::instance()->getCalendar( 1 )->isStandard = true;
         emit setCalendarDefault ( 1 );
     }
     emit needsUpdate();
     QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
     
 }
 void KOCalEditView::setColor( const QColor& c, int id )
 {
     KOPrefs::instance()->getCalendar( id )->mDefaultColor = c;
     emit needsUpdate();
 }
 void KOCalEditView::deleteCal( int id )
 {
     KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id );
     QString name = kkf->mName;
     QString file = KGlobal::formatMessage ( kkf->mFileName ,0 );
     if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
     if ( kkf->isStandard )
         selectStdCal( 1, true );
     emit removeCalendar ( id );
     KOPrefs::instance()->mCalendars.remove ( kkf );
     emit needsUpdate();
     QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
 }
 void KOCalEditView::infoCal( int id )
 {
     QString name = KOPrefs::instance()->getCalendar( id )->mName;
     QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 );
     if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) {
         if (  KMessageBox::Yes == KMessageBox::questionYesNo( this,  i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) {
             emit calendarAdded( id );
             emit needsUpdate();
             QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
         }
     }
     else
         KMessageBox::information( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) );
 }
 void KOCalEditView::readConfig() 
 {
     
     mStdandardB.clear();
     mEnabledB.clear();
     mAlarmB.clear();
     mROB.clear();
 
     if ( mw ) delete mw;
     mw = new QWidget ( viewport() );
     addChild(mw);
-
+    int ii = 0;
     mainLayout = new QGridLayout ( mw , 2, 8 );
-    mainLayout->setMargin( 3);
-    mainLayout->setSpacing( 2);
+    mainLayout->setMargin( 2 );
+    mainLayout->setSpacing( 2 );
     QPushButton * addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,0 );
     addBut->setPixmap ( SmallIcon("plus"));
     connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
-
+    int max = addBut->sizeHint().height();
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
-    mainLayout->addWidget( addBut,0,1 );
+    mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("eye"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw );
-    mainLayout->addWidget( lab,0,2 ); 
-    lab = new QLabel ( i18n(" "), mw );
-    mainLayout->addWidget( lab,0,3 );
-    lab->setFixedWidth( 6 );
+    mainLayout->addWidget( lab,0,++ii ); 
+    //lab = new QLabel ( i18n(" "), mw );
+    //mainLayout->addWidget( lab,0,++ii );
+    //lab->setFixedWidth( 1 );
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
-    mainLayout->addWidget( addBut,0,4 );
+    mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("bell"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
-    mainLayout->addWidget( addBut,0,5 );
+    mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("pencil"));
     connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     lab = new QLabel ( i18n(" Color "), mw );
-    mainLayout->addWidget( lab,0,6 );
+    mainLayout->addWidget( lab,0,++ii );
+    lab = new QLabel ( "", mw );
+    mainLayout->addWidget( lab,0,++ii );
+    lab->setMaximumWidth( max+4 );
+    lab = new QLabel ( "", mw );
+    mainLayout->addWidget( lab,0,++ii );
+
+
 #if 0
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,6 );
     addBut->setPixmap ( SmallIcon("minus"));
     connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 #endif
 
 
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     int row = 1;
     while ( kkf ) {
         int iii = 0;
         KOCalCheckButton* cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb );
         cb->setChecked( kkf->isStandard );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
         if ( kkf->mErrorOnLoad ||  kkf->isReadOnly )
             cb->setEnabled( false );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
         cb->setChecked( kkf->isEnabled );
         cb->setNum( kkf->mCalNumber );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) );
         KOCalButton* name = new KOCalButton( mw );
         name->setNum( kkf->mCalNumber );
         name->setText(  kkf->mName );
         mainLayout->addWidget( name,row,++iii );
         connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
-        lab = new QLabel ( i18n(" "), mw );
-        mainLayout->addWidget( lab,row,++iii );
+        //lab = new QLabel (" ", mw );
+        //mainLayout->addWidget( lab,row,++iii );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb );
         cb->setChecked( kkf->isAlarmEnabled );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mROB.append( cb );
         cb->setChecked( kkf->isReadOnly );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         if ( row > 1) {
             KColorButton *colb = new KColorButton( mw );
             mainLayout->addWidget( colb,row,++iii );
             colb->setID( kkf->mCalNumber );
             colb->setColor( kkf->mDefaultColor );
             connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) );
             KOCalButton* calb = new KOCalButton( mw );
             mainLayout->addWidget( calb,row,++iii );
             calb->setNum( kkf->mCalNumber );
             calb->setPixmap ( SmallIcon("minus"));
             connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) );
             int hei = calb->sizeHint().height();
             //calb->setMaximumSize( hei*9/10, hei*9/10 );
         }
         ++row;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     lab = new QLabel (  "", mw );
     mainLayout->addWidget( lab,row,0 );
     mw->show();
 
 }
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
     QString name, file;
     while ( tryagain ) {
         KONewCalPrefs prefs ( this ); 
          prefs.nameE->setText( name );
         prefs.url->setURL( file );
         if ( !  prefs.exec() )
             return;
         name = prefs.calName();
         file = prefs.calFileName();
         tryagain = false;
         KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
         while ( kkf ) {
             if ( kkf->mName == name ) {
                 KMessageBox::information( this,  i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); 
                 name = "";
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
                 KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
                 file = "";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();