1 files changed, 1 insertions, 1 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9a4e719..6ed6a1c 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1729,392 +1729,392 @@ bool CalendarView::checkFileVersion(QString fn)
     //qDebug("loaded file version %s",loadedFileVersion.toString().latin1());
     //qDebug("file on disk version  %s",dt.toString().latin1());
     if ( dt <= loadedFileVersion )
         return true;
    int km = KMessageBox::warningYesNoCancel(this, i18n("\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n").arg( QString::number( finf.size())).arg( KGlobal::locale()->formatDateTime(finf.lastModified (), true, true)) ,
                                                  i18n("KO/Pi Warning"),i18n("Overwrite"),
                                                  i18n("Sync+save"));
    
    if ( km ==  KMessageBox::Cancel )
        return false;
    if ( km ==  KMessageBox::Yes )
        return true;
 
     setSyncDevice("deleteaftersync" );
     mSyncManager->mAskForPreferences = true;
     mSyncManager->mSyncAlgoPrefs = 3;
     mSyncManager->mWriteBackFile = false;
     mSyncManager->mWriteBackExistingOnly = false;
     mSyncManager->mShowSyncSummary = false;
     syncCalendar( fn, 3 );
     Event * e = getLastSyncEvent();
     mCalendar->deleteEvent ( e );
     updateView();
     return true;
 }
 
 bool CalendarView::saveCalendar( QString filename )
 {
  
     // Store back all unsaved data into calendar object
     // qDebug("file %s %d ",  filename.latin1()           , mViewManager->currentView()         );
     if ( mViewManager->currentView() )
         mViewManager->currentView()->flushView();
 
     
     QDateTime lfv = QDateTime::currentDateTime().addSecs( -2);
     mStorage->setSaveFormat( new ICalFormat() );
     mStorage->setFileName( filename );
     bool success;
     success = mStorage->save();
     if ( !success ) {
         return false;
     }
     if ( filename == MainWindow::defaultFileName() ) {
         setLoadedFileVersion( lfv );
         watchSavedFile();
     }
     return true;
 }
 
 void CalendarView::closeCalendar()
 {
  
     // child windows no longer valid
     emit closingDown();
 
     mCalendar->close();
     setModified(false);
     updateView();
 }
 
 void CalendarView::archiveCalendar()
 {
     mDialogManager->showArchiveDialog();
 }
 
 
 void CalendarView::readSettings()
 {
  
   
     // mViewManager->showAgendaView();
     QString str;
     //qDebug("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 ) {
         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;
         sizes << 100;
     }
     mLeftFrame->setSizes(sizes);
     sizes = config->readIntListEntry("Main Splitter Frame");
     resetval = 0;
     maxVal = 0;
     if (sizes.count() != 2) { 
         if ( !KOPrefs::instance()->mVerticalScreen ) {
             resetval = mDateNavigator->sizeHint().width()+2;
         } else {
             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 );
+    QTimer::singleShot( 1, mDateNavigator, SLOT ( setResizeEnabled() ) );
 }
 
 
 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);
 #ifdef DESKTOP_VERSION
     config->setGroup("WidgetLayout");
     QStringList list ;//= config->readListEntry("MainLayout");
     int x,y,w,h;
     QWidget* wid;
     wid = topLevelWidget();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("MainLayout",list );
     
     wid = mEventEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditEventLayout",list );
  
     wid = mTodoEditor;
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("EditTodoLayout",list ); 
     wid = getEventViewerDialog();
     x = wid->geometry().x();
     y = wid->geometry().y();
     w = wid->width();
     h = wid->height();
     list.clear();
     list << QString::number( x );
     list << QString::number( y );
     list << QString::number( w );
     list << QString::number( h );
     config->writeEntry("ViewerLayout",list ); 
     wid = mDialogManager->getSearchDialog();
     if ( wid ) {
         x = wid->geometry().x();
         y = wid->geometry().y();
         w = wid->width();
         h = wid->height();
         list.clear();
         list << QString::number( x );
         list << QString::number( y );
         list << QString::number( w );
         list << QString::number( h );
         config->writeEntry("SearchLayout",list );
     }
 #endif
 
 
     config->sync();
 }
 
 void CalendarView::readFilterSettings(KConfig *config)
 {
     //  kdDebug() << "CalendarView::readFilterSettings()" << endl;
 
     mFilters.clear();
 
     config->setGroup("General");
     QStringList filterList = config->readListEntry("CalendarFilters");
 
     QStringList::ConstIterator it = filterList.begin();
     QStringList::ConstIterator end = filterList.end();
     while(it != end) {
         //    kdDebug() << "  filter: " << (*it) << endl;
 
         CalFilter *filter;
         filter = new CalFilter(*it);
         config->setGroup("Filter_" + (*it));
         //qDebug("readFilterSettings %d ",config->readNumEntry("Criteria",0) );
         filter->setCriteria(config->readNumEntry("Criteria",0));
         filter->setCategoryList(config->readListEntry("CategoryList"));
         mFilters.append(filter);
 
         ++it;
     }
 
     if (mFilters.count() == 0) {
         CalFilter *filter = new CalFilter(i18n("Default"));
         mFilters.append(filter);
     }
     mFilterView->updateFilters();
     config->setGroup("FilterView");
 
     mFilterView->blockSignals(true);
     mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled"));
     mFilterView->setSelectedFilter(config->readEntry("Current Filter"));
     mFilterView->blockSignals(false);
     // We do it manually to avoid it being done twice by the above calls
     updateFilter();
 }
 
 void CalendarView::writeFilterSettings(KConfig *config)
 {
     //  kdDebug() << "CalendarView::writeFilterSettings()" << endl;
 
     QStringList filterList;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         //    kdDebug() << " fn: " << filter->name() << endl;
         filterList << filter->name();
         config->setGroup("Filter_" + filter->name());
         config->writeEntry("Criteria",filter->criteria());
         config->writeEntry("CategoryList",filter->categoryList());
         filter = mFilters.next();
     }
     config->setGroup("General");
     config->writeEntry("CalendarFilters",filterList);
 
     config->setGroup("FilterView");
     config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
     config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 
 
 void CalendarView::goToday()
 {
     if ( mViewManager->currentView()->isMonthView() )
         mNavigator->selectTodayMonth();
     else
         mNavigator->selectToday();
 }
 
 void CalendarView::goNext()
 {
     mNavigator->selectNext();
 }
 
 void CalendarView::goPrevious()
 {
     mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
     mNavigator->selectNextMonth();
 }
 
 void CalendarView::goPreviousMonth()
 {
     mNavigator->selectPreviousMonth();
 }
 void CalendarView::writeLocale() 
 {
     //KPimGlobalPrefs::instance()->setGlobalConfig();
 #if 0
     KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime );
     KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday );
     KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate );
     KGlobal::locale()->setLanguage( KOPrefs::instance()->mPreferredLanguage );