journal fixxx

7 files changed, 156 insertions, 25 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a62145a..697093e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -442,48 +442,49 @@ void CalendarView::init()
         mMainFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Left);
         mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame);
         mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up );
     }
     mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding)   ); 
     //QBoxLayout * leftFrameLayout;
     topLayout->addWidget( mMainFrame );
     //mainBoxLayout->addWidget (mLeftFrame);  
     mDateNavigator = new DateNavigatorContainer( mLeftFrame,
                                                "CalendarView::DateNavigator" );
 #if 0
     // FIXME
     mDateNavigator = new KDateNavigator(mLeftFrame, mCalendar, TRUE,
                                         "CalendarView::DateNavigator", QDate::currentDate());
 #endif
     // mDateNavigator->blockSignals( true );
     //leftFrameLayout->addWidget( mDateNavigator  );
     mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall");
     mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); 
     mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView");
     connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) );
     connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) );
     connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) );
     connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) );
+    connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) );
     connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) );
     connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) );
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) );
     connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) );
     mTodoList->setNavigator( mNavigator );
 #if 0
     if (  QApplication::desktop()->width() < 480 ) {
         leftFrameLayout->addWidget(mFilterView);
         leftFrameLayout->addWidget(mTodoList, 2 );
       
     } else {
         leftFrameLayout->addWidget(mTodoList,2 );
         leftFrameLayout->addWidget(mFilterView );
     } 
 #endif
     mFilterView->hide();
     mCalEditView->hide();
     QWidget *rightBox = new QWidget( mMainFrame );
     //mainBoxLayout->addWidget ( rightBox, 10 );
     QBoxLayout *rightLayout = new QVBoxLayout( rightBox );
     mRightFrame = new QWidgetStack( rightBox );
     rightLayout->addWidget( mRightFrame, 10 );
 
     //mLeftFrame = (QWidget *)leftFrame;
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index c19a5ca..7274849 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -35,86 +35,105 @@
 #include <qpushbutton.h>
 #include <qapplication.h>
 
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktextedit.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include "koprefs.h"
 
 #include <libkcal/journal.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include "journalentry.h"
 //#include "journalentry.moc"
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   QFrame(parent)
 {
+    showOnlyMode = false;
   mCalendar = calendar;
   mJournal = 0;
   mDirty = false;
 
   QHBox * vb = new QHBox ( this );
+  QPushButton * newJournal = new QPushButton( vb );
+  QIconSet icon;
+  if ( QApplication::desktop()->width() < 321 ) 
+      icon = SmallIcon("ko16old");
+  else
+      icon = SmallIcon("ko24old");
+  newJournal->setIconSet (icon ) ;
+  int size = newJournal->sizeHint().height();
+  newJournal->setFixedSize(  size, size );
+
+
+  QPushButton * toggleJournal = new QPushButton( vb );
+  icon = SmallIcon("1updownarrow");
+  toggleJournal->setIconSet (icon ) ;
+  //int size = toggleJournal->sizeHint().height();
+  toggleJournal->setFixedSize( size * 2 /3  , size );
+
+
+
+  mTitleLabel = new QLabel(i18n("Title"),vb);
+  mTitleLabel->setMargin(2);
+  mTitleLabel->setAlignment(AlignCenter);
   QPushButton * loadTemplate = new QPushButton( vb );
   QPushButton * saveTemplate = new QPushButton( vb );
-  QIconSet icon;
   if ( QApplication::desktop()->width() < 321 ) 
       icon = SmallIcon("fileexport16");
   else
       icon = SmallIcon("fileexport");
   saveTemplate->setIconSet (icon ) ;
-  int size = saveTemplate->sizeHint().height();
+  //size = saveTemplate->sizeHint().height();
   saveTemplate->setFixedSize(  size, size );
   if ( QApplication::desktop()->width() < 321 ) 
       icon = SmallIcon("fileimport16");
   else
       icon = SmallIcon("fileimport");
   loadTemplate->setIconSet (icon ) ;
   loadTemplate->setFixedSize(  size, size );
-
-  mTitleLabel = new QLabel(i18n("Title"),vb);
-  mTitleLabel->setMargin(2);
-  mTitleLabel->setAlignment(AlignCenter);
-  
   mEditor = new KTextEdit(this);
   connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty()));
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
 #endif
   mEditor->setWordWrap( KTextEdit::WidgetWidth );
   QBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->addWidget(vb);
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
+  connect( newJournal, SIGNAL( clicked() ), this , SIGNAL( newJournal() ) );
+  connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
 }
 
 JournalEntry::~JournalEntry()
 {
 }
 
 void JournalEntry::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "journals" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/journal";
     fileName = KFileDialog::getSaveFileName(  fileName , i18n("Save as Journal template"), this );
     if ( fileName.length() == 0 )
         return;
 
     QFile fileIn( fileName );
     if (!fileIn.open( IO_WriteOnly ) ) {
         KMessageBox::error( this, i18n("Error saving template file\n '%1'.")
                             .arg( fileName ) );
         return;
     } 
     // QString text;
