summaryrefslogtreecommitdiff
path: root/core/pim/datebook/datebook.cpp
Unidiff
Diffstat (limited to 'core/pim/datebook/datebook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index c0d45c9..7dd93a6 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -79,8 +79,10 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
79 : QMainWindow( parent, "datebook", f ), 79 : QMainWindow( parent, "datebook", f ),
80 aPreset( FALSE ), 80 aPreset( FALSE ),
81 presetTime( -1 ), 81 presetTime( -1 ),
82 startTime( 8 ), // an acceptable default 82 startTime( 8 ), // an acceptable default
83 rowStyle( 0 ),
84 bJumpToCurTime(FALSE),
83 syncing(FALSE), 85 syncing(FALSE),
84 inSearch(FALSE), 86 inSearch(FALSE),
85 alarmCounter(0) 87 alarmCounter(0)
86{ 88{
@@ -248,18 +250,24 @@ void DateBook::slotSettings()
248{ 250{
249 DateBookSettings frmSettings( ampm, this ); 251 DateBookSettings frmSettings( ampm, this );
250 frmSettings.setStartTime( startTime ); 252 frmSettings.setStartTime( startTime );
251 frmSettings.setAlarmPreset( aPreset, presetTime ); 253 frmSettings.setAlarmPreset( aPreset, presetTime );
254 frmSettings.setJumpToCurTime( bJumpToCurTime );
255 frmSettings.setRowStyle( rowStyle );
252#if defined (Q_WS_QWS) || defined(_WS_QWS_) 256#if defined (Q_WS_QWS) || defined(_WS_QWS_)
253 frmSettings.showMaximized(); 257 frmSettings.showMaximized();
254#endif 258#endif
255 259
256 if ( frmSettings.exec() ) { 260 if ( frmSettings.exec() ) {
257 aPreset = frmSettings.alarmPreset(); 261 aPreset = frmSettings.alarmPreset();
258 presetTime = frmSettings.presetTime(); 262 presetTime = frmSettings.presetTime();
259 startTime = frmSettings.startTime(); 263 startTime = frmSettings.startTime();
264 bJumpToCurTime = frmSettings.jumpToCurTime();
265 rowStyle = frmSettings.rowStyle();
260 if ( dayView ) 266 if ( dayView )
261 dayView->setStartViewTime( startTime ); 267 dayView->setStartViewTime( startTime );
268 dayView->setJumpToCurTime( bJumpToCurTime );
269 dayView->setRowStyle( rowStyle );
262 if ( weekView ) 270 if ( weekView )
263 weekView->setStartViewTime( startTime ); 271 weekView->setStartViewTime( startTime );
264 saveSettings(); 272 saveSettings();
265 273
@@ -452,8 +460,10 @@ void DateBook::initDay()
452 if ( !dayView ) { 460 if ( !dayView ) {
453 dayView = new DateBookDay( ampm, onMonday, db, views, "day view" ); 461 dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
454 views->addWidget( dayView, DAY ); 462 views->addWidget( dayView, DAY );
455 dayView->setStartViewTime( startTime ); 463 dayView->setStartViewTime( startTime );
464 dayView->setJumpToCurTime( bJumpToCurTime );
465 dayView->setRowStyle( rowStyle );
456 connect( this, SIGNAL( newEvent() ), 466 connect( this, SIGNAL( newEvent() ),
457 dayView, SLOT( redraw() ) ); 467 dayView, SLOT( redraw() ) );
458 connect( dayView, SIGNAL( newEvent() ), 468 connect( dayView, SIGNAL( newEvent() ),
459 this, SLOT( fileNew() ) ); 469 this, SLOT( fileNew() ) );
@@ -546,8 +556,10 @@ void DateBook::loadSettings()
546 config.setGroup("Main"); 556 config.setGroup("Main");
547 startTime = config.readNumEntry("startviewtime", 8); 557 startTime = config.readNumEntry("startviewtime", 8);
548 aPreset = config.readBoolEntry("alarmpreset"); 558 aPreset = config.readBoolEntry("alarmpreset");
549 presetTime = config.readNumEntry("presettime"); 559 presetTime = config.readNumEntry("presettime");
560 bJumpToCurTime = config.readBoolEntry("jumptocurtime");
561 rowStyle = config.readNumEntry("rowstyle");
550 } 562 }
551} 563}
552 564
553void DateBook::saveSettings() 565void DateBook::saveSettings()
@@ -557,8 +569,10 @@ void DateBook::saveSettings()
557 configDB.setGroup( "Main" ); 569 configDB.setGroup( "Main" );
558 configDB.writeEntry("startviewtime",startTime); 570 configDB.writeEntry("startviewtime",startTime);
559 configDB.writeEntry("alarmpreset",aPreset); 571 configDB.writeEntry("alarmpreset",aPreset);
560 configDB.writeEntry("presettime",presetTime); 572 configDB.writeEntry("presettime",presetTime);
573 configDB.writeEntry("jumptocurtime", bJumpToCurTime);
574 configDB.writeEntry("rowstyle", rowStyle);
561} 575}
562 576
563void DateBook::newDefaultView(QAction *a) { 577void DateBook::newDefaultView(QAction *a) {
564 int val=DAY; 578 int val=DAY;