From 4a9bf75c2ef12a40be3aea1d147f3703aee48638 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 23 Feb 2005 21:53:18 +0000
Subject: morelayout fixes

---
(limited to 'korganizer/calendarview.cpp')

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1009956..d6918d3 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -480,6 +480,7 @@ CalendarView::~CalendarView()
     delete mStorage;
     delete mDateFrame ;
     delete beamDialog;
+    delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 
@@ -2527,7 +2528,13 @@ void CalendarView::showDatePicker( )
 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() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
@@ -2543,7 +2550,13 @@ void CalendarView::showEventEditor()
 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() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
@@ -2793,7 +2806,7 @@ void CalendarView::editTodo( Todo *todo )
 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()));
         connect( mEventViewerDialog, SIGNAL(jumpToTime( const QDate &)), 
@@ -3967,6 +3980,7 @@ void CalendarView::resetFocus()
     if ( !mViewerCallerIsSearchDialog ) {
         //mViewManager->currentView()->setFocus();
         //qDebug("sssssssssssssssset focus ");
+        topLevelWidget()->raise();
         setActiveWindow();
         //setFocus();
     }
--
cgit v0.9.0.2