author | umopapisdn <umopapisdn> | 2003-03-24 10:09:47 (UTC) |
---|---|---|
committer | umopapisdn <umopapisdn> | 2003-03-24 10:09:47 (UTC) |
commit | 4ddc90a51f8a4d248ece9a86d01ef636fe8c95e2 (patch) (unidiff) | |
tree | 3342092adf744b90b0da3be25bd35267d0610044 /core/pim/datebook | |
parent | 90eeb65c389f3c5deab32e3cc9ee084e89770563 (diff) | |
download | opie-4ddc90a51f8a4d248ece9a86d01ef636fe8c95e2.zip opie-4ddc90a51f8a4d248ece9a86d01ef636fe8c95e2.tar.gz opie-4ddc90a51f8a4d248ece9a86d01ef636fe8c95e2.tar.bz2 |
Bugfix: Duplicating events introduced a bug making it impossible to add events Week List view. This fixes it.
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 18 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.h | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index e8e12ba..5334a16 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -134,13 +134,13 @@ void DateBookWeekLstDayHdr::showDay() { | |||
134 | void DateBookWeekLstDayHdr::newEvent() { | 134 | void DateBookWeekLstDayHdr::newEvent() { |
135 | QDateTime start, stop; | 135 | QDateTime start, stop; |
136 | start=stop=date; | 136 | start=stop=date; |
137 | start.setTime(QTime(10,0)); | 137 | start.setTime(QTime(10,0)); |
138 | stop.setTime(QTime(12,0)); | 138 | stop.setTime(QTime(12,0)); |
139 | 139 | ||
140 | emit addEvent(start,stop,""); | 140 | emit addEvent(start,stop,"",0); |
141 | } | 141 | } |
142 | DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, | 142 | DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, |
143 | QWidget* parent, | 143 | QWidget* parent, |
144 | const char* name, | 144 | const char* name, |
145 | WFlags fl) : | 145 | WFlags fl) : |
146 | OClickableLabel(parent,name,fl), | 146 | OClickableLabel(parent,name,fl), |
@@ -197,16 +197,16 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, | |||
197 | DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i), | 197 | DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i), |
198 | onMonday,this); | 198 | onMonday,this); |
199 | connect(hdr, SIGNAL(showDate(int,int,int)), | 199 | connect(hdr, SIGNAL(showDate(int,int,int)), |
200 | this, SIGNAL(showDate(int,int,int))); | 200 | this, SIGNAL(showDate(int,int,int))); |
201 | connect(hdr, SIGNAL(addEvent(const QDateTime &, | 201 | connect(hdr, SIGNAL(addEvent(const QDateTime &, |
202 | const QDateTime &, | 202 | const QDateTime &, |
203 | const QString &)), | 203 | const QString &, const QString &)), |
204 | this, SIGNAL(addEvent(const QDateTime &, | 204 | this, SIGNAL(addEvent(const QDateTime &, |
205 | const QDateTime &, | 205 | const QDateTime &, |
206 | const QString &))); | 206 | const QString &, const QString &))); |
207 | layout->addWidget(hdr); | 207 | layout->addWidget(hdr); |
208 | 208 | ||
209 | // Events | 209 | // Events |
210 | while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) { | 210 | while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) { |
211 | if(!((*it).end().hour()==(*it).start().hour() && (*it).end().minute()==(*it).start().minute())) {// Skip effective events with no duration. (i.e ending at 00:00) | 211 | if(!((*it).end().hour()==(*it).start().hour() && (*it).end().minute()==(*it).start().minute())) {// Skip effective events with no duration. (i.e ending at 00:00) |
212 | DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,this); | 212 | DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,this); |
@@ -236,27 +236,27 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, | |||
236 | layout->addWidget(w); | 236 | layout->addWidget(w); |
237 | connect (w, SIGNAL(editEvent(const Event &)), | 237 | connect (w, SIGNAL(editEvent(const Event &)), |
238 | this, SIGNAL(editEvent(const Event &))); | 238 | this, SIGNAL(editEvent(const Event &))); |
239 | connect (w, SIGNAL(showDate(int,int,int)), | 239 | connect (w, SIGNAL(showDate(int,int,int)), |
240 | this, SIGNAL(showDate(int,int,int))); | 240 | this, SIGNAL(showDate(int,int,int))); |
241 | connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, | 241 | connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, |
242 | const QString &)), | 242 | const QString &,const QString &)), |
243 | this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, | 243 | this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, |
244 | const QString &))); | 244 | const QString &, const QString &))); |
245 | 245 | ||
246 | 246 | ||
247 | w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this); | 247 | w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this); |
248 | layout->addWidget(w); | 248 | layout->addWidget(w); |
249 | connect (w, SIGNAL(editEvent(const Event &)), | 249 | connect (w, SIGNAL(editEvent(const Event &)), |
250 | this, SIGNAL(editEvent(const Event &))); | 250 | this, SIGNAL(editEvent(const Event &))); |
251 | connect (w, SIGNAL(showDate(int,int,int)), | 251 | connect (w, SIGNAL(showDate(int,int,int)), |
252 | this, SIGNAL(showDate(int,int,int))); | 252 | this, SIGNAL(showDate(int,int,int))); |
253 | connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, | 253 | connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, |
254 | const QString &)), | 254 | const QString &, const QString &)), |
255 | this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, | 255 | this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, |
256 | const QString &))); | 256 | const QString &, const QString &))); |
257 | } | 257 | } |
258 | 258 | ||
259 | DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, | 259 | DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, |
260 | QWidget *parent, | 260 | QWidget *parent, |
261 | const char *name ) | 261 | const char *name ) |
262 | : QWidget( parent, name ), | 262 | : QWidget( parent, name ), |
@@ -338,15 +338,15 @@ void DateBookWeekLst::getEvents() { | |||
338 | 338 | ||
339 | connect (view, SIGNAL(editEvent(const Event &)), | 339 | connect (view, SIGNAL(editEvent(const Event &)), |
340 | this, SIGNAL(editEvent(const Event &))); | 340 | this, SIGNAL(editEvent(const Event &))); |
341 | connect (view, SIGNAL(showDate(int,int,int)), | 341 | connect (view, SIGNAL(showDate(int,int,int)), |
342 | this, SIGNAL(showDate(int,int,int))); | 342 | this, SIGNAL(showDate(int,int,int))); |
343 | connect (view, SIGNAL(addEvent(const QDateTime &, const QDateTime &, | 343 | connect (view, SIGNAL(addEvent(const QDateTime &, const QDateTime &, |
344 | const QString &)), | 344 | const QString &, const QString &)), |
345 | this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, | 345 | this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, |
346 | const QString &))); | 346 | const QString &, const QString &))); |
347 | 347 | ||
348 | scroll->addChild(view); | 348 | scroll->addChild(view); |
349 | view->show(); | 349 | view->show(); |
350 | scroll->updateScrollBars(); | 350 | scroll->updateScrollBars(); |
351 | } | 351 | } |
352 | 352 | ||
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h index 24f6c83..ea88f20 100644 --- a/core/pim/datebook/datebookweeklst.h +++ b/core/pim/datebook/datebookweeklst.h | |||
@@ -47,13 +47,13 @@ public: | |||
47 | public slots: | 47 | public slots: |
48 | void showDay(); | 48 | void showDay(); |
49 | void newEvent(); | 49 | void newEvent(); |
50 | signals: | 50 | signals: |
51 | void showDate(int y, int m, int d); | 51 | void showDate(int y, int m, int d); |
52 | void addEvent(const QDateTime &start, const QDateTime &stop, | 52 | void addEvent(const QDateTime &start, const QDateTime &stop, |
53 | const QString &str); | 53 | const QString &str, const QString &location); |
54 | private: | 54 | private: |
55 | QDate date; | 55 | QDate date; |
56 | }; | 56 | }; |
57 | 57 | ||
58 | class DateBookWeekLstEvent: public OClickableLabel | 58 | class DateBookWeekLstEvent: public OClickableLabel |
59 | { | 59 | { |
@@ -79,13 +79,13 @@ public: | |||
79 | WFlags fl = 0 ); | 79 | WFlags fl = 0 ); |
80 | ~DateBookWeekLstView(); | 80 | ~DateBookWeekLstView(); |
81 | signals: | 81 | signals: |
82 | void editEvent(const Event &e); | 82 | void editEvent(const Event &e); |
83 | void showDate(int y, int m, int d); | 83 | void showDate(int y, int m, int d); |
84 | void addEvent(const QDateTime &start, const QDateTime &stop, | 84 | void addEvent(const QDateTime &start, const QDateTime &stop, |
85 | const QString &str); | 85 | const QString &str, const QString &location); |
86 | private: | 86 | private: |
87 | bool onMonday; | 87 | bool onMonday; |
88 | protected slots: | 88 | protected slots: |
89 | void keyPressEvent(QKeyEvent *); | 89 | void keyPressEvent(QKeyEvent *); |
90 | }; | 90 | }; |
91 | 91 | ||
@@ -98,13 +98,13 @@ public: | |||
98 | QWidget* parent = 0, const char* name = 0, | 98 | QWidget* parent = 0, const char* name = 0, |
99 | WFlags fl = 0 ); | 99 | WFlags fl = 0 ); |
100 | signals: | 100 | signals: |
101 | void editEvent(const Event &e); | 101 | void editEvent(const Event &e); |
102 | void showDate(int y, int m, int d); | 102 | void showDate(int y, int m, int d); |
103 | void addEvent(const QDateTime &start, const QDateTime &stop, | 103 | void addEvent(const QDateTime &start, const QDateTime &stop, |
104 | const QString &str); | 104 | const QString &str, const QString &location); |
105 | }; | 105 | }; |
106 | 106 | ||
107 | class DateBookWeekLst : public QWidget | 107 | class DateBookWeekLst : public QWidget |
108 | { | 108 | { |
109 | Q_OBJECT | 109 | Q_OBJECT |
110 | 110 | ||
@@ -126,13 +126,13 @@ protected slots: | |||
126 | void keyPressEvent(QKeyEvent *); | 126 | void keyPressEvent(QKeyEvent *); |
127 | void setDbl(bool on); | 127 | void setDbl(bool on); |
128 | 128 | ||
129 | signals: | 129 | signals: |
130 | void showDate(int y, int m, int d); | 130 | void showDate(int y, int m, int d); |
131 | void addEvent(const QDateTime &start, const QDateTime &stop, | 131 | void addEvent(const QDateTime &start, const QDateTime &stop, |
132 | const QString &str); | 132 | const QString &str, const QString &location); |
133 | void editEvent(const Event &e); | 133 | void editEvent(const Event &e); |
134 | 134 | ||
135 | private: | 135 | private: |
136 | DateBookDB *db; | 136 | DateBookDB *db; |
137 | int startTime; | 137 | int startTime; |
138 | bool ampm; | 138 | bool ampm; |