Bugfix: Datebook shouldn't crash if we modify prefences when dayview isn't initialized. :)

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 /core/pim/datebook
parent: 79fcbf52d267aa3eb839de35f15992bf5e18f8eb (diff)
download: opie-212aef7fd20182fe926644af2ab10a4b49549440.zip
opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.gz
opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.bz2
1 files changed, 97 insertions, 92 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
@@ -223,3 +223,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
    qDebug("done t=%d", t.elapsed() );
-    
    /*
@@ -238,5 +238,5 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     */
-    if( needEvilHack ){
+        if( needEvilHack ){
-        QTimer::singleShot( 500, this, SLOT(viewWeek()) );
+                QTimer::singleShot( 500, this, SLOT(viewWeek()) );
-    }
+        }
 }
@@ -278,24 +278,28 @@ void DateBook::slotSettings()
-    if ( frmSettings.exec() ) {
+        if ( frmSettings.exec() ) {
-        aPreset = frmSettings.alarmPreset();
-        presetTime = frmSettings.presetTime();
+                aPreset = frmSettings.alarmPreset();
-        startTime = frmSettings.startTime();
+                presetTime = frmSettings.presetTime();
-        bJumpToCurTime = frmSettings.jumpToCurTime();
+                startTime = frmSettings.startTime();
-        rowStyle = frmSettings.rowStyle();
+                bJumpToCurTime = frmSettings.jumpToCurTime();
-        if ( dayView )
+                rowStyle = frmSettings.rowStyle();
-            dayView->setStartViewTime( startTime );
-            dayView->setJumpToCurTime( bJumpToCurTime );
+                if ( dayView ) {
-            dayView->setRowStyle( rowStyle );
+                        dayView->setStartViewTime( startTime );
-        if ( weekView )
+                        dayView->setJumpToCurTime( bJumpToCurTime );
-            weekView->setStartViewTime( startTime );
+                        dayView->setRowStyle( rowStyle );
-        saveSettings();
+                }
+                if ( weekView ) {
-        // make the change obvious
+                        weekView->setStartViewTime( startTime );
-        if ( views->visibleWidget() ) {
+                }
-            if ( views->visibleWidget() == dayView )
+                saveSettings();
-                dayView->redraw();
-            else if ( views->visibleWidget() == weekView )
+                // make the change obvious
-                weekView->redraw();
+                if ( views->visibleWidget() ) {
+                        if ( views->visibleWidget() == dayView )
+                                dayView->redraw();
+                        else if ( views->visibleWidget() == weekView )
+                                weekView->redraw();
+                }
        }
-    }
 }
@@ -353,27 +357,27 @@ QDate DateBook::currentDate()
 void DateBook::view(int v, const QDate &d) {
-    if (v==DAY) {
+        if (v==DAY) {
-        initDay();
+                initDay();
-        dayAction->setOn( TRUE );
+                dayAction->setOn( TRUE );
-        dayView->setDate( d );
+                dayView->setDate( d );
-        views->raiseWidget( dayView );
+                views->raiseWidget( dayView );
-        dayView->redraw();
+                dayView->redraw();
-    } else if (v==WEEK) {
+        } else if (v==WEEK) {
-        initWeek();
+                initWeek();
-        weekAction->setOn( TRUE );
+                weekAction->setOn( TRUE );
-        weekView->setDate( d );
+                weekView->setDate( d );
-        views->raiseWidget( weekView );
+                views->raiseWidget( weekView );
-        weekView->redraw();
+                weekView->redraw();
-    } else if (v==WEEKLST) {
+        } else if (v==WEEKLST) {
-        initWeekLst();
+                initWeekLst();
-        weekLstAction->setOn( TRUE );
+                weekLstAction->setOn( TRUE );
-        weekLstView->setDate(d);
+                weekLstView->setDate(d);
-        views->raiseWidget( weekLstView );
+                views->raiseWidget( weekLstView );
-        weekLstView->redraw();
+                weekLstView->redraw();
-    } else if (v==MONTH) {
+        } else if (v==MONTH) {
-        initMonth();
+                initMonth();
-        monthAction->setOn( TRUE );
+                monthAction->setOn( TRUE );
-        monthView->setDate( d.year(), d.month(), d.day() );
+                monthView->setDate( d.year(), d.month(), d.day() );
-        views->raiseWidget( monthView );
+                views->raiseWidget( monthView );
-        monthView->redraw();
+                monthView->redraw();
-    }
+        }
 }
