summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-07-26 14:26:36 (UTC)
committer zautrix <zautrix>2005-07-26 14:26:36 (UTC)
commite1d72bb77c51ff7313b390f263bc1f10d20123b0 (patch) (side-by-side diff)
tree35f6cb7936a6e05914bdb9329ece3143c8c9a2f7 /korganizer
parent08f8edb64a919e51ad6e1a62031569a629cffa0f (diff)
downloadkdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.zip
kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.tar.gz
kdepimpi-e1d72bb77c51ff7313b390f263bc1f10d20123b0.tar.bz2
fixx
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp7
-rw-r--r--korganizer/kofilterview.cpp10
2 files changed, 11 insertions, 6 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9674921..3ab4bb4 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -734,25 +734,25 @@ void CalendarView::nextConflict( bool all, bool allday )
if ( found ) {
if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
mViewManager->showDayView();
mNavigator->slotDaySelect( conflict.date() );
int hour = conflict.time().hour();
mViewManager->agendaView()->setStartHour( hour );
topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
block = false;
return;
}
topLevelWidget()->setCaption( i18n("No conflict found") );
- qDebug("No conflict found ");
+ //qDebug("No conflict found ");
block = false;
return;
}
void CalendarView::conflictAll()
{
nextConflict ( true, true );
}
void CalendarView::conflictAllday()
{
nextConflict ( false, true );
}
@@ -2819,32 +2819,33 @@ void CalendarView::checkConflictForEvent()
cE = test;
} else {
if ( retVal < conflict ) {
conflict = retVal;
cE = test;
}
}
found = true;
}
}
test = testlist.next();
}
+ topLevelWidget()->setCaption( i18n("KO/Pi") );
if ( found ) {
QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( mConflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ;
qApp->processEvents();
int km = KMessageBox::warningContinueCancel(this,mess,
i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!"));
- if ( km != KMessageBox::Continue )
+ if ( km != KMessageBox::Continue ) {
return;
-
+ }
if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
mViewManager->showDayView();
mNavigator->slotDaySelect( conflict.date() );
int hour = conflict.time().hour();
mViewManager->agendaView()->setStartHour( hour );
topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
} else
topLevelWidget()->setCaption( i18n("No conflict found") );
mConflictingEvent = 0;
return;
}
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 7ce3f1f..6a6fff9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -356,53 +356,57 @@ void KOCalEditView::readConfig()
mainLayout->addWidget( lab,row,0 );
mw->show();
}
void KOCalEditView::defaultInfo()
{
KMessageBox::information( this, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
}
void KOCalEditView::addCal()
{
bool tryagain = true;
- QString name, file;
+ QString name, file = KGlobalSettings::calendarDir()+"newCal.ics";
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 = "";
+ file = KGlobalSettings::calendarDir()+"newCal.ics";
break;
}
kkf = KOPrefs::instance()->mCalendars.next();
+ }
+ QFileInfo fi ( file );
+ if ( fi.isDir() ) {
+ tryagain = true;
}
}
addCalendar ( name, file );
- QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
+ QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
}
int KOCalEditView::addCalendar( QString name, QString file, bool ask )
{
QFileInfo fi ( file );
QString absFile = file;
bool isRelative = false;
if ( fi.isRelative() ) {
isRelative = true;
absFile = KGlobalSettings::calendarDir()+file;
fi.setFile( absFile );
} else {