@@ -130,64 +149,82 @@ void JournalEntry::slotLoadTemplate()
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/journal";
     fileName = KFileDialog::getOpenFileName(  fileName , i18n("Insert Journal template"), this );
     if ( fileName.length() == 0 )
         return;
     QFile fileIn( fileName );
     if (!fileIn.open( IO_ReadOnly ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return;
     }
     QTextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     QString text =  tsIn.read();
     fileIn.close();  
     int line, col;
     mEditor->getCursorPosition (& line, & col );
     mEditor-> insertAt ( text, line, col, true ); 
     //mEditor->setIgnoreMark( true );
     setDirty();
 }
 void JournalEntry::setDate(const QDate &date)
 {
+    showOnlyMode = false;
+  mDate = date;
   writeJournal();
-
+  int id = mCalendar->defaultCalendar();
+  if ( id == 1 ) {
   mTitleLabel->setText(KGlobal::locale()->formatDate(date));
+  } else {
+      QString calname = KOPrefs::instance()->getCalendar( id )->mName;
+      mTitleLabel->setText( KGlobal::locale()->formatDate(mDate,true) + " (" + calname +")");
+  }
+}
 
-  
-  mDate = date;
+void JournalEntry::toggleShowJournal()
+{ 
+    if ( showOnlyMode )
+        emit showJournalOnly( 0 );
+    else
+        emit showJournalOnly( mJournal );
 }
 
 void JournalEntry::setJournal(Journal *journal)
 {
   writeJournal();
 
   mJournal = journal;
   
   mEditor->setText(mJournal->description());
-
+  int id = mJournal->calID();
+  if ( id > 1 ) {
+      QString calname = KOPrefs::instance()->getCalendar( id )->mName;
+      mTitleLabel->setText( KGlobal::locale()->formatDate(mDate,true) + " (" + calname +")");
+  } else {
+      mTitleLabel->setText(KGlobal::locale()->formatDate(mDate));
+  }
   mDirty = false;
 }
 
 Journal *JournalEntry::journal() const
 {
   return mJournal;
 }
 
 void JournalEntry::setDirty()
 {
   mDirty = true;
 
 //  kdDebug() << "JournalEntry::setDirty()" << endl;
 }
 
 void JournalEntry::clear()
 {
   mJournal = 0;
   mEditor->setText("");
 }
 
 bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 {
 //  kdDebug() << "JournalEntry::event received " << e->type() << endl;
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index f1a1fef..85ad5df 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -27,49 +27,54 @@
 
 #include <qframe.h>
 
 #include <libkcal/calendar.h>
 
 class QLabel;
 class KTextEdit;
 
 using namespace KCal;
 
 class JournalEntry : public QFrame {
     Q_OBJECT
   public:
     JournalEntry(Calendar *,QWidget *parent);
     virtual ~JournalEntry();
     
     void setJournal(Journal *);
     Journal *journal() const;
 
     void setDate(const QDate &);
 
     void clear();
 
     void flushEntry();
+    void setShowOnly() {showOnlyMode = true;}
 
   protected slots:
     void slotSaveTemplate();
     void slotLoadTemplate();
     void setDirty();
+    void toggleShowJournal();
  signals:
      void deleteJournal(Journal *);
+     void newJournal();
+     void showJournalOnly( Journal * );
 
   protected:    
     bool eventFilter( QObject *o, QEvent *e );
 
     void writeJournal();
     
   private:
+    bool showOnlyMode;
     Calendar *mCalendar;
     Journal *mJournal;
     QDate mDate;
     void keyPressEvent ( QKeyEvent * ) ;
     QLabel *mTitleLabel;
     KTextEdit *mEditor;
 
     bool mDirty;
 };
 
 #endif
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index bc16037..fae59d6 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -21,96 +21,168 @@
     without including the source code for Qt in the source distribution.
 */
 
 //
 // View of Journal entries
 
 #include <qlayout.h>
 #include <qpopupmenu.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include "koprefs.h"
 
 #include <libkcal/calendar.h>
 
 #include "journalentry.h"
 
 #include "kojournalview.h"
 using namespace KOrg;
 
 KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent,
                        const char *name)
   : KOrg::BaseView(calendar, parent, name)
 {
-  mEntry = new JournalEntry(calendar,this);
-  mEntry->setFont ( KOPrefs::instance()->mJornalViewFont  );
-  QBoxLayout *topLayout = new QVBoxLayout(this);
-  topLayout->addWidget(mEntry); 
-  connect ( mEntry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) )  ;
+    mCalendar = calendar;
+  mTopLayout = new QVBoxLayout(this);
+  getNewEntry();
 }
 
 KOJournalView::~KOJournalView()
 {
 }
 
 int KOJournalView::currentDateCount()
 {
   return 0;
 }
