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

1 files changed, 6 insertions, 1 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
@@ -763,97 +763,102 @@ void DateBook::closeEvent( QCloseEvent *e )
         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 );