-rw-r--r-- | core/pim/today/today.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 58ba4f4..aef0a9b 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -62,26 +62,26 @@ int NEW_START=1; | |||
62 | Today::Today( QWidget* parent, const char* name, WFlags fl ) | 62 | Today::Today( QWidget* parent, const char* name, WFlags fl ) |
63 | : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) { | 63 | : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) { |
64 | QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) ); | 64 | QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) ); |
65 | QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) ); | 65 | QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) ); |
66 | QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); | 66 | QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); |
67 | QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); | 67 | QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); |
68 | 68 | ||
69 | #if defined(Q_WS_QWS) | 69 | #if defined(Q_WS_QWS) |
70 | #if !defined(QT_NO_COP) | 70 | #if !defined(QT_NO_COP) |
71 | QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this ); | 71 | QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this ); |
72 | connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)), | 72 | connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)), |
73 | this, SLOT ( channelReceived(const QCString &, const QByteArray &)) ); | 73 | this, SLOT ( channelReceived(const QCString &, const QByteArray &)) ); |
74 | #endif | 74 | #endif |
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | setOwnerField(); | 77 | setOwnerField(); |
78 | todo = new ToDoDB; | 78 | todo = new ToDoDB; |
79 | getTodo(); | 79 | getTodo(); |
80 | draw(); | 80 | draw(); |
81 | autoStart(); | 81 | autoStart(); |
82 | } | 82 | } |
83 | 83 | ||
84 | /* | 84 | /* |
85 | * Qcop receive method. | 85 | * Qcop receive method. |
86 | */ | 86 | */ |
87 | void Today::channelReceived(const QCString &msg, const QByteArray & data) { | 87 | void Today::channelReceived(const QCString &msg, const QByteArray & data) { |
@@ -137,81 +137,82 @@ void Today::autoStart() { | |||
137 | } | 137 | } |
138 | 138 | ||
139 | /* | 139 | /* |
140 | * Repaint method. Reread all fields. | 140 | * Repaint method. Reread all fields. |
141 | */ | 141 | */ |
142 | void Today::draw() { | 142 | void Today::draw() { |
143 | init(); | 143 | init(); |
144 | getDates(); | 144 | getDates(); |
145 | getMail(); | 145 | getMail(); |
146 | 146 | ||
147 | // if the todolist.xml file was not modified in between, do not parse it. | 147 | // if the todolist.xml file was not modified in between, do not parse it. |
148 | if (checkIfModified()) { | 148 | if (checkIfModified()) { |
149 | if (todo) delete todo; | ||
149 | todo = new ToDoDB; | 150 | todo = new ToDoDB; |
150 | getTodo(); | 151 | getTodo(); |
151 | } | 152 | } |
152 | 153 | ||
153 | // how often refresh | 154 | // how often refresh |
154 | QTimer::singleShot( 20*1000, this, SLOT(draw() ) ); | 155 | QTimer::singleShot( 20*1000, this, SLOT(draw() ) ); |
155 | } | 156 | } |
156 | 157 | ||
157 | /* | 158 | /* |
158 | * Check if the todolist.xml was modified (if there are new entries. | 159 | * Check if the todolist.xml was modified (if there are new entries. |
159 | * Returns true if it was modified. | 160 | * Returns true if it was modified. |
160 | */ | 161 | */ |
161 | bool Today::checkIfModified() { | 162 | bool Today::checkIfModified() { |
162 | 163 | ||
163 | QDir dir; | 164 | QDir dir; |
164 | QString homedir = dir.homeDirPath (); | 165 | QString homedir = dir.homeDirPath (); |
165 | QString time; | 166 | QString time; |
166 | 167 | ||
167 | Config cfg("today"); | 168 | Config cfg("today"); |
168 | cfg.setGroup("Files"); | 169 | cfg.setGroup("Files"); |
169 | time = cfg.readEntry("todolisttimestamp", ""); | 170 | time = cfg.readEntry("todolisttimestamp", ""); |
170 | 171 | ||
171 | QFileInfo file = (homedir +"/Applications/todolist/todolist.xml"); | 172 | QFileInfo file = (homedir +"/Applications/todolist/todolist.xml"); |
172 | QDateTime fileTime = file.lastModified(); | 173 | QDateTime fileTime = file.lastModified(); |
173 | if (time.compare(fileTime.toString()) == 0) { | 174 | if (time.compare(fileTime.toString()) == 0) { |
174 | return false; | 175 | return false; |
175 | } else { | 176 | } else { |
176 | cfg.writeEntry("todolisttimestamp", fileTime.toString() ); | 177 | cfg.writeEntry("todolisttimestamp", fileTime.toString() ); |
177 | cfg.write(); | 178 | cfg.write(); |
178 | return true; | 179 | return true; |
179 | } | 180 | } |
180 | } | 181 | } |
181 | 182 | ||
182 | 183 | ||
183 | /* | 184 | /* |
184 | * Init stuff needed for today. Reads the config file. | 185 | * Init stuff needed for today. Reads the config file. |
185 | */ | 186 | */ |
186 | void Today::init() { | 187 | void Today::init() { |
187 | QDate date = QDate::currentDate(); | 188 | QDate date = QDate::currentDate(); |
188 | QString time = (tr( date.toString()) ); | 189 | QString time = (tr( date.toString()) ); |
189 | 190 | ||
190 | TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>")); | 191 | TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>")); |
191 | 192 | ||
192 | // read config | 193 | // read config |
193 | Config cfg("today"); | 194 | Config cfg("today"); |
194 | cfg.setGroup("BaseConfig"); | 195 | cfg.setGroup("BaseConfig"); |
195 | 196 | ||
196 | // -- config file section -- | 197 | // -- config file section -- |
197 | // how many lines should be showed in the task section | 198 | // how many lines should be showed in the task section |
198 | MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5); | 199 | MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5); |
199 | // after how many chars should the be cut off on tasks and notes | 200 | // after how many chars should the be cut off on tasks and notes |
200 | MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",40); | 201 | MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",40); |
201 | // how many lines should be showed in the datebook section | 202 | // how many lines should be showed in the datebook section |
202 | MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5); | 203 | MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5); |
203 | // If location is to be showed too, 1 to activate it. | 204 | // If location is to be showed too, 1 to activate it. |
204 | SHOW_LOCATION = cfg.readNumEntry("showlocation",1); | 205 | SHOW_LOCATION = cfg.readNumEntry("showlocation",1); |
205 | // if notes should be shown | 206 | // if notes should be shown |
206 | SHOW_NOTES = cfg.readNumEntry("shownotes",0); | 207 | SHOW_NOTES = cfg.readNumEntry("shownotes",0); |
207 | // should only later appointments be shown or all for the current day. | 208 | // should only later appointments be shown or all for the current day. |
208 | ONLY_LATER = cfg.readNumEntry("onlylater",1); | 209 | ONLY_LATER = cfg.readNumEntry("onlylater",1); |
209 | 210 | ||
210 | db = new DateBookDB; | 211 | db = new DateBookDB; |
211 | } | 212 | } |
212 | 213 | ||
213 | /* | 214 | /* |
214 | * The method for the configuration dialog. | 215 | * The method for the configuration dialog. |
215 | */ | 216 | */ |
216 | void Today::startConfig() { | 217 | void Today::startConfig() { |
217 | 218 | ||
@@ -259,25 +260,25 @@ void Today::startConfig() { | |||
259 | cfg.write(); | 260 | cfg.write(); |
260 | NEW_START=1; | 261 | NEW_START=1; |
261 | draw(); | 262 | draw(); |
262 | autoStart(); | 263 | autoStart(); |
263 | } | 264 | } |
264 | 265 | ||
265 | 266 | ||
266 | /* | 267 | /* |
267 | * Get all events that are in the datebook xml file for today | 268 | * Get all events that are in the datebook xml file for today |
268 | */ | 269 | */ |
269 | void Today::getDates() { | 270 | void Today::getDates() { |
270 | QDate date = QDate::currentDate(); | 271 | QDate date = QDate::currentDate(); |
271 | 272 | ||
272 | if (AllDateBookEvents) delete AllDateBookEvents; | 273 | if (AllDateBookEvents) delete AllDateBookEvents; |
273 | AllDateBookEvents = new QWidget( ); | 274 | AllDateBookEvents = new QWidget( ); |
274 | QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents); | 275 | QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents); |
275 | 276 | ||
276 | QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); | 277 | QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); |
277 | 278 | ||
278 | qBubbleSort(list); | 279 | qBubbleSort(list); |
279 | // printf("Get dates\n"); | 280 | // printf("Get dates\n"); |
280 | 281 | ||
281 | Config config( "qpe" ); | 282 | Config config( "qpe" ); |
282 | // if 24 h format | 283 | // if 24 h format |
283 | //bool ampm = config.readBoolEntry( "AMPM", TRUE ); | 284 | //bool ampm = config.readBoolEntry( "AMPM", TRUE ); |