+JournalEntry* KOJournalView::getNewEntry()
+{
+    JournalEntry* Entry = new JournalEntry(mCalendar,this);
+    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::flushView()
 {
+    JournalEntry* mEntry = jEntries.first();
+    while ( mEntry ) {
   mEntry->flushEntry();
+        mEntry = jEntries.next();
+    }
 }
 
 void KOJournalView::clearList()
 {
+    JournalEntry* mEntry = jEntries.first();
+    while ( mEntry ) {
     mEntry->clear();
+        mEntry = jEntries.next();
 }
-void KOJournalView::showDates(const QDate &start, const QDate &)
+}
+void KOJournalView::newJournal()
 {
-//  kdDebug() << "KOJournalView::selectDates()" << endl;
-
-  mEntry->setDate(start);
+    Journal* mJournal = new Journal;
+    mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0)));
+    mCalendar->addJournal(mJournal);
+    showDates( mDate, QDate() );
+}
 
-  Journal *j = calendar()->journal(start);
-  if (j) mEntry->setJournal(j);
-  else mEntry->clear();
+void KOJournalView::showOnly ( Journal* j )
+{
+    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)
+{
+    JournalEntry* mEntry = jEntries.first();
+    JournalEntry* firstEntry =  mEntry;
+    int count = jl.count();
+    int iii = 0;
+    while ( iii < count ) {
+        if ( !mEntry ) {
+            mEntry = getNewEntry();
+            mEntry->show();
+            mEntry->setDate(mDate);
+            mEntry->setJournal(jl.at(iii));
+            mEntry = 0;
+        } else {
+            mEntry->setDate(mDate);
+            mEntry->setJournal(jl.at(iii));
+            mEntry->show();
+            mEntry = jEntries.next();
+        }
+        ++iii;
+    } 
+    while ( mEntry ) {
+        mEntry->setDate(mDate);
+        mEntry->clear();
+        if ( mEntry != firstEntry )
+            mEntry->hide(); 
+        else
+            mEntry->show();
+        mEntry = jEntries.next();
+    }
+}
   
