-rw-r--r-- | korganizer/journalentry.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 9e2c902..ca8d5f7 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -162,8 +162,8 @@ void JournalEntry::slotLoadTemplate() | |||
162 | void JournalEntry::setDate(const QDate &date) | 162 | void JournalEntry::setDate(const QDate &date) |
163 | { | 163 | { |
164 | showOnlyMode = false; | 164 | showOnlyMode = false; |
165 | mDate = date; | ||
166 | writeJournal(); | 165 | writeJournal(); |
166 | mDate = date; | ||
167 | int id = mCalendar->defaultCalendar(); | 167 | int id = mCalendar->defaultCalendar(); |
168 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; | 168 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; |
169 | mTitleLabel->setText( " (" + calname +")"); | 169 | mTitleLabel->setText( " (" + calname +")"); |
@@ -179,13 +179,20 @@ void JournalEntry::toggleShowJournal() | |||
179 | // we have to protect mJournal from deleting if mJournal has empty text | 179 | // we have to protect mJournal from deleting if mJournal has empty text |
180 | visibleMode = false; // set to true via :setShowOnly() | 180 | visibleMode = false; // set to true via :setShowOnly() |
181 | emit showJournalOnly( mJournal ); | 181 | emit showJournalOnly( mJournal ); |
182 | //QTimer::singleShot( 0, this, SLOT( setVisibleOn() ) ); | ||
182 | } | 183 | } |
183 | } | 184 | } |
185 | void JournalEntry::setVisibleOn() | ||
186 | { | ||
187 | visibleMode = true; | ||
188 | } | ||
184 | void JournalEntry::setShowOnly() | 189 | void JournalEntry::setShowOnly() |
185 | { | 190 | { |
186 | showOnlyMode = true; | 191 | showOnlyMode = true; |
187 | mEditor->setFocus(); | 192 | if ( mTitle->text().isEmpty() ) |
188 | visibleMode = true; | 193 | mTitle->setFocus(); |
194 | else | ||
195 | mEditor->setFocus(); | ||
189 | } | 196 | } |
190 | void JournalEntry::setJournal(Journal *journal) | 197 | void JournalEntry::setJournal(Journal *journal) |
191 | { | 198 | { |