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 | |||
@@ -27,17 +27,17 @@ public: | |||
27 | public slots: | 27 | public slots: |
28 | void nextWeek(); | 28 | void nextWeek(); |
29 | void prevWeek(); | 29 | void prevWeek(); |
30 | void nextMonth(); | 30 | void nextMonth(); |
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; |
40 | bool bStartOnMonday; | 40 | bool bStartOnMonday; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | class DateBookWeekLstDayHdr: public DateBookWeekLstDayHdrBase | 43 | class DateBookWeekLstDayHdr: public DateBookWeekLstDayHdrBase |
@@ -114,21 +114,21 @@ class DateBookWeekLst : public QWidget | |||
114 | public: | 114 | public: |
115 | DateBookWeekLst( bool ampm, bool onM, DateBookDB *newDB, | 115 | DateBookWeekLst( bool ampm, bool onM, DateBookDB *newDB, |
116 | QWidget *parent = 0, | 116 | QWidget *parent = 0, |
117 | const char *name = 0 ); | 117 | const char *name = 0 ); |
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); |
131 | 131 | ||
132 | signals: | 132 | signals: |
133 | void showDate(int y, int m, int d); | 133 | void showDate(int y, int m, int d); |
134 | void addEvent(const QDateTime &start, const QDateTime &stop, | 134 | void addEvent(const QDateTime &start, const QDateTime &stop, |
@@ -136,19 +136,20 @@ signals: | |||
136 | void editEvent(const Event &e); | 136 | void editEvent(const Event &e); |
137 | 137 | ||
138 | private: | 138 | private: |
139 | DateBookDB *db; | 139 | DateBookDB *db; |
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 |
154 | 155 | ||