fixes

4 files changed, 11 insertions, 5 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 5fc3f2f..7f6f221 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -221,65 +221,67 @@ void JournalEntry::slotLoadTemplate()
 void JournalEntry::setDate(const QDate &date)
 {
     showOnlyMode = false;
   writeJournal();
   mDate = date;
   fillCalendar( mCalendar->defaultCalendar() );
 }
 void JournalEntry::fillCalendar( int setToID )
 {
     mCalendarBox->clear();
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     int std = 0;
     int count = 0;
     while ( kkf ) {
         if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) ||  setToID == kkf->mCalNumber ) {
             if ( setToID ) {
                 if ( kkf->mCalNumber == setToID ) 
                     std = count;
             } else {
                 if ( kkf->isStandard ) {
                     std = count;
                 }
             }
             ++count;
             mCalendarBox->insertItem( kkf->mName );
         }
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     mCalendarBox->setCurrentItem( std );
 }
 
 void JournalEntry::toggleShowJournal()
-{ 
+{  
+    if ( mEditor->text().isEmpty() && mTitle->currentText ().isEmpty() )
+        return;
     if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty())
         flushEntry();
     if ( showOnlyMode )
         emit showJournalOnly( 0 );
     else {
         // we have to protect mJournal from deleting if mJournal has empty text
         visibleMode = false; // set to true via :setShowOnly() 
         emit showJournalOnly( mJournal );
         //QTimer::singleShot( 0, this, SLOT( setVisibleOn() ) );
     }
 }
 void JournalEntry::setVisibleOn() 
 {
     visibleMode = true;
 }
 void JournalEntry::setShowOnly() 
 {
     showOnlyMode = true;
     if ( mTitle->currentText().isEmpty() ) 
         mTitle->setFocus();
     else
         mEditor->setFocus();
 }
 void JournalEntry::setJournal(Journal *journal, bool saveJournal )
 {
     if ( saveJournal )
         writeJournal();
   mTitle->load( KOLocationBox::SUMMARYJOURNAL );
 
   mJournal = journal;
   if ( journal->isReadOnly()  )
       mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")");
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index c738f7e..7e9fa71 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -58,65 +58,68 @@
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockStartup;
 
 
 ////////////////////////////////////////////////////////////////////////////
 MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
     : QFrame(_agenda->viewport(),name), agenda(_agenda)
 {
     setLineWidth(0);
     setMargin(0);
     setBackgroundColor(Qt::red);
     minutes = new QTimer(this);
     connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc()));
     minutes->start(0, true);
     mTimeBox = new QLabel(this);
     mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
     QPalette pal = mTimeBox->palette();
     pal.setColor(QColorGroup::Foreground, Qt::red);
     mTimeBox->setPalette(pal);
     //mTimeBox->setAutoMask(true);
 
     agenda->addChild(mTimeBox);
 
     oldToday = -1;
 }
 
 MarcusBains::~MarcusBains()
 {
     //delete minutes;
 }
