fixxx

2 files changed, 2 insertions, 5 deletions

diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 51ae0a0..7a96aa5 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -59,129 +59,128 @@ KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
   mTopLayout = new QVBoxLayout(parWid);
   QHBox * vb = new QHBox ( parWid );
   QPushButton * newJournal = new QPushButton( vb );
   QPixmap icon;
   if ( QApplication::desktop()->width() < 321 ) 
       icon = SmallIcon("ko16old");
   else
       icon = SmallIcon("ko24old");
   newJournal->setPixmap (icon ) ;
   int size = newJournal->sizeHint().height();
   newJournal->setFixedSize(  size, size );
   mDateLabel = new QLabel ( vb );
   mTopLayout->addWidget( vb );
   mDateLabel->setMargin(1);
   mDateLabel->setAlignment(AlignCenter);
   connect( newJournal, SIGNAL( clicked() ), this , SLOT( newJournal() ) );
   getNewEntry();
 }
 
 KOJournalView::~KOJournalView()
 {
 }
 
 int KOJournalView::currentDateCount()
 {
   return 0;
 }
 JournalEntry* KOJournalView::getNewEntry()
 {
     JournalEntry* Entry = new JournalEntry(mCalendar,parWid);
     jEntries.append( Entry );
     mTopLayout->addWidget(Entry); 
     Entry->setFont ( KOPrefs::instance()->mJornalViewFont  );
     connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) )  ;
     connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) )  ;
     connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) )  ;
     return Entry;
 }
 
 QPtrList<Incidence> KOJournalView::selectedIncidences()
 {
   QPtrList<Incidence> eventList;
 
   return eventList;
 }
 void KOJournalView::updateConfig()
 {
     JournalEntry* mEntry = jEntries.first();
     while ( mEntry ) {
         mEntry->setFont ( KOPrefs::instance()->mJornalViewFont  );
         mEntry = jEntries.next();
     }
 }
 void KOJournalView::updateView()
 { 
     JournalEntry* mEntry = jEntries.first();
     while ( mEntry ) {
         mEntry->setFont ( KOPrefs::instance()->mJornalViewFont  );
         mEntry = jEntries.next();
     }
     showDates( mDate, QDate() );
 }
 void KOJournalView::checkModified()
 {
-    qDebug("checkmod ");
     flushView();
 }
 void KOJournalView::flushView()
 { 
     static bool ff = false;
     if ( ff ) return;
     ff = true;
     JournalEntry* mEntry = jEntries.first();
     while ( mEntry ) {
         mEntry->flushEntry();
         mEntry = jEntries.next();
     }
     ff = false;
 }
 
 void KOJournalView::clearList()
 {
     JournalEntry* mEntry = jEntries.first();
     while ( mEntry ) {
         mEntry->clear();
         mEntry = jEntries.next();
     }
 }
 void KOJournalView::newJournal()
 {
     //qDebug("  KOJournalView::newJournal()");
     flushView();
     Journal* mJournal = new Journal;
     mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0)));
     mCalendar->addJournal(mJournal);
     showDates( mDate, QDate() );
 }
 
 void KOJournalView::showOnly ( Journal* j )
 {
     //qDebug("showOnly %x ", j);
     flushView();
     if ( j == 0 ) {
         showDates( mDate, QDate() );
         return;
     }
     QPtrList<Journal> jl;
     jl.append ( j );
     showList( jl );
     JournalEntry* mEntry = jEntries.first();
     mEntry->setShowOnly();
 }
 void KOJournalView::showList(QPtrList<Journal> jl)
 {
     //qDebug("KOJournalView::showList %d",jl.count() );
     JournalEntry* mEntry = jEntries.first();
     JournalEntry* firstEntry =  mEntry;
     int count = jl.count();
     int iii = 0;
     while ( iii < count ) {
         if ( !mEntry ) {
             mEntry = getNewEntry();
             mEntry->show();
             mEntry->setVisibleMode( true );
             mEntry->setDate(mDate);
             mEntry->setJournal(jl.at(iii));
             mEntry = 0;
         } else { 
             mEntry->setDate(mDate);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fb6d6ec..23537a6 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1774,132 +1774,130 @@ void MainWindow::importQtopia()
 #if 0
     int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                        i18n("Not supported \non desktop!\n"),
                                        i18n("Ok"), i18n("Cancel"), 0,
                                        0, 1 );
 
 #endif
 }
 
 void MainWindow::saveOnClose()
 {
     KOPrefs *p = KOPrefs::instance();
     p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarHorV = ( viewToolBar->orientation () == Qt:: Horizontal );
     p->mToolBarHorN = ( navigatorToolBar->orientation () == Qt:: Horizontal );
     if ( filterToolBar ) {
         p->mToolBarHorF = ( filterToolBar->orientation () == Qt:: Horizontal );
     }
 #ifdef DESKTOP_VERSION
     
     QPoint myP;
     myP = mapFromGlobal( iconToolBar->mapToGlobal( QPoint( 0,0) ) );
     if (  p->mToolBarHor )
         p->mToolBarUp = myP.y() > height()/2;
     else
         p->mToolBarUp = myP.x() > width()/2;
     myP = mapFromGlobal( viewToolBar->mapToGlobal( QPoint( 0,0) ) );
     if ( p->mToolBarHorV )
         p->mToolBarUpV = myP.y()  > height()/2;
     else
         p->mToolBarUpV = myP.x() > width()/2 ;
     myP = mapFromGlobal( navigatorToolBar->mapToGlobal( QPoint( 0,0) ) );
     if ( p->mToolBarHorN )
         p->mToolBarUpN = myP.y() > height()/2;
     else
         p->mToolBarUpN = myP.x() > width()/2 ;
     if ( filterToolBar ) {
         myP = mapFromGlobal( filterToolBar->mapToGlobal( QPoint( 0,0) ) );
         if ( p->mToolBarHorF )
             p->mToolBarUpF = myP.y() > height()/2;
         else
             p->mToolBarUpF = myP.x() > width()/2 ;
     }
 #else
     if (  p->mToolBarHor )
         p->mToolBarUp = iconToolBar->y() > height()/2;
     else
         p->mToolBarUp = iconToolBar->x() > width()/2;
     if ( p->mToolBarHorV )
         p->mToolBarUpV = viewToolBar->y() > height()/2;
     else
         p->mToolBarUpV = viewToolBar->x() > width()/2 ;
     
     if ( p->mToolBarHorN )
         p->mToolBarUpN = navigatorToolBar->y() > height()/2;
     else
         p->mToolBarUpN = navigatorToolBar->x() > width()/2 ;
     if ( filterToolBar ) {
         if ( p->mToolBarHorF )
             p->mToolBarUpF = filterToolBar->y() > height()/2;
         else
             p->mToolBarUpF = filterToolBar->x() > width()/2 ;
     }
 #endif
-    if ( mView->viewManager()->journalView() )
-        mView->viewManager()->journalView()->checkModified();
-    if ( mCalendarModifiedFlag || mView->checkFileChanged( defaultFileName()))
-        save();
+    
+    save();
     mView->writeSettings();
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
     if ( mBlockAtStartup )
         return;
    
     int msec;
     // we store the changes after 1 minute,
     // and for safety reasons after 10 minutes again
     if ( !mSyncManager->blockSave() )
         msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
     else
         msec = 1000 * 600;
     mSaveTimer.start( msec, true ); // 1 minute
     qDebug("KO: Saving File in %d secs!", msec/1000);
     mCalendarModifiedFlag = true;
 }
 void MainWindow::saveStopTimer()
 {
     mSaveTimer.stop();
 }
 void MainWindow::backupAllFiles()
 {
     QDate reference ( 2000,1,1);
     int daysTo = reference.daysTo ( QDate::currentDate() );
     setCaption(i18n("Creating backup ... please wait ..." ));
     qDebug("KO: Last backup was %d days ago ", daysTo - KOPrefs::instance()->mLastBackupDate);
     // we need the file path, the backup dir and the number of bups as param
     QString bupDir = KPimGlobalPrefs::instance()->mBackupDatadir;
     if ( KPimGlobalPrefs::instance()->mBackupUseDefaultDir)
         bupDir = KGlobalSettings::backupDataDir();
     int retval =  KApplication::createBackup(  defaultFileName(), bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );
     if ( retval == 0 ) {
         setCaption(i18n("Backup cancelled" ));
         qDebug("KO: Backup cancelled. Will try again tomorrow ");
         // retval == 0 : backup skipped for today, try again tomorrow
         KOPrefs::instance()->mLastBackupDate = daysTo- KPimGlobalPrefs::instance()->mBackupDayCount+1;
     } else if ( retval == 1 ){
         qDebug("KO: Backup created.");
         // backup ok
         QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
         KopiCalendarFile * cal = calendars.first();
         cal = calendars.next();
         while ( cal ) {
             if ( !cal->mErrorOnLoad ) {
                 int retval =  KApplication::createBackup(  cal->mFileName, bupDir, KPimGlobalPrefs::instance()->mBackupNumbers );  
             }
             cal = calendars.next();
         }
         KOPrefs::instance()->mLastBackupDate =  daysTo;
         setCaption(i18n("Backup succesfully finished" ));
     } else if ( retval == 2 ){
         setCaption(i18n("Backup globally disabled" ));
         qDebug("KO: Backup globally cancelled.");
         // backup globally cancelled
         KPimGlobalPrefs::instance()->mBackupEnabled = false;
     }
     // retval == 3: do nothing, try again later
 }
 void MainWindow::save()
 {
     if ( mView->viewManager()->journalView() )
         mView->viewManager()->journalView()->checkModified();