| -rw-r--r-- | core/pim/today/today.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 0f6e598..7a2d0c9 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -105,219 +105,218 @@ void Today::startConfig() conf = new todayconfig ( this, "", true ); //Config cfg = new Config("today"); // read the config Config cfg("today"); cfg.setGroup("BaseConfig"); //init(); conf->SpinBox1->setValue(MAX_LINES_MEET); // location show box conf->CheckBox1->setChecked(SHOW_LOCATION); // notes show box conf->CheckBox2->setChecked(SHOW_NOTES); // task lines conf->SpinBox2->setValue(MAX_LINES_TASK); // clip when? conf->SpinBox7->setValue(MAX_CHAR_CLIP); // only later conf->CheckBox3->setChecked(ONLY_LATER); conf->exec(); int maxlinestask = conf->SpinBox2->value(); int maxmeet = conf->SpinBox1->value(); int location = conf->CheckBox1->isChecked(); int notes = conf->CheckBox2->isChecked(); int maxcharclip = conf->SpinBox7->value(); int onlylater = conf->CheckBox3->isChecked(); cfg.writeEntry("maxlinestask",maxlinestask); cfg.writeEntry("maxcharclip", maxcharclip); cfg.writeEntry("maxlinesmeet",maxmeet); cfg.writeEntry("showlocation",location); cfg.writeEntry("shownotes", notes); cfg.writeEntry("onlylater", onlylater); // sync it to "disk" cfg.write(); draw(); } /* * Get all events that are in the datebook xml file for today */ void Today::getDates() { QDate date = QDate::currentDate(); QTime time = QTime::currentTime(); QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); Config config( "qpe" ); // if 24 h format // bool ampm = config.readBoolEntry( "AMPM", TRUE ); int count=0; if ( list.count() > 0 ) { QString msg; for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); it!=list.end(); ++it ) { count++; if ( count <= MAX_LINES_MEET ) { //only get events past current time (start or end??) //cout << time.toString() << endl; //cout << TimeString::dateString((*it).event().end()) << endl; // still some bug in here, 1 h off // decide if to get all day or only later appointments if (!ONLY_LATER) { msg += "<B>" + (*it).description() + "</B>"; // include location or not if (SHOW_LOCATION == 1) { msg+= "<BR>" + (*it).location(); } msg += "<BR>" // start time of event + TimeString::timeString(QTime((*it).event().start().time()) ) // end time of event + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) + "<BR>"; // include possible note or not if (SHOW_NOTES == 1) { msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; } } - else if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER ) + else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) { msg += "<B>" + (*it).description() + "</B>"; // include location or not if (SHOW_LOCATION == 1) { msg+= "<BR>" + (*it).location(); } msg += "<BR>" // start time of event + TimeString::timeString(QTime((*it).event().start().time()) ) // end time of event + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) + "<BR>"; // include possible note or not if (SHOW_NOTES == 1) { msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; } } } - + } if (msg.isEmpty()) { msg = "No more appointments today"; } - } DatesField->setText(msg); } } /* * Parse in the todolist.xml * */ QList<TodoItem> Today::loadTodo(const char *filename) { DOM *todo; ELE *tasks; ELE **tasklist; ATT **attlist; int i, j; char *description; int completed; int priority; TodoItem *tmp; QList<TodoItem> loadtodolist; todo = minidom_load(filename); tasks = todo->el; tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/ if(tasks) { tasklist = tasks->el; i = 0; while((tasklist) && (tasklist[i])) { attlist = tasklist[i]->at; j = 0; description = NULL; priority = -1; completed = -1; while((attlist) && (attlist[j])) { if(!attlist[i]->name) continue; if(!strcmp(attlist[j]->name, "Description")) { description = attlist[j]->value; } // get Completed tag (0 or 1) if(!strcmp(attlist[j]->name, "Completed")) { QString s = attlist[j]->name; if(s == "Completed") { completed = QString(attlist[j]->value).toInt(); } } // get Priority (1 to 5) if(!strcmp(attlist[j]->name, "Priority")) { QString s = attlist[j]->name; if(s == "Priority") { priority = QString(attlist[j]->value).toInt(); } } j++; } if(description) { tmp = new TodoItem(description, completed, priority); loadtodolist.append(tmp); } i++; } } minidom_free(todo); return loadtodolist; } void Today::getMail() { Config cfg("opiemail"); cfg.setGroup("today"); // how many lines should be showed in the task section int NEW_MAILS = cfg.readNumEntry("newmails",0); int OUTGOING = cfg.readNumEntry("outgoing",0); QString output = tr("<b>%1</b> new mails, <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING); MailField->setText(output); } /* * Get the todos |