-//  emit incidenceSelected( 0 );
+void KOJournalView::showDates(const QDate &start, const QDate &)
+{
+    mDate = start;
+    QPtrList<Journal> jl = calendar()->journals4Date( start );
+    showList( jl );
 }
 
 void KOJournalView::showEvents(QPtrList<Event>)
 {
   // After new creation of list view no events are selected.
 //  emit incidenceSelected( 0 );
 }
 
 void KOJournalView::changeEventDisplay(Event *, int /*action*/)
 {
   updateView();
 }
  
 void KOJournalView::keyPressEvent ( QKeyEvent * e ) 
 {
     //qDebug("keyPressEven ");
     if ( e->state() == Qt::ControlButton  ) {  
         if ( e->key () == Qt::Key_Right ||  e->key () == Qt::Key_Left )
              e->ignore();
     }
 }
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 445f940..aabf11c 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -3,66 +3,74 @@
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef _KOJOURNALVIEW_H
 #define _KOJOURNALVIEW_H
 
 #include <korganizer/baseview.h>
+#include <qlayout.h>
 
 class JournalEntry;
 
 /**
  * This class provides a journal view.
  
  * @short View for Journal components.
  * @author Cornelius Schumacher <schumacher@kde.org>
  * @see KOBaseView
  */
 class KOJournalView : public KOrg::BaseView
 {
     Q_OBJECT
   public:
     KOJournalView(Calendar *calendar, QWidget *parent = 0, 
                const char *name = 0);
     ~KOJournalView();
 
     virtual int currentDateCount();
     void clearList();
     virtual QPtrList<Incidence> selectedIncidences();
     DateList selectedDates()
       {DateList q;
        return q;};
  signals:
      void deleteJournal(Journal *);
   public slots:
+     void showOnly ( Journal* );
+     void newJournal();
     void updateView();
     void flushView();
     void updateConfig();
     void showDates( const QDate &start, const QDate &end );
     void showEvents(QPtrList<Event> eventList);
 
     void changeEventDisplay(Event *, int);
   
   private:
-    JournalEntry *mEntry; 
+    void showList(QPtrList<Journal> jl);
+    Calendar *mCalendar;
+    JournalEntry* getNewEntry();
+    QPtrList<JournalEntry> jEntries; 
     void keyPressEvent ( QKeyEvent * ) ;
+    QBoxLayout *mTopLayout;
+    QDate mDate;
     
 };
 
 #endif
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 5d9af6d..7b307f7 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -89,48 +89,49 @@ void KOViewManager::readSettings(KConfig *config)
     QString view = config->readEntry("Current View");
     if (view == "WhatsNext") showWhatsNextView();
     else if (view == "Month") {
         if ( !KOPrefs::instance()->mMonthViewWeek )
             showMonthView();
         else
             showMonthViewWeek();
     }
     else if (view == "List") showListView();
     else if (view == "Journal") showJournalView();
     else if (view == "TimeSpan") showTimeSpanView();
     else if (view == "Todo") showTodoView();
     else {
         config->setGroup( "Views" );
         int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
         mCurrentAgendaView = dateCount;
         showAgendaView();
         mCurrentAgendaView = dateCount;
 #ifdef DESKTOP_VERSION
         QTimer::singleShot( 1000, mAgendaView, SLOT ( setInitStartHour() ) );
 #endif
     }
 }
 
