author | hakan <hakan> | 2002-05-06 21:09:38 (UTC) |
---|---|---|
committer | hakan <hakan> | 2002-05-06 21:09:38 (UTC) |
commit | f046179d3b49c44896298aa86380046a21394bbc (patch) (unidiff) | |
tree | b0df64a4170cd9d2631244213b33c7ef0e55b4f8 /core/pim/datebook/dateentryimpl.cpp | |
parent | 8622bcb85245937853f3e657498957deb7eb2073 (diff) | |
download | opie-f046179d3b49c44896298aa86380046a21394bbc.zip opie-f046179d3b49c44896298aa86380046a21394bbc.tar.gz opie-f046179d3b49c44896298aa86380046a21394bbc.tar.bz2 |
In the date entry dialog:
- Show end time (not only chnage label) when end textbox is selected.
- Update timepicker when endtime is edited.
- Update time textboxes when they looses focus.
- Got rid of vertical empty borders.
- "All day" dissables timepicker aswell.
- Picking bad end time will set and show end time to starttime
Diffstat (limited to 'core/pim/datebook/dateentryimpl.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index f2f17c6..e14e2f5 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -68,13 +68,29 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev ) | |||
68 | { | 68 | { |
69 | if( ev->type() == QEvent::FocusIn ){ | 69 | if( ev->type() == QEvent::FocusIn ){ |
70 | if( obj == comboStart ){ | 70 | if( obj == comboStart ){ |
71 | TextLabel3_2->setText( tr("Start Time" ) ); | 71 | timePickerStart->setHour(startTime.hour()); |
72 | timePickerStart->setMinute(startTime.minute()); | ||
73 | TimePickerLabel->setText( tr("Start Time" ) ); | ||
72 | m_showStart= true; | 74 | m_showStart= true; |
73 | }else if( obj == comboEnd ){ | 75 | }else if( obj == comboEnd ){ |
74 | TextLabel3_2->setText( tr("End Time") ); | 76 | timePickerStart->setHour(endTime.hour()); |
77 | timePickerStart->setMinute(endTime.minute()); | ||
78 | TimePickerLabel->setText( tr("End Time") ); | ||
75 | m_showStart = false; | 79 | m_showStart = false; |
76 | } | 80 | } |
81 | } else if( ev->type() == QEvent::FocusOut ){ | ||
82 | if( obj == comboEnd ){ | ||
83 | QString s; | ||
84 | s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute()); | ||
85 | comboEnd->setText(s); | ||
86 | } | ||
87 | else if( obj == comboStart ){ | ||
88 | QString s; | ||
89 | s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute()); | ||
90 | comboStart->setText(s); | ||
91 | } | ||
77 | } | 92 | } |
93 | |||
78 | return false; | 94 | return false; |
79 | } | 95 | } |
80 | 96 | ||
@@ -268,17 +284,18 @@ static QTime parseTime( const QString& s, bool ampm ) | |||
268 | */ | 284 | */ |
269 | void DateEntry::endTimeChanged( const QString &s ) | 285 | void DateEntry::endTimeChanged( const QString &s ) |
270 | { | 286 | { |
271 | QTime tmpTime = parseTime(s,ampm); | 287 | endTimeChanged( parseTime(s,ampm) ); |
272 | if ( endDate > startDate || tmpTime >= startTime ) { | 288 | } |
273 | endTime = tmpTime; | 289 | |
290 | void DateEntry::endTimeChanged( const QTime &t ) { | ||
291 | if ( endDate > startDate || t >= startTime ) { | ||
292 | endTime = t; | ||
274 | } else { | 293 | } else { |
275 | endTime = startTime; | 294 | endTime = startTime; |
276 | //comboEnd->setCurrentItem( comboStart->currentItem() ); | 295 | //comboEnd->setCurrentItem( comboStart->currentItem() ); |
277 | } | 296 | } |
278 | 297 | timePickerStart->setHour(endTime.hour()); | |
279 | } | 298 | timePickerStart->setMinute(endTime.minute()); |
280 | |||
281 | void DateEntry::endTimeChanged( const QTime &t ) { | ||
282 | } | 299 | } |
283 | 300 | ||
284 | /* | 301 | /* |
@@ -326,9 +343,8 @@ void DateEntry::startTimePicked( const QTime &t ) { | |||
326 | startTimeChanged(t); | 343 | startTimeChanged(t); |
327 | updateTimeEdit(true,true); | 344 | updateTimeEdit(true,true); |
328 | }else{ | 345 | }else{ |
329 | endTime = t; | 346 | endTimeChanged(t); |
330 | updateTimeEdit(false, true ); | 347 | updateTimeEdit(false, true ); |
331 | |||
332 | } | 348 | } |
333 | } | 349 | } |
334 | 350 | ||