2 files changed, 10 insertions, 3 deletions

diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index a653c18..105028a 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -142,24 +142,25 @@ void KOFilterView::setSelectedFilter( int fil )
 
 
 
 KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
   : QScrollView(parent,name)
 {
     mw = 0; 
     setResizePolicy( AutoOneFit );
     setFrameStyle ( QFrame::Panel | QFrame::Plain );
     setLineWidth ( 1 ); 
     setMidLineWidth ( 1 ); 
+    setFocusPolicy(NoFocus); 
 }
 
 KOCalEditView::~KOCalEditView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void KOCalEditView::selectCal(int id ,bool b)
 {
     KOPrefs::instance()->getCalendar( id )->isEnabled = b;
     emit calendarEnabled ( id, b );
     emit needsUpdate();
 
@@ -219,85 +220,89 @@ void KOCalEditView::selectReadOnly(int id ,bool b )
     
 }
 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 = kkf->mFileName;
-    if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b><tr> Do you want to remove this calendar from KO/Pi? (The file is not removed, of course!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
+    if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar<tr><b>%1</b><tr>is displaying file<tr><b>%2</b><tr>Do you want to remove<tr>this calendar from KO/Pi?<tr>(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 = KOPrefs::instance()->getCalendar( id )->mFileName;
     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) ) ) {
+        if (  KMessageBox::Yes == KMessageBox::questionYesNo( this,  i18n("The calendar <tr><b>%1</b><tr> is not loaded! Loading of file <tr><b>%2</b><tr> failed! <tr><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) );
+        KMessageBox::information( this,  i18n("The calendar <tr><b>%1</b><tr>is displaying file<tr><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);
 
     mainLayout = new QGridLayout ( mw , 2, 8 );
     mainLayout->setMargin( 3);
     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() );
 
     addBut = new QPushButton ( mw );
+    addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,1 );
     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 );
     addBut = new QPushButton ( mw );
+    addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,4 );
     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 );
     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 );
 #if 0
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,6 );
     addBut->setPixmap ( SmallIcon("minus"));
     connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index e2ebdd4..3ab316f 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -36,48 +36,50 @@ class QGridLayout;
 
 using namespace KCal;
 class KOCalButton : public QPushButton
 {
     Q_OBJECT
   public:
     KOCalButton( QWidget *parent=0, const char *name=0 ) :
       QPushButton( parent, name) 
     {
       connect( this, SIGNAL( clicked() ),
                SLOT( bottonClicked() )); 
       mNumber = -1;
+      setFocusPolicy(NoFocus); 
     }
     void setNum ( int num ) {mNumber = num; }
     signals:
     void selectNum ( int );
 private: 
     int mNumber;
     void keyPressEvent ( QKeyEvent * e )
     {
         e->ignore();     
     }
 
 private slots :
     void bottonClicked() { if ( mNumber > 0 ) emit selectNum ( mNumber ); }
 };
 class KOCalCheckButton : public QCheckBox
 {
     Q_OBJECT
   public:
     KOCalCheckButton( QWidget *parent=0, const char *name=0 ) :
       QCheckBox( parent, name) 
     {
       connect( this, SIGNAL( toggled ( bool ) ),
                SLOT( bottonClicked( bool ) )); 
       mNumber = -1;
+      setFocusPolicy(NoFocus); 
       //setMaximumWidth( 10 );
 
     }
     void setNum ( int num ) {mNumber = num; }
     signals:
     void selectNum ( int, bool );
 private: 
     int mNumber;
     void keyPressEvent ( QKeyEvent * e )
     {
         e->ignore();     
     }