summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-05 19:37:52 (UTC)
committer zautrix <zautrix>2005-08-05 19:37:52 (UTC)
commit6bf157dca5ab703c7f1674c117cc62d9675f4bde (patch) (unidiff)
tree3f9df43dab51dfc409779bb31085b7bcbeee16ff
parent78ae7e3faed42b510f4f0a60007115756cd06128 (diff)
downloadkdepimpi-6bf157dca5ab703c7f1674c117cc62d9675f4bde.zip
kdepimpi-6bf157dca5ab703c7f1674c117cc62d9675f4bde.tar.gz
kdepimpi-6bf157dca5ab703c7f1674c117cc62d9675f4bde.tar.bz2
fixx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kojournalview.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 0523954..a23a3b2 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -159,25 +159,28 @@ void KOJournalView::showOnly ( Journal* 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}
170void KOJournalView::showList(QPtrList<Journal> jl) 170void KOJournalView::showList(QPtrList<Journal> jl)
171{ 171{
172 static bool ff = false;
173 if ( ff ) return;
174 ff = true;
172 //qDebug("KOJournalView::showList %d",jl.count() ); 175 //qDebug("KOJournalView::showList %d",jl.count() );
173 JournalEntry* mEntry = jEntries.first(); 176 JournalEntry* mEntry = jEntries.first();
174 JournalEntry* firstEntry = mEntry; 177 JournalEntry* firstEntry = mEntry;
175 int count = jl.count(); 178 int count = jl.count();
176 int iii = 0; 179 int iii = 0;
177 while ( iii < count ) { 180 while ( iii < count ) {
178 if ( !mEntry ) { 181 if ( !mEntry ) {
179 mEntry = getNewEntry(); 182 mEntry = getNewEntry();
180 mEntry->setVisibleMode( true ); 183 mEntry->setVisibleMode( true );
181 mEntry->setDate(mDate); 184 mEntry->setDate(mDate);
182 mEntry->setJournal(jl.at(iii), false); 185 mEntry->setJournal(jl.at(iii), false);
183 mEntry->setVisibleMode( true ); 186 mEntry->setVisibleMode( true );
@@ -197,24 +200,25 @@ void KOJournalView::showList(QPtrList<Journal> jl)
197 mEntry->setDate(mDate); 200 mEntry->setDate(mDate);
198 mEntry->clear(); 201 mEntry->clear();
199 if ( mEntry != firstEntry ) { 202 if ( mEntry != firstEntry ) {
200 mEntry->hide(); 203 mEntry->hide();
201 mEntry->setVisibleMode( false ); 204 mEntry->setVisibleMode( false );
202 } 205 }
203 else { 206 else {
204 mEntry->setVisibleMode( true ); 207 mEntry->setVisibleMode( true );
205 mEntry->show(); 208 mEntry->show();
206 } 209 }
207 mEntry = jEntries.next(); 210 mEntry = jEntries.next();
208 } 211 }
212 ff = false;
209} 213}
210 214
211void KOJournalView::showDates(const QDate &start, const QDate &) 215void KOJournalView::showDates(const QDate &start, const QDate &)
212{ 216{
213 mDate = start; 217 mDate = start;
214 mDateLabel->setText(KGlobal::locale()->formatDate(mDate)); 218 mDateLabel->setText(KGlobal::locale()->formatDate(mDate));
215 QPtrList<Journal> jl = calendar()->journals4Date( start ); 219 QPtrList<Journal> jl = calendar()->journals4Date( start );
216 showList( jl ); 220 showList( jl );
217} 221}
218 222
219void KOJournalView::showEvents(QPtrList<Event>) 223void KOJournalView::showEvents(QPtrList<Event>)
220{ 224{