author | zautrix <zautrix> | 2005-04-14 20:32:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-14 20:32:31 (UTC) |
commit | 7e87a287a0860882af27e26288bc9cc553dd3a0b (patch) (side-by-side diff) | |
tree | a55374f708a8c27da182bcd8d975ad3f20f39057 /korganizer | |
parent | 2a449f785f955649df9de639d38dcb250fe1376d (diff) | |
download | kdepimpi-7e87a287a0860882af27e26288bc9cc553dd3a0b.zip kdepimpi-7e87a287a0860882af27e26288bc9cc553dd3a0b.tar.gz kdepimpi-7e87a287a0860882af27e26288bc9cc553dd3a0b.tar.bz2 |
fix
-rw-r--r-- | korganizer/koeditorgeneralevent.cpp | 24 | ||||
-rw-r--r-- | korganizer/koeditorgeneralevent.h | 2 | ||||
-rw-r--r-- | korganizer/koeventviewerdialog.cpp | 7 |
3 files changed, 18 insertions, 15 deletions
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 3b2a276..af97ee9 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -141,11 +141,10 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout) connect(mStartDateEdit, SIGNAL(dateChanged(QDate)), this, SLOT(startDateChanged(QDate))); connect(mEndDateEdit, SIGNAL(dateChanged(QDate)), this, SLOT(endDateChanged(QDate))); - connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime))); - connect(mEndDateEdit,SIGNAL(setTimeTo(QTime)),mEndTimeEdit,SLOT(setTime(QTime))); - + connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),this,SLOT(sTimeChanged(QTime))); + connect(mEndDateEdit,SIGNAL(setTimeTo(QTime)),this,SLOT(eTimeChanged(QTime))); } void KOEditorGeneralEvent::initClass(QWidget *parent,QBoxLayout *topLayout) { @@ -195,17 +194,26 @@ void KOEditorGeneralEvent::setDateTimes(QDateTime start, QDateTime end) setDuration(); emitDateTimeStr(); } +void KOEditorGeneralEvent::sTimeChanged(QTime ti) +{ + mStartTimeEdit->setTime( ti ); + startTimeChanged ( ti); +} +void KOEditorGeneralEvent::eTimeChanged(QTime ti ) +{ + mEndTimeEdit->setTime( ti ); + endTimeChanged( ti ); +} void KOEditorGeneralEvent::startTimeChanged(QTime newtime) { - kdDebug() << "KOEditorGeneralEvent::startTimeChanged() " << newtime.toString() << endl; int secsep = mCurrStartDateTime.secsTo(mCurrEndDateTime); - mCurrStartDateTime.setTime(newtime); - + mCurrStartDateTime = QDateTime( mStartDateEdit->date(), QTime(newtime.hour(),newtime.minute(),0) ); // adjust end time so that the event has the same duration as before. + if( secsep > 0 ) mCurrEndDateTime = mCurrStartDateTime.addSecs(secsep); mEndTimeEdit->setTime(mCurrEndDateTime.time()); mEndDateEdit->setDate(mCurrEndDateTime.date()); @@ -213,12 +221,10 @@ void KOEditorGeneralEvent::startTimeChanged(QTime newtime) } void KOEditorGeneralEvent::endTimeChanged(QTime newtime) { -// kdDebug() << "KOEditorGeneralEvent::endTimeChanged " << newtime.toString() << endl; - QDateTime newdt(mCurrEndDateTime.date(), newtime); - mCurrEndDateTime = newdt; + mCurrEndDateTime = QDateTime ( mEndDateEdit->date(), QTime(newtime.hour(),newtime.minute(),0)); emit dateTimesChanged(mCurrStartDateTime,mCurrEndDateTime); } diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h index 0174788..9649806 100644 --- a/korganizer/koeditorgeneralevent.h +++ b/korganizer/koeditorgeneralevent.h @@ -82,8 +82,10 @@ class KOEditorGeneralEvent : public KOEditorGeneral void endTimeChanged(QTime); void endDateChanged(QDate); void emitDateTimeStr(); + void sTimeChanged(QTime); + void eTimeChanged(QTime); signals: void dateTimesChanged(QDateTime start,QDateTime end); void allDayChanged(bool); diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index baa11b5..e5ff8af 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -215,12 +215,9 @@ void KOEventViewerDialog::editIncidence() accept(); return; } if ( mIncidence ){ -#ifndef DESKTOP_VERSION - //hide(); close(); -#endif emit editIncidence( mIncidence ); } } void KOEventViewerDialog::showIncidence() @@ -253,11 +250,9 @@ void KOEventViewerDialog::showIncidence() emit showAgendaView( false ); globalFlagBlockAgenda = 2; emit jumpToTime( date ); } -#ifndef DESKTOP_VERSION - reject(); -#endif + close(); } } void KOEventViewerDialog::keyPressEvent ( QKeyEvent * e ) { |