| -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 @@ -276,19 +276,23 @@ void DateBook::slotSettings() frmSettings.showMaximized(); #endif if ( frmSettings.exec() ) { + aPreset = frmSettings.alarmPreset(); presetTime = frmSettings.presetTime(); startTime = frmSettings.startTime(); bJumpToCurTime = frmSettings.jumpToCurTime(); rowStyle = frmSettings.rowStyle(); - if ( dayView ) + + if ( dayView ) { dayView->setStartViewTime( startTime ); dayView->setJumpToCurTime( bJumpToCurTime ); dayView->setRowStyle( rowStyle ); - if ( weekView ) + } + if ( weekView ) { weekView->setStartViewTime( startTime ); + } saveSettings(); // make the change obvious if ( views->visibleWidget() ) { @@ -547,12 +551,12 @@ void DateBook::initWeek() this, SLOT( showDay( int, int, int ) ) ); connect( this, SIGNAL( newEvent() ), weekView, SLOT( redraw() ) ); } + //But also get it right: the year that we display can be different //from the year of the current date. So, first find the year //number of the current week. - int yearNumber, totWeeks; calcWeek( currentDate(), totWeeks, yearNumber, onMonday ); QDate d = QDate( yearNumber, 12, 31 ); @@ -564,8 +568,9 @@ void DateBook::initWeek() } if ( totWeeks != weekView->totalWeeks() ) weekView->setTotalWeeks( totWeeks ); } + void DateBook::initWeekLst() { if ( !weekLstView ) { weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" ); |