summaryrefslogtreecommitdiffabout
path: root/korganizer
Unidiff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/journalentry.cpp13
-rw-r--r--korganizer/journalentry.h1
-rw-r--r--korganizer/kojournalview.cpp12
3 files changed, 17 insertions, 9 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 9e2c902..ca8d5f7 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -161,10 +161,10 @@ void JournalEntry::slotLoadTemplate()
161} 161}
162void JournalEntry::setDate(const QDate &date) 162void 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 +")");
170} 170}
@@ -178,15 +178,22 @@ void JournalEntry::toggleShowJournal()
178 else { 178 else {
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}
185void JournalEntry::setVisibleOn()
186{
187 visibleMode = true;
188}
184void JournalEntry::setShowOnly() 189void 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}
190void JournalEntry::setJournal(Journal *journal) 197void JournalEntry::setJournal(Journal *journal)
191{ 198{
192 writeJournal(); 199 writeJournal();
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h
index e98d018..cc9b5ef 100644
--- a/korganizer/journalentry.h
+++ b/korganizer/journalentry.h
@@ -56,8 +56,9 @@ class JournalEntry : public QFrame {
56 protected slots: 56 protected slots:
57 void slotSaveTemplate(); 57 void slotSaveTemplate();
58 void slotLoadTemplate(); 58 void slotLoadTemplate();
59 void toggleShowJournal(); 59 void toggleShowJournal();
60 void setVisibleOn();
60 signals: 61 signals:
61 void deleteJournal(Journal *); 62 void deleteJournal(Journal *);
62 void newJournal(); 63 void newJournal();
63 void showJournalOnly( Journal * ); 64 void showJournalOnly( Journal * );
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index 7a96aa5..6fa9b23 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -154,9 +154,9 @@ void KOJournalView::newJournal()
154} 154}
155 155
156void KOJournalView::showOnly ( Journal* j ) 156void 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;
@@ -168,26 +168,26 @@ void KOJournalView::showOnly ( Journal* j )
168 mEntry->setShowOnly(); 168 mEntry->setShowOnly();
169} 169}
170void KOJournalView::showList(QPtrList<Journal> jl) 170void 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 }
@@ -208,9 +208,9 @@ void KOJournalView::showList(QPtrList<Journal> jl)
208 208
209void KOJournalView::showDates(const QDate &start, const QDate &) 209void 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