| -rw-r--r-- | korganizer/journalentry.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koagenda.cpp | 6 | ||||
| -rw-r--r-- | korganizer/koagenda.h | 2 | ||||
| -rw-r--r-- | korganizer/kotodoview.cpp | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 5fc3f2f..7f6f221 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -251,6 +251,8 @@ void JournalEntry::fillCalendar( int setToID ) void JournalEntry::toggleShowJournal() { + if ( mEditor->text().isEmpty() && mTitle->currentText ().isEmpty() ) + return; if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) flushEntry(); if ( showOnlyMode ) diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index c738f7e..7e9fa71 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -87,7 +87,10 @@ MarcusBains::~MarcusBains() { //delete minutes; } - +void MarcusBains::hideMe() +{ + hide(); mTimeBox->hide(); +} int MarcusBains::todayColumn() { QDate currentDate = QDate::currentDate(); @@ -372,6 +375,7 @@ void KOAgenda::changeColumns(int columns) clear(); mColumns = columns; computeSizes(); + if(mMarcusBains) mMarcusBains->hideMe(); } /* diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h index 86cf2f4..59e7472 100644 --- a/korganizer/koagenda.h +++ b/korganizer/koagenda.h @@ -48,7 +48,7 @@ class MarcusBains : public QFrame { public: MarcusBains(KOAgenda *agenda=0,const char *name=0); virtual ~MarcusBains(); - + void hideMe(); public slots: void updateLocation(bool recalculate=false); void updateLoc(); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index f46a103..82c0f4c 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -1357,7 +1357,7 @@ void KOTodoView::toggleRunningItem() tp.setGeometry( xx,yy,wid,hei ); } tp.exec(); - mActiveItem->construct(); + updateTodo ( t, 0 ); } else { KOStartTodoPrefs tp ( t->summary(), this ); if (QApplication::desktop()->width() <= 800 ){ @@ -1374,7 +1374,7 @@ void KOTodoView::toggleRunningItem() updateView(); } else { t->setRunning( true ); - mActiveItem->construct(); + updateTodo ( t, 0 ); } } } |