cosmetic changes on request from zecke

1 files changed, 50 insertions, 90 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index c63a9ef..6a0e9fc 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -57,4 +57,3 @@ int ONLY_LATER;
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
-  : TodayBase( parent, name, fl )
-{
+  : TodayBase( parent, name, fl ) {
   QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) );
@@ -68,4 +67,3 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
 
-void Today::draw()
-{
+void Today::draw() {
   init();
@@ -76,7 +74,5 @@ void Today::draw()
   QTimer::singleShot( 5*1000, this, SLOT(draw()) );
-
 }
 
-void Today::init()
-{
+void Today::init() {
   QDate date = QDate::currentDate();
@@ -105,4 +101,3 @@ void Today::init()
 
-void Today::startConfig() 
-{
+void Today::startConfig() {
   conf = new todayconfig ( this, "", true );
@@ -155,4 +150,3 @@ void Today::startConfig()
  */
-void Today::getDates()
-{
+void Today::getDates() {
   QDate date = QDate::currentDate();
@@ -175,4 +169,3 @@ void Today::getDates()
       
-      if ( count <= MAX_LINES_MEET ) 
-	{
+      if ( count <= MAX_LINES_MEET ) {
 	  //cout << time.toString() << endl;
@@ -181,7 +174,5 @@ void Today::getDates()
 	  // decide if to get all day or only later appointments
-	  if (!ONLY_LATER)
-	    {
+	if (!ONLY_LATER) {
 	      msg += "<B>" + (*it).description() + "</B>";
-	      if ( (*it).event().hasAlarm() )
-		{
+	  if ( (*it).event().hasAlarm() ) {
 		  msg += " <b>[with alarm]</b>";
@@ -189,4 +180,3 @@ void Today::getDates()
 	      // include location or not
-	      if (SHOW_LOCATION == 1) 
-		{
+	  if (SHOW_LOCATION == 1) {
 		  msg += "<BR><i>" + (*it).location();
@@ -195,8 +185,5 @@ void Today::getDates()
 	      
-		if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") )
-		  {
+	  if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
 		    msg += "<br>All day";
-		  }
-		else 
-		  {
+	  }  else {
 		    // start time of event
@@ -208,12 +195,8 @@ void Today::getDates()
 	      // include possible note or not
-	      if (SHOW_NOTES == 1)
-		{
+	  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())) )
-	    {
+	} else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
 	      msg += "<B>" + (*it).description() + "</B>";
-	      if ( (*it).event().hasAlarm() )
-		{
+	  if ( (*it).event().hasAlarm() ) {
 		  msg += " <b>[with alarm]</b>";
@@ -221,4 +204,3 @@ void Today::getDates()
 	      // include location or not
-	      if (SHOW_LOCATION == 1) 
-		{
+	  if (SHOW_LOCATION == 1) {
 		  msg+= "<BR><i>" + (*it).location();
@@ -227,8 +209,5 @@ void Today::getDates()
 	  		
-	      if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") )
-		  {
+	  if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
 		    msg += "<br>All day";
-		  }
-	      else 
-		{
+	  } else {
 		    // start time of event
@@ -240,4 +219,3 @@ void Today::getDates()
 	      // include possible note or not
-	      if (SHOW_NOTES == 1)
-		{
+	  if (SHOW_NOTES == 1) {
 		  msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
@@ -247,4 +225,3 @@ void Today::getDates()
     }
-    if (msg.isEmpty())
-      {
+    if (msg.isEmpty()) {
 	msg = "No more appointments today";
@@ -258,4 +235,3 @@ void Today::getDates()
  */
-QList<TodoItem> Today::loadTodo(const char *filename)
-{
+QList<TodoItem> Today::loadTodo(const char *filename) {
   DOM *todo;
@@ -275,8 +251,6 @@ QList<TodoItem> Today::loadTodo(const char *filename)
   tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/
-  if(tasks)
-    {
+  if(tasks) {
       tasklist = tasks->el;
       i = 0;
-      while((tasklist) && (tasklist[i]))
-	{
+    while((tasklist) && (tasklist[i])) {
 	  attlist = tasklist[i]->at;
@@ -286,8 +260,7 @@ QList<TodoItem> Today::loadTodo(const char *filename)
 	  completed = -1;
-	  while((attlist) && (attlist[j]))
- 	    {
-	      // SEGFAULT HERE WITH MORE THAN 7 ENTRIES
-	      if(!attlist[j]->name) continue;
-	      if(!strcmp(attlist[j]->name, "Description"))
-		{
+      while((attlist) && (attlist[j])) {
+	if(!attlist[j]->name) {
+	  continue;
+	}
+	if(!strcmp(attlist[j]->name, "Description")) {
 		  description = attlist[j]->value;
@@ -295,7 +268,5 @@ QList<TodoItem> Today::loadTodo(const char *filename)
 	      // get Completed tag (0 or 1)
-	      if(!strcmp(attlist[j]->name, "Completed"))
-		{
+	if(!strcmp(attlist[j]->name, "Completed")) {
 		  QString s = attlist[j]->name;
-		  if(s == "Completed")
-		    {
+	  if(s == "Completed") {
 		      completed = QString(attlist[j]->value).toInt();
@@ -304,7 +275,5 @@ QList<TodoItem> Today::loadTodo(const char *filename)
 	      // get Priority (1 to 5)
-	      if(!strcmp(attlist[j]->name, "Priority")) 
-		{
+	if(!strcmp(attlist[j]->name, "Priority")) {
 		  QString s = attlist[j]->name;
-		  if(s == "Priority")
-		    {
+	  if(s == "Priority") {
 		      priority = QString(attlist[j]->value).toInt(); 
@@ -314,4 +283,3 @@ QList<TodoItem> Today::loadTodo(const char *filename)
 	    }
-	  if(description)
-	    {
+      if(description) {
 	      tmp = new TodoItem(description, completed, priority);
@@ -329,4 +297,3 @@ QList<TodoItem> Today::loadTodo(const char *filename)
 
-void Today::getMail()
-{
+void Today::getMail() {
   Config cfg("opiemail");
@@ -338,3 +305,4 @@ void Today::getMail()
   
-  QString output = tr("<b>%1</b> new mails, <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
+
+  QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
   
@@ -349,4 +317,3 @@ void Today::getMail()
  */
-void Today::getTodo()
-{
+void Today::getTodo() {
   QString output;
@@ -359,4 +326,3 @@ void Today::getTodo()
   QFile f(homedir +"/Applications/todolist/todolist.xml");
-  if ( f.exists() )
-    {
+  if ( f.exists() ) {
       QList<TodoItem> todolist = loadTodo(homedir +"/Applications/todolist/todolist.xml");
@@ -364,9 +330,6 @@ void Today::getTodo()
       TodoItem *item;
-      for( item = todolist.first(); item; item = todolist.next())
-	{
-	  if (!(item->getCompleted() == 1) )
-	    {
+    for( item = todolist.first(); item; item = todolist.next()) {
+      if (!(item->getCompleted() == 1) ) {
 	      count++;
-	      if (count <= MAX_LINES_TASK)
-		{
+	if (count <= MAX_LINES_TASK) {
 		  tmpout += "<b>- </b>" + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("<br>")));
@@ -377,9 +340,10 @@ void Today::getTodo()
   
-  if (count > 0) 
-    {
+  if (count > 0) {
+    if( count == 1 ) {
+      output = QString("There is <b> 1</b> active task:  <br>" );
+    } else {
       output = QString("There are <b> %1</b> active tasks: <br>").arg(count);
-      output += tmpout;
     }
-  else 
-    {
+    output += tmpout;
+  } else {
       output = ("No active tasks");
@@ -393,4 +357,3 @@ void Today::getTodo()
  */
-void Today::startDatebook()
-{ 
+void Today::startDatebook() { 
   QCopEnvelope e("QPE/System", "execute(QString)");
@@ -402,4 +365,3 @@ void Today::startDatebook()
  */ 
-void Today::startTodo()
-{
+void Today::startTodo() {
   QCopEnvelope e("QPE/System", "execute(QString)");
@@ -411,4 +373,3 @@ void Today::startTodo()
  */
-void Today::startMail()
-{
+void Today::startMail() {
   QCopEnvelope e("QPE/System", "execute(QString)");
@@ -420,4 +381,3 @@ void Today::startMail()
  */
-Today::~Today()
-{
+Today::~Today() {
   // no need to delete child widgets, Qt does it all for us