Diffstat (limited to 'korganizer/kojournalview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/kojournalview.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index a23a3b2..406df5a 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -24,32 +24,33 @@ | |||
24 | // | 24 | // |
25 | // View of Journal entries | 25 | // View of Journal entries |
26 | 26 | ||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | #include <qscrollview.h> | 28 | #include <qscrollview.h> |
29 | #include <qpopupmenu.h> | 29 | #include <qpopupmenu.h> |
30 | #include <qhbox.h> | 30 | #include <qhbox.h> |
31 | #include <qpushbutton.h> | 31 | #include <qpushbutton.h> |
32 | #include <qlabel.h> | 32 | #include <qlabel.h> |
33 | #include <qpushbutton.h> | 33 | #include <qpushbutton.h> |
34 | #include <qapplication.h> | 34 | #include <qapplication.h> |
35 | 35 | ||
36 | #include <klocale.h> | 36 | #include <klocale.h> |
37 | #include <kdebug.h> | 37 | #include <kdebug.h> |
38 | #include "koprefs.h" | 38 | #include "koprefs.h" |
39 | #include <kglobal.h> | 39 | #include <kglobal.h> |
40 | #include <ktextedit.h> | ||
40 | 41 | ||
41 | #include <libkcal/calendar.h> | 42 | #include <libkcal/calendar.h> |
42 | 43 | ||
43 | #include "journalentry.h" | 44 | #include "journalentry.h" |
44 | 45 | ||
45 | #include "kojournalview.h" | 46 | #include "kojournalview.h" |
46 | using namespace KOrg; | 47 | using namespace KOrg; |
47 | 48 | ||
48 | KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, | 49 | KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, |
49 | const char *name) | 50 | const char *name) |
50 | : KOrg::BaseView(calendar, parent, name) | 51 | : KOrg::BaseView(calendar, parent, name) |
51 | { | 52 | { |
52 | mCalendar = calendar; | 53 | mCalendar = calendar; |
53 | QHBox * vb = new QHBox ( this ); | 54 | QHBox * vb = new QHBox ( this ); |
54 | QPushButton * newJournal = new QPushButton( vb ); | 55 | QPushButton * newJournal = new QPushButton( vb ); |
55 | QPixmap icon; | 56 | QPixmap icon; |
@@ -164,47 +165,55 @@ void KOJournalView::showOnly ( Journal* j ) | |||
164 | QPtrList<Journal> jl; | 165 | QPtrList<Journal> jl; |
165 | jl.append ( j ); | 166 | jl.append ( j ); |
166 | showList( jl ); | 167 | showList( jl ); |
167 | JournalEntry* mEntry = jEntries.first(); | 168 | JournalEntry* mEntry = jEntries.first(); |
168 | mEntry->setShowOnly(); | 169 | mEntry->setShowOnly(); |
169 | } | 170 | } |
170 | void KOJournalView::showList(QPtrList<Journal> jl) | 171 | void KOJournalView::showList(QPtrList<Journal> jl) |
171 | { | 172 | { |
172 | static bool ff = false; | 173 | static bool ff = false; |
173 | if ( ff ) return; | 174 | if ( ff ) return; |
174 | ff = true; | 175 | ff = true; |
175 | //qDebug("KOJournalView::showList %d",jl.count() ); | 176 | //qDebug("KOJournalView::showList %d",jl.count() ); |
176 | JournalEntry* mEntry = jEntries.first(); | 177 | JournalEntry* mEntry = jEntries.first(); |
177 | JournalEntry* firstEntry = mEntry; | 178 | JournalEntry* firstEntry = mEntry; |
178 | int count = jl.count(); | 179 | int count = jl.count(); |
179 | int iii = 0; | 180 | int iii = 0; |
181 | QWidget* fw = qApp->focusWidget (); | ||
180 | while ( iii < count ) { | 182 | while ( iii < count ) { |
181 | if ( !mEntry ) { | 183 | if ( !mEntry ) { |
182 | mEntry = getNewEntry(); | 184 | mEntry = getNewEntry(); |
183 | mEntry->setVisibleMode( true ); | 185 | mEntry->setVisibleMode( true ); |
184 | mEntry->setDate(mDate); | 186 | mEntry->setDate(mDate); |
185 | mEntry->setJournal(jl.at(iii), false); | 187 | mEntry->setJournal(jl.at(iii), false); |
186 | mEntry->setVisibleMode( true ); | 188 | mEntry->setVisibleMode( true ); |
187 | mEntry->show(); | 189 | mEntry->show(); |
188 | mEntry = 0; | 190 | mEntry = 0; |
189 | } else { | 191 | } else { |
192 | int xxx = -1, yyy = -1; | ||
193 | if ( ((QWidget*) mEntry->editor() ) == fw ) { | ||
194 | mEntry->editor()->getCursorPosition( &xxx,&yyy); | ||
195 | } | ||
190 | mEntry->setVisibleMode( true ); | 196 | mEntry->setVisibleMode( true ); |
191 | mEntry->setDate(mDate); | 197 | mEntry->setDate(mDate); |
192 | mEntry->setJournal(jl.at(iii), false); | 198 | mEntry->setJournal(jl.at(iii), false); |
193 | mEntry->setVisibleMode( true ); | 199 | mEntry->setVisibleMode( true ); |
194 | mEntry->show(); | 200 | mEntry->show(); |
201 | if ( xxx > -1 && yyy > -1 ) { | ||
202 | mEntry->editor()->setCursorPosition( xxx, yyy ); | ||
203 | } | ||
195 | mEntry = jEntries.next(); | 204 | mEntry = jEntries.next(); |
196 | } | 205 | } |
197 | ++iii; | 206 | ++iii; |
198 | } | 207 | } |
199 | while ( mEntry ) { | 208 | while ( mEntry ) { |
200 | mEntry->setDate(mDate); | 209 | mEntry->setDate(mDate); |
201 | mEntry->clear(); | 210 | mEntry->clear(); |
202 | if ( mEntry != firstEntry ) { | 211 | if ( mEntry != firstEntry ) { |
203 | mEntry->hide(); | 212 | mEntry->hide(); |
204 | mEntry->setVisibleMode( false ); | 213 | mEntry->setVisibleMode( false ); |
205 | } | 214 | } |
206 | else { | 215 | else { |
207 | mEntry->setVisibleMode( true ); | 216 | mEntry->setVisibleMode( true ); |
208 | mEntry->show(); | 217 | mEntry->show(); |
209 | } | 218 | } |
210 | mEntry = jEntries.next(); | 219 | mEntry = jEntries.next(); |