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/datebookweeklst.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/datebookweeklst.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklst.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklst.h b/core/pim/datebook/modules/weeklst/datebookweeklst.h index 505810b..53bed05 100644 --- a/core/pim/datebook/modules/weeklst/datebookweeklst.h +++ b/core/pim/datebook/modules/weeklst/datebookweeklst.h | |||
@@ -14,48 +14,49 @@ class DateBookWeekLstDblView; | |||
14 | class QVBoxLayout; | 14 | class QVBoxLayout; |
15 | class QScrollView; | 15 | class QScrollView; |
16 | 16 | ||
17 | class DateBookWeekLst : public QWidget | 17 | class DateBookWeekLst : public QWidget |
18 | { | 18 | { |
19 | Q_OBJECT | 19 | Q_OBJECT |
20 | 20 | ||
21 | public: | 21 | public: |
22 | DateBookWeekLst( bool ampm, bool onM, DateBookDBHoliday *newDB, | 22 | DateBookWeekLst( bool ampm, bool onM, DateBookDBHoliday *newDB, |
23 | QWidget *parent = 0, | 23 | QWidget *parent = 0, |
24 | const char *name = 0 ); | 24 | const char *name = 0 ); |
25 | ~DateBookWeekLst(); | 25 | ~DateBookWeekLst(); |
26 | void setDate( int y, int w ); | 26 | void setDate( int y, int w ); |
27 | void setDate(const QDate &d ); | 27 | void setDate(const QDate &d ); |
28 | int week() const { return _week; }; | 28 | int week() const { return _week; }; |
29 | QDate date(); | 29 | QDate date(); |
30 | QDate weekDate() const; | 30 | QDate weekDate() const; |
31 | 31 | ||
32 | public slots: | 32 | public slots: |
33 | void redraw(); | 33 | void redraw(); |
34 | void dateChanged(QDate &date); | 34 | void dateChanged(QDate &date); |
35 | 35 | ||
36 | protected slots: | 36 | protected slots: |
37 | void keyPressEvent(QKeyEvent *); | 37 | void keyPressEvent(QKeyEvent *); |
38 | void slotClockChanged(bool); | ||
38 | void setDbl(bool on); | 39 | void setDbl(bool on); |
39 | 40 | ||
40 | signals: | 41 | signals: |
41 | void showDate(int y, int m, int d); | 42 | void showDate(int y, int m, int d); |
42 | void addEvent(const QDateTime &start, const QDateTime &stop, | 43 | void addEvent(const QDateTime &start, const QDateTime &stop, |
43 | const QString &str, const QString &location); | 44 | const QString &str, const QString &location); |
44 | void editEvent(const Event &e); | 45 | void editEvent(const Event &e); |
45 | void duplicateEvent(const Event &e); | 46 | void duplicateEvent(const Event &e); |
46 | void removeEvent(const Event &e); | 47 | void removeEvent(const Event &e); |
47 | void beamEvent(const Event &e); | 48 | void beamEvent(const Event &e); |
48 | 49 | ||
49 | private: | 50 | private: |
50 | DateBookDBHoliday *db; | 51 | DateBookDBHoliday *db; |
51 | int startTime; | 52 | int startTime; |
52 | bool ampm; | 53 | bool ampm; |
53 | bool bStartOnMonday; | 54 | bool bStartOnMonday; |
54 | bool dbl; | 55 | bool dbl; |
55 | QDate bdate; | 56 | QDate bdate; |
56 | int year, _week,dow; | 57 | int year, _week,dow; |
57 | DateBookWeekLstHeader *header; | 58 | DateBookWeekLstHeader *header; |
58 | QVBoxLayout *layout; | 59 | QVBoxLayout *layout; |
59 | QScrollView *scroll; | 60 | QScrollView *scroll; |
60 | DateBookWeekLstDblView*m_CurrentView; | 61 | DateBookWeekLstDblView*m_CurrentView; |
61 | bool dateset:1; | 62 | bool dateset:1; |