journal fixxx

10 files changed, 173 insertions, 38 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a62145a..697093e 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -463,6 +463,7 @@ void CalendarView::init()
     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()) );
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index c19a5ca..7274849 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -56,20 +56,42 @@
 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");
@@ -77,11 +99,6 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
       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
@@ -94,6 +111,8 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   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()
@@ -151,12 +170,24 @@ void JournalEntry::slotLoadTemplate()
 }
 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 +")");
+  }
+}
 
-  mTitleLabel->setText(KGlobal::locale()->formatDate(date));
-
-  
-  mDate = date;
+void JournalEntry::toggleShowJournal()
+{ 
+    if ( showOnlyMode )
+        emit showJournalOnly( 0 );
+    else
+        emit showJournalOnly( mJournal );
 }
 
 void JournalEntry::setJournal(Journal *journal)
@@ -166,7 +197,13 @@ void JournalEntry::setJournal(Journal *journal)
   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;
 }
 
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index f1a1fef..85ad5df 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -48,13 +48,17 @@ class JournalEntry : public QFrame {
     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 );
@@ -62,6 +66,7 @@ class JournalEntry : public QFrame {
     void writeJournal();
     
   private:
+    bool showOnlyMode;
     Calendar *mCalendar;
     Journal *mJournal;
     QDate mDate;
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index bc16037..fae59d6 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -42,11 +42,9 @@ 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()
@@ -57,6 +55,17 @@ 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()
 {
@@ -66,33 +75,96 @@ QPtrList<Incidence> KOJournalView::selectedIncidences()
 }
 void KOJournalView::updateConfig()
 {
-  mEntry->setFont ( KOPrefs::instance()->mJornalViewFont  );
+    JournalEntry* mEntry = jEntries.first();
+    while ( mEntry ) {
+        mEntry->setFont ( KOPrefs::instance()->mJornalViewFont  );
+        mEntry = jEntries.next();
+    }
 }
 void KOJournalView::updateView()
-{
-  mEntry->setFont ( KOPrefs::instance()->mJornalViewFont  );
+{ 
+    JournalEntry* mEntry = jEntries.first();
+    while ( mEntry ) {
+        mEntry->setFont ( KOPrefs::instance()->mJornalViewFont  );
+        mEntry = jEntries.next();
+    }
+    showDates( mDate, QDate() );
 }
 
 void KOJournalView::flushView()
-{
-  mEntry->flushEntry();
+{ 
+    JournalEntry* mEntry = jEntries.first();
+    while ( mEntry ) {
+        mEntry->flushEntry();
+        mEntry = jEntries.next();
+    }
 }
 
 void KOJournalView::clearList()
 {
-    mEntry->clear();
+    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;
+    Journal* mJournal = new Journal;
+    mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0)));
+    mCalendar->addJournal(mJournal);
+    showDates( mDate, QDate() );
+}
 
-  mEntry->setDate(start);
+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();
+    }
+}
 
-  Journal *j = calendar()->journal(start);
-  if (j) mEntry->setJournal(j);
-  else mEntry->clear();
-  
-//  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>)
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h
index 445f940..aabf11c 100644
--- a/korganizer/kojournalview.h
+++ b/korganizer/kojournalview.h
@@ -24,6 +24,7 @@
 #define _KOJOURNALVIEW_H
 
 #include <korganizer/baseview.h>
+#include <qlayout.h>
 
 class JournalEntry;
 
@@ -51,6 +52,8 @@ class KOJournalView : public KOrg::BaseView
  signals:
      void deleteJournal(Journal *);
   public slots:
+     void showOnly ( Journal* );
+     void newJournal();
     void updateView();
     void flushView();
     void updateConfig();
@@ -60,8 +63,13 @@ class KOJournalView : public KOrg::BaseView
     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;
     
 };
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 5d9af6d..7b307f7 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -110,6 +110,7 @@ void KOViewManager::readSettings(KConfig *config)
     }
 }
 
+
 void KOViewManager::showDateView( int view, QDate date)
 {
     static int lastMode = 0;
@@ -282,6 +283,12 @@ void KOViewManager::resetDateSilent( QDate date , int days )
     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 )
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index 838583b..d5a8e3b 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -83,6 +83,7 @@ class KOViewManager : public QObject
     void signalFullScreen( bool );
     void signalAgendaView( bool );
   public slots: 
+    void setDefaultCalendar(int);
     void slotprintWNV();
     void showNextView();
     void showMonth( const QDate & );
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 2efa355..4652fe5 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -243,6 +243,7 @@ public:
       Return Journal for given date.
     */
     virtual Journal *journal( const QDate & ) = 0;
+    virtual  QPtrList<Journal> journals4Date( const QDate & ) = 0;
     /**
       Return Journal with given UID.
     */
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 418bfca..ca64e66 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -776,12 +776,7 @@ QPtrList<Event> CalendarLocal::rawEvents()
 
 bool CalendarLocal::addJournal(Journal *journal)
 {
-  if ( journal->dtStart().isValid())
-    kdDebug(5800) << "Adding Journal on " << journal->dtStart().toString() << endl;
-  else
-    kdDebug(5800) << "Adding Journal without a DTSTART" << endl;
-
-  mJournalList.append(journal);
+    mJournalList.append(journal);
 
   journal->registerObserver( this );
 
@@ -801,6 +796,13 @@ void CalendarLocal::deleteJournal( Journal *journal )
   }
 }
 
+QPtrList<Journal> CalendarLocal::journals4Date( const QDate & date )
+{
+    QPtrList<Journal> el;
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->calEnabled() && it->dtStart().date() == date) el.append( it );
+    return el;
+}
 Journal *CalendarLocal::journal( const QDate &date )
 {
 //  kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl;
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index d32597f..98d16a3 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -131,6 +131,7 @@ class CalendarLocal : public Calendar
       Return Journal for given date.
     */
     Journal *journal( const QDate & );
+    QPtrList<Journal> journals4Date( const QDate & );
     /**
       Return Journal with given UID.
     */