Diffstat (limited to 'core/pim/datebook/dateentryimpl.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index d9e5225..856837c 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -240,28 +240,25 @@ DateEntry::~DateEntry() | |||
240 | 240 | ||
241 | /* | 241 | /* |
242 | * public slot | 242 | * public slot |
243 | */ | 243 | */ |
244 | 244 | ||
245 | void DateEntry::slotEditNote() { | 245 | void DateEntry::slotEditNote() { |
246 | QString s; | 246 | QString s; |
247 | s = "<B>"+ TimeString::longDateString( startDate ) + "</B>"; | 247 | s = "<B>"+ TimeString::longDateString( startDate ) + "</B>"; |
248 | // s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month()); | 248 | // s.sprintf("<B>%d/%d</B> ", startDate.day(), startDate.month()); |
249 | NoteEntry noteDlg(s+comboDescription->currentText(), noteStr, | 249 | NoteEntry noteDlg(s+comboDescription->currentText(), noteStr, |
250 | this,0,TRUE); | 250 | this,0,TRUE); |
251 | 251 | ||
252 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 252 | if ( QPEApplication::execDialog( ¬eDlg ) ) { |
253 | noteDlg.showMaximized(); | ||
254 | #endif | ||
255 | if (noteDlg.exec() ) { | ||
256 | noteStr=noteDlg.note->text(); | 253 | noteStr=noteDlg.note->text(); |
257 | } | 254 | } |
258 | 255 | ||
259 | } | 256 | } |
260 | 257 | ||
261 | void DateEntry::endDateChanged( int y, int m, int d ) | 258 | void DateEntry::endDateChanged( int y, int m, int d ) |
262 | { | 259 | { |
263 | endDate.setYMD( y, m, d ); | 260 | endDate.setYMD( y, m, d ); |
264 | if ( endDate < startDate ) { | 261 | if ( endDate < startDate ) { |
265 | endDate = startDate; | 262 | endDate = startDate; |
266 | } | 263 | } |
267 | 264 | ||
@@ -386,28 +383,25 @@ void DateEntry::typeChanged( const QString &s ) | |||
386 | void DateEntry::slotRepeat() | 383 | void DateEntry::slotRepeat() |
387 | { | 384 | { |
388 | // Work around for compiler Bug.. | 385 | // Work around for compiler Bug.. |
389 | RepeatEntry *e; | 386 | RepeatEntry *e; |
390 | 387 | ||
391 | // it is better in my opinion to just grab this from the mother, | 388 | // it is better in my opinion to just grab this from the mother, |
392 | // since, this dialog doesn't need to keep track of it... | 389 | // since, this dialog doesn't need to keep track of it... |
393 | if ( rp.type != Event::NoRepeat ) | 390 | if ( rp.type != Event::NoRepeat ) |
394 | e = new RepeatEntry( startWeekOnMonday, rp, startDate, this); | 391 | e = new RepeatEntry( startWeekOnMonday, rp, startDate, this); |
395 | else | 392 | else |
396 | e = new RepeatEntry( startWeekOnMonday, startDate, this ); | 393 | e = new RepeatEntry( startWeekOnMonday, startDate, this ); |
397 | 394 | ||
398 | #if defined(Q_WS_QWS) || defined(_WS_QWS_) | 395 | if ( QPEApplication::execDialog( e ) ) { |
399 | e->showMaximized(); | ||
400 | #endif | ||
401 | if ( e->exec() ) { | ||
402 | rp = e->repeatPattern(); | 396 | rp = e->repeatPattern(); |
403 | setRepeatLabel(); | 397 | setRepeatLabel(); |
404 | } | 398 | } |
405 | // deleting sounds like a nice idea... | 399 | // deleting sounds like a nice idea... |
406 | delete e; | 400 | delete e; |
407 | } | 401 | } |
408 | 402 | ||
409 | void DateEntry::slotChangeStartOfWeek( bool onMonday ) | 403 | void DateEntry::slotChangeStartOfWeek( bool onMonday ) |
410 | { | 404 | { |
411 | startWeekOnMonday = onMonday; | 405 | startWeekOnMonday = onMonday; |
412 | } | 406 | } |
413 | 407 | ||