author | umopapisdn <umopapisdn> | 2003-04-13 23:14:23 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-04-13 23:14:23 (UTC) |
commit | ef69f1d1ca947a0b972e3f8d635883ae7ef0ae23 (patch) (unidiff) | |
tree | 23de36544964e52be73c31cd467838d473c97293 /core/pim/datebook/dateentryimpl.cpp | |
parent | 377a172d8b497674d14d7e3580a008228f83d081 (diff) | |
download | opie-ef69f1d1ca947a0b972e3f8d635883ae7ef0ae23.zip opie-ef69f1d1ca947a0b972e3f8d635883ae7ef0ae23.tar.gz opie-ef69f1d1ca947a0b972e3f8d635883ae7ef0ae23.tar.bz2 |
Bugfix: (Bug #0000716) The timepicker now works in am/pm mode also, I also changed datebook to use the otimepicker class in libopie.
Diffstat (limited to 'core/pim/datebook/dateentryimpl.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index 33b9d9b..13d2ce2 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -37,13 +37,13 @@ | |||
37 | #include <qmultilineedit.h> | 37 | #include <qmultilineedit.h> |
38 | #include <qpopupmenu.h> | 38 | #include <qpopupmenu.h> |
39 | #include <qscrollview.h> | 39 | #include <qscrollview.h> |
40 | #include <qspinbox.h> | 40 | #include <qspinbox.h> |
41 | #include <qtoolbutton.h> | 41 | #include <qtoolbutton.h> |
42 | 42 | ||
43 | #include "timepicker.h" | 43 | #include <opie/otimepicker.h> |
44 | #include "onoteedit.h" | 44 | #include "onoteedit.h" |
45 | 45 | ||
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | #include <stdio.h> | 47 | #include <stdio.h> |
48 | 48 | ||
49 | /* | 49 | /* |
@@ -79,22 +79,22 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev ) | |||
79 | timePickerStart->setHour(endTime.hour()); | 79 | timePickerStart->setHour(endTime.hour()); |
80 | timePickerStart->setMinute(endTime.minute()); | 80 | timePickerStart->setMinute(endTime.minute()); |
81 | TimePickerLabel->setText( tr("End Time") ); | 81 | TimePickerLabel->setText( tr("End Time") ); |
82 | m_showStart = false; | 82 | m_showStart = false; |
83 | } | 83 | } |
84 | } else if( ev->type() == QEvent::FocusOut ){ | 84 | } else if( ev->type() == QEvent::FocusOut ){ |
85 | if( obj == comboEnd ){ | 85 | // if( obj == comboEnd ){ |
86 | QString s; | 86 | // QString s; |
87 | s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute()); | 87 | // s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute()); |
88 | comboEnd->setText(s); | 88 | // comboEnd->setText(s); |
89 | } | 89 | // } |
90 | else if( obj == comboStart ){ | 90 | // else if( obj == comboStart ){ |
91 | QString s; | 91 | // QString s; |
92 | s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute()); | 92 | // s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute()); |
93 | comboStart->setText(s); | 93 | // comboStart->setText(s); |
94 | } | 94 | // } |
95 | } | 95 | } |
96 | 96 | ||
97 | return false; | 97 | return false; |
98 | } | 98 | } |
99 | 99 | ||
100 | static void addOrPick( QComboBox* combo, const QString& t ) | 100 | static void addOrPick( QComboBox* combo, const QString& t ) |