Diffstat (limited to 'korganizer/kojournalview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kojournalview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 7a96aa5..6fa9b23 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -146,79 +146,79 @@ void KOJournalView::clearList() | |||
146 | void KOJournalView::newJournal() | 146 | void KOJournalView::newJournal() |
147 | { | 147 | { |
148 | //qDebug(" KOJournalView::newJournal()"); | 148 | //qDebug(" KOJournalView::newJournal()"); |
149 | flushView(); | 149 | flushView(); |
150 | Journal* mJournal = new Journal; | 150 | Journal* mJournal = new Journal; |
151 | mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); | 151 | mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); |
152 | mCalendar->addJournal(mJournal); | 152 | mCalendar->addJournal(mJournal); |
153 | showDates( mDate, QDate() ); | 153 | showDates( mDate, QDate() ); |
154 | } | 154 | } |
155 | 155 | ||
156 | void KOJournalView::showOnly ( Journal* j ) | 156 | void KOJournalView::showOnly ( Journal* j ) |
157 | { | 157 | { |
158 | //qDebug("showOnly %x ", j); | 158 | qDebug("showOnly %x ", j); |
159 | flushView(); | 159 | flushView(); |
160 | if ( j == 0 ) { | 160 | if ( j == 0 ) { |
161 | showDates( mDate, QDate() ); | 161 | showDates( mDate, QDate() ); |
162 | return; | 162 | return; |
163 | } | 163 | } |
164 | QPtrList<Journal> jl; | 164 | QPtrList<Journal> jl; |
165 | jl.append ( j ); | 165 | jl.append ( j ); |
166 | showList( jl ); | 166 | showList( jl ); |
167 | JournalEntry* mEntry = jEntries.first(); | 167 | JournalEntry* mEntry = jEntries.first(); |
168 | mEntry->setShowOnly(); | 168 | mEntry->setShowOnly(); |
169 | } | 169 | } |
170 | void KOJournalView::showList(QPtrList<Journal> jl) | 170 | void KOJournalView::showList(QPtrList<Journal> jl) |
171 | { | 171 | { |
172 | //qDebug("KOJournalView::showList %d",jl.count() ); | 172 | qDebug("KOJournalView::showList %d",jl.count() ); |
173 | JournalEntry* mEntry = jEntries.first(); | 173 | JournalEntry* mEntry = jEntries.first(); |
174 | JournalEntry* firstEntry = mEntry; | 174 | JournalEntry* firstEntry = mEntry; |
175 | int count = jl.count(); | 175 | int count = jl.count(); |
176 | int iii = 0; | 176 | int iii = 0; |
177 | while ( iii < count ) { | 177 | while ( iii < count ) { |
178 | if ( !mEntry ) { | 178 | if ( !mEntry ) { |
179 | mEntry = getNewEntry(); | 179 | mEntry = getNewEntry(); |
180 | mEntry->show(); | ||
181 | mEntry->setVisibleMode( true ); | ||
182 | mEntry->setDate(mDate); | 180 | mEntry->setDate(mDate); |
183 | mEntry->setJournal(jl.at(iii)); | 181 | mEntry->setJournal(jl.at(iii)); |
182 | mEntry->setVisibleMode( true ); | ||
183 | mEntry->show(); | ||
184 | mEntry = 0; | 184 | mEntry = 0; |
185 | } else { | 185 | } else { |
186 | mEntry->setDate(mDate); | 186 | mEntry->setDate(mDate); |
187 | mEntry->setJournal(jl.at(iii)); | 187 | mEntry->setJournal(jl.at(iii)); |
188 | mEntry->show(); | ||
189 | mEntry->setVisibleMode( true ); | 188 | mEntry->setVisibleMode( true ); |
189 | mEntry->show(); | ||
190 | mEntry = jEntries.next(); | 190 | mEntry = jEntries.next(); |
191 | } | 191 | } |
192 | ++iii; | 192 | ++iii; |
193 | } | 193 | } |
194 | while ( mEntry ) { | 194 | while ( mEntry ) { |
195 | mEntry->setDate(mDate); | 195 | mEntry->setDate(mDate); |
196 | mEntry->clear(); | 196 | mEntry->clear(); |
197 | if ( mEntry != firstEntry ) { | 197 | if ( mEntry != firstEntry ) { |
198 | mEntry->hide(); | 198 | mEntry->hide(); |
199 | mEntry->setVisibleMode( false ); | 199 | mEntry->setVisibleMode( false ); |
200 | } | 200 | } |
201 | else { | 201 | else { |
202 | mEntry->setVisibleMode( true ); | 202 | mEntry->setVisibleMode( true ); |
203 | mEntry->show(); | 203 | mEntry->show(); |
204 | } | 204 | } |
205 | mEntry = jEntries.next(); | 205 | mEntry = jEntries.next(); |
206 | } | 206 | } |
207 | } | 207 | } |
208 | 208 | ||
209 | void KOJournalView::showDates(const QDate &start, const QDate &) | 209 | void KOJournalView::showDates(const QDate &start, const QDate &) |
210 | { | 210 | { |
211 | mDate = start; | 211 | mDate = start; |
212 | mDateLabel-> setText(KGlobal::locale()->formatDate(mDate)); | 212 | mDateLabel->setText(KGlobal::locale()->formatDate(mDate)); |
213 | QPtrList<Journal> jl = calendar()->journals4Date( start ); | 213 | QPtrList<Journal> jl = calendar()->journals4Date( start ); |
214 | showList( jl ); | 214 | showList( jl ); |
215 | } | 215 | } |
216 | 216 | ||
217 | void KOJournalView::showEvents(QPtrList<Event>) | 217 | void KOJournalView::showEvents(QPtrList<Event>) |
218 | { | 218 | { |
219 | // After new creation of list view no events are selected. | 219 | // After new creation of list view no events are selected. |
220 | // emit incidenceSelected( 0 ); | 220 | // emit incidenceSelected( 0 ); |
221 | } | 221 | } |
222 | 222 | ||
223 | void KOJournalView::changeEventDisplay(Event *, int /*action*/) | 223 | void KOJournalView::changeEventDisplay(Event *, int /*action*/) |
224 | { | 224 | { |