| -rw-r--r-- | korganizer/calendarview.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1009956..d6918d3 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -481,4 +481,5 @@ CalendarView::~CalendarView() delete mDateFrame ; delete beamDialog; + delete mEventViewerDialog; //kdDebug() << "~CalendarView() done" << endl; } @@ -2528,5 +2529,11 @@ void CalendarView::showEventEditor() { #ifdef DESKTOP_VERSION + int x,y,w,h; + x = mEventEditor->geometry().x(); + y = mEventEditor->geometry().y(); + w = mEventEditor->width(); + h = mEventEditor->height(); mEventEditor->show(); + mEventEditor->setGeometry(x,y,w,h); #else if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { @@ -2544,5 +2551,11 @@ void CalendarView::showTodoEditor() { #ifdef DESKTOP_VERSION + int x,y,w,h; + x = mTodoEditor->geometry().x(); + y = mTodoEditor->geometry().y(); + w = mTodoEditor->width(); + h = mTodoEditor->height(); mTodoEditor->show(); + mTodoEditor->setGeometry(x,y,w,h); #else if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { @@ -2794,5 +2807,5 @@ KOEventViewerDialog* CalendarView::getEventViewerDialog() { if ( !mEventViewerDialog ) { - mEventViewerDialog = new KOEventViewerDialog(this); + mEventViewerDialog = new KOEventViewerDialog(0); connect( mEventViewerDialog, SIGNAL( editIncidence( Incidence* )), this, SLOT(editIncidence( Incidence* ) ) ); connect( this, SIGNAL(configChanged()), mEventViewerDialog, SLOT(updateConfig())); @@ -3968,4 +3981,5 @@ void CalendarView::resetFocus() //mViewManager->currentView()->setFocus(); //qDebug("sssssssssssssssset focus "); + topLevelWidget()->raise(); setActiveWindow(); //setFocus(); |