-rw-r--r-- | korganizer/journalentry.cpp | 17 | ||||
-rw-r--r-- | korganizer/journalentry.h | 2 | ||||
-rw-r--r-- | korganizer/kojournalview.cpp | 17 |
3 files changed, 29 insertions, 7 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index add874f..395392c 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -63,3 +63,3 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | |||
63 | mJournal = 0; | 63 | mJournal = 0; |
64 | 64 | visibleMode = true; | |
65 | QHBox * vb = new QHBox ( this ); | 65 | QHBox * vb = new QHBox ( this ); |
@@ -173,2 +173,3 @@ void JournalEntry::toggleShowJournal() | |||
173 | { | 173 | { |
174 | if (!mEditor->text().isEmpty() || !mTitle->text().isEmpty()) | ||
174 | flushEntry(); | 175 | flushEntry(); |
@@ -176,5 +177,8 @@ void JournalEntry::toggleShowJournal() | |||
176 | emit showJournalOnly( 0 ); | 177 | emit showJournalOnly( 0 ); |
177 | else | 178 | else { |
179 | // we have to protect mJournal from deleting if mJournal has empty text | ||
180 | visibleMode = false; // set to true via :setShowOnly() | ||
178 | emit showJournalOnly( mJournal ); | 181 | emit showJournalOnly( mJournal ); |
179 | } | 182 | } |
183 | } | ||
180 | void JournalEntry::setShowOnly() | 184 | void JournalEntry::setShowOnly() |
@@ -183,2 +187,3 @@ void JournalEntry::setShowOnly() | |||
183 | mEditor->setFocus(); | 187 | mEditor->setFocus(); |
188 | visibleMode = true; | ||
184 | } | 189 | } |
@@ -213,2 +218,3 @@ void JournalEntry::clear() | |||
213 | mEditor->setText(""); | 218 | mEditor->setText(""); |
219 | mTitle->setText(""); | ||
214 | } | 220 | } |
@@ -235,10 +241,11 @@ void JournalEntry::writeJournal() | |||
235 | { | 241 | { |
236 | 242 | if ( !visibleMode ) return; | |
237 | if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) { | 243 | if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) { |
238 | if ( mJournal ) { | 244 | if ( mJournal ) { |
245 | Journal* j = mJournal; | ||
246 | mJournal = 0; | ||
239 | bool conf = KOPrefs::instance()->mConfirm; | 247 | bool conf = KOPrefs::instance()->mConfirm; |
240 | KOPrefs::instance()->mConfirm = false; | 248 | KOPrefs::instance()->mConfirm = false; |
241 | emit deleteJournal(mJournal); | 249 | emit deleteJournal(j); |
242 | KOPrefs::instance()->mConfirm = conf; | 250 | KOPrefs::instance()->mConfirm = conf; |
243 | mJournal = 0; | ||
244 | } | 251 | } |
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index f2db785..e98d018 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h | |||
@@ -53,2 +53,3 @@ class JournalEntry : public QFrame { | |||
53 | QSize sizeHint() const; | 53 | QSize sizeHint() const; |
54 | void setVisibleMode( bool b ) { visibleMode = b;} | ||
54 | 55 | ||
@@ -69,2 +70,3 @@ class JournalEntry : public QFrame { | |||
69 | private: | 70 | private: |
71 | bool visibleMode; | ||
70 | bool showOnlyMode; | 72 | bool showOnlyMode; |
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index cb9a2c0..b659d53 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -123,2 +123,5 @@ void KOJournalView::flushView() | |||
123 | { | 123 | { |
124 | static bool ff = false; | ||
125 | if ( ff ) return; | ||
126 | ff = true; | ||
124 | JournalEntry* mEntry = jEntries.first(); | 127 | JournalEntry* mEntry = jEntries.first(); |
@@ -128,2 +131,3 @@ void KOJournalView::flushView() | |||
128 | } | 131 | } |
132 | ff = false; | ||
129 | } | 133 | } |
@@ -140,2 +144,3 @@ void KOJournalView::newJournal() | |||
140 | { | 144 | { |
145 | //qDebug(" KOJournalView::newJournal()"); | ||
141 | flushView(); | 146 | flushView(); |
@@ -149,2 +154,3 @@ void KOJournalView::showOnly ( Journal* j ) | |||
149 | { | 154 | { |
155 | //qDebug("showOnly %x ", j); | ||
150 | flushView(); | 156 | flushView(); |
@@ -162,2 +168,3 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
162 | { | 168 | { |
169 | //qDebug("KOJournalView::showList %d",jl.count() ); | ||
163 | JournalEntry* mEntry = jEntries.first(); | 170 | JournalEntry* mEntry = jEntries.first(); |
@@ -170,2 +177,3 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
170 | mEntry->show(); | 177 | mEntry->show(); |
178 | mEntry->setVisibleMode( true ); | ||
171 | mEntry->setDate(mDate); | 179 | mEntry->setDate(mDate); |
@@ -177,2 +185,3 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
177 | mEntry->show(); | 185 | mEntry->show(); |
186 | mEntry->setVisibleMode( true ); | ||
178 | mEntry = jEntries.next(); | 187 | mEntry = jEntries.next(); |
@@ -184,6 +193,10 @@ void KOJournalView::showList(QPtrList<Journal> jl) | |||
184 | mEntry->clear(); | 193 | mEntry->clear(); |
185 | if ( mEntry != firstEntry ) | 194 | if ( mEntry != firstEntry ) { |
186 | mEntry->hide(); | 195 | mEntry->hide(); |
187 | else | 196 | mEntry->setVisibleMode( false ); |
197 | } | ||
198 | else { | ||
199 | mEntry->setVisibleMode( true ); | ||
188 | mEntry->show(); | 200 | mEntry->show(); |
201 | } | ||
189 | mEntry = jEntries.next(); | 202 | mEntry = jEntries.next(); |