author | erik <erik> | 2007-04-23 20:46:34 (UTC) |
---|---|---|
committer | erik <erik> | 2007-04-23 20:46:34 (UTC) |
commit | 34975323367e4a903886cd317b34192f1271a1f2 (patch) (unidiff) | |
tree | 8898d9010cdb89b371e0bccdbf717f87359d8513 /core/pim/datebook/modules/weeklst/datebookweeklstevent.h | |
parent | d38e40fe9ee475230425fa83e924c49e5946b87c (diff) | |
download | opie-34975323367e4a903886cd317b34192f1271a1f2.zip opie-34975323367e4a903886cd317b34192f1271a1f2.tar.gz opie-34975323367e4a903886cd317b34192f1271a1f2.tar.bz2 |
Fix for bug 1844. The display of 12hour (AM/PM) time was broken. It was
because the views never bother to check.
This fix incorporates the patch submitted by harlekin. Thanks!
Diffstat (limited to 'core/pim/datebook/modules/weeklst/datebookweeklstevent.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklstevent.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstevent.h b/core/pim/datebook/modules/weeklst/datebookweeklstevent.h index 77f6283..1e3cd5d 100644 --- a/core/pim/datebook/modules/weeklst/datebookweeklstevent.h +++ b/core/pim/datebook/modules/weeklst/datebookweeklstevent.h | |||
@@ -1,34 +1,35 @@ | |||
1 | #ifndef _DATEBOOKWEEKLSTEVENT_H | 1 | #ifndef _DATEBOOKWEEKLSTEVENT_H |
2 | #define _DATEBOOKWEEKLSTEVENT_H | 2 | #define _DATEBOOKWEEKLSTEVENT_H |
3 | 3 | ||
4 | #include <opie2/oclickablelabel.h> | 4 | #include <opie2/oclickablelabel.h> |
5 | 5 | ||
6 | #include <qpe/event.h> | 6 | #include <qpe/event.h> |
7 | 7 | ||
8 | class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel | 8 | class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel |
9 | { | 9 | { |
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | public: | 11 | public: |
12 | DateBookWeekLstEvent(const EffectiveEvent &ev, int weeklistviewconfig =1, | 12 | DateBookWeekLstEvent(bool ampm, const EffectiveEvent &ev, int weeklistviewconfig =1, |
13 | QWidget* parent = 0, const char* name = 0, | 13 | QWidget* parent = 0, const char* name = 0, |
14 | WFlags fl = 0); | 14 | WFlags fl = 0); |
15 | signals: | 15 | signals: |
16 | void editEvent(const Event &e); | 16 | void editEvent(const Event &e); |
17 | void duplicateEvent(const Event &e); | 17 | void duplicateEvent(const Event &e); |
18 | void removeEvent(const Event &e); | 18 | void removeEvent(const Event &e); |
19 | void beamEvent(const Event &e); | 19 | void beamEvent(const Event &e); |
20 | void redraw(); | 20 | void redraw(); |
21 | private slots: | 21 | private slots: |
22 | void editMe(); | 22 | void editMe(); |
23 | void duplicateMe(); | 23 | void duplicateMe(); |
24 | void deleteMe(); | 24 | void deleteMe(); |
25 | void beamMe(); | 25 | void beamMe(); |
26 | private: | 26 | private: |
27 | const EffectiveEvent event; | 27 | const EffectiveEvent event; |
28 | QPopupMenu* popmenue; | 28 | QPopupMenu* popmenue; |
29 | protected: | 29 | protected: |
30 | void mousePressEvent( QMouseEvent *e ); | 30 | void mousePressEvent( QMouseEvent *e ); |
31 | bool ampm; | ||
31 | }; | 32 | }; |
32 | 33 | ||
33 | 34 | ||
34 | #endif | 35 | #endif |