author | zecke <zecke> | 2002-04-15 22:40:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-04-15 22:40:49 (UTC) |
commit | 38052b763f7d248023024487a7e645b46637c76b (patch) (unidiff) | |
tree | dc6131bc2f56ea2aaab7c75364a979d117a52915 /core/pim | |
parent | a91544d04ed391bbdc0c6f95ff8a80d35190788c (diff) | |
download | opie-38052b763f7d248023024487a7e645b46637c76b.zip opie-38052b763f7d248023024487a7e645b46637c76b.tar.gz opie-38052b763f7d248023024487a7e645b46637c76b.tar.bz2 |
-fix handling of the kewl timepicker
click in a lineedit and the focus will change
ARDO FEEL FREE TO REVERT IT WANTED TO GET THIS INTO THE FEED
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 24 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.h | 7 |
2 files changed, 28 insertions, 3 deletions
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index 403378e..f2f17c6 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <qpe/timestring.h> | 29 | #include <qpe/timestring.h> |
30 | #include <qpe/tzselect.h> | 30 | #include <qpe/tzselect.h> |
31 | 31 | ||
32 | #include <qevent.h> | ||
32 | #include <qcheckbox.h> | 33 | #include <qcheckbox.h> |
33 | #include <qcombobox.h> | 34 | #include <qcombobox.h> |
34 | #include <qlayout.h> | 35 | #include <qlayout.h> |
@@ -63,6 +64,20 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start, | |||
63 | setFocusProxy(comboDescription); | 64 | setFocusProxy(comboDescription); |
64 | } | 65 | } |
65 | 66 | ||
67 | bool DateEntry::eventFilter(QObject *obj, QEvent *ev ) | ||
68 | { | ||
69 | if( ev->type() == QEvent::FocusIn ){ | ||
70 | if( obj == comboStart ){ | ||
71 | TextLabel3_2->setText( tr("Start Time" ) ); | ||
72 | m_showStart= true; | ||
73 | }else if( obj == comboEnd ){ | ||
74 | TextLabel3_2->setText( tr("End Time") ); | ||
75 | m_showStart = false; | ||
76 | } | ||
77 | } | ||
78 | return false; | ||
79 | } | ||
80 | |||
66 | static void addOrPick( QComboBox* combo, const QString& t ) | 81 | static void addOrPick( QComboBox* combo, const QString& t ) |
67 | { | 82 | { |
68 | // Pick an item if one excists | 83 | // Pick an item if one excists |
@@ -186,6 +201,9 @@ void DateEntry::init() | |||
186 | connect(timePickerStart, SIGNAL( timeChanged(const QTime &) ), | 201 | connect(timePickerStart, SIGNAL( timeChanged(const QTime &) ), |
187 | this, SLOT( startTimePicked(const QTime &) )); | 202 | this, SLOT( startTimePicked(const QTime &) )); |
188 | editNote->setFixedVisibleLines(3); | 203 | editNote->setFixedVisibleLines(3); |
204 | // install eventFilters | ||
205 | comboEnd->installEventFilter( this ); | ||
206 | comboStart->installEventFilter( this ); | ||
189 | } | 207 | } |
190 | 208 | ||
191 | /* | 209 | /* |
@@ -304,8 +322,14 @@ void DateEntry::startTimeChanged( const QTime &t ) | |||
304 | endTime=t.addSecs(duration); | 322 | endTime=t.addSecs(duration); |
305 | } | 323 | } |
306 | void DateEntry::startTimePicked( const QTime &t ) { | 324 | void DateEntry::startTimePicked( const QTime &t ) { |
325 | if(m_showStart ){ | ||
307 | startTimeChanged(t); | 326 | startTimeChanged(t); |
308 | updateTimeEdit(true,true); | 327 | updateTimeEdit(true,true); |
328 | }else{ | ||
329 | endTime = t; | ||
330 | updateTimeEdit(false, true ); | ||
331 | |||
332 | } | ||
309 | } | 333 | } |
310 | 334 | ||
311 | /* | 335 | /* |
diff --git a/core/pim/datebook/dateentryimpl.h b/core/pim/datebook/dateentryimpl.h index bde3119..4eb24b4 100644 --- a/core/pim/datebook/dateentryimpl.h +++ b/core/pim/datebook/dateentryimpl.h | |||
@@ -42,7 +42,7 @@ public: | |||
42 | 42 | ||
43 | Event event(); | 43 | Event event(); |
44 | void setAlarmEnabled( bool alarmPreset, int presetTime, Event::SoundTypeChoice ); | 44 | void setAlarmEnabled( bool alarmPreset, int presetTime, Event::SoundTypeChoice ); |
45 | 45 | virtual bool eventFilter( QObject *, QEvent * ); | |
46 | public slots: | 46 | public slots: |
47 | void endDateChanged( int, int, int ); | 47 | void endDateChanged( int, int, int ); |
48 | void endTimeChanged( const QString & ); | 48 | void endTimeChanged( const QString & ); |
@@ -67,8 +67,9 @@ private: | |||
67 | QDate startDate, endDate; | 67 | QDate startDate, endDate; |
68 | QTime startTime, endTime; | 68 | QTime startTime, endTime; |
69 | Event::RepeatPattern rp; | 69 | Event::RepeatPattern rp; |
70 | bool ampm; | 70 | bool ampm:1; |
71 | bool startWeekOnMonday; | 71 | bool startWeekOnMonday:1; |
72 | bool m_showStart:1; | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | #endif // DATEENTRY_H | 75 | #endif // DATEENTRY_H |