-rw-r--r-- | korganizer/calendarview.cpp | 1 | ||||
-rw-r--r-- | korganizer/journalentry.cpp | 61 | ||||
-rw-r--r-- | korganizer/journalentry.h | 5 | ||||
-rw-r--r-- | korganizer/kojournalview.cpp | 110 | ||||
-rw-r--r-- | korganizer/kojournalview.h | 10 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 7 | ||||
-rw-r--r-- | korganizer/koviewmanager.h | 1 | ||||
-rw-r--r-- | libkcal/calendar.h | 1 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 14 | ||||
-rw-r--r-- | libkcal/calendarlocal.h | 1 |
10 files changed, 173 insertions, 38 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a62145a..697093e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -458,16 +458,17 @@ void CalendarView::init() | |||
458 | //leftFrameLayout->addWidget( mDateNavigator ); | 458 | //leftFrameLayout->addWidget( mDateNavigator ); |
459 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); | 459 | mTodoList = new KOTodoView(mCalendar, mLeftFrame, "todolistsmall"); |
460 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); | 460 | mFilterView = new KOFilterView(&mFilters,mLeftFrame,"CalendarView::FilterView"); |
461 | mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); | 461 | mCalEditView = new KOCalEditView(mLeftFrame,"CalendarView::CaleditView"); |
462 | connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) ); | 462 | connect( mCalEditView, SIGNAL( calendarEnabled (int,bool) ),mCalendar, SLOT( setCalendarEnabled(int,bool)) ); |
463 | connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) ); | 463 | connect( mCalEditView, SIGNAL( alarmEnabled(int,bool) ),mCalendar, SLOT( setAlarmEnabled(int,bool)) ); |
464 | connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) ); | 464 | connect( mCalEditView, SIGNAL( calendarReadonly(int,bool) ),mCalendar, SLOT( setReadOnly(int,bool)) ); |
465 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); | 465 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mCalendar, SLOT( setDefaultCalendar(int)) ); |
466 | connect( mCalEditView, SIGNAL( setCalendarDefault(int) ),mViewManager, SLOT( setDefaultCalendar(int)) ); | ||
466 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); | 467 | connect( mCalEditView, SIGNAL( removeCalendar(int) ),mCalendar, SLOT( setCalendarRemove(int)) ); |
467 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); | 468 | connect( mCalEditView, SIGNAL( calendarAdded(int) ),this, SLOT( addCalendarId(int)) ); |
468 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); | 469 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) ); |
469 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); | 470 | connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) ); |
470 | mTodoList->setNavigator( mNavigator ); | 471 | mTodoList->setNavigator( mNavigator ); |
471 | #if 0 | 472 | #if 0 |
472 | if ( QApplication::desktop()->width() < 480 ) { | 473 | if ( QApplication::desktop()->width() < 480 ) { |
473 | leftFrameLayout->addWidget(mFilterView); | 474 | leftFrameLayout->addWidget(mFilterView); |
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index c19a5ca..7274849 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -51,54 +51,73 @@ | |||
51 | #include "journalentry.h" | 51 | #include "journalentry.h" |
52 | //#include "journalentry.moc" | 52 | //#include "journalentry.moc" |
53 | #ifndef DESKTOP_VERSION | 53 | #ifndef DESKTOP_VERSION |
54 | #include <qpe/qpeapplication.h> | 54 | #include <qpe/qpeapplication.h> |
55 | #endif | 55 | #endif |
56 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : | 56 | JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) : |
57 | QFrame(parent) | 57 | QFrame(parent) |
58 | { | 58 | { |
59 | showOnlyMode = false; | ||
59 | mCalendar = calendar; | 60 | mCalendar = calendar; |
60 | mJournal = 0; | 61 | mJournal = 0; |
61 | mDirty = false; | 62 | mDirty = false; |
62 | 63 | ||
63 | QHBox * vb = new QHBox ( this ); | 64 | QHBox * vb = new QHBox ( this ); |
65 | QPushButton * newJournal = new QPushButton( vb ); | ||
66 | QIconSet icon; | ||
67 | if ( QApplication::desktop()->width() < 321 ) | ||
68 | icon = SmallIcon("ko16old"); | ||
69 | else | ||
70 | icon = SmallIcon("ko24old"); | ||
71 | newJournal->setIconSet (icon ) ; | ||
72 | int size = newJournal->sizeHint().height(); | ||
73 | newJournal->setFixedSize( size, size ); | ||
74 | |||
75 | |||
76 | QPushButton * toggleJournal = new QPushButton( vb ); | ||
77 | icon = SmallIcon("1updownarrow"); | ||
78 | toggleJournal->setIconSet (icon ) ; | ||
79 | //int size = toggleJournal->sizeHint().height(); | ||
80 | toggleJournal->setFixedSize( size * 2 /3 , size ); | ||
81 | |||
82 | |||
83 | |||
84 | mTitleLabel = new QLabel(i18n("Title"),vb); | ||
85 | mTitleLabel->setMargin(2); | ||
86 | mTitleLabel->setAlignment(AlignCenter); | ||
64 | QPushButton * loadTemplate = new QPushButton( vb ); | 87 | QPushButton * loadTemplate = new QPushButton( vb ); |
65 | QPushButton * saveTemplate = new QPushButton( vb ); | 88 | QPushButton * saveTemplate = new QPushButton( vb ); |
66 | QIconSet icon; | ||
67 | if ( QApplication::desktop()->width() < 321 ) | 89 | if ( QApplication::desktop()->width() < 321 ) |
68 | icon = SmallIcon("fileexport16"); | 90 | icon = SmallIcon("fileexport16"); |
69 | else | 91 | else |
70 | icon = SmallIcon("fileexport"); | 92 | icon = SmallIcon("fileexport"); |
71 | saveTemplate->setIconSet (icon ) ; | 93 | saveTemplate->setIconSet (icon ) ; |
72 | int size = saveTemplate->sizeHint().height(); | 94 | //size = saveTemplate->sizeHint().height(); |
73 | saveTemplate->setFixedSize( size, size ); | 95 | saveTemplate->setFixedSize( size, size ); |
74 | if ( QApplication::desktop()->width() < 321 ) | 96 | if ( QApplication::desktop()->width() < 321 ) |
75 | icon = SmallIcon("fileimport16"); | 97 | icon = SmallIcon("fileimport16"); |
76 | else | 98 | else |
77 | icon = SmallIcon("fileimport"); | 99 | icon = SmallIcon("fileimport"); |
78 | loadTemplate->setIconSet (icon ) ; | 100 | loadTemplate->setIconSet (icon ) ; |
79 | loadTemplate->setFixedSize( size, size ); | 101 | loadTemplate->setFixedSize( size, size ); |
80 | |||
81 | mTitleLabel = new QLabel(i18n("Title"),vb); | ||
82 | mTitleLabel->setMargin(2); | ||
83 | mTitleLabel->setAlignment(AlignCenter); | ||
84 | |||
85 | mEditor = new KTextEdit(this); | 102 | mEditor = new KTextEdit(this); |
86 | connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty())); | 103 | connect(mEditor,SIGNAL(textChanged()),SLOT(setDirty())); |
87 | #ifndef DESKTOP_VERSION | 104 | #ifndef DESKTOP_VERSION |
88 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); | 105 | QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold ); |
89 | #endif | 106 | #endif |
90 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); | 107 | mEditor->setWordWrap( KTextEdit::WidgetWidth ); |
91 | QBoxLayout *topLayout = new QVBoxLayout(this); | 108 | QBoxLayout *topLayout = new QVBoxLayout(this); |
92 | topLayout->addWidget(vb); | 109 | topLayout->addWidget(vb); |
93 | topLayout->addWidget(mEditor); | 110 | topLayout->addWidget(mEditor); |
94 | mEditor->installEventFilter(this); | 111 | mEditor->installEventFilter(this); |
95 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); | 112 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); |
96 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); | 113 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); |
114 | connect( newJournal, SIGNAL( clicked() ), this , SIGNAL( newJournal() ) ); | ||
115 | connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) ); | ||
97 | } | 116 | } |
98 | 117 | ||
99 | JournalEntry::~JournalEntry() | 118 | JournalEntry::~JournalEntry() |
100 | { | 119 | { |
101 | } | 120 | } |
102 | 121 | ||
103 | void JournalEntry::slotSaveTemplate() | 122 | void JournalEntry::slotSaveTemplate() |
104 | { | 123 | { |
@@ -146,32 +165,50 @@ void JournalEntry::slotLoadTemplate() | |||
146 | int line, col; | 165 | int line, col; |
147 | mEditor->getCursorPosition (& line, & col ); | 166 | mEditor->getCursorPosition (& line, & col ); |
148 | mEditor-> insertAt ( text, line, col, true ); | 167 | mEditor-> insertAt ( text, line, col, true ); |
149 | //mEditor->setIgnoreMark( true ); | 168 | //mEditor->setIgnoreMark( true ); |
150 | setDirty(); | 169 | setDirty(); |
151 | } | 170 | } |
152 | void JournalEntry::setDate(const QDate &date) | 171 | void JournalEntry::setDate(const QDate &date) |
153 | { | 172 | { |
173 | showOnlyMode = false; | ||
174 | mDate = date; | ||
154 | writeJournal(); | 175 | writeJournal(); |
176 | int id = mCalendar->defaultCalendar(); | ||
177 | if ( id == 1 ) { | ||
178 | mTitleLabel->setText(KGlobal::locale()->formatDate(date)); | ||
179 | } else { | ||
180 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; | ||
181 | mTitleLabel->setText( KGlobal::locale()->formatDate(mDate,true) + " (" + calname +")"); | ||
182 | } | ||
183 | } | ||
155 | 184 | ||
156 | mTitleLabel->setText(KGlobal::locale()->formatDate(date)); | 185 | void JournalEntry::toggleShowJournal() |
157 | 186 | { | |
158 | 187 | if ( showOnlyMode ) | |
159 | mDate = date; | 188 | emit showJournalOnly( 0 ); |
189 | else | ||
190 | emit showJournalOnly( mJournal ); | ||
160 | } | 191 | } |
161 | 192 | ||
162 | void JournalEntry::setJournal(Journal *journal) | 193 | void JournalEntry::setJournal(Journal *journal) |
163 | { | 194 | { |
164 | writeJournal(); | 195 | writeJournal(); |
165 | 196 | ||
166 | mJournal = journal; | 197 | mJournal = journal; |
167 | 198 | ||
168 | mEditor->setText(mJournal->description()); | 199 | mEditor->setText(mJournal->description()); |
169 | 200 | int id = mJournal->calID(); | |
201 | if ( id > 1 ) { | ||
202 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; | ||
203 | mTitleLabel->setText( KGlobal::locale()->formatDate(mDate,true) + " (" + calname +")"); | ||
204 | } else { | ||
205 | mTitleLabel->setText(KGlobal::locale()->formatDate(mDate)); | ||
206 | } | ||
170 | mDirty = false; | 207 | mDirty = false; |
171 | } | 208 | } |
172 | 209 | ||
173 | Journal *JournalEntry::journal() const | 210 | Journal *JournalEntry::journal() const |
174 | { | 211 | { |
175 | return mJournal; | 212 | return mJournal; |
176 | } | 213 | } |
177 | 214 | ||
diff --git a/korganizer/journalentry.h b/korganizer/journalentry.h index f1a1fef..85ad5df 100644 --- a/korganizer/journalentry.h +++ b/korganizer/journalentry.h | |||
@@ -43,30 +43,35 @@ class JournalEntry : public QFrame { | |||
43 | void setJournal(Journal *); | 43 | void setJournal(Journal *); |
44 | Journal *journal() const; | 44 | Journal *journal() const; |
45 | 45 | ||
46 | void setDate(const QDate &); | 46 | void setDate(const QDate &); |
47 | 47 | ||
48 | void clear(); | 48 | void clear(); |
49 | 49 | ||
50 | void flushEntry(); | 50 | void flushEntry(); |
51 | void setShowOnly() {showOnlyMode = true;} | ||
51 | 52 | ||
52 | protected slots: | 53 | protected slots: |
53 | void slotSaveTemplate(); | 54 | void slotSaveTemplate(); |
54 | void slotLoadTemplate(); | 55 | void slotLoadTemplate(); |
55 | void setDirty(); | 56 | void setDirty(); |
57 | void toggleShowJournal(); | ||
56 | signals: | 58 | signals: |
57 | void deleteJournal(Journal *); | 59 | void deleteJournal(Journal *); |
60 | void newJournal(); | ||
61 | void showJournalOnly( Journal * ); | ||
58 | 62 | ||
59 | protected: | 63 | protected: |
60 | bool eventFilter( QObject *o, QEvent *e ); | 64 | bool eventFilter( QObject *o, QEvent *e ); |
61 | 65 | ||
62 | void writeJournal(); | 66 | void writeJournal(); |
63 | 67 | ||
64 | private: | 68 | private: |
69 | bool showOnlyMode; | ||
65 | Calendar *mCalendar; | 70 | Calendar *mCalendar; |
66 | Journal *mJournal; | 71 | Journal *mJournal; |
67 | QDate mDate; | 72 | QDate mDate; |
68 | void keyPressEvent ( QKeyEvent * ) ; | 73 | void keyPressEvent ( QKeyEvent * ) ; |
69 | QLabel *mTitleLabel; | 74 | QLabel *mTitleLabel; |
70 | KTextEdit *mEditor; | 75 | KTextEdit *mEditor; |
71 | 76 | ||
72 | bool mDirty; | 77 | bool mDirty; |
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index bc16037..fae59d6 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp | |||
@@ -37,67 +37,139 @@ | |||
37 | 37 | ||
38 | #include "kojournalview.h" | 38 | #include "kojournalview.h" |
39 | using namespace KOrg; | 39 | using namespace KOrg; |
40 | 40 | ||
41 | KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, | 41 | KOJournalView::KOJournalView(Calendar *calendar, QWidget *parent, |
42 | const char *name) | 42 | const char *name) |
43 | : KOrg::BaseView(calendar, parent, name) | 43 | : KOrg::BaseView(calendar, parent, name) |
44 | { | 44 | { |
45 | mEntry = new JournalEntry(calendar,this); | 45 | mCalendar = calendar; |
46 | mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); | 46 | mTopLayout = new QVBoxLayout(this); |
47 | QBoxLayout *topLayout = new QVBoxLayout(this); | 47 | getNewEntry(); |
48 | topLayout->addWidget(mEntry); | ||
49 | connect ( mEntry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) ) ; | ||
50 | } | 48 | } |
51 | 49 | ||
52 | KOJournalView::~KOJournalView() | 50 | KOJournalView::~KOJournalView() |
53 | { | 51 | { |
54 | } | 52 | } |
55 | 53 | ||
56 | int KOJournalView::currentDateCount() | 54 | int KOJournalView::currentDateCount() |
57 | { | 55 | { |
58 | return 0; | 56 | return 0; |
59 | } | 57 | } |
58 | JournalEntry* KOJournalView::getNewEntry() | ||
59 | { | ||
60 | JournalEntry* Entry = new JournalEntry(mCalendar,this); | ||
61 | jEntries.append( Entry ); | ||
62 | mTopLayout->addWidget(Entry); | ||
63 | Entry->setFont ( KOPrefs::instance()->mJornalViewFont ); | ||
64 | connect ( Entry,SIGNAL(deleteJournal(Journal *) ),this ,SIGNAL(deleteJournal(Journal *) ) ) ; | ||
65 | connect ( Entry,SIGNAL(newJournal() ),this ,SLOT(newJournal() ) ) ; | ||
66 | connect ( Entry,SIGNAL(showJournalOnly( Journal * ) ),this ,SLOT(showOnly ( Journal* ) ) ) ; | ||
67 | return Entry; | ||
68 | } | ||
60 | 69 | ||
61 | QPtrList<Incidence> KOJournalView::selectedIncidences() | 70 | QPtrList<Incidence> KOJournalView::selectedIncidences() |
62 | { | 71 | { |
63 | QPtrList<Incidence> eventList; | 72 | QPtrList<Incidence> eventList; |
64 | 73 | ||
65 | return eventList; | 74 | return eventList; |
66 | } | 75 | } |
67 | void KOJournalView::updateConfig() | 76 | void KOJournalView::updateConfig() |
68 | { | 77 | { |
69 | mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); | 78 | JournalEntry* mEntry = jEntries.first(); |
79 | while ( mEntry ) { | ||
80 | mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); | ||
81 | mEntry = jEntries.next(); | ||
82 | } | ||
70 | } | 83 | } |
71 | void KOJournalView::updateView() | 84 | void KOJournalView::updateView() |
72 | { | 85 | { |
73 | mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); | 86 | JournalEntry* mEntry = jEntries.first(); |
87 | while ( mEntry ) { | ||
88 | mEntry->setFont ( KOPrefs::instance()->mJornalViewFont ); | ||
89 | mEntry = jEntries.next(); | ||
90 | } | ||
91 | showDates( mDate, QDate() ); | ||
74 | } | 92 | } |
75 | 93 | ||
76 | void KOJournalView::flushView() | 94 | void KOJournalView::flushView() |
77 | { | 95 | { |
78 | mEntry->flushEntry(); | 96 | JournalEntry* mEntry = jEntries.first(); |
97 | while ( mEntry ) { | ||
98 | mEntry->flushEntry(); | ||
99 | mEntry = jEntries.next(); | ||
100 | } | ||
79 | } | 101 | } |
80 | 102 | ||
81 | void KOJournalView::clearList() | 103 | void KOJournalView::clearList() |
82 | { | 104 | { |
83 | mEntry->clear(); | 105 | JournalEntry* mEntry = jEntries.first(); |
106 | while ( mEntry ) { | ||
107 | mEntry->clear(); | ||
108 | mEntry = jEntries.next(); | ||
109 | } | ||
84 | } | 110 | } |
85 | void KOJournalView::showDates(const QDate &start, const QDate &) | 111 | void KOJournalView::newJournal() |
86 | { | 112 | { |
87 | // kdDebug() << "KOJournalView::selectDates()" << endl; | 113 | Journal* mJournal = new Journal; |
114 | mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0))); | ||
115 | mCalendar->addJournal(mJournal); | ||
116 | showDates( mDate, QDate() ); | ||
117 | } | ||
88 | 118 | ||
89 | mEntry->setDate(start); | 119 | void KOJournalView::showOnly ( Journal* j ) |
120 | { | ||
121 | if ( j == 0 ) { | ||
122 | showDates( mDate, QDate() ); | ||
123 | return; | ||
124 | } | ||
125 | QPtrList<Journal> jl; | ||
126 | jl.append ( j ); | ||
127 | showList( jl ); | ||
128 | JournalEntry* mEntry = jEntries.first(); | ||
129 | mEntry->setShowOnly(); | ||
130 | } | ||
131 | void KOJournalView::showList(QPtrList<Journal> jl) | ||
132 | { | ||
133 | JournalEntry* mEntry = jEntries.first(); | ||
134 | JournalEntry* firstEntry = mEntry; | ||
135 | int count = jl.count(); | ||
136 | int iii = 0; | ||
137 | while ( iii < count ) { | ||
138 | if ( !mEntry ) { | ||
139 | mEntry = getNewEntry(); | ||
140 | mEntry->show(); | ||
141 | mEntry->setDate(mDate); | ||
142 | mEntry->setJournal(jl.at(iii)); | ||
143 | mEntry = 0; | ||
144 | } else { | ||
145 | mEntry->setDate(mDate); | ||
146 | mEntry->setJournal(jl.at(iii)); | ||
147 | mEntry->show(); | ||
148 | mEntry = jEntries.next(); | ||
149 | } | ||
150 | ++iii; | ||
151 | } | ||
152 | while ( mEntry ) { | ||
153 | mEntry->setDate(mDate); | ||
154 | mEntry->clear(); | ||
155 | if ( mEntry != firstEntry ) | ||
156 | mEntry->hide(); | ||
157 | else | ||
158 | mEntry->show(); | ||
159 | mEntry = jEntries.next(); | ||
160 | } | ||
161 | } | ||
90 | 162 | ||
91 | Journal *j = calendar()->journal(start); | 163 | void KOJournalView::showDates(const QDate &start, const QDate &) |
92 | if (j) mEntry->setJournal(j); | 164 | { |
93 | else mEntry->clear(); | 165 | mDate = start; |
94 | 166 | QPtrList<Journal> jl = calendar()->journals4Date( start ); | |
95 | // emit incidenceSelected( 0 ); | 167 | showList( jl ); |
96 | } | 168 | } |
97 | 169 | ||
98 | void KOJournalView::showEvents(QPtrList<Event>) | 170 | void KOJournalView::showEvents(QPtrList<Event>) |
99 | { | 171 | { |
100 | // After new creation of list view no events are selected. | 172 | // After new creation of list view no events are selected. |
101 | // emit incidenceSelected( 0 ); | 173 | // emit incidenceSelected( 0 ); |
102 | } | 174 | } |
103 | 175 | ||
diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h index 445f940..aabf11c 100644 --- a/korganizer/kojournalview.h +++ b/korganizer/kojournalview.h | |||
@@ -19,16 +19,17 @@ | |||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | #ifndef _KOJOURNALVIEW_H | 23 | #ifndef _KOJOURNALVIEW_H |
24 | #define _KOJOURNALVIEW_H | 24 | #define _KOJOURNALVIEW_H |
25 | 25 | ||
26 | #include <korganizer/baseview.h> | 26 | #include <korganizer/baseview.h> |
27 | #include <qlayout.h> | ||
27 | 28 | ||
28 | class JournalEntry; | 29 | class JournalEntry; |
29 | 30 | ||
30 | /** | 31 | /** |
31 | * This class provides a journal view. | 32 | * This class provides a journal view. |
32 | 33 | ||
33 | * @short View for Journal components. | 34 | * @short View for Journal components. |
34 | * @author Cornelius Schumacher <schumacher@kde.org> | 35 | * @author Cornelius Schumacher <schumacher@kde.org> |
@@ -46,23 +47,30 @@ class KOJournalView : public KOrg::BaseView | |||
46 | void clearList(); | 47 | void clearList(); |
47 | virtual QPtrList<Incidence> selectedIncidences(); | 48 | virtual QPtrList<Incidence> selectedIncidences(); |
48 | DateList selectedDates() | 49 | DateList selectedDates() |
49 | {DateList q; | 50 | {DateList q; |
50 | return q;}; | 51 | return q;}; |
51 | signals: | 52 | signals: |
52 | void deleteJournal(Journal *); | 53 | void deleteJournal(Journal *); |
53 | public slots: | 54 | public slots: |
55 | void showOnly ( Journal* ); | ||
56 | void newJournal(); | ||
54 | void updateView(); | 57 | void updateView(); |
55 | void flushView(); | 58 | void flushView(); |
56 | void updateConfig(); | 59 | void updateConfig(); |
57 | void showDates( const QDate &start, const QDate &end ); | 60 | void showDates( const QDate &start, const QDate &end ); |
58 | void showEvents(QPtrList<Event> eventList); | 61 | void showEvents(QPtrList<Event> eventList); |
59 | 62 | ||
60 | void changeEventDisplay(Event *, int); | 63 | void changeEventDisplay(Event *, int); |
61 | 64 | ||
62 | private: | 65 | private: |
63 | JournalEntry *mEntry; | 66 | void showList(QPtrList<Journal> jl); |
67 | Calendar *mCalendar; | ||
68 | JournalEntry* getNewEntry(); | ||
69 | QPtrList<JournalEntry> jEntries; | ||
64 | void keyPressEvent ( QKeyEvent * ) ; | 70 | void keyPressEvent ( QKeyEvent * ) ; |
71 | QBoxLayout *mTopLayout; | ||
72 | QDate mDate; | ||
65 | 73 | ||
66 | }; | 74 | }; |
67 | 75 | ||
68 | #endif | 76 | #endif |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 5d9af6d..7b307f7 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -105,16 +105,17 @@ void KOViewManager::readSettings(KConfig *config) | |||
105 | showAgendaView(); | 105 | showAgendaView(); |
106 | mCurrentAgendaView = dateCount; | 106 | mCurrentAgendaView = dateCount; |
107 | #ifdef DESKTOP_VERSION | 107 | #ifdef DESKTOP_VERSION |
108 | QTimer::singleShot( 1000, mAgendaView, SLOT ( setInitStartHour() ) ); | 108 | QTimer::singleShot( 1000, mAgendaView, SLOT ( setInitStartHour() ) ); |
109 | #endif | 109 | #endif |
110 | } | 110 | } |
111 | } | 111 | } |
112 | 112 | ||
113 | |||
113 | void KOViewManager::showDateView( int view, QDate date) | 114 | void KOViewManager::showDateView( int view, QDate date) |
114 | { | 115 | { |
115 | static int lastMode = 0; | 116 | static int lastMode = 0; |
116 | static int lastCount = 0; | 117 | static int lastCount = 0; |
117 | static bool lastNDMode = false; | 118 | static bool lastNDMode = false; |
118 | static QDate lastDate; | 119 | static QDate lastDate; |
119 | //qDebug("date %d %s", view, date.toString().latin1()); | 120 | //qDebug("date %d %s", view, date.toString().latin1()); |
120 | 121 | ||
@@ -277,16 +278,22 @@ void KOViewManager::showNextView() | |||
277 | 278 | ||
278 | } | 279 | } |
279 | void KOViewManager::resetDateSilent( QDate date , int days ) | 280 | void KOViewManager::resetDateSilent( QDate date , int days ) |
280 | { | 281 | { |
281 | mMainView->dateNavigator()->blockSignals( true ); | 282 | mMainView->dateNavigator()->blockSignals( true ); |
282 | mMainView->dateNavigator()->selectDates( date , days ); | 283 | mMainView->dateNavigator()->selectDates( date , days ); |
283 | mMainView->dateNavigator()->blockSignals( false ); | 284 | mMainView->dateNavigator()->blockSignals( false ); |
284 | } | 285 | } |
286 | void KOViewManager::setDefaultCalendar(int) | ||
287 | { | ||
288 | if ( mJournalView && mCurrentView == mJournalView ) | ||
289 | mJournalView->updateView(); | ||
290 | } | ||
291 | |||
285 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) | 292 | void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) |
286 | { | 293 | { |
287 | if ( flagResetViewChangeDate < 10 ) | 294 | if ( flagResetViewChangeDate < 10 ) |
288 | ++flagResetViewChangeDate; | 295 | ++flagResetViewChangeDate; |
289 | //mFlagShowNextxDays = false; | 296 | //mFlagShowNextxDays = false; |
290 | //if(view == mCurrentView) return; | 297 | //if(view == mCurrentView) return; |
291 | if ( view == 0 ) { | 298 | if ( view == 0 ) { |
292 | view = mCurrentView; | 299 | view = mCurrentView; |
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index 838583b..d5a8e3b 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h | |||
@@ -78,16 +78,17 @@ class KOViewManager : public QObject | |||
78 | 78 | ||
79 | KOAgendaView *agendaView() const { return mAgendaView; } | 79 | KOAgendaView *agendaView() const { return mAgendaView; } |
80 | 80 | ||
81 | signals: | 81 | signals: |
82 | void printWNV(); | 82 | void printWNV(); |
83 | void signalFullScreen( bool ); | 83 | void signalFullScreen( bool ); |
84 | void signalAgendaView( bool ); | 84 | void signalAgendaView( bool ); |
85 | public slots: | 85 | public slots: |
86 | void setDefaultCalendar(int); | ||
86 | void slotprintWNV(); | 87 | void slotprintWNV(); |
87 | void showNextView(); | 88 | void showNextView(); |
88 | void showMonth( const QDate & ); | 89 | void showMonth( const QDate & ); |
89 | void showDateView( int, QDate ); | 90 | void showDateView( int, QDate ); |
90 | void updateView(); | 91 | void updateView(); |
91 | void showWhatsNextView(); | 92 | void showWhatsNextView(); |
92 | void showListView(); | 93 | void showListView(); |
93 | void showAgendaView( bool fullScreen = false ); | 94 | void showAgendaView( bool fullScreen = false ); |
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 2efa355..4652fe5 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -238,16 +238,17 @@ public: | |||
238 | 238 | ||
239 | @return true on success, false on error. | 239 | @return true on success, false on error. |
240 | */ | 240 | */ |
241 | virtual bool addJournal( Journal * ) = 0; | 241 | virtual bool addJournal( Journal * ) = 0; |
242 | /** | 242 | /** |
243 | Return Journal for given date. | 243 | Return Journal for given date. |
244 | */ | 244 | */ |
245 | virtual Journal *journal( const QDate & ) = 0; | 245 | virtual Journal *journal( const QDate & ) = 0; |
246 | virtual QPtrList<Journal> journals4Date( const QDate & ) = 0; | ||
246 | /** | 247 | /** |
247 | Return Journal with given UID. | 248 | Return Journal with given UID. |
248 | */ | 249 | */ |
249 | virtual Journal *journal( const QString &UID ) = 0; | 250 | virtual Journal *journal( const QString &UID ) = 0; |
250 | /** | 251 | /** |
251 | Return list of all Journal entries. | 252 | Return list of all Journal entries. |
252 | */ | 253 | */ |
253 | virtual QPtrList<Journal> journals() = 0; | 254 | virtual QPtrList<Journal> journals() = 0; |
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 418bfca..ca64e66 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -771,22 +771,17 @@ QPtrList<Event> CalendarLocal::rawEvents() | |||
771 | QPtrList<Event> el; | 771 | QPtrList<Event> el; |
772 | for ( Event *it = mEventList.first(); it; it = mEventList.next() ) | 772 | for ( Event *it = mEventList.first(); it; it = mEventList.next() ) |
773 | if ( it->calEnabled() ) el.append( it ); | 773 | if ( it->calEnabled() ) el.append( it ); |
774 | return el; | 774 | return el; |
775 | } | 775 | } |
776 | 776 | ||
777 | bool CalendarLocal::addJournal(Journal *journal) | 777 | bool CalendarLocal::addJournal(Journal *journal) |
778 | { | 778 | { |
779 | if ( journal->dtStart().isValid()) | 779 | mJournalList.append(journal); |
780 | kdDebug(5800) << "Adding Journal on " << journal->dtStart().toString() << endl; | ||
781 | else | ||
782 | kdDebug(5800) << "Adding Journal without a DTSTART" << endl; | ||
783 | |||
784 | mJournalList.append(journal); | ||
785 | 780 | ||
786 | journal->registerObserver( this ); | 781 | journal->registerObserver( this ); |
787 | 782 | ||
788 | setModified( true ); | 783 | setModified( true ); |
789 | journal->setCalID( mDefaultCalendar ); | 784 | journal->setCalID( mDefaultCalendar ); |
790 | journal->setCalEnabled( true ); | 785 | journal->setCalEnabled( true ); |
791 | return true; | 786 | return true; |
792 | } | 787 | } |
@@ -796,16 +791,23 @@ void CalendarLocal::deleteJournal( Journal *journal ) | |||
796 | if ( mUndoIncidence ) delete mUndoIncidence; | 791 | if ( mUndoIncidence ) delete mUndoIncidence; |
797 | mUndoIncidence = journal->clone(); | 792 | mUndoIncidence = journal->clone(); |
798 | mUndoIncidence->setSummary( mUndoIncidence->description().left(25)); | 793 | mUndoIncidence->setSummary( mUndoIncidence->description().left(25)); |
799 | if ( mJournalList.removeRef(journal) ) { | 794 | if ( mJournalList.removeRef(journal) ) { |
800 | setModified( true ); | 795 | setModified( true ); |
801 | } | 796 | } |
802 | } | 797 | } |
803 | 798 | ||
799 | QPtrList<Journal> CalendarLocal::journals4Date( const QDate & date ) | ||
800 | { | ||
801 | QPtrList<Journal> el; | ||
802 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) | ||
803 | if ( it->calEnabled() && it->dtStart().date() == date) el.append( it ); | ||
804 | return el; | ||
805 | } | ||
804 | Journal *CalendarLocal::journal( const QDate &date ) | 806 | Journal *CalendarLocal::journal( const QDate &date ) |
805 | { | 807 | { |
806 | // kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl; | 808 | // kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl; |
807 | 809 | ||
808 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) | 810 | for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) |
809 | if ( it->calEnabled() && it->dtStart().date() == date ) | 811 | if ( it->calEnabled() && it->dtStart().date() == date ) |
810 | return it; | 812 | return it; |
811 | 813 | ||
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h index d32597f..98d16a3 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h | |||
@@ -126,16 +126,17 @@ class CalendarLocal : public Calendar | |||
126 | /** | 126 | /** |
127 | Remove a Journal from the calendar. | 127 | Remove a Journal from the calendar. |
128 | */ | 128 | */ |
129 | void deleteJournal( Journal * ); | 129 | void deleteJournal( Journal * ); |
130 | /** | 130 | /** |
131 | Return Journal for given date. | 131 | Return Journal for given date. |
132 | */ | 132 | */ |
133 | Journal *journal( const QDate & ); | 133 | Journal *journal( const QDate & ); |
134 | QPtrList<Journal> journals4Date( const QDate & ); | ||
134 | /** | 135 | /** |
135 | Return Journal with given UID. | 136 | Return Journal with given UID. |
136 | */ | 137 | */ |
137 | Journal *journal( const QString &uid ); | 138 | Journal *journal( const QString &uid ); |
138 | /** | 139 | /** |
139 | Return list of all Journals stored in calendar. | 140 | Return list of all Journals stored in calendar. |
140 | */ | 141 | */ |
141 | QPtrList<Journal> journals(); | 142 | QPtrList<Journal> journals(); |