-rw-r--r-- | korganizer/calendarview.cpp | 19 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 12 |
2 files changed, 20 insertions, 11 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3ab4bb4..a76f2ed 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -372,3 +372,3 @@ void CalendarView::init() | |||
372 | mBlockShowDates = false; | 372 | mBlockShowDates = false; |
373 | 373 | mConflictingEvent = 0; | |
374 | mDatePickerMode = 0; | 374 | mDatePickerMode = 0; |
@@ -2795,5 +2795,6 @@ void CalendarView::checkConflictForEvent() | |||
2795 | if ( ! mConflictingEvent ) return; | 2795 | if ( ! mConflictingEvent ) return; |
2796 | QDateTime current = QDateTime::currentDateTime(); | 2796 | Event * conflictingEvent = mConflictingEvent; |
2797 | if ( ! mConflictingEvent->matchTime( ¤t, 0 ) ) { | ||
2798 | mConflictingEvent = 0; | 2797 | mConflictingEvent = 0; |
2798 | QDateTime current = QDateTime::currentDateTime(); | ||
2799 | if ( ! conflictingEvent->matchTime( ¤t, 0 ) ) { | ||
2799 | return; | 2800 | return; |
@@ -2815,3 +2816,3 @@ void CalendarView::checkConflictForEvent() | |||
2815 | if ( !skip && !test->doesFloat() ) { | 2816 | if ( !skip && !test->doesFloat() ) { |
2816 | if ( mConflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { | 2817 | if ( conflictingEvent->isOverlapping ( test, &retVal, ¤t ) ) { |
2817 | if ( ! found ) { | 2818 | if ( ! found ) { |
@@ -2832,3 +2833,3 @@ void CalendarView::checkConflictForEvent() | |||
2832 | if ( found ) { | 2833 | if ( found ) { |
2833 | 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()) ) ; | 2834 | QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( conflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ; |
2834 | qApp->processEvents(); | 2835 | qApp->processEvents(); |
@@ -2844,6 +2845,5 @@ void CalendarView::checkConflictForEvent() | |||
2844 | mViewManager->agendaView()->setStartHour( hour ); | 2845 | mViewManager->agendaView()->setStartHour( hour ); |
2845 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( mConflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); | 2846 | topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( conflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) ); |
2846 | } else | 2847 | } else |
2847 | topLevelWidget()->setCaption( i18n("No conflict found") ); | 2848 | topLevelWidget()->setCaption( i18n("No conflict found") ); |
2848 | mConflictingEvent = 0; | ||
2849 | return; | 2849 | return; |
@@ -4094,8 +4094,9 @@ void CalendarView::setModified(bool modified) | |||
4094 | { | 4094 | { |
4095 | //qDebug("CalendarView::setModified %d ", modified); | ||
4095 | if ( modified ) | 4096 | if ( modified ) |
4096 | emit signalmodified(); | 4097 | emit signalmodified(); |
4097 | if (mModified != modified) { | ||
4098 | mModified = modified; | 4098 | mModified = modified; |
4099 | if ( mModified ) | ||
4099 | emit modifiedChanged(mModified); | 4100 | emit modifiedChanged(mModified); |
4100 | } | 4101 | |
4101 | } | 4102 | } |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 279955f..77d0ac8 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1916,2 +1916,6 @@ void MainWindow::slotModifiedChanged( bool ) | |||
1916 | int msec; | 1916 | int msec; |
1917 | if ( mCalendarModifiedFlag ) { | ||
1918 | //qDebug(" MainWindow timer is running "); | ||
1919 | return; | ||
1920 | } | ||
1917 | // we store the changes after 1 minute, | 1921 | // we store the changes after 1 minute, |
@@ -1977,4 +1981,5 @@ void MainWindow::save() | |||
1977 | } | 1981 | } |
1978 | if ( mSyncManager->blockSave() ) | 1982 | if ( mSyncManager->blockSave() ) { |
1979 | return; | 1983 | return; |
1984 | } | ||
1980 | mSyncManager->setBlockSave(true); | 1985 | mSyncManager->setBlockSave(true); |
@@ -2003,4 +2008,7 @@ void MainWindow::save() | |||
2003 | qDebug(savemes); | 2008 | qDebug(savemes); |
2004 | } else | 2009 | } else { |
2005 | setCaption(i18n("Saving cancelled!")); | 2010 | setCaption(i18n("Saving cancelled!")); |
2011 | mCalendarModifiedFlag = false; | ||
2012 | slotModifiedChanged( true ); | ||
2013 | } | ||
2006 | mSyncManager->setBlockSave( false ); | 2014 | mSyncManager->setBlockSave( false ); |