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/datebookweeklstview.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/datebookweeklstview.h') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklstview.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstview.h b/core/pim/datebook/modules/weeklst/datebookweeklstview.h index 3d47842..900101d 100644 --- a/core/pim/datebook/modules/weeklst/datebookweeklstview.h +++ b/core/pim/datebook/modules/weeklst/datebookweeklstview.h | |||
@@ -14,9 +14,11 @@ class QVBoxLayout; | |||
14 | class DateBookWeekLstView: public QWidget | 14 | class DateBookWeekLstView: public QWidget |
15 | { | 15 | { |
16 | Q_OBJECT | 16 | Q_OBJECT |
17 | public: | 17 | public: |
18 | DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM, QWidget* parent = 0, const char* name = 0, | 18 | DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, |
19 | bool onM, bool showAmPm, QWidget* parent = 0, | ||
20 | const char* name = 0, | ||
19 | WFlags fl = 0 ); | 21 | WFlags fl = 0 ); |
20 | ~DateBookWeekLstView(); | 22 | ~DateBookWeekLstView(); |
21 | 23 | ||
22 | void setEvents(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM); | 24 | void setEvents(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM); |
@@ -29,15 +31,18 @@ signals: | |||
29 | void redraw(); | 31 | void redraw(); |
30 | void showDate(int y, int m, int d); | 32 | void showDate(int y, int m, int d); |
31 | void addEvent(const QDateTime &start, const QDateTime &stop, | 33 | void addEvent(const QDateTime &start, const QDateTime &stop, |
32 | const QString &str, const QString &location); | 34 | const QString &str, const QString &location); |
35 | |||
33 | protected: | 36 | protected: |
34 | bool bStartOnMonday; | 37 | bool bStartOnMonday; |
38 | bool ampm; | ||
35 | QValueList<QObject*> childs; | 39 | QValueList<QObject*> childs; |
36 | 40 | ||
37 | QVBoxLayout*m_MainLayout; | 41 | QVBoxLayout*m_MainLayout; |
38 | 42 | ||
39 | protected slots: | 43 | protected slots: |
40 | void keyPressEvent(QKeyEvent *); | 44 | void keyPressEvent(QKeyEvent *); |
45 | void slotClockChanged( bool ap ); | ||
41 | }; | 46 | }; |
42 | 47 | ||
43 | #endif | 48 | #endif |