many bugfixes

1 files changed, 13 insertions, 11 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 15c5dd9..a46cd87 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2475,4 +2475,5 @@ void CalendarView::showEventEditor()
 #else
-    if ( mEventEditor->width() != QApplication::desktop()->width() ) {
-        qDebug("CalendarView: recreate mEventEditor ");
+    if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) {
+        topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
+        qDebug("CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
         delete mEventEditor;
@@ -2488,4 +2489,5 @@ void CalendarView::showTodoEditor()
 #else
-    if ( mTodoEditor->width() != QApplication::desktop()->width() ) {
-        qDebug("CalendarView: recreate mTodoEditor ");
+    if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) {
+        topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
+        qDebug("CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
         delete mTodoEditor;  
@@ -2544,4 +2546,4 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
         Todo* t = (Todo*) newInc; 
-        mTodoEditor->editTodo( t );
         showTodoEditor();
+        mTodoEditor->editTodo( t );
         if ( mTodoEditor->exec() ) {
@@ -2555,4 +2557,4 @@ void CalendarView::cloneIncidence(Incidence * orgInc )
         Event*  e = (Event*)  newInc;
-        mEventEditor->editEvent( e );
         showEventEditor();
+        mEventEditor->editEvent( e );
         if ( mEventEditor->exec() ) {
@@ -2608,2 +2610,3 @@ void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
   
+    showEventEditor();
     mEventEditor->newEvent(fromHint,toHint,allDay);
@@ -2617,3 +2620,2 @@ void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
     }
-    showEventEditor();
 }
@@ -2646,2 +2648,3 @@ void CalendarView::newTodo()
  
+    showTodoEditor();
     mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),0,true);
@@ -2655,3 +2658,2 @@ void CalendarView::newTodo()
     }
-    showTodoEditor();
 }
@@ -2667,4 +2669,4 @@ void CalendarView::newSubTodo(Todo *parentEvent)
   
-    mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),parentEvent,true);
     showTodoEditor();
+    mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),parentEvent,true);
 }
@@ -2689,4 +2691,4 @@ void CalendarView::editEvent( Event *event )
     }
-    mEventEditor->editEvent( event , mFlagEditDescription);
     showEventEditor();
+    mEventEditor->editEvent( event , mFlagEditDescription);
 }
@@ -2707,4 +2709,4 @@ void CalendarView::editTodo( Todo *todo )
     }
-    mTodoEditor->editTodo( todo ,mFlagEditDescription);
     showTodoEditor();
+    mTodoEditor->editTodo( todo ,mFlagEditDescription);