author | umopapisdn <umopapisdn> | 2003-04-12 01:19:53 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-04-12 01:19:53 (UTC) |
commit | 212aef7fd20182fe926644af2ab10a4b49549440 (patch) (unidiff) | |
tree | 9e8fb96b40037b31cb2eed411c7a51f35d819ddc | |
parent | 79fcbf52d267aa3eb839de35f15992bf5e18f8eb (diff) | |
download | opie-212aef7fd20182fe926644af2ab10a4b49549440.zip opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.gz opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.bz2 |
Bugfix: Datebook shouldn't crash if we modify prefences when dayview isn't initialized. :)
-rw-r--r-- | core/pim/datebook/datebook.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 1bc82a5..829f8f8 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp | |||
@@ -274,23 +274,27 @@ void DateBook::slotSettings() | |||
274 | frmSettings.setRowStyle( rowStyle ); | 274 | frmSettings.setRowStyle( rowStyle ); |
275 | #if defined (Q_WS_QWS) || defined(_WS_QWS_) | 275 | #if defined (Q_WS_QWS) || defined(_WS_QWS_) |
276 | frmSettings.showMaximized(); | 276 | frmSettings.showMaximized(); |
277 | #endif | 277 | #endif |
278 | 278 | ||
279 | if ( frmSettings.exec() ) { | 279 | if ( frmSettings.exec() ) { |
280 | |||
280 | aPreset = frmSettings.alarmPreset(); | 281 | aPreset = frmSettings.alarmPreset(); |
281 | presetTime = frmSettings.presetTime(); | 282 | presetTime = frmSettings.presetTime(); |
282 | startTime = frmSettings.startTime(); | 283 | startTime = frmSettings.startTime(); |
283 | bJumpToCurTime = frmSettings.jumpToCurTime(); | 284 | bJumpToCurTime = frmSettings.jumpToCurTime(); |
284 | rowStyle = frmSettings.rowStyle(); | 285 | rowStyle = frmSettings.rowStyle(); |
285 | if ( dayView ) | 286 | |
287 | if ( dayView ) { | ||
286 | dayView->setStartViewTime( startTime ); | 288 | dayView->setStartViewTime( startTime ); |
287 | dayView->setJumpToCurTime( bJumpToCurTime ); | 289 | dayView->setJumpToCurTime( bJumpToCurTime ); |
288 | dayView->setRowStyle( rowStyle ); | 290 | dayView->setRowStyle( rowStyle ); |
289 | if ( weekView ) | 291 | } |
292 | if ( weekView ) { | ||
290 | weekView->setStartViewTime( startTime ); | 293 | weekView->setStartViewTime( startTime ); |
294 | } | ||
291 | saveSettings(); | 295 | saveSettings(); |
292 | 296 | ||
293 | // make the change obvious | 297 | // make the change obvious |
294 | if ( views->visibleWidget() ) { | 298 | if ( views->visibleWidget() ) { |
295 | if ( views->visibleWidget() == dayView ) | 299 | if ( views->visibleWidget() == dayView ) |
296 | dayView->redraw(); | 300 | dayView->redraw(); |
@@ -545,16 +549,16 @@ void DateBook::initWeek() | |||
545 | views->addWidget( weekView, WEEK ); | 549 | views->addWidget( weekView, WEEK ); |
546 | connect( weekView, SIGNAL( showDate( int, int, int ) ), | 550 | connect( weekView, SIGNAL( showDate( int, int, int ) ), |
547 | this, SLOT( showDay( int, int, int ) ) ); | 551 | this, SLOT( showDay( int, int, int ) ) ); |
548 | connect( this, SIGNAL( newEvent() ), | 552 | connect( this, SIGNAL( newEvent() ), |
549 | weekView, SLOT( redraw() ) ); | 553 | weekView, SLOT( redraw() ) ); |
550 | } | 554 | } |
555 | |||
551 | //But also get it right: the year that we display can be different | 556 | //But also get it right: the year that we display can be different |
552 | //from the year of the current date. So, first find the year | 557 | //from the year of the current date. So, first find the year |
553 | //number of the current week. | 558 | //number of the current week. |
554 | |||
555 | int yearNumber, totWeeks; | 559 | int yearNumber, totWeeks; |
556 | calcWeek( currentDate(), totWeeks, yearNumber, onMonday ); | 560 | calcWeek( currentDate(), totWeeks, yearNumber, onMonday ); |
557 | 561 | ||
558 | QDate d = QDate( yearNumber, 12, 31 ); | 562 | QDate d = QDate( yearNumber, 12, 31 ); |
559 | calcWeek( d, totWeeks, yearNumber, onMonday ); | 563 | calcWeek( d, totWeeks, yearNumber, onMonday ); |
560 | 564 | ||
@@ -562,12 +566,13 @@ void DateBook::initWeek() | |||
562 | d = d.addDays( -1 ); | 566 | d = d.addDays( -1 ); |
563 | calcWeek( d, totWeeks, yearNumber, onMonday ); | 567 | calcWeek( d, totWeeks, yearNumber, onMonday ); |
564 | } | 568 | } |
565 | if ( totWeeks != weekView->totalWeeks() ) | 569 | if ( totWeeks != weekView->totalWeeks() ) |
566 | weekView->setTotalWeeks( totWeeks ); | 570 | weekView->setTotalWeeks( totWeeks ); |
567 | } | 571 | } |
572 | |||
568 | void DateBook::initWeekLst() { | 573 | void DateBook::initWeekLst() { |
569 | if ( !weekLstView ) { | 574 | if ( !weekLstView ) { |
570 | weekLstView = new DateBookWeekLst( ampm, onMonday, db, | 575 | weekLstView = new DateBookWeekLst( ampm, onMonday, db, |
571 | views, "weeklst view" ); | 576 | views, "weeklst view" ); |
572 | views->addWidget( weekLstView, WEEKLST ); | 577 | views->addWidget( weekLstView, WEEKLST ); |
573 | 578 | ||