+
 void KOViewManager::showDateView( int view, QDate date)
 {
     static int lastMode = 0;
     static int lastCount = 0;
     static bool lastNDMode = false;
     static QDate lastDate;
     //qDebug("date %d %s", view, date.toString().latin1());
 
     if (view != 9)
         lastMode = 0;
     //qDebug("%d %d  ", lastNDMode, mFlagShowNextxDays );
     bool savemFlagShowNextxDays = mFlagShowNextxDays;
     mFlagShowNextxDays = false;
     if ( view == 3 ) {
         //mCurrentAgendaView = 1 ;
         lastDate = mMainView->dateNavigator()->selectedDates().first();
         lastCount = mMainView->dateNavigator()->selectedDates().count();
         lastNDMode = savemFlagShowNextxDays;
         mMainView->dateNavigator()->selectDate( date );
         lastMode = 1;
         mCurrentAgendaView = 1 ;
     } else if (view == 4 ) {
         mCurrentAgendaView = 7 ;
         mMainView->dateNavigator()->selectDates( date, 7 );
@@ -261,48 +262,54 @@ void KOViewManager::showNextView()
  TODO:
     if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;goto ENTE ;}
     if ( KOPrefs::instance()->mShowIconNext )  { goto NEXT ;}
     if ( KOPrefs::instance()->mShowIconNextDays )  { goto NEXT_X ;}
     if ( KOPrefs::instance()->mShowIconJournal )  { goto  JOURNAL;}
     if ( KOPrefs::instance()->mShowIconDay1 )  { goto DAY_1 ;}
     if ( KOPrefs::instance()->mShowIconDay5 )  { goto DAY_5 ;}
     if ( KOPrefs::instance()->mShowIconDay7 )   { goto DAY_7 ;}
     if ( KOPrefs::instance()->mShowIconDay6 )   { goto DAY_6 ;}
     if ( KOPrefs::instance()->mShowIconMonth )   {goto MONTH ;}
     if ( KOPrefs::instance()->mShowIconList )  {  goto LIST ;}
     //if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;goto ENTE ;}
  ENTE:
     flagResetViewChangeDate = 0;
     selecteddatescount =  mMainView->dateNavigator()->selectedDates().count();
     selecteddate = mMainView->dateNavigator()->selectedDates().first();
 
 }
 void KOViewManager::resetDateSilent( QDate date , int days )
 {
     mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectDates( date , days ); 
     mMainView->dateNavigator()->blockSignals( false );
 }
+void KOViewManager::setDefaultCalendar(int)
+{
+    if ( mJournalView && mCurrentView == mJournalView )
+        mJournalView->updateView();
+}
+
 void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 {
     if ( flagResetViewChangeDate < 10 )
         ++flagResetViewChangeDate;
     //mFlagShowNextxDays = false;
     //if(view == mCurrentView) return;  
     if ( view == 0 ) {
         view = mCurrentView;
         if ( view == 0 )
             return;
     }
     bool callupdate = !(view == mCurrentView);
     bool full = fullScreen;
     if(view == mCurrentView && view != mWhatsNextView ) {
         if ( mCurrentAgendaView < 0 )
             return;
         if ( view != mMonthView )
             full = mMainView->leftFrame()->isVisible();
     } else {
         if ( view == mMonthView && mMonthView)
             ;//mMonthView->skipResize = true ; 
         mCurrentView = view;
         // bool full = fullScreen;
         bool isFull = !mMainView->leftFrame()->isVisible();
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 838583b..d5a8e3b 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -62,48 +62,49 @@ class KOViewManager : public QObject
     /** Write which view is currently shown to config file */
     void writeCurrentView(KConfig *);
 
     KOrg::BaseView *currentView();
 
     void setDocumentId( const QString & );
 
     void updateView( const QDate &start, const QDate &end );
     void clearAllViews();
 
     void raiseCurrentView( bool fullScreen = false , bool updateView = false);
 
     void addView(KOrg::BaseView *);
 
     Incidence *currentSelection();
     QDate currentSelectionDate();
 
     KOAgendaView *agendaView() const { return mAgendaView; }
 
  signals:
     void printWNV();
     void signalFullScreen( bool );
     void signalAgendaView( bool );
   public slots: 
+    void setDefaultCalendar(int);
     void slotprintWNV();
     void showNextView();
     void showMonth( const QDate & );
     void showDateView( int, QDate );
     void updateView();
     void showWhatsNextView();
     void showListView();
     void showAgendaView( bool fullScreen = false );
     void showDayView();
     void showWorkWeekView();
     void showWeekView();
     void showNextXView();
     void showMonthView();
     void showMonthViewWeek();
     void showTodoView();
     void showJournalView();
     void showTimeSpanView();
 
   private:
     void resetDateSilent( QDate date , int days );
     int flagResetViewChangeDate;
     QDate currentViewChangeDate;
     void createMonthView();
     CalendarView *mMainView;