| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
| -rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
| -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 | ||||
| -rw-r--r-- | version | 2 |
7 files changed, 18 insertions, 7 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index d0b2880..f4b3ddb 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,4 +1,9 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 2.1.19 ************ + +Fixed a crash in journal view and a crash in setting a todo to stopped when KO/Pi saved the file when "stop todo" dialog was shown. +Fixed a minor problem with the marcus bains line (whatever that is). + ********** VERSION 2.1.18 ************ diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 133d0d1..a29e4ea 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm @@ -1,5 +1,5 @@ Summary: A collection of PIM programs Name: KDE-Pim-Pi -Version: 2.1.18 +Version: 2.1.19 Release: SuSE_9.2 Copyright:GPL 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 ); } } @@ -1 +1 @@ -version = "2.1.18"; +version = "2.1.19"; |