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
@@ -151,6 +151,7 @@ KOCalEditView::KOCalEditView(QWidget* parent,
     setFrameStyle ( QFrame::Panel | QFrame::Plain );
     setLineWidth ( 1 ); 
     setMidLineWidth ( 1 ); 
+    setFocusPolicy(NoFocus); 
 }
 
 KOCalEditView::~KOCalEditView()
@@ -228,7 +229,7 @@ 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 );
@@ -241,14 +242,14 @@ 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() 
 {
@@ -266,12 +267,14 @@ void KOCalEditView::readConfig()
     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()));
@@ -283,12 +286,14 @@ void KOCalEditView::readConfig()
     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()));
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index e2ebdd4..3ab316f 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -45,6 +45,7 @@ class KOCalButton : public QPushButton
       connect( this, SIGNAL( clicked() ),
                SLOT( bottonClicked() )); 
       mNumber = -1;
+      setFocusPolicy(NoFocus); 
     }
     void setNum ( int num ) {mNumber = num; }
     signals:
@@ -69,6 +70,7 @@ class KOCalCheckButton : public QCheckBox
       connect( this, SIGNAL( toggled ( bool ) ),
                SLOT( bottonClicked( bool ) )); 
       mNumber = -1;
+      setFocusPolicy(NoFocus); 
       //setMaximumWidth( 10 );
 
     }