summaryrefslogtreecommitdiff
authorumopapisdn <umopapisdn>2003-03-24 10:09:47 (UTC)
committer umopapisdn <umopapisdn>2003-03-24 10:09:47 (UTC)
commit4ddc90a51f8a4d248ece9a86d01ef636fe8c95e2 (patch) (unidiff)
tree3342092adf744b90b0da3be25bd35267d0610044
parent90eeb65c389f3c5deab32e3cc9ee084e89770563 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookweeklst.cpp18
-rw-r--r--core/pim/datebook/datebookweeklst.h8
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
@@ -137,7 +137,7 @@ void DateBookWeekLstDayHdr::newEvent() {
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}
142DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, 142DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
143 QWidget* parent, 143 QWidget* parent,
@@ -200,10 +200,10 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
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
@@ -239,9 +239,9 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
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);
@@ -251,9 +251,9 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
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
259DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, 259DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
@@ -341,9 +341,9 @@ void DateBookWeekLst::getEvents() {
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();
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
@@ -50,7 +50,7 @@ public slots:
50signals: 50signals:
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);
54private: 54private:
55 QDate date; 55 QDate date;
56}; 56};
@@ -82,7 +82,7 @@ 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);
86private: 86private:
87 bool onMonday; 87 bool onMonday;
88protected slots: 88protected slots:
@@ -101,7 +101,7 @@ 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
107class DateBookWeekLst : public QWidget 107class DateBookWeekLst : public QWidget
@@ -129,7 +129,7 @@ protected slots:
129signals: 129signals:
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
135private: 135private: