*** empty log message ***

1 files changed, 2 insertions, 2 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 47be523..3e18374 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -408,388 +408,388 @@ void DateBook::duplicateEvent( const Event &e )
     // Alot of code duplication, as this is almost like editEvent();
 	if (syncing) {
 	QMessageBox::warning( this, tr("Calendar"),
 	                      tr( "Can not edit data, currently syncing") );
 	return;
     }
 	
 	Event dupevent;
 	dupevent.setStart(e.start());
 	dupevent.setEnd(e.end());
 	dupevent.setDescription(e.description());
 	dupevent.setLocation(e.location());
 //	dupevent.setCategory(e.category());	// how is this done??
 	dupevent.setNotes(e.notes());
 	dupevent.setAllDay(e.isAllDay());
 	dupevent.setTimeZone(e.timeZone());
 	if(e.hasAlarm()) dupevent.setAlarm(e.alarmDelay(),e.alarmSound());
 	if(e.hasRepeat()) dupevent.setRepeat(e.repeatPattern());
 	
 	// workaround added for text input.
     QDialog editDlg( this, 0, TRUE );
     DateEntry *entry;
     editDlg.setCaption( tr("Duplicate Event") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     // KLUDGE!!!
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     entry = new DateEntry( onMonday, dupevent, ampm, &editDlg, "editor" );
     entry->timezone->setEnabled( FALSE );
     sv->addChild( entry );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     editDlg.showMaximized();
 #endif
     while (editDlg.exec() ) {
 	Event newEv = entry->event();
 	if(newEv.description().isEmpty() && newEv.notes().isEmpty() )
 	    break;
 	newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
 	QString error = checkEvent(newEv);
 	if (!error.isNull()) {
 	    if (QMessageBox::warning(this, "error box",
 				     error, "Fix it", "Continue",
 				     0, 0, 1) == 0)
 		continue;
 	}
 	db->addEvent(newEv);
 	emit newEvent();
 	break;
     }
 }
 
 void DateBook::editEvent( const Event &e )
 {
     if (syncing) {
 	QMessageBox::warning( this, tr("Calendar"),
 	                      tr( "Can not edit data, currently syncing") );
 	return;
     }
 
     // workaround added for text input.
     QDialog editDlg( this, 0, TRUE );
     DateEntry *entry;
     editDlg.setCaption( tr("Edit Event") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     // KLUDGE!!!
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     entry = new DateEntry( onMonday, e, ampm, &editDlg, "editor" );
     entry->timezone->setEnabled( FALSE );
     sv->addChild( entry );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     editDlg.showMaximized();
 #endif
     while (editDlg.exec() ) {
 	Event newEv = entry->event();
 	if(newEv.description().isEmpty() && newEv.notes().isEmpty() )
 	    break;
 	newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
 	QString error = checkEvent(newEv);
 	if (!error.isNull()) {
 	    if (QMessageBox::warning(this, "error box",
 				     error, "Fix it", "Continue",
 				     0, 0, 1) == 0)
 		continue;
 	}
 	db->editEvent(e, newEv);
 	emit newEvent();
 	break;
     }
 }
 
 void DateBook::removeEvent( const Event &e )
 {
     if (syncing) {
 	QMessageBox::warning( this, tr("Calendar"),
 	                      tr( "Can not edit data, currently syncing") );
 	return;
     }
 
     QString strName = e.description();
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Calendar" ),strName ) )
 	return;
 
     db->removeEvent( e );
     if ( views->visibleWidget() == dayView && dayView )
         dayView->redraw();
 }
 
 void DateBook::addEvent( const Event &e )
 {
     QDate d = e.start().date();
     initDay();
     dayView->setDate( d );
 }
 
 void DateBook::showDay( int year, int month, int day )
 {
     QDate d(year, month, day);
     view(DAY,d);
 }
 
 void DateBook::initDay()
 {
     if ( !dayView ) {
 	dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
 	views->addWidget( dayView, DAY );
 	dayView->setStartViewTime( startTime );
 	dayView->setJumpToCurTime( bJumpToCurTime );
 	dayView->setRowStyle( rowStyle );
 	connect( this, SIGNAL( newEvent() ),
 		 dayView, SLOT( redraw() ) );
 	connect( dayView, SIGNAL( newEvent() ),
 		 this, SLOT( fileNew() ) );
 	connect( dayView, SIGNAL( removeEvent( const Event & ) ),
 		 this, SLOT( removeEvent( const Event & ) ) );
 	connect( dayView, SIGNAL( editEvent( const Event & ) ),
 		 this, SLOT( editEvent( const Event & ) ) );
 	connect( dayView, SIGNAL( duplicateEvent( const Event & ) ),
 		 this, SLOT( duplicateEvent( const Event & ) ) );
 	connect( dayView, SIGNAL( beamEvent( const Event & ) ),
 		 this, SLOT( beamEvent( const Event & ) ) );
 	connect( dayView, SIGNAL(sigNewEvent(const QString &)),
 		 this, SLOT(slotNewEventFromKey(const QString &)) );
     }
 }
 
 void DateBook::initWeek()
 {
     if ( !weekView ) {
 	weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
 	weekView->setStartViewTime( startTime );
 	views->addWidget( weekView, WEEK );
 	connect( weekView, SIGNAL( showDate( int, int, int ) ),
 		 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 );
     calcWeek( d, totWeeks, yearNumber, onMonday );
 
     while ( totWeeks == 1 ) {
 	d = d.addDays( -1 );
 	calcWeek( d, totWeeks, yearNumber, onMonday );
     }
     if ( totWeeks != weekView->totalWeeks() )
 	weekView->setTotalWeeks( totWeeks );
 }
 void DateBook::initWeekLst() {
   if ( !weekLstView ) {
       weekLstView = new DateBookWeekLst( ampm, onMonday, db,
 					 views, "weeklst view" );
       views->addWidget( weekLstView, WEEKLST );
 
       //weekLstView->setStartViewTime( startTime );
       connect( weekLstView, SIGNAL( showDate( int, int, int ) ),
 	       this, SLOT( showDay( int, int, int ) ) );
       connect( weekLstView, SIGNAL( addEvent( const QDateTime &,
 					      const QDateTime &,
-					      const QString & ) ),
+					      const QString & , const QString &) ),
 	       this, SLOT( slotNewEntry( const QDateTime &,
 					 const QDateTime &,
-					 const QString & ) ) );
+					 const QString & , const QString &) ) );
       connect( this, SIGNAL( newEvent() ),
 	       weekLstView, SLOT( redraw() ) );
       connect( weekLstView, SIGNAL( editEvent( const Event & ) ),
 	       this, SLOT( editEvent( const Event & ) ) );
   }
 }
 
 
 void DateBook::initMonth()
 {
     if ( !monthView ) {
 	monthView = new DateBookMonth( views, "month view", FALSE, db );
 	views->addWidget( monthView, MONTH );
 	connect( monthView, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( showDay( int, int, int ) ) );
 	connect( this, SIGNAL( newEvent() ),
 		 monthView, SLOT( redraw() ) );
 	qApp->processEvents();
     }
 }
 
 void DateBook::loadSettings()
 {
     {
 	Config config( "qpe" );
 	config.setGroup("Time");
 	ampm = config.readBoolEntry( "AMPM", TRUE );
 	onMonday = config.readBoolEntry( "MONDAY" );
     }
 
     {
 	Config config("DateBook");
 	config.setGroup("Main");
 	startTime = config.readNumEntry("startviewtime", 8);
 	aPreset = config.readBoolEntry("alarmpreset");
 	presetTime = config.readNumEntry("presettime");
 	bJumpToCurTime = config.readBoolEntry("jumptocurtime");
 	rowStyle = config.readNumEntry("rowstyle");
     }
 }
 
 void DateBook::saveSettings()
 {
     Config config( "qpe" );
     Config configDB( "DateBook" );
     configDB.setGroup( "Main" );
     configDB.writeEntry("startviewtime",startTime);
     configDB.writeEntry("alarmpreset",aPreset);
     configDB.writeEntry("presettime",presetTime);
     configDB.writeEntry("jumptocurtime", bJumpToCurTime);
     configDB.writeEntry("rowstyle", rowStyle);
 }
 
 void DateBook::newDefaultView(QAction *a) {
     int val=DAY;
     if (a->text() == "Day") val=DAY;
     if (a->text() == "Week") val=WEEK;
     if (a->text() == "WeekLst") val=WEEKLST;
     if (a->text() == "Month") val=MONTH;
 
     Config configDB( "DateBook" );
     configDB.setGroup( "Main" );
     configDB.writeEntry("defaultview",val);
 }
 
 void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 {
     bool needShow = FALSE;
     if ( msg == "alarm(QDateTime,int)" ) {
 	QDataStream ds(data,IO_ReadOnly);
 	QDateTime when; int warn;
 	ds >> when >> warn;
 
 	// check to make it's okay to continue,
 	// this is the case that the time was set ahead, and
 	// we are forced given a stale alarm...
 	QDateTime current = QDateTime::currentDateTime();
 	if ( current.time().hour() != when.time().hour()
 	     && current.time().minute() != when.time().minute() )
 	    return;
 
 	QValueList<EffectiveEvent> list = db->getEffectiveEvents(when.addSecs(warn*60));
 	if ( list.count() > 0 ) {
 	    QString msg;
 	    bool bSound = FALSE;
 	    int stopTimer = 0;
 	    bool found = FALSE;
 	    for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
 		  it!=list.end(); ++it ) {
 		if ( (*it).event().hasAlarm() ) {
 		    found = TRUE;
 		    msg += "<CENTER><B>" + (*it).description() + "</B>"
 			   + "<BR>" + (*it).location() + "<BR>"
 			   + TimeString::dateString((*it).event().start(),ampm)
 			   + (warn
 			      ? tr(" (in " + QString::number(warn)
 				   + tr(" minutes)"))
 			      : QString(""))
 			   + "<BR>"
 			   + (*it).notes() + "</CENTER>";
 		    if ( (*it).event().alarmSound() != Event::Silent ) {
 			bSound = TRUE;
 		    }
 		}
 	    }
 	    if ( found ) {
 		if ( bSound ) {
 		    Sound::soundAlarm();
 		    alarmCounter = 0;
 		    stopTimer = startTimer( 5000 );
 		}
 
 		QDialog dlg( this, 0, TRUE );
 		QVBoxLayout *vb = new QVBoxLayout( &dlg );
 		QScrollView *view = new QScrollView( &dlg, "scrollView");
 		view->setResizePolicy( QScrollView::AutoOneFit );
 		vb->addWidget( view );
 		QLabel *lblMsg = new QLabel( msg, &dlg );
 		view->addChild( lblMsg );
 		QPushButton *cmdOk = new QPushButton( tr("OK"), &dlg );
 		connect( cmdOk, SIGNAL(clicked()), &dlg, SLOT(accept()) );
 		vb->addWidget( cmdOk );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 		dlg.showMaximized();
 #endif
 		needShow = dlg.exec();
 
 		if ( bSound )
 		    killTimer( stopTimer );
 	    }
 	}
     } else if ( msg == "nextView()" ) {
 	if ( !qApp-> activeWindow ( )) {
 	    needShow = TRUE;
 	}
 	else {
 	    QWidget* cur = views->visibleWidget();
 	    if ( cur ) {
 		if ( cur == dayView )
 		    viewWeek();
 		else if ( cur == weekView )
 		    viewWeekLst();
 		else if ( cur == weekLstView )
 		    viewMonth();
 		else if ( cur == monthView )
 		    viewDay();
 		needShow = TRUE;
 	    }
 	}
     }
     if ( needShow ) {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	showMaximized();
 #else
 	show();
 #endif
 	raise();
 	QPEApplication::setKeepRunning();
 	setActiveWindow();
     }
 }
 
 void DateBook::reload()
 {
     db->reload();
     if ( dayAction->isOn() )
 	viewDay();
     else if ( weekAction->isOn() )
 	viewWeek();
     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 )