3 files changed, 18 insertions, 8 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 47cd488..543897a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2447,24 +2447,30 @@ void CalendarView::showDatePicker( )
 
 void CalendarView::showEventEditor()
 {
 #ifdef DESKTOP_VERSION
     mEventEditor->show();
 #else
-    if ( mEventEditor->width() != QApplication::desktop()->width() )
-        mEventEditor->hide();
+    if ( mEventEditor->width() != QApplication::desktop()->width() ) {
+        qDebug("CalendarView: recreate mEventEditor ");
+        delete mEventEditor;
+        mEventEditor = mDialogManager->getEventEditor(); 
+    }
     mEventEditor->showMaximized();
 #endif
 }
 void CalendarView::showTodoEditor()
 {
 #ifdef DESKTOP_VERSION
     mTodoEditor->show();
 #else
-    if ( mTodoEditor->width() != QApplication::desktop()->width() )
-        mTodoEditor->hide();
+    if ( mTodoEditor->width() != QApplication::desktop()->width() ) {
+        qDebug("CalendarView: recreate mTodoEditor ");
+        delete mTodoEditor;  
+        mTodoEditor = mDialogManager->getTodoEditor(); 
+    }
     mTodoEditor->showMaximized();
 #endif
 }
 
 void CalendarView::cloneIncidence()
 {
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 66f6977..b73d22f 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -139,24 +139,25 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
 
   mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
   // buttonLayout->addWidget(mAddressBookButton);
   connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook()));
   //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
 
-  if (qApp->desktop()->width() < 300 ) {
+  if (qApp->desktop()->width() < 640 ) {
+      if ( qApp->desktop()->width() < 300 )
       mListView->setFixedHeight(80);
       topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
       topLayout->addMultiCellWidget(mListView,1,1,0,3);
       topLayout->addWidget(attendeeLabel,3,0);
       topLayout->addMultiCellWidget(mNameEdit,3,3,1,2);
       topLayout->addWidget(emailLabel,4,0);
       topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2);
       topLayout->addWidget(attendeeRoleLabel,5,0);
-      topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2);
+      topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3);
       topLayout->addWidget(statusLabel,6,0);
-      topLayout->addMultiCellWidget(mStatusCombo,6,6,1,2);
+      topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3);
       topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3);
       topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
       topLayout->addMultiCellWidget(buttonBox,3,4,3,3);
       topLayout->setRowStretch(1,2);
       topLayout->setColStretch(0,0);
       topLayout->setColStretch(1,2);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 65566b5..46ae6a0 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -110,13 +110,16 @@ class KOex2phonePrefs : public QDialog
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
-        
+        qApp->processEvents();
+        int dw = QApplication::desktop()->width();
+        int dh = QApplication::desktop()->height();
+        move( (dw-width())/2, (dh - height() )/2 );
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;