author | umopapisdn <umopapisdn> | 2003-05-13 22:58:18 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-05-13 22:58:18 (UTC) |
commit | 1e0e2f57472538bd880967ebe061c8f39a7e270b (patch) (unidiff) | |
tree | fcc070d53148385f93c0dc6ab5443d5100be0d26 /core/pim/datebook/datebookweeklst.h | |
parent | 45c0386de12b107e54e4d020d54eb05517a9efac (diff) | |
download | opie-1e0e2f57472538bd880967ebe061c8f39a7e270b.zip opie-1e0e2f57472538bd880967ebe061c8f39a7e270b.tar.gz opie-1e0e2f57472538bd880967ebe061c8f39a7e270b.tar.bz2 |
Bugfix: (Bug #0000902) Adding events in weekview shouldn't create them as events on the first day of the week but rather the last visited day.
Diffstat (limited to 'core/pim/datebook/datebookweeklst.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweeklst.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h index f858c4f..0bfbcda 100644 --- a/core/pim/datebook/datebookweeklst.h +++ b/core/pim/datebook/datebookweeklst.h | |||
@@ -31,9 +31,9 @@ public slots: | |||
31 | void prevMonth(); | 31 | void prevMonth(); |
32 | void pickDate(); | 32 | void pickDate(); |
33 | void setDate(int y, int m, int d); | 33 | void setDate(int y, int m, int d); |
34 | signals: | 34 | signals: |
35 | void dateChanged(int y, int w); | 35 | void dateChanged(QDate &newdate); |
36 | void setDbl(bool on); | 36 | void setDbl(bool on); |
37 | private: | 37 | private: |
38 | QDate date; | 38 | QDate date; |
39 | //bool onMonday; | 39 | //bool onMonday; |
@@ -118,13 +118,13 @@ public: | |||
118 | ~DateBookWeekLst(); | 118 | ~DateBookWeekLst(); |
119 | void setDate( int y, int w ); | 119 | void setDate( int y, int w ); |
120 | void setDate(const QDate &d ); | 120 | void setDate(const QDate &d ); |
121 | int week() const { return _week; }; | 121 | int week() const { return _week; }; |
122 | QDate date() const; | 122 | QDate date(); |
123 | 123 | ||
124 | public slots: | 124 | public slots: |
125 | void redraw(); | 125 | void redraw(); |
126 | void dateChanged(int y, int w); | 126 | void dateChanged(QDate &date); |
127 | 127 | ||
128 | protected slots: | 128 | protected slots: |
129 | void keyPressEvent(QKeyEvent *); | 129 | void keyPressEvent(QKeyEvent *); |
130 | void setDbl(bool on); | 130 | void setDbl(bool on); |
@@ -140,14 +140,15 @@ private: | |||
140 | int startTime; | 140 | int startTime; |
141 | bool ampm; | 141 | bool ampm; |
142 | bool bStartOnMonday; | 142 | bool bStartOnMonday; |
143 | bool dbl; | 143 | bool dbl; |
144 | int year, _week; | 144 | QDate bdate; |
145 | int year, _week,dow; | ||
145 | DateBookWeekLstHeader *header; | 146 | DateBookWeekLstHeader *header; |
146 | QWidget *view; | 147 | QWidget *view; |
147 | QVBoxLayout *layout; | 148 | QVBoxLayout *layout; |
148 | QScrollView *scroll; | 149 | QScrollView *scroll; |
149 | 150 | ||
150 | void getEvents(); | 151 | void getEvents(); |
151 | }; | 152 | }; |
152 | 153 | ||
153 | #endif | 154 | #endif |