fixii

9 files changed, 43 insertions, 13 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 11a0413..44e6bdf 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1472,7 +1472,7 @@
 { "Edit category list...","Ändere Kategorieliste..." },
 { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
-{ "","" },
-{ "","" },
-{ "","" },
+{ "Filepath: ","Dateipfad: " },
+{ "The loading of one or more calendar failed:","Das Laden eines oder mehrerer Kalender schlug fehl:" },
+{ "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index c0f3be7..fd026fa 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -685,4 +685,18 @@ void CalendarView::scrollBarValue(int val )
 void CalendarView::checkAlarms()
 {
+
+    QString message;
+    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    KopiCalendarFile * cal = calendars.first();
+    while ( cal ) {
+        if (  cal->mErrorOnLoad ) {
+            message +=  cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n";
+        }
+        cal = calendars.next();
+    }
+    if ( !message.isEmpty() ) {
+        message = KGlobal::formatMessage( i18n("The loading of one or more calendar failed:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0); 
+        KMessageBox::error(this,message);
+    }
     KConfig *config = KOGlobals::config();
     config->setGroup( "AppRun" );
@@ -1924,5 +1938,6 @@ void CalendarView::addCalendarId( int id )
 {
     KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id );
-    addCalendar( cal );    
+    if ( cal )
+        addCalendar( cal );    
 }
 bool CalendarView::addCalendar( KopiCalendarFile * cal )
@@ -1933,6 +1948,5 @@ bool CalendarView::addCalendar( KopiCalendarFile * cal )
         return true;
     }
-    qDebug("KO: Error adding calendar file %1 ",cal->mFileName.latin1() );
-    KMessageBox::error(this,i18n("Error loading calendar file\n%1.").arg(cal->mFileName));
+    qDebug("KO: Error adding calendar file %s ",cal->mFileName.latin1() );
     cal->mErrorOnLoad = true;
     return false;
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 7354940..479bd8b 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -34,4 +34,5 @@
 #include <klocale.h>
 #include <kglobal.h>
+#include <kdialog.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
@@ -82,4 +83,5 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   QGridLayout *topLayout = new QGridLayout(this);
   topLayout->setSpacing(spacing);
+  topLayout->setMargin(KDialog::marginHint()-2);
 
   QString organizer = KOPrefs::instance()->email();
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index e07bc53..29e68b3 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -36,4 +36,5 @@
 
 #include <kglobal.h>
+#include <kdialog.h>
 #include <kdebug.h>
 #include <klocale.h>
@@ -77,5 +78,7 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
     headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1);
 #endif
-
+    // 1 on pda
+    // 11 on desktop
+    headerLayout->setSpacing( (KDialog::spacingHint()-3)*2+1 );
     QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent);
     headerLayout->addWidget(summaryLabel,1,0);
@@ -101,5 +104,5 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
 
     mLocationEdit = new KOLocationBox(TRUE,parent,10); 
-    mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding  ,FALSE) );
+    mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding ,FALSE) );
     if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 ) 
         mLocationEdit->setMaximumHeight( hei + 6);
@@ -190,5 +193,5 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
     categoriesLayout->addWidget(mCategoriesButton);
     mCategoriesLabel = new QPushButton(parent);//new QLabel(parent);
-    mCategoriesLabel->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding  ,FALSE) );
+    mCategoriesLabel->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Fixed  ,FALSE) );
     mCategoriesLabel->setPopup( mCatPopup );
     //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken);
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 3dd7f5c..2c6ed9f 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -32,4 +32,5 @@
 #include <kdebug.h>
 #include <kglobal.h>
+#include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -92,6 +93,6 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
   timeLayout->addWidget(timeGroupBox);
 
-  timeGroupBox->layout()->setSpacing( 0 ); 
-  timeGroupBox->layout()->setMargin( 5 ); 
+  timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); 
+  timeGroupBox->layout()->setMargin( KDialog::marginHint() ); 
   QFrame *timeBoxFrame = new QFrame(timeGroupBox);
 
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 0a734ee..965cf47 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -90,5 +90,5 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
                                           i18n("Date && Time"),parent);
   timeLayout->addWidget(timeGroupBox);
-  timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); 
+  timeGroupBox->layout()->setSpacing( KDialog::spacingHint()-2 ); 
   timeGroupBox->layout()->setMargin(  KDialog::marginHint() ); 
   QFrame *timeBoxFrame = new QFrame(timeGroupBox);
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp
index 75dae34..9ede543 100644
--- a/korganizer/koeventeditor.cpp
+++ b/korganizer/koeventeditor.cpp
@@ -109,8 +109,12 @@ void KOEventEditor::setupGeneral()
     topLayout->setSpacing(spacingHint()-1);
     topLayout->setMargin(marginHint()-1);
+    topLayout->addStretch ( 1 );
     mGeneral->initHeader(topFrame,topLayout);
+    topLayout->addStretch ( 1 );
     mGeneral->initTime(topFrame,topLayout);
+    topLayout->addStretch ( 1 );
 //    QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
     mGeneral->initAlarm(topFrame,topLayout);
+    topLayout->addStretch ( 1 );
     mGeneral->enableAlarm( false );
 
@@ -145,4 +149,6 @@ void KOEventEditor::setupGeneral()
 
     QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
+    topLayout2->setSpacing(spacingHint()-1);
+    topLayout2->setMargin(marginHint()-1);
     topLayout2->setSpacing(spacingHint());
 
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 9813a80..9bc0302 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -87,5 +87,5 @@ void KOIncidenceEditor::setupAttendeesTab()
   QBoxLayout *topLayout = new QVBoxLayout(topFrame);
 
-  mDetails = new KOEditorDetails(spacingHint(),topFrame);
+  mDetails = new KOEditorDetails(spacingHint()-2,topFrame);
   topLayout->addWidget(mDetails);
 }
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 8b90ae5..555c1b1 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -121,7 +121,11 @@ void KOTodoEditor::setupGeneral()
         topLayout->setSpacing(spacingHint());
     }
+    topLayout->addStretch( 1 );
    mGeneral->initHeader(topFrame,topLayout);
+    topLayout->addStretch( 1 );
     mGeneral->initTime(topFrame,topLayout); 
+    topLayout->addStretch( 1 );
    mGeneral->initAlarm(topFrame,topLayout);
+    topLayout->addStretch( 1 );
     mGeneral->enableAlarm( false );