From f330b9d0a7f755660ddd59739e3ab9b98d60bc18 Mon Sep 17 00:00:00 2001 From: zautrix Date: Fri, 01 Jul 2005 14:47:16 +0000 Subject: fixii --- (limited to 'korganizer') diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index c0f3be7..fd026fa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -684,6 +684,20 @@ void CalendarView::scrollBarValue(int val ) void CalendarView::checkAlarms() { + + QString message; + QPtrList 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" ); QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); @@ -1923,7 +1937,8 @@ bool CalendarView::restoreCalendarSettings() void CalendarView::addCalendarId( int id ) { KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); - addCalendar( cal ); + if ( cal ) + addCalendar( cal ); } bool CalendarView::addCalendar( KopiCalendarFile * cal ) { @@ -1932,8 +1947,7 @@ bool CalendarView::addCalendar( KopiCalendarFile * cal ) cal->mLoadDt = QDateTime::currentDateTime(); 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 @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -81,6 +82,7 @@ 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(); mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this); diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index e07bc53..29e68b3 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -35,6 +35,7 @@ #include +#include #include #include #include @@ -76,7 +77,9 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) mOwnerLabel = new QLabel(i18n("Owner:"),parent); 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); @@ -100,7 +103,7 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) headerLayout->addWidget(locationLabel,2,0); 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); @@ -189,7 +192,7 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) //connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); 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); categoriesLayout->addWidget(mCategoriesLabel,1); diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 3dd7f5c..2c6ed9f 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -91,8 +92,8 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout) i18n("Date && Time"),parent); 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); QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,2,3); diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 0a734ee..965cf47 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -89,7 +89,7 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout) QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal, 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 @@ -108,10 +108,14 @@ void KOEventEditor::setupGeneral() QBoxLayout *topLayout = new QVBoxLayout(topFrame); 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 ); QBoxLayout *buttonLayout; @@ -144,6 +148,8 @@ void KOEventEditor::setupGeneral() QFrame *topFrame2 = addPage(i18n("Details")); QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2); + topLayout2->setSpacing(spacingHint()-1); + topLayout2->setMargin(marginHint()-1); topLayout2->setSpacing(spacingHint()); mGeneral->initClass(topFrame2,topLayout2); diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 9813a80..9bc0302 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -86,7 +86,7 @@ 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 @@ -120,9 +120,13 @@ void KOTodoEditor::setupGeneral() topLayout->setMargin(marginHint()); 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 ); -- cgit v0.9.0.2