@@ -516,22 +520,22 @@ void DateBook::initDay()
 {
-    if ( !dayView ) {
+        if ( !dayView ) {
-        dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
+                dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
-        views->addWidget( dayView, DAY );
+                views->addWidget( dayView, DAY );
-        dayView->setStartViewTime( startTime );
+                dayView->setStartViewTime( startTime );
-        dayView->setJumpToCurTime( bJumpToCurTime );
+                dayView->setJumpToCurTime( bJumpToCurTime );
-        dayView->setRowStyle( rowStyle );
+                dayView->setRowStyle( rowStyle );
-        connect( this, SIGNAL( newEvent() ),
+                connect( this, SIGNAL( newEvent() ),
-                 dayView, SLOT( redraw() ) );
+                        dayView, SLOT( redraw() ) );
-        connect( dayView, SIGNAL( newEvent() ),
+                connect( dayView, SIGNAL( newEvent() ),
-                 this, SLOT( fileNew() ) );
+                        this, SLOT( fileNew() ) );
-        connect( dayView, SIGNAL( removeEvent( const Event & ) ),
+                connect( dayView, SIGNAL( removeEvent( const Event & ) ),
-                 this, SLOT( removeEvent( const Event & ) ) );
+                        this, SLOT( removeEvent( const Event & ) ) );
-        connect( dayView, SIGNAL( editEvent( const Event & ) ),
+                connect( dayView, SIGNAL( editEvent( const Event & ) ),
-                 this, SLOT( editEvent( const Event & ) ) );
+                        this, SLOT( editEvent( const Event & ) ) );
-        connect( dayView, SIGNAL( duplicateEvent( const Event & ) ),
+                connect( dayView, SIGNAL( duplicateEvent( const Event & ) ),
-                 this, SLOT( duplicateEvent( const Event & ) ) );
+                        this, SLOT( duplicateEvent( const Event & ) ) );
-        connect( dayView, SIGNAL( beamEvent( const Event & ) ),
+                connect( dayView, SIGNAL( beamEvent( const Event & ) ),
-                 this, SLOT( beamEvent( const Event & ) ) );
+                        this, SLOT( beamEvent( const Event & ) ) );
-        connect( dayView, SIGNAL(sigNewEvent(const QString &)),
+                connect( dayView, SIGNAL(sigNewEvent(const QString &)),
-                 this, SLOT(slotNewEventFromKey(const QString &)) );
+                        this, SLOT(slotNewEventFromKey(const QString &)) );
    }
@@ -541,28 +545,29 @@ void DateBook::initWeek()
 {
-    if ( !weekView ) {
+        if ( !weekView ) {
-        weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
+                weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
-        weekView->setStartViewTime( startTime );
+                weekView->setStartViewTime( startTime );
-        views->addWidget( weekView, WEEK );
+                views->addWidget( weekView, WEEK );
-        connect( weekView, SIGNAL( showDate( int, int, int ) ),
+                connect( weekView, SIGNAL( showDate( int, int, int ) ),
-                 this, SLOT( showDay( int, int, int ) ) );
+                        this, SLOT( showDay( int, int, int ) ) );
-        connect( this, SIGNAL( newEvent() ),
+                connect( this, SIGNAL( newEvent() ),
-                 weekView, SLOT( redraw() ) );
+                        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 );
+        //But also get it right: the year that we display can be different
-    calcWeek( d, totWeeks, yearNumber, onMonday );
+        //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 );
-    while ( totWeeks == 1 ) {
+        QDate d = QDate( yearNumber, 12, 31 );
-        d = d.addDays( -1 );
        calcWeek( d, totWeeks, yearNumber, onMonday );
-    }
-    if ( totWeeks != weekView->totalWeeks() )
+        while ( totWeeks == 1 ) {
-        weekView->setTotalWeeks( totWeeks );
+                d = d.addDays( -1 );
+                calcWeek( d, totWeeks, yearNumber, onMonday );
+        }
+        if ( totWeeks != weekView->totalWeeks() )
+                weekView->setTotalWeeks( totWeeks );
 }
 void DateBook::initWeekLst() {
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 /core/pim/datebook
parent	79fcbf52d267aa3eb839de35f15992bf5e18f8eb (diff)
download	opie-212aef7fd20182fe926644af2ab10a4b49549440.zip opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.gz opie-212aef7fd20182fe926644af2ab10a4b49549440.tar.bz2

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
@@ -223,3 +223,3 @@ DateBook::DateBook( QWidget parent, const char , WFlags f )
223	qDebug("done t=%d", t.elapsed() );	223	qDebug("done t=%d", t.elapsed() );
224		224
225	/*	225	/*
@@ -238,5 +238,5 @@ DateBook::DateBook( QWidget parent, const char , WFlags f )
238	*/	238	*/
239	if( needEvilHack ){	239	if( needEvilHack ){
240	QTimer::singleShot( 500, this, SLOT(viewWeek()) );	240	QTimer::singleShot( 500, this, SLOT(viewWeek()) );
241	}	241	}
242	}	242	}
@@ -278,24 +278,28 @@ void DateBook::slotSettings()
278		278
279	if ( frmSettings.exec() ) {	279	if ( frmSettings.exec() ) {
280	aPreset = frmSettings.alarmPreset();	280
281	presetTime = frmSettings.presetTime();	281	aPreset = frmSettings.alarmPreset();
282	startTime = frmSettings.startTime();	282	presetTime = frmSettings.presetTime();
283	bJumpToCurTime = frmSettings.jumpToCurTime();	283	startTime = frmSettings.startTime();
284	rowStyle = frmSettings.rowStyle();	284	bJumpToCurTime = frmSettings.jumpToCurTime();
285	if ( dayView )	285	rowStyle = frmSettings.rowStyle();
286	dayView->setStartViewTime( startTime );	286
287	dayView->setJumpToCurTime( bJumpToCurTime );	287	if ( dayView ) {
288	dayView->setRowStyle( rowStyle );	288	dayView->setStartViewTime( startTime );
289	if ( weekView )	289	dayView->setJumpToCurTime( bJumpToCurTime );
290	weekView->setStartViewTime( startTime );	290	dayView->setRowStyle( rowStyle );
291	saveSettings();	291	}
292		292	if ( weekView ) {
293	// make the change obvious	293	weekView->setStartViewTime( startTime );
294	if ( views->visibleWidget() ) {	294	}
295	if ( views->visibleWidget() == dayView )	295	saveSettings();
296	dayView->redraw();	296
297	else if ( views->visibleWidget() == weekView )	297	// make the change obvious
298	weekView->redraw();	298	if ( views->visibleWidget() ) {
		299	if ( views->visibleWidget() == dayView )
		300	dayView->redraw();
		301	else if ( views->visibleWidget() == weekView )
		302	weekView->redraw();
		303	}
299	}	304	}
300	}
301	}	305	}
@@ -353,27 +357,27 @@ QDate DateBook::currentDate()
353	void DateBook::view(int v, const QDate &d) {	357	void DateBook::view(int v, const QDate &d) {
354	if (v==DAY) {	358	if (v==DAY) {
355	initDay();	359	initDay();
356	dayAction->setOn( TRUE );	360	dayAction->setOn( TRUE );
357	dayView->setDate( d );	361	dayView->setDate( d );
358	views->raiseWidget( dayView );	362	views->raiseWidget( dayView );
359	dayView->redraw();	363	dayView->redraw();
360	} else if (v==WEEK) {	364	} else if (v==WEEK) {
361	initWeek();	365	initWeek();
362	weekAction->setOn( TRUE );	366	weekAction->setOn( TRUE );
363	weekView->setDate( d );	367	weekView->setDate( d );
364	views->raiseWidget( weekView );	368	views->raiseWidget( weekView );
365	weekView->redraw();	369	weekView->redraw();
366	} else if (v==WEEKLST) {	370	} else if (v==WEEKLST) {
367	initWeekLst();	371	initWeekLst();
368	weekLstAction->setOn( TRUE );	372	weekLstAction->setOn( TRUE );
369	weekLstView->setDate(d);	373	weekLstView->setDate(d);
370	views->raiseWidget( weekLstView );	374	views->raiseWidget( weekLstView );
371	weekLstView->redraw();	375	weekLstView->redraw();
372	} else if (v==MONTH) {	376	} else if (v==MONTH) {
373	initMonth();	377	initMonth();
374	monthAction->setOn( TRUE );	378	monthAction->setOn( TRUE );
375	monthView->setDate( d.year(), d.month(), d.day() );	379	monthView->setDate( d.year(), d.month(), d.day() );
376	views->raiseWidget( monthView );	380	views->raiseWidget( monthView );
377	monthView->redraw();	381	monthView->redraw();
378	}	382	}
379	}	383	}
@@ -516,22 +520,22 @@ void DateBook::initDay()
516	{	520	{
517	if ( !dayView ) {	521	if ( !dayView ) {
518	dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );	522	dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
519	views->addWidget( dayView, DAY );	523	views->addWidget( dayView, DAY );
520	dayView->setStartViewTime( startTime );	524	dayView->setStartViewTime( startTime );
521	dayView->setJumpToCurTime( bJumpToCurTime );	525	dayView->setJumpToCurTime( bJumpToCurTime );
522	dayView->setRowStyle( rowStyle );	526	dayView->setRowStyle( rowStyle );
523	connect( this, SIGNAL( newEvent() ),	527	connect( this, SIGNAL( newEvent() ),
524	dayView, SLOT( redraw() ) );	528	dayView, SLOT( redraw() ) );
525	connect( dayView, SIGNAL( newEvent() ),	529	connect( dayView, SIGNAL( newEvent() ),
526	this, SLOT( fileNew() ) );	530	this, SLOT( fileNew() ) );
527	connect( dayView, SIGNAL( removeEvent( const Event & ) ),	531	connect( dayView, SIGNAL( removeEvent( const Event & ) ),
528	this, SLOT( removeEvent( const Event & ) ) );	532	this, SLOT( removeEvent( const Event & ) ) );
529	connect( dayView, SIGNAL( editEvent( const Event & ) ),	533	connect( dayView, SIGNAL( editEvent( const Event & ) ),
530	this, SLOT( editEvent( const Event & ) ) );	534	this, SLOT( editEvent( const Event & ) ) );
531	connect( dayView, SIGNAL( duplicateEvent( const Event & ) ),	535	connect( dayView, SIGNAL( duplicateEvent( const Event & ) ),
532	this, SLOT( duplicateEvent( const Event & ) ) );	536	this, SLOT( duplicateEvent( const Event & ) ) );
533	connect( dayView, SIGNAL( beamEvent( const Event & ) ),	537	connect( dayView, SIGNAL( beamEvent( const Event & ) ),
534	this, SLOT( beamEvent( const Event & ) ) );	538	this, SLOT( beamEvent( const Event & ) ) );
535	connect( dayView, SIGNAL(sigNewEvent(const QString &)),	539	connect( dayView, SIGNAL(sigNewEvent(const QString &)),
536	this, SLOT(slotNewEventFromKey(const QString &)) );	540	this, SLOT(slotNewEventFromKey(const QString &)) );
537	}	541	}
@@ -541,28 +545,29 @@ void DateBook::initWeek()
541	{	545	{
542	if ( !weekView ) {	546	if ( !weekView ) {
543	weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );	547	weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
544	weekView->setStartViewTime( startTime );	548	weekView->setStartViewTime( startTime );
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	}
551	//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
553	//number of the current week.
554
555	int yearNumber, totWeeks;
556	calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
557		555
558	QDate d = QDate( yearNumber, 12, 31 );	556	//But also get it right: the year that we display can be different
559	calcWeek( d, totWeeks, yearNumber, onMonday );	557	//from the year of the current date. So, first find the year
		558	//number of the current week.
		559	int yearNumber, totWeeks;
		560	calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
560		561
561	while ( totWeeks == 1 ) {	562	QDate d = QDate( yearNumber, 12, 31 );
562	d = d.addDays( -1 );
563	calcWeek( d, totWeeks, yearNumber, onMonday );	563	calcWeek( d, totWeeks, yearNumber, onMonday );
564	}	564
565	if ( totWeeks != weekView->totalWeeks() )	565	while ( totWeeks == 1 ) {
566	weekView->setTotalWeeks( totWeeks );	566	d = d.addDays( -1 );
		567	calcWeek( d, totWeeks, yearNumber, onMonday );
		568	}
		569	if ( totWeeks != weekView->totalWeeks() )
		570	weekView->setTotalWeeks( totWeeks );
567	}	571	}
		572
568	void DateBook::initWeekLst() {	573	void DateBook::initWeekLst() {