init fix

1 files changed, 43 insertions, 43 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 96ced08..90b36ac 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1802,48 +1802,91 @@ void CalendarView::readSettings()
     // read settings from the KConfig, supplying reasonable
     // defaults where none are to be found
     KConfig *config = KOGlobals::config();
 #ifndef KORG_NOSPLITTER
     config->setGroup("KOrganizer Geometry");
 
     QValueList<int> sizes = config->readIntListEntry("Separator1");
     if (sizes.count() != 2) {
         sizes << mDateNavigator->minimumSizeHint().width();
         sizes << 300;
     }
     mPanner->setSizes(sizes);
 
     sizes = config->readIntListEntry("Separator2");
     if ( ( mResourceView && sizes.count() == 4 ) ||
          ( !mResourceView && sizes.count() == 3 ) ) {
         mLeftSplitter->setSizes(sizes);
     }
 #endif
     globalFlagBlockAgenda = 1;
     mViewManager->showAgendaView();
     //mViewManager->readSettings( config );
     mTodoList->restoreLayout(config,QString("Todo Layout"));
     readFilterSettings(config);
+   
+#ifdef DESKTOP_VERSION
+    config->setGroup("WidgetLayout");
+    QStringList list;
+    list = config->readListEntry("MainLayout");
+    int x,y,w,h;
+    if ( ! list.isEmpty() ) {
+        x = list[0].toInt();
+        y = list[1].toInt();
+        w = list[2].toInt();
+        h = list[3].toInt();
+        topLevelWidget()->setGeometry(x,y,w,h);
+
+    } else {
+        topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
+    }
+    list = config->readListEntry("EditEventLayout");
+    if ( ! list.isEmpty() ) {
+        x = list[0].toInt();
+        y = list[1].toInt();
+        w = list[2].toInt();
+        h = list[3].toInt();
+        mEventEditor->setGeometry(x,y,w,h);
+
+    }
+    list = config->readListEntry("EditTodoLayout");
+    if ( ! list.isEmpty() ) {
+        x = list[0].toInt();
+        y = list[1].toInt();
+        w = list[2].toInt();
+        h = list[3].toInt();
+        mTodoEditor->setGeometry(x,y,w,h);
+
+    }
+    list = config->readListEntry("ViewerLayout");
+    if ( ! list.isEmpty() ) {
+        x = list[0].toInt();
+        y = list[1].toInt();
+        w = list[2].toInt();
+        h = list[3].toInt();
+        getEventViewerDialog()->setGeometry(x,y,w,h);
+    }
+#endif
     config->setGroup( "Views" );
     int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
 
     QValueList<int> sizes = config->readIntListEntry("Left Splitter Frame");
    
     int resetval = 0;
     int maxVal = 0;
     if (sizes.count() != 3) { 
         if ( KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
     if ( !resetval ){// i.e. sizes.count() == 3  
         if ( KOPrefs::instance()->mVerticalScreen ) {
             if ( sizes[0] <  mDateNavigator->sizeHint().width()+1 )
                 resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             if ( sizes[0] <  mDateNavigator->sizeHint().height()+1 )
                 resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
     if ( resetval ) {
@@ -1877,91 +1920,48 @@ void CalendarView::readSettings()
                 resetval = mDateNavigator->sizeHint().height()+2;
         }
     }
     if ( resetval ) {
         sizes.clear();
         if ( !KOPrefs::instance()->mVerticalScreen ) {
             maxVal = QApplication::desktop()->width() -10;
         } else {
             maxVal = QApplication::desktop()->height()-10;
         }
         sizes << resetval;
         if ( maxVal < resetval + resetval)
             resetval = maxVal - resetval;
         sizes << resetval;
     }
     mMainFrame->setSizes(sizes);
    
     if ( dateCount == 5 ) mNavigator->selectWorkWeek();
     else if ( dateCount == 7 ) mNavigator->selectWeek();
     else mNavigator->selectDates( dateCount );
     // mViewManager->readSettings( config );
     updateConfig(); 
     globalFlagBlockAgenda = 2;
     mViewManager->readSettings( config );
-#ifdef DESKTOP_VERSION
-    config->setGroup("WidgetLayout");
-    QStringList list;
-    list = config->readListEntry("MainLayout");
-    int x,y,w,h;
-    if ( ! list.isEmpty() ) {
-        x = list[0].toInt();
-        y = list[1].toInt();
-        w = list[2].toInt();
-        h = list[3].toInt();
-        topLevelWidget()->setGeometry(x,y,w,h);
-
-    } else {
-        topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
-    }
-    list = config->readListEntry("EditEventLayout");
-    if ( ! list.isEmpty() ) {
-        x = list[0].toInt();
-        y = list[1].toInt();
-        w = list[2].toInt();
-        h = list[3].toInt();
-        mEventEditor->setGeometry(x,y,w,h);
-
-    }
-    list = config->readListEntry("EditTodoLayout");
-    if ( ! list.isEmpty() ) {
-        x = list[0].toInt();
-        y = list[1].toInt();
-        w = list[2].toInt();
-        h = list[3].toInt();
-        mTodoEditor->setGeometry(x,y,w,h);
-
-    }
-    list = config->readListEntry("ViewerLayout");
-    if ( ! list.isEmpty() ) {
-        x = list[0].toInt();
-        y = list[1].toInt();
-        w = list[2].toInt();
-        h = list[3].toInt();
-        getEventViewerDialog()->setGeometry(x,y,w,h);
-    }
-#endif
-
 }
 
 
 void CalendarView::writeSettings()
 {
     //  kdDebug() << "CalendarView::writeSettings" << endl;
 
     KConfig *config = KOGlobals::config();
 
     mViewManager->writeSettings( config );
     mTodoList->saveLayout(config,QString("Todo Layout"));
     mDialogManager->writeSettings( config );
     //KOPrefs::instance()->usrWriteConfig();
     KOPrefs::instance()->writeConfig();
 
     writeFilterSettings(config);
 
     config->setGroup( "Views" );
     config->writeEntry( "ShownDatesCount", mNavigator->selectedDates().count() );
 
     QValueList<int> listINT = mLeftFrame->sizes();
     config->writeEntry("Left Splitter Frame",listINT);
     QValueList<int> listINT2 = mMainFrame->sizes();
     config->writeEntry("Main Splitter Frame",listINT2);