Bugfix: (bug #0000735) New events added in WeekListView are no longer defaulting to 01-01-1970.

1 files changed, 5 insertions, 0 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 7dcf156..db2058b 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -715,192 +715,197 @@ void DateBook::reload()
     else if ( monthAction->isOn() )
 	viewMonth();
     syncing = FALSE;
 }
 
 void DateBook::flush()
 {
     syncing = TRUE;
     db->save();
 }
 
 void DateBook::timerEvent( QTimerEvent *e )
 {
     if ( alarmCounter < 10 ) {
 	alarmCounter++;
 	Sound::soundAlarm();
     }
     else
 	killTimer( e->timerId() );
 }
 
 void DateBook::changeClock( bool newClock )
 {
     ampm = newClock;
     // repaint the affected objects...
     if (dayView) dayView->redraw();
     if (weekView) weekView->redraw();
     if (weekLstView) weekLstView->redraw();
 }
 
 void DateBook::changeWeek( bool m )
 {
     /* no need to redraw, each widget catches.  Do need to
        store though for widgets we haven't made yet */
     onMonday = m;
 }
 
 void DateBook::slotToday()
 {
     // we need to view today using default view
     viewDefault(QDate::currentDate());
 }
 
 void DateBook::closeEvent( QCloseEvent *e )
 {
     if(syncing) {
 	/* no need to save, did that at flush */
 	e->accept();
 	return;
     }
 
     // save settings will generate it's own error messages, no
     // need to do checking ourselves.
     saveSettings();
     if ( db->save() )
 	e->accept();
     else {
 	if ( QMessageBox::critical( this, tr( "Out of space" ),
 				    tr("Calendar was unable to save\n"
 				       "your changes.\n"
 				       "Free up some space and try again.\n"
 				       "\nQuit anyway?"),
 				    QMessageBox::Yes|QMessageBox::Escape,
 				    QMessageBox::No|QMessageBox::Default )
 	     != QMessageBox::No )
 	    e->accept();
 	else
 	    e->ignore();
     }
 }
 
 // Entering directly from the "keyboard"
 void DateBook::slotNewEventFromKey( const QString &str )
 {
     if (syncing) {
 	QMessageBox::warning( this, tr("Calendar"),
 	                      tr( "Can not edit data, currently syncing") );
 	return;
     }
 
     // We get to here from a key pressed in the Day View
     // So we can assume some things.  We want the string
     // passed in to be part of the description.
     QDateTime start, end;
     if ( views->visibleWidget() == dayView ) {
 	dayView->selectedDates( start, end );
     } else if ( views->visibleWidget() == monthView ) {
 	QDate d = monthView->selectedDate();
 	start = end = d;
 	start.setTime( QTime( 10, 0 ) );
 	end.setTime( QTime( 12, 0 ) );
     } else if ( views->visibleWidget() == weekView ) {
 	QDate d = weekView->date();
 	start = end = d;
 	start.setTime( QTime( 10, 0 ) );
 	end.setTime( QTime( 12, 0 ) );
+    } else if ( views->visibleWidget() == weekLstView ) {
+	QDate d = weekLstView->date();
+	start = end = d;
+	start.setTime( QTime( 10, 0 ) );
+	end.setTime( QTime( 12, 0 ) );
     }
     slotNewEntry(start, end, str);
 }
 void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str) {
     // argh!  This really needs to be encapsulated in a class
     // or function.
     QDialog newDlg( this, 0, TRUE );
     newDlg.setCaption( DateEntryBase::tr("New Event") );
     DateEntry *e;
     QVBoxLayout *vb = new QVBoxLayout( &newDlg );
     QScrollView *sv = new QScrollView( &newDlg );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
 
     Event ev;
     ev.setDescription(  str );
     // When the new gui comes in, change this...
     ev.setLocation( tr("(Unknown)") );
     ev.setStart( start );
     ev.setEnd( end );
 
     e = new DateEntry( onMonday, ev, ampm, &newDlg );
     e->setAlarmEnabled( aPreset, presetTime, Event::Loud );
     sv->addChild( e );
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     newDlg.showMaximized();
 #endif
     while (newDlg.exec()) {
 	ev = e->event();
 	ev.assignUid();
 	QString error = checkEvent( ev );
 	if ( !error.isNull() ) {
 	    if ( QMessageBox::warning( this, tr("Error!"),
 				       error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 )
 		continue;
 	}
 	db->addEvent( ev );
 	emit newEvent();
 	break;
     }
 }
 
 void DateBook::setDocument( const QString &filename )
 {
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     QValueList<Event> tl = Event::readVCalendar( filename );
     for( QValueList<Event>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
 	db->addEvent( *it );
     }
 }
 
 static const char * beamfile = "/tmp/obex/event.vcs";
 
 void DateBook::beamEvent( const Event &e )
 {
     qDebug("trying to beamn");
     unlink( beamfile ); // delete if exists
     mkdir("/tmp/obex/", 0755);
     Event::writeVCalendar( beamfile, e );
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
     QString description = e.description();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void DateBook::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }
 
 void DateBook::slotFind()
 {
     // move it to the day view...
     viewDay();
     FindDialog frmFind( "Calendar", this );
     frmFind.setUseDate( true );
     frmFind.setDate( currentDate() );
     QObject::connect( &frmFind,
                       SIGNAL(signalFindClicked(const QString&, const QDate&,
 					       bool, bool, int)),
 		      this,
 		      SLOT(slotDoFind(const QString&, const QDate&,
 				      bool, bool, int)) );
     QObject::connect( this,
 		      SIGNAL(signalNotFound()),
 		      &frmFind,
 		      SLOT(slotNotFound()) );
     QObject::connect( this,
 		      SIGNAL(signalWrapAround()),
 		      &frmFind,
 		      SLOT(slotWrapAround()) );
     frmFind.exec();