| -rw-r--r-- | korganizer/journalentry.cpp | 4 | ||||
| -rw-r--r-- | korganizer/koagenda.cpp | 6 | ||||
| -rw-r--r-- | korganizer/koagenda.h | 2 | ||||
| -rw-r--r-- | korganizer/kotodoview.cpp | 4 |
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 @@ -251,5 +251,7 @@ void JournalEntry::fillCalendar( int setToID ) void JournalEntry::toggleShowJournal() -{ +{ + if ( mEditor->text().isEmpty() && mTitle->currentText ().isEmpty() ) + return; if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty()) flushEntry(); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index c738f7e..7e9fa71 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -88,5 +88,8 @@ MarcusBains::~MarcusBains() //delete minutes; } - +void MarcusBains::hideMe() +{ + hide(); mTimeBox->hide(); +} int MarcusBains::todayColumn() { @@ -373,4 +376,5 @@ void KOAgenda::changeColumns(int columns) 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 @@ -49,5 +49,5 @@ class MarcusBains : public QFrame { MarcusBains(KOAgenda *agenda=0,const char *name=0); virtual ~MarcusBains(); - + void hideMe(); public slots: void updateLocation(bool recalculate=false); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index f46a103..82c0f4c 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -1358,5 +1358,5 @@ void KOTodoView::toggleRunningItem() } tp.exec(); - mActiveItem->construct(); + updateTodo ( t, 0 ); } else { KOStartTodoPrefs tp ( t->summary(), this ); @@ -1375,5 +1375,5 @@ void KOTodoView::toggleRunningItem() } else { t->setRunning( true ); - mActiveItem->construct(); + updateTodo ( t, 0 ); } } |