-
+void MarcusBains::hideMe()
+{
+    hide(); mTimeBox->hide();
+}
 int MarcusBains::todayColumn()
 {
     QDate currentDate = QDate::currentDate();
 
     DateList dateList = agenda->dateList();
     DateList::ConstIterator it;
     int col = 0;
     for(it = dateList.begin(); it != dateList.end(); ++it) {
         if((*it) == currentDate)
             return KOGlobals::self()->reverseLayout() ?
                                  agenda->columns() - 1 - col : col;
         ++col;
     }
 
     return -1;
 }
 void MarcusBains::updateLoc()
 {
     updateLocation();
 }
 void MarcusBains::updateLocation(bool recalculate)
 {
   
     QTime tim = QTime::currentTime();
     //qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1());
     if((tim.hour() == 0) && (oldTime.hour()==23))
         recalculate = true;
 
     int mins = tim.hour()*60 + tim.minute();
     int minutesPerCell = 24 * 60 / agenda->rows();
     int y = mins*agenda->gridSpacingY()/minutesPerCell;
     int today = recalculate ? todayColumn() : oldToday;
@@ -343,64 +346,65 @@ void KOAgenda::clear()
   KOAgendaItem *item;
   for ( item=mItems.first(); item != 0; item=mItems.next() ) {
     mUnusedItems.append( item );
     //item->hide();
   }
   mItems.clear();
   mSelectedItem = 0;
   clearSelection();
 }
 
 void KOAgenda::clearSelection()
 {
   mSelectionCellX = 0;
   mSelectionYTop = 0;
   mSelectionHeight = 0;
 }
 
 void KOAgenda::marcus_bains()
 {
     if(mMarcusBains) mMarcusBains->updateLocation(true);
 }
 
 
 void KOAgenda::changeColumns(int columns)
 {
     if (columns == 0) {
         qDebug("KOAgenda::changeColumns() called with argument 0 ");
         return;
     }
     clear();
     mColumns = columns;
     computeSizes();
+    if(mMarcusBains) mMarcusBains->hideMe();
 }
 
 /*
   This is the eventFilter function, which gets all events from the KOAgendaItems
   contained in the agenda. It has to handle moving and resizing for all items.
 */
 bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
 {
     //  kdDebug() << "KOAgenda::eventFilter" << endl;
     switch(event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonDblClick:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
         return eventFilter_mouse(object, static_cast<QMouseEvent *>(event));
 
     case (QEvent::Leave):
         if (!mActionItem)
             setCursor(arrowCursor);
         return true;
 
     default:
         return QScrollView::eventFilter(object,event);
     }
 }
 void KOAgenda::popupMenu()
 {
     mPopupTimer->stop();
     if (  mPopupKind == 1 || mPopupKind == 3 ) {
         if (mActionItem ) {
             endItemAction();
         }
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 86cf2f4..59e7472 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -19,65 +19,65 @@
     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 KOAGENDA_H
 #define KOAGENDA_H
 
 #include <qscrollview.h>
 #include <qtimer.h>
 #include <qmemarray.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qguardedptr.h>
 
 #include "koagendaitem.h"
 #include "koeventview.h"
 
 class QPopupMenu;
 class QTime;
 class KConfig;
 class QFrame;
 class KOAgenda;
 class KCal::Event;
 class KCal::Todo;
 
 using namespace KCal;
 
 class MarcusBains : public QFrame {
     Q_OBJECT
   public:
     MarcusBains(KOAgenda *agenda=0,const char *name=0);
     virtual ~MarcusBains();
-
+    void hideMe();
   public slots:
     void updateLocation(bool recalculate=false);
     void updateLoc();
 
   private:
     int todayColumn();
     QTimer *minutes;
     QLabel *mTimeBox;
     KOAgenda *agenda;
     QTime oldTime;
     int oldToday;
 };
 
 
 class KOAgenda : public QScrollView
 {
     Q_OBJECT
   public:
     enum MouseActionType { NOP, MOVE, SELECT,
                            RESIZETOP, RESIZEBOTTOM, RESIZELEFT, RESIZERIGHT };
 
     KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0,
                const char * name=0, WFlags f=0 );
     KOAgenda ( int columns, QWidget * parent=0,
                const char * name=0, WFlags f=0 );
     virtual ~KOAgenda();
     bool mInvalidPixmap;
 
     Incidence *selectedIncidence() const;
     QDate selectedIncidenceDate() const;
 
     virtual bool eventFilter ( QObject *, QEvent * );
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index f46a103..82c0f4c 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1328,82 +1328,82 @@ void KOTodoView::itemDoubleClicked(QListViewItem *item)
                 else
                     toggleRunningItem();
                 return;
             } else {
                     t->setRunning( true );
                     mActiveItem->construct();
                     topLevelWidget()->setCaption(i18n("Todo started! Double click again to stop!"));
                 return;
             }
         }
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::toggleRunningItem()
 {
     // qDebug("KOTodoView::toggleRunning() ");
     if ( ! mActiveItem )
         return;
     Todo * t = mActiveItem->todo();
     if ( t->isRunning() ) {
         KOStopTodoPrefs tp ( t, this );
         if (QApplication::desktop()->width() <= 800 ){
             int wid = tp.width();
             int hei = tp.height();
             int xx = (QApplication::desktop()->width()-wid)/2;
             int yy = (QApplication::desktop()->height()-hei)/2;
             tp.setGeometry( xx,yy,wid,hei );
         }
         tp.exec();
-        mActiveItem->construct();
+        updateTodo ( t, 0 );
     } else {
         KOStartTodoPrefs tp ( t->summary(), this );
         if (QApplication::desktop()->width() <= 800 ){
             int wid = tp.width();
             int hei = tp.height();
             int xx = (QApplication::desktop()->width()-wid)/2;
             int yy = (QApplication::desktop()->height()-hei)/2;
             tp.setGeometry( xx,yy,wid,hei );
         }
         if ( !tp.exec() ) return;
         if ( tp.stopAll() ) {
             mCalendar->stopAllTodos();
             t->setRunning( true );
             updateView();
         } else {
             t->setRunning( true );
-            mActiveItem->construct();
+            updateTodo ( t, 0 );
         }
     }
 }
 
 void KOTodoView::itemClicked(QListViewItem *item)
 {
     //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {
       if ( pendingSubtodo != 0 ) {
           topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
       }
       pendingSubtodo = 0;
       return;
   }
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
   if ( pendingSubtodo != 0 ) {
       bool allowReparent = true;
       QListViewItem *par = item;
       while ( par ) {
           if ( par ==  pendingSubtodo ) {
               allowReparent = false;
               break;
           }
           par = par->parent();
       }
       if ( !allowReparent  ) {
           topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!"));
           pendingSubtodo = 0;
       } else {
           Todo* newParent = todoItem->todo();
           Todo* newSub = pendingSubtodo->todo();
           pendingSubtodo = 0;