author | zautrix <zautrix> | 2005-06-04 09:25:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-06-04 09:25:09 (UTC) |
commit | d40cf5135c640506011334364274b8ee5df9998b (patch) (unidiff) | |
tree | 56895a78e170856ff641dfa13f2f6eb4cc2b3488 /korganizer | |
parent | 0e0ac7a92ac2fe052b3e72d49e505a078b05e7f3 (diff) | |
download | kdepimpi-d40cf5135c640506011334364274b8ee5df9998b.zip kdepimpi-d40cf5135c640506011334364274b8ee5df9998b.tar.gz kdepimpi-d40cf5135c640506011334364274b8ee5df9998b.tar.bz2 |
fix
-rw-r--r-- | korganizer/calendarview.cpp | 10 | ||||
-rw-r--r-- | korganizer/calendarview.h | 1 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 5132f98..42166ab 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -118,192 +118,196 @@ | |||
118 | #include "mainwindow.h" | 118 | #include "mainwindow.h" |
119 | 119 | ||
120 | #include "calendarview.h" | 120 | #include "calendarview.h" |
121 | #ifndef DESKTOP_VERSION | 121 | #ifndef DESKTOP_VERSION |
122 | #include <qtopia/alarmserver.h> | 122 | #include <qtopia/alarmserver.h> |
123 | #endif | 123 | #endif |
124 | #ifndef _WIN32_ | 124 | #ifndef _WIN32_ |
125 | #include <stdlib.h> | 125 | #include <stdlib.h> |
126 | #include <stdio.h> | 126 | #include <stdio.h> |
127 | #include <unistd.h> | 127 | #include <unistd.h> |
128 | #else | 128 | #else |
129 | #include <qprocess.h> | 129 | #include <qprocess.h> |
130 | #endif | 130 | #endif |
131 | 131 | ||
132 | #ifdef DESKTOP_VERSION | 132 | #ifdef DESKTOP_VERSION |
133 | #include <kabc/stdaddressbook.h> | 133 | #include <kabc/stdaddressbook.h> |
134 | #endif | 134 | #endif |
135 | using namespace KOrg; | 135 | using namespace KOrg; |
136 | using namespace KCal; | 136 | using namespace KCal; |
137 | extern int globalFlagBlockAgenda; | 137 | extern int globalFlagBlockAgenda; |
138 | extern int globalFlagBlockStartup; | 138 | extern int globalFlagBlockStartup; |
139 | 139 | ||
140 | 140 | ||
141 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) | 141 | MissedAlarmTextBrowser::MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms,QDateTime start ) : QTextBrowser(parent) |
142 | 142 | ||
143 | { | 143 | { |
144 | mAlarms = alarms; | 144 | mAlarms = alarms; |
145 | setBackgroundColor( QColor( 86, 153, 205 ) ); | 145 | setBackgroundColor( QColor( 86, 153, 205 ) ); |
146 | QString mText = "<table width=\"100%\">\n"; | 146 | QString mText = "<table width=\"100%\">\n"; |
147 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; | 147 | //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; |
148 | #ifdef DESKTOP_VERSION | 148 | #ifdef DESKTOP_VERSION |
149 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>"; | 149 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>"; |
150 | #else | 150 | #else |
151 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h3>"; | 151 | mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h3>"; |
152 | #endif | 152 | #endif |
153 | // mText += "<img src=\""; | 153 | // mText += "<img src=\""; |
154 | // mText += ipath; | 154 | // mText += ipath; |
155 | // mText += "\">"; | 155 | // mText += "\">"; |
156 | //mEventDate = QDate::currentDate(); | 156 | //mEventDate = QDate::currentDate(); |
157 | #ifdef DESKTOP_VERSION | 157 | #ifdef DESKTOP_VERSION |
158 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>"; | 158 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h2>"; |
159 | #else | 159 | #else |
160 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h3>"; | 160 | mText += "<font color=\"#FFFFFF\"> <em>" + i18n("You missed the alarms for the following events or todos:")+"</em></font></h3>"; |
161 | #endif | 161 | #endif |
162 | mText += "</td></tr>\n<tr bgcolor=\"#FF997D\"><td>"; | 162 | mText += "</td></tr>\n<tr bgcolor=\"#FF997D\"><td>"; |
163 | 163 | ||
164 | Incidence * inc = getNextInc( start ); | 164 | Incidence * inc = getNextInc( start ); |
165 | int time = 0; | 165 | int time = 0; |
166 | mText += "<table>"; | 166 | mText += "<table>"; |
167 | while ( inc ) { | 167 | while ( inc ) { |
168 | QDateTime dt ; | 168 | QDateTime dt ; |
169 | QString tempText = "<a "; | 169 | QString tempText = "<a "; |
170 | bool ok; | 170 | bool ok; |
171 | dt = inc->getNextOccurence( start, &ok ); | 171 | dt = inc->getNextOccurence( start, &ok ); |
172 | if ( !ok ) continue; | 172 | if ( !ok ) continue; |
173 | if ( inc->type() == "Event" ) { | 173 | if ( inc->type() == "Event" ) { |
174 | tempText += "href=\"event:"; | 174 | tempText += "href=\"event:"; |
175 | } else if ( inc->type() == "Todo" ) { | 175 | } else if ( inc->type() == "Todo" ) { |
176 | tempText += "href=\"todo:"; | 176 | tempText += "href=\"todo:"; |
177 | } | 177 | } |
178 | tempText += inc->uid() + "\">"; | 178 | tempText += inc->uid() + "\">"; |
179 | if ( inc->type() == "Todo" ) | 179 | if ( inc->type() == "Todo" ) |
180 | tempText += i18n("Todo: "); | 180 | tempText += i18n("Todo: "); |
181 | if ( inc->summary().length() > 0 ) | 181 | if ( inc->summary().length() > 0 ) |
182 | tempText += inc->summary(); | 182 | tempText += inc->summary(); |
183 | else | 183 | else |
184 | tempText += i18n("-no summary-"); | 184 | tempText += i18n("-no summary-"); |
185 | QString timestr; | 185 | QString timestr; |
186 | if (!inc->doesFloat()) | 186 | if (!inc->doesFloat()) |
187 | timestr = KGlobal::locale()->formatDateTime( dt, KOPrefs::instance()->mShortDateInViewer) +": "; | 187 | timestr = KGlobal::locale()->formatDateTime( dt, KOPrefs::instance()->mShortDateInViewer) +": "; |
188 | else | 188 | else |
189 | timestr = KGlobal::locale()->formatDate( dt.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | 189 | timestr = KGlobal::locale()->formatDate( dt.date() , KOPrefs::instance()->mShortDateInViewer) +": "; |
190 | if ( dt.date() == QDate::currentDate() && time == 0 ) { | 190 | if ( dt.date() == QDate::currentDate() && time == 0 ) { |
191 | time = 1; | 191 | time = 1; |
192 | mText +="</table>"; | 192 | mText +="</table>"; |
193 | mText += "</td></tr>\n<tr bgcolor=\"#FFDC64\"><td>"; | 193 | mText += "</td></tr>\n<tr bgcolor=\"#FFDC64\"><td>"; |
194 | mText += "<table>"; | 194 | mText += "<table>"; |
195 | 195 | ||
196 | } | 196 | } |
197 | if ( dt.date() > QDate::currentDate() && time != 2 ) { | 197 | if ( dt.date() > QDate::currentDate() && time != 2 ) { |
198 | time = 2; | 198 | time = 2; |
199 | mText +="</table>"; | 199 | mText +="</table>"; |
200 | mText += "</td></tr>\n<tr bgcolor=\"#6AFF6A\"><td>"; | 200 | mText += "</td></tr>\n<tr bgcolor=\"#6AFF6A\"><td>"; |
201 | mText += "<table>"; | 201 | mText += "<table>"; |
202 | } | 202 | } |
203 | mText +="<tr><td><b>"; | 203 | mText +="<tr><td><b>"; |
204 | mText += timestr; | 204 | mText += timestr; |
205 | mText += "</b></td><td>"; | 205 | mText += "</b></td><td>"; |
206 | mText += tempText; | 206 | mText += tempText; |
207 | mText += "</td></tr>\n"; | 207 | mText += "</td></tr>\n"; |
208 | inc = getNextInc( start ); | 208 | inc = getNextInc( start ); |
209 | } | 209 | } |
210 | mText +="</table>"; | 210 | mText +="</table>"; |
211 | setText( mText ); | 211 | setText( mText ); |
212 | } | 212 | } |
213 | 213 | ||
214 | MissedAlarmTextBrowser::~MissedAlarmTextBrowser() | ||
215 | { | ||
216 | //qDebug("delete MissedAlarmTextBrowser::~MissedAlarmTextBrowser() "); | ||
217 | } | ||
214 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) | 218 | Incidence * MissedAlarmTextBrowser::getNextInc( QDateTime start ) |
215 | { | 219 | { |
216 | QDateTime dt ; | 220 | QDateTime dt ; |
217 | Incidence * retInc; | 221 | Incidence * retInc; |
218 | Incidence * inc = mAlarms.first(); | 222 | Incidence * inc = mAlarms.first(); |
219 | if ( inc == 0 ) | 223 | if ( inc == 0 ) |
220 | return 0; | 224 | return 0; |
221 | bool ok; | 225 | bool ok; |
222 | dt = inc->getNextOccurence( start, &ok ); | 226 | dt = inc->getNextOccurence( start, &ok ); |
223 | if ( ! ok ) return 0; | 227 | if ( ! ok ) return 0; |
224 | QDateTime dtn ; | 228 | QDateTime dtn ; |
225 | retInc = inc; | 229 | retInc = inc; |
226 | inc = mAlarms.next(); | 230 | inc = mAlarms.next(); |
227 | while ( inc ) { | 231 | while ( inc ) { |
228 | dtn = inc->getNextOccurence( start, &ok ); | 232 | dtn = inc->getNextOccurence( start, &ok ); |
229 | if ( ! ok ) return 0; | 233 | if ( ! ok ) return 0; |
230 | if ( dtn < dt ) { | 234 | if ( dtn < dt ) { |
231 | dt = dtn; | 235 | dt = dtn; |
232 | retInc = inc; | 236 | retInc = inc; |
233 | } | 237 | } |
234 | inc = mAlarms.next(); | 238 | inc = mAlarms.next(); |
235 | } | 239 | } |
236 | mAlarms.remove( retInc ); | 240 | mAlarms.remove( retInc ); |
237 | return retInc; | 241 | return retInc; |
238 | 242 | ||
239 | } | 243 | } |
240 | void MissedAlarmTextBrowser::setSource(const QString & n) | 244 | void MissedAlarmTextBrowser::setSource(const QString & n) |
241 | { | 245 | { |
242 | if (n.startsWith("event:")) { | 246 | if (n.startsWith("event:")) { |
243 | #ifdef DESKTOP_VERSION | 247 | #ifdef DESKTOP_VERSION |
244 | emit showIncidence(n.mid(8)); | 248 | emit showIncidence(n.mid(8)); |
245 | #else | 249 | #else |
246 | emit showIncidence(n.mid(6)); | 250 | emit showIncidence(n.mid(6)); |
247 | #endif | 251 | #endif |
248 | return; | 252 | return; |
249 | } else if (n.startsWith("todo:")) { | 253 | } else if (n.startsWith("todo:")) { |
250 | #ifdef DESKTOP_VERSION | 254 | #ifdef DESKTOP_VERSION |
251 | emit showIncidence(n.mid(7)); | 255 | emit showIncidence(n.mid(7)); |
252 | #else | 256 | #else |
253 | emit showIncidence(n.mid(5)); | 257 | emit showIncidence(n.mid(5)); |
254 | #endif | 258 | #endif |
255 | return; | 259 | return; |
256 | } | 260 | } |
257 | } | 261 | } |
258 | 262 | ||
259 | 263 | ||
260 | class KOBeamPrefs : public QDialog | 264 | class KOBeamPrefs : public QDialog |
261 | { | 265 | { |
262 | public: | 266 | public: |
263 | KOBeamPrefs( QWidget *parent=0, const char *name=0 ) : | 267 | KOBeamPrefs( QWidget *parent=0, const char *name=0 ) : |
264 | QDialog( parent, name, true ) | 268 | QDialog( parent, name, true ) |
265 | { | 269 | { |
266 | setCaption( i18n("Beam Options") ); | 270 | setCaption( i18n("Beam Options") ); |
267 | QVBoxLayout* lay = new QVBoxLayout( this ); | 271 | QVBoxLayout* lay = new QVBoxLayout( this ); |
268 | lay->setSpacing( 3 ); | 272 | lay->setSpacing( 3 ); |
269 | lay->setMargin( 3 ); | 273 | lay->setMargin( 3 ); |
270 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("File format"), this ); | 274 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("File format"), this ); |
271 | lay->addWidget( format ); | 275 | lay->addWidget( format ); |
272 | format->setExclusive ( true ) ; | 276 | format->setExclusive ( true ) ; |
273 | QButtonGroup* time = new QButtonGroup(1, Horizontal, i18n("Time format"), this ); | 277 | QButtonGroup* time = new QButtonGroup(1, Horizontal, i18n("Time format"), this ); |
274 | lay->addWidget( time ); time->setExclusive ( true ) ; | 278 | lay->addWidget( time ); time->setExclusive ( true ) ; |
275 | vcal = new QRadioButton(" vCalendar ", format ); | 279 | vcal = new QRadioButton(" vCalendar ", format ); |
276 | ical = new QRadioButton(" iCalendar ", format ); | 280 | ical = new QRadioButton(" iCalendar ", format ); |
277 | vcal->setChecked( true ); | 281 | vcal->setChecked( true ); |
278 | tz = new QRadioButton(i18n(" With timezone "), time ); | 282 | tz = new QRadioButton(i18n(" With timezone "), time ); |
279 | local = new QRadioButton(i18n(" Local time "), time ); | 283 | local = new QRadioButton(i18n(" Local time "), time ); |
280 | tz->setChecked( true ); | 284 | tz->setChecked( true ); |
281 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); | 285 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); |
282 | lay->addWidget( ok ); | 286 | lay->addWidget( ok ); |
283 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 287 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
284 | lay->addWidget( cancel ); | 288 | lay->addWidget( cancel ); |
285 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 289 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
286 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 290 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
287 | resize( 200, 200 ); | 291 | resize( 200, 200 ); |
288 | } | 292 | } |
289 | 293 | ||
290 | bool beamVcal() { return vcal->isChecked(); } | 294 | bool beamVcal() { return vcal->isChecked(); } |
291 | bool beamLocal() { return local->isChecked(); } | 295 | bool beamLocal() { return local->isChecked(); } |
292 | private: | 296 | private: |
293 | QRadioButton* vcal, *ical, *local, *tz; | 297 | QRadioButton* vcal, *ical, *local, *tz; |
294 | }; | 298 | }; |
295 | class KOCatPrefs : public QDialog | 299 | class KOCatPrefs : public QDialog |
296 | { | 300 | { |
297 | public: | 301 | public: |
298 | KOCatPrefs( QWidget *parent=0, const char *name=0 ) : | 302 | KOCatPrefs( QWidget *parent=0, const char *name=0 ) : |
299 | QDialog( parent, name, true ) | 303 | QDialog( parent, name, true ) |
300 | { | 304 | { |
301 | setCaption( i18n("Manage new Categories") ); | 305 | setCaption( i18n("Manage new Categories") ); |
302 | QVBoxLayout* lay = new QVBoxLayout( this ); | 306 | QVBoxLayout* lay = new QVBoxLayout( this ); |
303 | lay->setSpacing( 3 ); | 307 | lay->setSpacing( 3 ); |
304 | lay->setMargin( 3 ); | 308 | lay->setMargin( 3 ); |
305 | QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n "), this ); | 309 | QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n "), this ); |
306 | lay->addWidget( lab ); | 310 | lay->addWidget( lab ); |
307 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); | 311 | QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this ); |
308 | lay->addWidget( format ); | 312 | lay->addWidget( format ); |
309 | format->setExclusive ( true ) ; | 313 | format->setExclusive ( true ) ; |
@@ -551,200 +555,200 @@ void CalendarView::init() | |||
551 | connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ), | 555 | connect( mTodoList, SIGNAL( unparentTodoSignal( Todo * ) ), |
552 | this, SLOT ( todo_unsub( Todo * ) ) ); | 556 | this, SLOT ( todo_unsub( Todo * ) ) ); |
553 | 557 | ||
554 | connect( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), | 558 | connect( mTodoList, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ), |
555 | this, SLOT ( todo_resub( Todo *,Todo * ) ) ); | 559 | this, SLOT ( todo_resub( Todo *,Todo * ) ) ); |
556 | connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList, | 560 | connect( this, SIGNAL( todoModified( Todo *, int )), mTodoList, |
557 | SLOT( updateTodo( Todo *, int ) ) ); | 561 | SLOT( updateTodo( Todo *, int ) ) ); |
558 | connect( this, SIGNAL( todoModified( Todo *, int )), this, | 562 | connect( this, SIGNAL( todoModified( Todo *, int )), this, |
559 | SLOT( changeTodoDisplay( Todo *, int ) ) ); | 563 | SLOT( changeTodoDisplay( Todo *, int ) ) ); |
560 | 564 | ||
561 | 565 | ||
562 | connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) ); | 566 | connect( mFilterView, SIGNAL( filterChanged() ), SLOT( updateFilter() ) ); |
563 | connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) ); | 567 | connect( mFilterView, SIGNAL( editFilters() ), SLOT( editFilters() ) ); |
564 | connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addAlarm(const QDateTime &, const QString & ) ) ); | 568 | connect( mCalendar, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addAlarm(const QDateTime &, const QString & ) ) ); |
565 | connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString & ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) ); | 569 | connect( mCalendar, SIGNAL( removeAlarm(const QDateTime &, const QString & ) ), SLOT( removeAlarm(const QDateTime &, const QString & ) ) ); |
566 | 570 | ||
567 | 571 | ||
568 | 572 | ||
569 | 573 | ||
570 | 574 | ||
571 | connect(QApplication::clipboard(),SIGNAL(dataChanged()), | 575 | connect(QApplication::clipboard(),SIGNAL(dataChanged()), |
572 | SLOT(checkClipboard())); | 576 | SLOT(checkClipboard())); |
573 | connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ), | 577 | connect( mTodoList,SIGNAL( incidenceSelected( Incidence * ) ), |
574 | SLOT( processTodoListSelection( Incidence * ) ) ); | 578 | SLOT( processTodoListSelection( Incidence * ) ) ); |
575 | connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool))); | 579 | connect(mTodoList,SIGNAL(isModified(bool)),SLOT(setModified(bool))); |
576 | 580 | ||
577 | // kdDebug() << "CalendarView::CalendarView() done" << endl; | 581 | // kdDebug() << "CalendarView::CalendarView() done" << endl; |
578 | 582 | ||
579 | mDateFrame = new QVBox(0,0,WType_Popup); | 583 | mDateFrame = new QVBox(0,0,WType_Popup); |
580 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); | 584 | //mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised); |
581 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); | 585 | mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised ); |
582 | mDateFrame->setLineWidth(3); | 586 | mDateFrame->setLineWidth(3); |
583 | mDateFrame->hide(); | 587 | mDateFrame->hide(); |
584 | mDateFrame->setCaption( i18n( "Pick a date to display")); | 588 | mDateFrame->setCaption( i18n( "Pick a date to display")); |
585 | mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() ); | 589 | mDatePicker = new KDatePicker ( mDateFrame , QDate::currentDate() ); |
586 | 590 | ||
587 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate))); | 591 | connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(slotSelectPickerDate(QDate))); |
588 | 592 | ||
589 | mEventEditor = mDialogManager->getEventEditor(); | 593 | mEventEditor = mDialogManager->getEventEditor(); |
590 | mTodoEditor = mDialogManager->getTodoEditor(); | 594 | mTodoEditor = mDialogManager->getTodoEditor(); |
591 | 595 | ||
592 | mFlagEditDescription = false; | 596 | mFlagEditDescription = false; |
593 | 597 | ||
594 | mSuspendTimer = new QTimer( this ); | 598 | mSuspendTimer = new QTimer( this ); |
595 | mAlarmTimer = new QTimer( this ); | 599 | mAlarmTimer = new QTimer( this ); |
596 | mRecheckAlarmTimer = new QTimer( this ); | 600 | mRecheckAlarmTimer = new QTimer( this ); |
597 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); | 601 | connect( mRecheckAlarmTimer, SIGNAL( timeout () ), SLOT( recheckTimerAlarm() ) ); |
598 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); | 602 | connect( mSuspendTimer, SIGNAL( timeout () ), SLOT( suspendAlarm() ) ); |
599 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); | 603 | connect( mAlarmTimer, SIGNAL( timeout () ), SLOT( timerAlarm() ) ); |
600 | mAlarmDialog = new AlarmDialog( this ); | 604 | mAlarmDialog = new AlarmDialog( this ); |
601 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); | 605 | connect( mAlarmDialog, SIGNAL( addAlarm(const QDateTime &, const QString & ) ), SLOT( addSuspendAlarm(const QDateTime &, const QString & ) ) ); |
602 | mAlarmDialog->setServerNotification( false ); | 606 | mAlarmDialog->setServerNotification( false ); |
603 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); | 607 | mAlarmDialog->setSuspendTime( KOPrefs::instance()->mAlarmSuspendTime ); |
604 | 608 | ||
605 | 609 | ||
606 | #ifndef DESKTOP_VERSION | 610 | #ifndef DESKTOP_VERSION |
607 | //US listen for arriving address resultsets | 611 | //US listen for arriving address resultsets |
608 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), | 612 | connect(ExternalAppHandler::instance(), SIGNAL(receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), |
609 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); | 613 | this, SLOT(insertBirthdays(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&))); |
610 | #endif | 614 | #endif |
611 | mDateNavigator->setCalendar( mCalendar ); | 615 | mDateNavigator->setCalendar( mCalendar ); |
612 | } | 616 | } |
613 | 617 | ||
614 | 618 | ||
615 | CalendarView::~CalendarView() | 619 | CalendarView::~CalendarView() |
616 | { | 620 | { |
617 | // kdDebug() << "~CalendarView()" << endl; | 621 | // kdDebug() << "~CalendarView()" << endl; |
618 | //qDebug("CalendarView::~CalendarView() "); | 622 | //qDebug("CalendarView::~CalendarView() "); |
619 | delete mDialogManager; | 623 | delete mDialogManager; |
620 | delete mViewManager; | 624 | delete mViewManager; |
621 | delete mStorage; | 625 | delete mStorage; |
622 | delete mDateFrame ; | 626 | delete mDateFrame ; |
623 | delete beamDialog; | 627 | delete beamDialog; |
624 | delete mEventViewerDialog; | 628 | delete mEventViewerDialog; |
625 | //kdDebug() << "~CalendarView() done" << endl; | 629 | //kdDebug() << "~CalendarView() done" << endl; |
626 | } | 630 | } |
627 | void CalendarView::checkAlarms() | 631 | void CalendarView::checkAlarms() |
628 | { | 632 | { |
629 | KConfig *config = KOGlobals::config(); | 633 | KConfig *config = KOGlobals::config(); |
630 | config->setGroup( "AppRun" ); | 634 | config->setGroup( "AppRun" ); |
631 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 635 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
632 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; | 636 | int secs = config->readNumEntry( "LatestProgramStop" ) - 30; |
633 | secs -= ( 3600 * 24*3 ); // debug only | 637 | secs -= ( 3600 * 24*3 ); // debug only |
634 | QDateTime latest = dt.addSecs ( secs ); | 638 | QDateTime latest = dt.addSecs ( secs ); |
635 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); | 639 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); |
636 | QPtrList<Incidence> el = mCalendar->rawIncidences(); | 640 | QPtrList<Incidence> el = mCalendar->rawIncidences(); |
637 | QPtrList<Incidence> al; | 641 | QPtrList<Incidence> al; |
638 | Incidence* inL = el.first(); | 642 | Incidence* inL = el.first(); |
639 | while ( inL ) { | 643 | while ( inL ) { |
640 | bool ok = false; | 644 | bool ok = false; |
641 | int offset = 0; | 645 | int offset = 0; |
642 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; | 646 | QDateTime next = inL->getNextAlarmDateTime(& ok, &offset, latest ) ; |
643 | if ( ok ) { | 647 | if ( ok ) { |
644 | //qDebug("OK %s",next.toString().latin1()); | 648 | //qDebug("OK %s",next.toString().latin1()); |
645 | if ( next < QDateTime::currentDateTime() ) { | 649 | if ( next < QDateTime::currentDateTime() ) { |
646 | al.append( inL ); | 650 | al.append( inL ); |
647 | qDebug("found missed alarm: %s ", inL->summary().latin1() ); | 651 | //qDebug("found missed alarm: %s ", inL->summary().latin1() ); |
648 | } | 652 | } |
649 | } | 653 | } |
650 | inL = el.next(); | 654 | inL = el.next(); |
651 | } | 655 | } |
652 | if ( al.count() ) { | 656 | if ( al.count() ) { |
653 | QDialog* dia = new QDialog( this, "huhu", false ); | 657 | QDialog* dia = new QDialog( this, "huhu", false, WDestructiveClose | WStyle_StaysOnTop ); |
654 | dia->setCaption( i18n("KO/Pi: Missing alarm notification!") ); | 658 | dia->setCaption( i18n("KO/Pi: Missing alarms!") ); |
655 | QVBoxLayout* lay = new QVBoxLayout( dia ); | 659 | QVBoxLayout* lay = new QVBoxLayout( dia ); |
656 | lay->setSpacing( 0 ); | 660 | lay->setSpacing( 0 ); |
657 | lay->setMargin( 0 ); | 661 | lay->setMargin( 0 ); |
658 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); | 662 | MissedAlarmTextBrowser* matb = new MissedAlarmTextBrowser ( dia, al, latest ); |
659 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); | 663 | connect( matb, SIGNAL( showIncidence( QString ) ),SLOT( showIncidence( QString ) )); |
660 | lay->addWidget( matb ); | 664 | lay->addWidget( matb ); |
661 | int si = 220; | 665 | int si = 220; |
662 | if ( QApplication::desktop()->width() > 470 ) | 666 | if ( QApplication::desktop()->width() > 470 ) |
663 | si = 400; | 667 | si = 400; |
664 | dia->resize(si,si/2); | 668 | dia->resize(si,si/2); |
665 | dia->setBackgroundColor( QColor( 255, 255, 255 ) ); | 669 | dia->setBackgroundColor( QColor( 255, 255, 255 ) ); |
666 | dia->show(); | 670 | dia->show(); |
667 | 671 | ||
668 | } | 672 | } |
669 | } | 673 | } |
670 | void CalendarView::showDay( QDate d ) | 674 | void CalendarView::showDay( QDate d ) |
671 | { | 675 | { |
672 | dateNavigator()->blockSignals( true ); | 676 | dateNavigator()->blockSignals( true ); |
673 | dateNavigator()->selectDate( d ); | 677 | dateNavigator()->selectDate( d ); |
674 | dateNavigator()->blockSignals( false ); | 678 | dateNavigator()->blockSignals( false ); |
675 | mViewManager->showDayView(); | 679 | mViewManager->showDayView(); |
676 | //dateNavigator()->selectDate( d ); | 680 | //dateNavigator()->selectDate( d ); |
677 | } | 681 | } |
678 | void CalendarView::timerAlarm() | 682 | void CalendarView::timerAlarm() |
679 | { | 683 | { |
680 | //qDebug("CalendarView::timerAlarm() "); | 684 | //qDebug("CalendarView::timerAlarm() "); |
681 | computeAlarm(mAlarmNotification ); | 685 | computeAlarm(mAlarmNotification ); |
682 | } | 686 | } |
683 | 687 | ||
684 | void CalendarView::suspendAlarm() | 688 | void CalendarView::suspendAlarm() |
685 | { | 689 | { |
686 | //qDebug(" CalendarView::suspendAlarm() "); | 690 | //qDebug(" CalendarView::suspendAlarm() "); |
687 | computeAlarm(mSuspendAlarmNotification ); | 691 | computeAlarm(mSuspendAlarmNotification ); |
688 | 692 | ||
689 | } | 693 | } |
690 | 694 | ||
691 | void CalendarView::startAlarm( QString mess , QString filename) | 695 | void CalendarView::startAlarm( QString mess , QString filename) |
692 | { | 696 | { |
693 | 697 | ||
694 | topLevelWidget()->showNormal(); | 698 | topLevelWidget()->showNormal(); |
695 | topLevelWidget()->setActiveWindow(); | 699 | topLevelWidget()->setActiveWindow(); |
696 | topLevelWidget()->raise(); | 700 | topLevelWidget()->raise(); |
697 | 701 | ||
698 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); | 702 | mAlarmDialog->eventNotification( mess, KOPrefs::instance()->mAlarmPlayBeeps, filename, true,KOPrefs::instance()->mAlarmBeepInterval ,KOPrefs::instance()->mAlarmSuspendCount ); |
699 | QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) ); | 703 | QTimer::singleShot( 3000, this, SLOT( checkNextTimerAlarm() ) ); |
700 | 704 | ||
701 | } | 705 | } |
702 | 706 | ||
703 | void CalendarView::checkNextTimerAlarm() | 707 | void CalendarView::checkNextTimerAlarm() |
704 | { | 708 | { |
705 | mCalendar->checkAlarmForIncidence( 0, true ); | 709 | mCalendar->checkAlarmForIncidence( 0, true ); |
706 | } | 710 | } |
707 | 711 | ||
708 | void CalendarView::computeAlarm( QString msg ) | 712 | void CalendarView::computeAlarm( QString msg ) |
709 | { | 713 | { |
710 | 714 | ||
711 | QString mess = msg; | 715 | QString mess = msg; |
712 | QString mAlarmMessage = mess.mid( 9 ); | 716 | QString mAlarmMessage = mess.mid( 9 ); |
713 | QString filename = MainWindow::resourcePath(); | 717 | QString filename = MainWindow::resourcePath(); |
714 | filename += "koalarm.wav"; | 718 | filename += "koalarm.wav"; |
715 | QString tempfilename; | 719 | QString tempfilename; |
716 | if ( mess.left( 13 ) == "suspend_alarm") { | 720 | if ( mess.left( 13 ) == "suspend_alarm") { |
717 | bool error = false; | 721 | bool error = false; |
718 | int len = mess.mid( 13 ).find("+++"); | 722 | int len = mess.mid( 13 ).find("+++"); |
719 | if ( len < 2 ) | 723 | if ( len < 2 ) |
720 | error = true; | 724 | error = true; |
721 | else { | 725 | else { |
722 | tempfilename = mess.mid( 13, len ); | 726 | tempfilename = mess.mid( 13, len ); |
723 | if ( !QFile::exists( tempfilename ) ) | 727 | if ( !QFile::exists( tempfilename ) ) |
724 | error = true; | 728 | error = true; |
725 | } | 729 | } |
726 | if ( ! error ) { | 730 | if ( ! error ) { |
727 | filename = tempfilename; | 731 | filename = tempfilename; |
728 | } | 732 | } |
729 | mAlarmMessage = mess.mid( 13+len+3 ); | 733 | mAlarmMessage = mess.mid( 13+len+3 ); |
730 | //qDebug("suspend file %s ",tempfilename.latin1() ); | 734 | //qDebug("suspend file %s ",tempfilename.latin1() ); |
731 | startAlarm( mAlarmMessage, filename); | 735 | startAlarm( mAlarmMessage, filename); |
732 | return; | 736 | return; |
733 | } | 737 | } |
734 | if ( mess.left( 11 ) == "timer_alarm") { | 738 | if ( mess.left( 11 ) == "timer_alarm") { |
735 | //mTimerTime = 0; | 739 | //mTimerTime = 0; |
736 | startAlarm( mess.mid( 11 ), filename ); | 740 | startAlarm( mess.mid( 11 ), filename ); |
737 | return; | 741 | return; |
738 | } | 742 | } |
739 | if ( mess.left( 10 ) == "proc_alarm") { | 743 | if ( mess.left( 10 ) == "proc_alarm") { |
740 | bool error = false; | 744 | bool error = false; |
741 | int len = mess.mid( 10 ).find("+++"); | 745 | int len = mess.mid( 10 ).find("+++"); |
742 | if ( len < 2 ) | 746 | if ( len < 2 ) |
743 | error = true; | 747 | error = true; |
744 | else { | 748 | else { |
745 | tempfilename = mess.mid( 10, len ); | 749 | tempfilename = mess.mid( 10, len ); |
746 | if ( !QFile::exists( tempfilename ) ) | 750 | if ( !QFile::exists( tempfilename ) ) |
747 | error = true; | 751 | error = true; |
748 | } | 752 | } |
749 | if ( error ) { | 753 | if ( error ) { |
750 | mAlarmMessage = "Procedure Alarm\nError - File not found\n"; | 754 | mAlarmMessage = "Procedure Alarm\nError - File not found\n"; |
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 1eca905..084b6db 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h | |||
@@ -1,186 +1,187 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KOrganizer. | 2 | This file is part of KOrganizer. |
3 | Copyright (c) 2000, 2001 | 3 | Copyright (c) 2000, 2001 |
4 | Cornelius Schumacher <schumacher@kde.org> | 4 | Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This program is free software; you can redistribute it and/or modify | 6 | This program is free software; you can redistribute it and/or modify |
7 | it under the terms of the GNU General Public License as published by | 7 | it under the terms of the GNU General Public License as published by |
8 | the Free Software Foundation; either version 2 of the License, or | 8 | the Free Software Foundation; either version 2 of the License, or |
9 | (at your option) any later version. | 9 | (at your option) any later version. |
10 | 10 | ||
11 | This program is distributed in the hope that it will be useful, | 11 | This program is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | GNU General Public License for more details. | 14 | GNU General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
17 | along with this program; if not, write to the Free Software | 17 | along with this program; if not, write to the Free Software |
18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | 19 | ||
20 | As a special exception, permission is given to link this program | 20 | As a special exception, permission is given to link this program |
21 | with any edition of Qt, and distribute the resulting executable, | 21 | with any edition of Qt, and distribute the resulting executable, |
22 | without including the source code for Qt in the source distribution. | 22 | without including the source code for Qt in the source distribution. |
23 | */ | 23 | */ |
24 | #ifndef CALENDARVIEW_H | 24 | #ifndef CALENDARVIEW_H |
25 | #define CALENDARVIEW_H | 25 | #define CALENDARVIEW_H |
26 | 26 | ||
27 | #include <qframe.h> | 27 | #include <qframe.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qwidget.h> | 29 | #include <qwidget.h> |
30 | #include <qptrlist.h> | 30 | #include <qptrlist.h> |
31 | #include <qvbox.h> | 31 | #include <qvbox.h> |
32 | #include <qmap.h> | 32 | #include <qmap.h> |
33 | #ifndef DESKTOP_VERSION | 33 | #ifndef DESKTOP_VERSION |
34 | #include <qtopia/ir.h> | 34 | #include <qtopia/ir.h> |
35 | #else | 35 | #else |
36 | #define Ir char | 36 | #define Ir char |
37 | #endif | 37 | #endif |
38 | #include <libkcal/calendar.h> | 38 | #include <libkcal/calendar.h> |
39 | #include <libkcal/scheduler.h> | 39 | #include <libkcal/scheduler.h> |
40 | #include <libkcal/calendarresources.h> | 40 | #include <libkcal/calendarresources.h> |
41 | #include <libkcal/resourcecalendar.h> | 41 | #include <libkcal/resourcecalendar.h> |
42 | #include <KDGanttMinimizeSplitter.h> | 42 | #include <KDGanttMinimizeSplitter.h> |
43 | 43 | ||
44 | #include <korganizer/calendarviewbase.h> | 44 | #include <korganizer/calendarviewbase.h> |
45 | 45 | ||
46 | #include <ksyncmanager.h> | 46 | #include <ksyncmanager.h> |
47 | 47 | ||
48 | class QWidgetStack; | 48 | class QWidgetStack; |
49 | class QSplitter; | 49 | class QSplitter; |
50 | 50 | ||
51 | class CalPrinter; | 51 | class CalPrinter; |
52 | class KOFilterView; | 52 | class KOFilterView; |
53 | class KOViewManager; | 53 | class KOViewManager; |
54 | class KODialogManager; | 54 | class KODialogManager; |
55 | class KOTodoView; | 55 | class KOTodoView; |
56 | class KDateNavigator; | 56 | class KDateNavigator; |
57 | class DateNavigatorContainer; | 57 | class DateNavigatorContainer; |
58 | class DateNavigator; | 58 | class DateNavigator; |
59 | class KOIncidenceEditor; | 59 | class KOIncidenceEditor; |
60 | class KDatePicker; | 60 | class KDatePicker; |
61 | class ResourceView; | 61 | class ResourceView; |
62 | class KOEventEditor; | 62 | class KOEventEditor; |
63 | class KOTodoEditor ; | 63 | class KOTodoEditor ; |
64 | class KOEventViewerDialog; | 64 | class KOEventViewerDialog; |
65 | class KOBeamPrefs; | 65 | class KOBeamPrefs; |
66 | class KSyncProfile; | 66 | class KSyncProfile; |
67 | class AlarmDialog; | 67 | class AlarmDialog; |
68 | class KCal::Attendee; | 68 | class KCal::Attendee; |
69 | 69 | ||
70 | namespace KCal { class FileStorage; } | 70 | namespace KCal { class FileStorage; } |
71 | 71 | ||
72 | using namespace KCal; | 72 | using namespace KCal; |
73 | 73 | ||
74 | /** | 74 | /** |
75 | This is the main calendar widget. It provides the different vies on t he | 75 | This is the main calendar widget. It provides the different vies on t he |
76 | calendar data as well as the date navigator. It also handles synchronisation | 76 | calendar data as well as the date navigator. It also handles synchronisation |
77 | of the different views and controls the different dialogs like preferences, | 77 | of the different views and controls the different dialogs like preferences, |
78 | event editor, search dialog etc. | 78 | event editor, search dialog etc. |
79 | 79 | ||
80 | @short main calendar view widget | 80 | @short main calendar view widget |
81 | @author Cornelius Schumacher | 81 | @author Cornelius Schumacher |
82 | */ | 82 | */ |
83 | 83 | ||
84 | #include <qtextbrowser.h> | 84 | #include <qtextbrowser.h> |
85 | #include <qtextcodec.h> | 85 | #include <qtextcodec.h> |
86 | 86 | ||
87 | class MissedAlarmTextBrowser : public QTextBrowser { | 87 | class MissedAlarmTextBrowser : public QTextBrowser { |
88 | Q_OBJECT | 88 | Q_OBJECT |
89 | public: | 89 | public: |
90 | MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); | 90 | MissedAlarmTextBrowser(QWidget *parent, QPtrList<Incidence> alarms ,QDateTime start); |
91 | ~MissedAlarmTextBrowser(); | ||
91 | void setSource(const QString & n); | 92 | void setSource(const QString & n); |
92 | 93 | ||
93 | private: | 94 | private: |
94 | Incidence * getNextInc(QDateTime start ); | 95 | Incidence * getNextInc(QDateTime start ); |
95 | QPtrList<Incidence> mAlarms; | 96 | QPtrList<Incidence> mAlarms; |
96 | signals: | 97 | signals: |
97 | void showIncidence( QString uid); | 98 | void showIncidence( QString uid); |
98 | }; | 99 | }; |
99 | 100 | ||
100 | 101 | ||
101 | class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface | 102 | class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Observer, public KSyncInterface |
102 | { | 103 | { |
103 | Q_OBJECT | 104 | Q_OBJECT |
104 | public: | 105 | public: |
105 | /** | 106 | /** |
106 | Constructs a new calendar view widget. | 107 | Constructs a new calendar view widget. |
107 | 108 | ||
108 | @param calendar calendar document | 109 | @param calendar calendar document |
109 | @param parent parent window | 110 | @param parent parent window |
110 | @param name Qt internal widget object name | 111 | @param name Qt internal widget object name |
111 | */ | 112 | */ |
112 | CalendarView( CalendarResources *calendar, QWidget *parent = 0, | 113 | CalendarView( CalendarResources *calendar, QWidget *parent = 0, |
113 | const char *name = 0 ); | 114 | const char *name = 0 ); |
114 | CalendarView( Calendar *calendar, QWidget *parent = 0, | 115 | CalendarView( Calendar *calendar, QWidget *parent = 0, |
115 | const char *name = 0 ); | 116 | const char *name = 0 ); |
116 | virtual ~CalendarView(); | 117 | virtual ~CalendarView(); |
117 | 118 | ||
118 | Calendar *calendar() { return mCalendar; } | 119 | Calendar *calendar() { return mCalendar; } |
119 | 120 | ||
120 | KOViewManager *viewManager(); | 121 | KOViewManager *viewManager(); |
121 | KODialogManager *dialogManager(); | 122 | KODialogManager *dialogManager(); |
122 | 123 | ||
123 | QDate startDate(); | 124 | QDate startDate(); |
124 | QDate endDate(); | 125 | QDate endDate(); |
125 | 126 | ||
126 | QWidgetStack *viewStack(); | 127 | QWidgetStack *viewStack(); |
127 | QWidget *leftFrame(); | 128 | QWidget *leftFrame(); |
128 | 129 | ||
129 | DateNavigator *dateNavigator(); | 130 | DateNavigator *dateNavigator(); |
130 | KDateNavigator *dateNavigatorWidget(); | 131 | KDateNavigator *dateNavigatorWidget(); |
131 | 132 | ||
132 | void addView(KOrg::BaseView *); | 133 | void addView(KOrg::BaseView *); |
133 | void showView(KOrg::BaseView *); | 134 | void showView(KOrg::BaseView *); |
134 | KOEventViewerDialog* getEventViewerDialog(); | 135 | KOEventViewerDialog* getEventViewerDialog(); |
135 | Incidence *currentSelection(); | 136 | Incidence *currentSelection(); |
136 | 137 | ||
137 | signals: | 138 | signals: |
138 | void save (); | 139 | void save (); |
139 | void saveStopTimer (); | 140 | void saveStopTimer (); |
140 | void tempDisableBR(bool); | 141 | void tempDisableBR(bool); |
141 | /** This todo has been modified */ | 142 | /** This todo has been modified */ |
142 | void todoModified(Todo *, int); | 143 | void todoModified(Todo *, int); |
143 | 144 | ||
144 | /** when change is made to options dialog, the topwidget will catch this | 145 | /** when change is made to options dialog, the topwidget will catch this |
145 | * and emit this signal which notifies all widgets which have registered | 146 | * and emit this signal which notifies all widgets which have registered |
146 | * for notification to update their settings. */ | 147 | * for notification to update their settings. */ |
147 | void configChanged(); | 148 | void configChanged(); |
148 | /** emitted when the topwidget is closing down, so that any attached | 149 | /** emitted when the topwidget is closing down, so that any attached |
149 | child windows can also close. */ | 150 | child windows can also close. */ |
150 | void closingDown(); | 151 | void closingDown(); |
151 | /** emitted right before we die */ | 152 | /** emitted right before we die */ |
152 | void closed(QWidget *); | 153 | void closed(QWidget *); |
153 | 154 | ||
154 | /** Emitted when state of modified flag changes */ | 155 | /** Emitted when state of modified flag changes */ |
155 | void modifiedChanged(bool); | 156 | void modifiedChanged(bool); |
156 | void signalmodified(); | 157 | void signalmodified(); |
157 | 158 | ||
158 | /** Emitted when state of read-only flag changes */ | 159 | /** Emitted when state of read-only flag changes */ |
159 | void readOnlyChanged(bool); | 160 | void readOnlyChanged(bool); |
160 | 161 | ||
161 | /** Emitted when the unit of navigation changes */ | 162 | /** Emitted when the unit of navigation changes */ |
162 | void changeNavStringPrev(const QString &); | 163 | void changeNavStringPrev(const QString &); |
163 | void changeNavStringNext(const QString &); | 164 | void changeNavStringNext(const QString &); |
164 | 165 | ||
165 | /** Emitted when state of events selection has changed and user is organizer*/ | 166 | /** Emitted when state of events selection has changed and user is organizer*/ |
166 | void organizerEventsSelected(bool); | 167 | void organizerEventsSelected(bool); |
167 | /** Emitted when state of events selection has changed and user is attendee*/ | 168 | /** Emitted when state of events selection has changed and user is attendee*/ |
168 | void groupEventsSelected(bool); | 169 | void groupEventsSelected(bool); |
169 | /** | 170 | /** |
170 | Emitted when an incidence gets selected. If the selection is cleared the | 171 | Emitted when an incidence gets selected. If the selection is cleared the |
171 | signal is emitted with 0 as argument. | 172 | signal is emitted with 0 as argument. |
172 | */ | 173 | */ |
173 | void incidenceSelected( Incidence * ); | 174 | void incidenceSelected( Incidence * ); |
174 | /** Emitted, when a todoitem is selected or deselected. */ | 175 | /** Emitted, when a todoitem is selected or deselected. */ |
175 | void todoSelected( bool ); | 176 | void todoSelected( bool ); |
176 | 177 | ||
177 | /** | 178 | /** |
178 | Emitted, when clipboard content changes. Parameter indicates if paste | 179 | Emitted, when clipboard content changes. Parameter indicates if paste |
179 | is possible or not. | 180 | is possible or not. |
180 | */ | 181 | */ |
181 | void pasteEnabled(bool); | 182 | void pasteEnabled(bool); |
182 | 183 | ||
183 | /** Emitted, when the number of incoming messages has changed. */ | 184 | /** Emitted, when the number of incoming messages has changed. */ |
184 | void numIncomingChanged(int); | 185 | void numIncomingChanged(int); |
185 | 186 | ||
186 | /** Emitted, when the number of outgoing messages has changed. */ | 187 | /** Emitted, when the number of outgoing messages has changed. */ |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 1320231..63053a5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -279,194 +279,197 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
279 | vh -= iconToolBar->height(); | 279 | vh -= iconToolBar->height(); |
280 | } else { | 280 | } else { |
281 | vw -= iconToolBar->height(); | 281 | vw -= iconToolBar->height(); |
282 | } | 282 | } |
283 | //mView->setMaximumSize( splash->size() ); | 283 | //mView->setMaximumSize( splash->size() ); |
284 | //mView->resize( splash->size() ); | 284 | //mView->resize( splash->size() ); |
285 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 285 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
286 | mView->readSettings(); | 286 | mView->readSettings(); |
287 | bool newFile = false; | 287 | bool newFile = false; |
288 | if( !QFile::exists( defaultFileName() ) ) { | 288 | if( !QFile::exists( defaultFileName() ) ) { |
289 | QFileInfo finfo ( defaultFileName() ); | 289 | QFileInfo finfo ( defaultFileName() ); |
290 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); | 290 | QString oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics"); |
291 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; | 291 | QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n"; |
292 | finfo.setFile( oldFile ); | 292 | finfo.setFile( oldFile ); |
293 | if (finfo.exists() ) { | 293 | if (finfo.exists() ) { |
294 | KMessageBox::information( this, message); | 294 | KMessageBox::information( this, message); |
295 | mView->openCalendar( oldFile ); | 295 | mView->openCalendar( oldFile ); |
296 | qApp->processEvents(); | 296 | qApp->processEvents(); |
297 | } else { | 297 | } else { |
298 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); | 298 | oldFile = QDir::convertSeparators( QDir::homeDirPath()+"/korganizer/mycalendar.ics"); |
299 | finfo.setFile( oldFile ); | 299 | finfo.setFile( oldFile ); |
300 | if (finfo.exists() ) { | 300 | if (finfo.exists() ) { |
301 | KMessageBox::information( this, message); | 301 | KMessageBox::information( this, message); |
302 | mView->openCalendar( oldFile ); | 302 | mView->openCalendar( oldFile ); |
303 | qApp->processEvents(); | 303 | qApp->processEvents(); |
304 | } | 304 | } |
305 | } | 305 | } |
306 | mView->saveCalendar( defaultFileName() ); | 306 | mView->saveCalendar( defaultFileName() ); |
307 | newFile = true; | 307 | newFile = true; |
308 | } | 308 | } |
309 | 309 | ||
310 | QTime neededSaveTime = QDateTime::currentDateTime().time(); | 310 | QTime neededSaveTime = QDateTime::currentDateTime().time(); |
311 | mView->openCalendar( defaultFileName() ); | 311 | mView->openCalendar( defaultFileName() ); |
312 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); | 312 | int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() ); |
313 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); | 313 | qDebug("KO: Calendar loading time: %d ms",msNeeded ); |
314 | 314 | ||
315 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { | 315 | if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) { |
316 | KOPrefs::instance()->setAllDefaults(); | 316 | KOPrefs::instance()->setAllDefaults(); |
317 | int count = mView->addCategories(); | 317 | int count = mView->addCategories(); |
318 | } | 318 | } |
319 | processIncidenceSelection( 0 ); | 319 | processIncidenceSelection( 0 ); |
320 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), | 320 | connect( mView, SIGNAL( incidenceSelected( Incidence * ) ), |
321 | SLOT( processIncidenceSelection( Incidence * ) ) ); | 321 | SLOT( processIncidenceSelection( Incidence * ) ) ); |
322 | connect( mView, SIGNAL( modifiedChanged( bool ) ), | 322 | connect( mView, SIGNAL( modifiedChanged( bool ) ), |
323 | SLOT( slotModifiedChanged( bool ) ) ); | 323 | SLOT( slotModifiedChanged( bool ) ) ); |
324 | 324 | ||
325 | 325 | ||
326 | connect( mView, SIGNAL( tempDisableBR(bool) ), | 326 | connect( mView, SIGNAL( tempDisableBR(bool) ), |
327 | SLOT( disableBR(bool) ) ); | 327 | SLOT( disableBR(bool) ) ); |
328 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); | 328 | connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) ); |
329 | mView->setModified( false ); | 329 | mView->setModified( false ); |
330 | mBlockAtStartup = false; | 330 | mBlockAtStartup = false; |
331 | mView->setModified( false ); | 331 | mView->setModified( false ); |
332 | setCentralWidget( mView ); | 332 | setCentralWidget( mView ); |
333 | globalFlagBlockStartup = 0; | 333 | globalFlagBlockStartup = 0; |
334 | mView->show(); | 334 | mView->show(); |
335 | delete splash; | 335 | delete splash; |
336 | if ( newFile ) | 336 | if ( newFile ) |
337 | mView->updateConfig(); | 337 | mView->updateConfig(); |
338 | // qApp->processEvents(); | 338 | // qApp->processEvents(); |
339 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); | 339 | //qDebug("MainView x %d y %d w %d h %d", mView->x(),mView-> y(), mView->width(), mView->height ()); |
340 | //fillSyncMenu(); | 340 | //fillSyncMenu(); |
341 | 341 | ||
342 | 342 | ||
343 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); | 343 | connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) ); |
344 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); | 344 | connect(mView , SIGNAL( save() ), this, SLOT( save() ) ); |
345 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); | 345 | connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) ); |
346 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); | 346 | connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) ); |
347 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); | 347 | connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) ); |
348 | mSyncManager->setDefaultFileName( sentSyncFile()); | 348 | mSyncManager->setDefaultFileName( sentSyncFile()); |
349 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); | 349 | connect ( syncMenu, SIGNAL( activated ( int ) ), mSyncManager, SLOT (slotSyncMenu( int ) ) ); |
350 | mSyncManager->fillSyncMenu(); | 350 | mSyncManager->fillSyncMenu(); |
351 | 351 | ||
352 | 352 | ||
353 | 353 | ||
354 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); | 354 | mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins ); |
355 | if ( showWarning ) { | 355 | if ( showWarning ) { |
356 | KMessageBox::information( this, | 356 | KMessageBox::information( this, |
357 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); | 357 | "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information"); |
358 | qApp->processEvents(); | 358 | qApp->processEvents(); |
359 | mView->dialogManager()->showSyncOptions(); | 359 | mView->dialogManager()->showSyncOptions(); |
360 | } | 360 | } |
361 | 361 | ||
362 | //US listen for result adressed from Ka/Pi | 362 | //US listen for result adressed from Ka/Pi |
363 | #ifndef DESKTOP_VERSION | 363 | #ifndef DESKTOP_VERSION |
364 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); | 364 | connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & ))); |
365 | #endif | 365 | #endif |
366 | #ifndef DESKTOP_VERSION | 366 | #ifndef DESKTOP_VERSION |
367 | infrared = 0; | 367 | infrared = 0; |
368 | #endif | 368 | #endif |
369 | updateFilterToolbar(); | 369 | updateFilterToolbar(); |
370 | updateWeek( mView->startDate() ); | 370 | updateWeek( mView->startDate() ); |
371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), | 371 | connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ), |
372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); | 372 | SLOT( updateWeekNum( const KCal::DateList & ) ) ); |
373 | mBRdisabled = false; | 373 | mBRdisabled = false; |
374 | //toggleBeamReceive(); | 374 | //toggleBeamReceive(); |
375 | 375 | int tiint= 3000; | |
376 | QTimer::singleShot( 1000, mView, SLOT ( checkAlarms() )); | 376 | #ifndef DESKTOP_VERSION |
377 | tiint = 5000; | ||
378 | #endif | ||
379 | QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() )); | ||
377 | } | 380 | } |
378 | MainWindow::~MainWindow() | 381 | MainWindow::~MainWindow() |
379 | { | 382 | { |
380 | //qDebug("MainWindow::~MainWindow() "); | 383 | //qDebug("MainWindow::~MainWindow() "); |
381 | //save toolbar location | 384 | //save toolbar location |
382 | delete mCalendar; | 385 | delete mCalendar; |
383 | delete mSyncManager; | 386 | delete mSyncManager; |
384 | #ifndef DESKTOP_VERSION | 387 | #ifndef DESKTOP_VERSION |
385 | if ( infrared ) | 388 | if ( infrared ) |
386 | delete infrared; | 389 | delete infrared; |
387 | #endif | 390 | #endif |
388 | 391 | ||
389 | 392 | ||
390 | } | 393 | } |
391 | 394 | ||
392 | void MainWindow::disableBR(bool b) | 395 | void MainWindow::disableBR(bool b) |
393 | { | 396 | { |
394 | #ifndef DESKTOP_VERSION | 397 | #ifndef DESKTOP_VERSION |
395 | if ( b ) { | 398 | if ( b ) { |
396 | if ( infrared ) { | 399 | if ( infrared ) { |
397 | toggleBeamReceive(); | 400 | toggleBeamReceive(); |
398 | mBRdisabled = true; | 401 | mBRdisabled = true; |
399 | } | 402 | } |
400 | mBRdisabled = true; | 403 | mBRdisabled = true; |
401 | } else { | 404 | } else { |
402 | if ( mBRdisabled ) { | 405 | if ( mBRdisabled ) { |
403 | mBRdisabled = false; | 406 | mBRdisabled = false; |
404 | //makes no sense,because other cal ap is probably running | 407 | //makes no sense,because other cal ap is probably running |
405 | // toggleBeamReceive(); | 408 | // toggleBeamReceive(); |
406 | } | 409 | } |
407 | } | 410 | } |
408 | #endif | 411 | #endif |
409 | 412 | ||
410 | } | 413 | } |
411 | bool MainWindow::beamReceiveEnabled() | 414 | bool MainWindow::beamReceiveEnabled() |
412 | { | 415 | { |
413 | #ifndef DESKTOP_VERSION | 416 | #ifndef DESKTOP_VERSION |
414 | return ( infrared != 0 ); | 417 | return ( infrared != 0 ); |
415 | #endif | 418 | #endif |
416 | return false; | 419 | return false; |
417 | } | 420 | } |
418 | 421 | ||
419 | void MainWindow::toggleBeamReceive() | 422 | void MainWindow::toggleBeamReceive() |
420 | { | 423 | { |
421 | if ( mBRdisabled ) | 424 | if ( mBRdisabled ) |
422 | return; | 425 | return; |
423 | #ifndef DESKTOP_VERSION | 426 | #ifndef DESKTOP_VERSION |
424 | if ( infrared ) { | 427 | if ( infrared ) { |
425 | qDebug("KO: Disable BeamReceive "); | 428 | qDebug("KO: Disable BeamReceive "); |
426 | delete infrared; | 429 | delete infrared; |
427 | infrared = 0; | 430 | infrared = 0; |
428 | brAction->setOn(false); | 431 | brAction->setOn(false); |
429 | return; | 432 | return; |
430 | } | 433 | } |
431 | qDebug("KO: Enable BeamReceive "); | 434 | qDebug("KO: Enable BeamReceive "); |
432 | brAction->setOn(true); | 435 | brAction->setOn(true); |
433 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; | 436 | infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ; |
434 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); | 437 | QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve( const QCString&, const QByteArray& ))); |
435 | #endif | 438 | #endif |
436 | } | 439 | } |
437 | void MainWindow::showMaximized () | 440 | void MainWindow::showMaximized () |
438 | { | 441 | { |
439 | #ifndef DESKTOP_VERSION | 442 | #ifndef DESKTOP_VERSION |
440 | if ( ! globalFlagBlockStartup ) | 443 | if ( ! globalFlagBlockStartup ) |
441 | if ( mClosed ) | 444 | if ( mClosed ) |
442 | mView->goToday(); | 445 | mView->goToday(); |
443 | #endif | 446 | #endif |
444 | QWidget::showMaximized () ; | 447 | QWidget::showMaximized () ; |
445 | mClosed = false; | 448 | mClosed = false; |
446 | } | 449 | } |
447 | void MainWindow::closeEvent( QCloseEvent* ce ) | 450 | void MainWindow::closeEvent( QCloseEvent* ce ) |
448 | { | 451 | { |
449 | 452 | ||
450 | 453 | ||
451 | 454 | ||
452 | if ( ! KOPrefs::instance()->mAskForQuit ) { | 455 | if ( ! KOPrefs::instance()->mAskForQuit ) { |
453 | saveOnClose(); | 456 | saveOnClose(); |
454 | mClosed = true; | 457 | mClosed = true; |
455 | ce->accept(); | 458 | ce->accept(); |
456 | return; | 459 | return; |
457 | 460 | ||
458 | } | 461 | } |
459 | 462 | ||
460 | switch( QMessageBox::information( this, "KO/Pi", | 463 | switch( QMessageBox::information( this, "KO/Pi", |
461 | i18n("Do you really want\nto close KO/Pi?"), | 464 | i18n("Do you really want\nto close KO/Pi?"), |
462 | i18n("Close"), i18n("No"), | 465 | i18n("Close"), i18n("No"), |
463 | 0, 0 ) ) { | 466 | 0, 0 ) ) { |
464 | case 0: | 467 | case 0: |
465 | saveOnClose(); | 468 | saveOnClose(); |
466 | mClosed = true; | 469 | mClosed = true; |
467 | ce->accept(); | 470 | ce->accept(); |
468 | break; | 471 | break; |
469 | case 1: | 472 | case 1: |
470 | ce->ignore(); | 473 | ce->ignore(); |
471 | break; | 474 | break; |
472 | case 2: | 475 | case 2: |