am/pm support, ugly

5 files changed, 155 insertions, 101 deletions

diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 48e8d20..6acbf5a 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,10 +1,8 @@
 TODO for today: 
 
 * show alarm icons on alarm events (partly done)
 
-* add am/pm mode instead of 24 h, take system default
-
 * qcop integration for updating events?
 
 * make Opiezilla a clickable label wich is allway on the far right side of
 the screen , klick will open credits ,)
\ No newline at end of file
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index b3da1fb..f04ff78 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,24 +1,26 @@
+* am/pm time optinal (autodetect)
+
 0.3.1
 
 * fixed the wrong color of the buttons
 * better translation (thanks carsten and others)
 * fixes memory leaks
 * bugfixes in calendar part, now location and note are working again. 
 
 0.3.0
 
 * today uses now tododb from libopie. So major changes in the todo part:
 	- overdue items on top
 	- then sorted by date, then by priority
 * some cleanups
 * speed optimisations
 
 0.2.9
 
 * Many bugfixes.
 * Today now apparently sorts the dates _allways_ right, i would assume it 
 to be a qt bug
 
 0.2.8
 
 * Appointments are now clickable (connection to datebook still missing)
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 7cef035..028947d 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -1,172 +1,174 @@
 /*
  * today.cpp : main class
  *
  * ---------------------
  *
  * begin       : Sun 10 17:20:00 CEST 2002
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "today.h"
 
 #include <qpe/timestring.h>
 #include <qpe/config.h>
-#include <qpe/qcopenvelope_qws.h> 
+#include <qpe/qcopenvelope_qws.h>
 #include <qpe/qprocess.h>
 #include <qpe/resource.h>
 #include <qpe/contact.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
 
 #include <qdir.h>
 #include <qfile.h>
-#include <qdatetime.h> 
+#include <qdatetime.h>
 #include <qtextstream.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qfileinfo.h>
 #include <qlayout.h>
 #include <qtl.h>
 
 //#include <iostream.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 int MAX_LINES_TASK;
 int MAX_CHAR_CLIP;
 int MAX_LINES_MEET;
 int SHOW_LOCATION;
 int SHOW_NOTES;
 // show only later dates
 int ONLY_LATER;
 int AUTOSTART;
 int NEW_START=1;
 
-/* 
- *  Constructs a Example which is a child of 'parent', with the 
- *  name 'name' and widget flags set to 'f' 
+/*
+ *  Constructs a Example which is a child of 'parent', with the
+ *  name 'name' and widget flags set to 'f'
  */
 Today::Today( QWidget* parent,  const char* name, WFlags fl )
   : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) {
   QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) );
   QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) );
   QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
   QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
-  
-#if defined(Q_WS_QWS) 
+
+#if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
   QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this );
   connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)),
 	   this, SLOT ( channelReceived(const QCString &, const QByteArray &)) );
 #endif
 #endif
-  
+
+
+
   db = NULL;
   setOwnerField();
   todo = new ToDoDB;
   getTodo();
   draw();
   autoStart();
 }
 
 /*
  * Qcop receive method.
  */
 void Today::channelReceived(const QCString &msg, const QByteArray & data) {
   QDataStream stream(data, IO_ReadOnly );
   if ( msg == "message(QString)" ) {
     QString message;
     stream >> message;
     setOwnerField(message);
   }
 
 }
 
 /*
  * Initialises the owner field with the default value, the username
- */ 
+ */
 void Today::setOwnerField() {
   QString file = Global::applicationFileName("addressbook", "businesscard.vcf");
   if (QFile::exists(file)) {
     Contact cont = Contact::readVCard(file)[0];
     QString returnString = cont.fullName();
     OwnerField->setText( tr ("<b>Owned by " + returnString + "</b>"));
   } else {
     OwnerField->setText( tr ("<b>Please fill out the business card </b>"));
   }
 }
 
 /*
  * Set the owner field with a given QString, for example per qcop.
  */
 void Today::setOwnerField(QString &message) {
   if (!message.isEmpty()) {
     OwnerField->setText("<b>" + message + "</b>");
   }
-}  
+}
 
 /*
  * Autostart, uses the new (opie only) autostart method in the launcher code.
  * If registered against that today ist started on each resume.
  */
 void Today::autoStart() {
   Config cfg("today");
-  cfg.setGroup("Autostart"); 
+  cfg.setGroup("Autostart");
   AUTOSTART = cfg.readNumEntry("autostart",1);
   if (AUTOSTART) {
     QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
     e << QString("add");
     e << QString("today");
   } else {
     QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
     e << QString("remove");
     e << QString("today");
   }
 }
 
 /*
  * Repaint method. Reread all fields.
  */
 void Today::draw() {
   init();
   getDates();
   getMail();
- 
+
   // if the todolist.xml file was not modified in between, do not parse it.
   if (checkIfModified()) {
     if (todo) delete todo;
     todo = new ToDoDB;
     getTodo();
   }
 
   // how often refresh
   QTimer::singleShot( 20*1000, this, SLOT(draw() ) );
 }
 
 /*
  * Check if the todolist.xml was modified (if there are new entries.
  * Returns true if it was modified.
  */
 bool Today::checkIfModified() {
 
   QDir dir;
   QString homedir = dir.homeDirPath ();
   QString time;
 
   Config cfg("today");
   cfg.setGroup("Files");
   time = cfg.readEntry("todolisttimestamp", "");
@@ -200,344 +202,392 @@ void Today::init() {
   // how many lines should be showed in the task section
   MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5);
   // after how many chars should the be cut off on tasks and notes
   MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",40);
   // how many lines should be showed in the datebook section
   MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5);
   // If location is to be showed too, 1 to activate it.
   SHOW_LOCATION = cfg.readNumEntry("showlocation",1);
   // if notes should be shown
   SHOW_NOTES = cfg.readNumEntry("shownotes",0);
   // should only later appointments be shown or all for the current day.
   ONLY_LATER = cfg.readNumEntry("onlylater",1);
 
   //db = new DateBookDB;
 }
 
 /*
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
   conf = new todayconfig ( this, "", true );
   // read the config
   Config cfg("today");
-  cfg.setGroup("BaseConfig"); 
-  
+  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);
   // if today should be autostarted
   conf->CheckBoxAuto->setChecked(AUTOSTART);
 
   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();
   int autostart =conf->CheckBoxAuto->isChecked();
-  
+
   cfg.writeEntry("maxlinestask",maxlinestask);
-  cfg.writeEntry("maxcharclip", maxcharclip); 
+  cfg.writeEntry("maxcharclip", maxcharclip);
   cfg.writeEntry("maxlinesmeet",maxmeet);
   cfg.writeEntry("showlocation",location);
   cfg.writeEntry("shownotes", notes);
   cfg.writeEntry("onlylater", onlylater);
   cfg.setGroup("Autostart");
   cfg.writeEntry("autostart", autostart);
-  
+
   // sync it to "disk"
-  cfg.write(); 
+  cfg.write();
   NEW_START=1;
   draw();
   autoStart();
 }
 
 
 /*
  *  Get all events that are in the datebook xml file for today
  */
 void Today::getDates() {
   QDate date = QDate::currentDate();
 
   if (AllDateBookEvents) delete AllDateBookEvents;
   AllDateBookEvents = new QWidget( );
   QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents);
 
   if (db) {
    delete db;
   }
-  db = new DateBookDB;  
+  db = new DateBookDB;
 
   QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
 
   qBubbleSort(list);
   // printf("Get dates\n");
 
   Config config( "qpe" );
   // if 24 h format
   //bool ampm = config.readBoolEntry( "AMPM", TRUE );
-  
+
   int count=0;
-  
+
   if ( list.count() > 0 ) {
-    
+
     for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
     it!=list.end(); ++it ) {
-      
-      
+
+
       if ( count <= MAX_LINES_MEET ) {
 
 	QTime time = QTime::currentTime();
-	
+
 	if (!ONLY_LATER) {
 	  count++;
 	  DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES);
 	  layoutDates->addWidget(l);
 	  connect (l, SIGNAL(editEvent(const Event &)),
 		   this, SLOT(editEvent(const Event &)));
 	} else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
 	  count++;
-	  
+
 	  // show only later appointments
 	  DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES);
 	  layoutDates->addWidget(l);
 	  connect (l, SIGNAL(editEvent(const Event &)),
 		   this, SLOT(editEvent(const Event &)));
-	} 
+	}
       }
     }
     if (ONLY_LATER && count==0) {
 	QLabel* noMoreEvents = new QLabel(AllDateBookEvents);
 	noMoreEvents->setText(tr("No more appointments today"));
 	layoutDates->addWidget(noMoreEvents);
-    } 	
+    }
   } else {
     QLabel* noEvents = new QLabel(AllDateBookEvents);
     noEvents->setText(tr("No appointments today"));
     layoutDates->addWidget(noEvents);
   }
-  
+
   layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
   sv1->addChild(AllDateBookEvents);
   AllDateBookEvents->show();
 }
-  
+
 
 void Today::getMail() {
   Config cfg("opiemail");
-  cfg.setGroup("today"); 
-  
+  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 mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
-  
+
   MailField->setText(output);
 }
 
 
 /*
  * Get the todos
  */
 void Today::getTodo() {
-  
+
   QString output;
   QString tmpout;
   int count = 0;
   int ammount = 0;
 
   // get overdue todos first
   QValueList<ToDoEvent> overDueList = todo->overDue();
   qBubbleSort(overDueList);
   for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin();
 	it!=overDueList.end(); ++it ) {
     if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) {
       tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
       ammount++;
     }
   }
-  
+
   // get total number of still open todos
   QValueList<ToDoEvent> open = todo->rawToDos();
   qBubbleSort(open);
   for ( QValueList<ToDoEvent>::Iterator it=open.begin();
 	it!=open.end(); ++it ) {
     if (!(*it).isCompleted()){
       count +=1;
-      // not the overdues, we allready got them, and not if we are 
+      // not the overdues, we allready got them, and not if we are
       // over the maxlines
       if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) {
 	tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>";
 	ammount++;
       }
     }
   }
-  
-    
+
+
   if (count > 0) {
     if( count == 1 ) {
       output = tr("There is <b> 1</b> active task:  <br>" );
     } else {
       output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
     }
     output += tmpout;
   } else {
     output = tr("No active tasks");
   }
-  
+
   TodoField->setText(tr(output));
 }
 
 /*
  * launches datebook
  */
-void Today::startDatebook() { 
+void Today::startDatebook() {
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("datebook");
 }
 
 /*
  * starts the edit dialog as known from datebook
- */ 
+ */
 
 extern QPEApplication *todayApp;
 
 void Today::editEvent(const Event &e) {
   startDatebook();
-  
+
   while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents();
   QCopEnvelope env("QPE/Datebook", "editEvent(int)");
   env << e.uid();
 }
 
 /*
  * launches todolist
- */ 
+ */
 void Today::startTodo() {
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("todolist");
 }
 
 /*
  * launch opiemail
  */
 void Today::startMail() {
   QCopEnvelope e("QPE/System", "execute(QString)");
   e << QString("opiemail");
 }
 
 
 Today::~Today() {
 }
 
-
-
 /*
- * Gets the events for the current day, if it should get all dates 
+ * Gets the events for the current day, if it should get all dates
  */
-DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 
-			     QWidget* parent = 0, 
+DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
+			     QWidget* parent = 0,
 			     int SHOW_LOCATION = 0,
 			     int SHOW_NOTES = 0,
-			     const char* name = 0, 
+			     const char* name = 0,
 			     WFlags fl = 0) :
   ClickableLabel(parent,name,fl), event(ev) {
-  
+
   QString msg;
   //QTime time = QTime::currentTime();
-  
+
+   Config config( "qpe" );
+  // if 24 h format
+   ampm = config.readBoolEntry( "AMPM", TRUE );
+
+
   if (!ONLY_LATER) {
     msg += "<B>" + (ev).description() + "</B>";
     if ( (ev).event().hasAlarm() ) {
       msg += " <b>[with alarm]</b>";
     }
     // include location or not
     if (SHOW_LOCATION == 1) {
       msg += "<BR><i>" + (ev).location() + "</i>";
     }
-    
+
     if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
       msg += "<br>All day";
     }  else {
       // start time of event
-      msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+        msg += "<br>" + ampmTime(QTime((ev).event().start().time()) );
         // end time of event
-        + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+        + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) );
     }
-    
+
     // include possible note or not
     if (SHOW_NOTES == 1) {
       msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP);
     }
   }
   setText(msg);
   connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
   setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 
 
-DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, 
-				       QWidget* parent = 0, 
+QString DateBookEvent::ampmTime(QTime tm) {
+
+    QString s;
+    if( ampm ) {
+	int hour = tm.hour();
+	if (hour == 0)
+	    hour = 12;
+	if (hour > 12)
+	    hour -= 12;
+	s.sprintf( "%2d:%02d %s", hour, tm.minute(),
+		   (tm.hour() >= 12) ? "PM" : "AM" );
+        return s;
+    } else {
+	s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
+        return s;
+    }
+
+}
+
+
+DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
+				       QWidget* parent = 0,
 				       int SHOW_LOCATION = 0,
 				       int SHOW_NOTES = 0,
-				       const char* name = 0, 
+				       const char* name = 0,
 				       WFlags fl = 0) :
   ClickableLabel(parent,name,fl), event(ev) {
-  
+
   QString msg;
   QTime time = QTime::currentTime();
-  
+
+  Config config( "qpe" );
+  // if 24 h format
+  ampm = config.readBoolEntry( "AMPM", TRUE );
+
+
   if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
     // show only later appointments
     msg += "<B>" + (ev).description() + "</B>";
     if ( (ev).event().hasAlarm() ) {
       msg += " <b>[with alarm]</b>";
     }
     // include location or not
     if (SHOW_LOCATION == 1) {
       msg += "<BR><i>" + (ev).location() + "</i>";
     }
-    
+
     if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") &&  (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
       msg += "<br>All day";
     } else {
       // start time of event
-      msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+      msg += "<br>" + ampmTime(QTime((ev).event().start().time()) )
         // end time of event
-        + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+        + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) );
     }
     // include possible note or not
     if (SHOW_NOTES == 1) {
       msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP);
     }
-  } 
-  
+  }
+
   setText(msg);
   connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
   setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
 }
 
 
+QString DateBookEventLater::ampmTime(QTime tm) {
+
+    QString s;
+    if( ampm ) {
+	int hour = tm.hour();
+	if (hour == 0)
+	    hour = 12;
+	if (hour > 12)
+	    hour -= 12;
+	s.sprintf( "%2d:%02d %s", hour, tm.minute(),
+		   (tm.hour() >= 12) ? "PM" : "AM" );
+        return s;
+    } else {
+	s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
+        return s;
+    }
+
+}
+
+
 void DateBookEvent::editMe() {
   emit editEvent(event.event());
 }
 
 void DateBookEventLater::editMe() {
   emit editEvent(event.event());
 }
 
 
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 090e8f9..d265d67 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -6,107 +6,111 @@
  * begin       : Sun 10 17:20:00 CEST 2002
  * copyright   : (c) 2002 by Maximilian Reiß
  * email       : max.reiss@gmx.de
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #ifndef TODAY_H
 #define TODAY_H
 
 #include <qpe/datebookdb.h>
 #include <qpe/event.h>
 
 #include <opie/tododb.h>
 
 #include <qdatetime.h>
-#include <qlist.h> 
+#include <qlist.h>
 
 #include "todayconfig.h"
 #include "todaybase.h"
 #include "clickablelabel.h"
 
 class QVBoxLayout;
 
 class Today : public TodayBase {
-  Q_OBJECT
-    
-    public:
-  Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
-  ~Today();
-  
+    Q_OBJECT
+
+  public:
+    Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    ~Today();
+
   private slots:
     void startConfig();
     void startTodo();
     void startDatebook();
     void startMail();
     void draw();
     void editEvent(const Event &e);
  private:
     void init();
     void getDates();
     void getTodo();
     void getMail();
     void autoStart();
     bool checkIfModified();
     void setOwnerField();
     void setOwnerField(QString &string);
-    private slots:
-      void channelReceived(const QCString &msg, const QByteArray & data);
-    
+  private slots:
+    void channelReceived(const QCString &msg, const QByteArray & data);
+
  private:
     DateBookDB *db;
     ToDoDB *todo;
     todayconfig *conf;
     QWidget* AllDateBookEvents;
     //Config cfg;
     int MAX_LINES_TASK;
     int MAX_CHAR_CLIP;
     int MAX_LINES_MEET;
-    int SHOW_LOCATION; 
+    int SHOW_LOCATION;
     int SHOW_NOTES;
 };
 
 class DateBookEvent: public ClickableLabel {
   Q_OBJECT
 public:
-    DateBookEvent(const EffectiveEvent &ev, 
-		  QWidget* parent = 0,
-		  int SHOW_LOCATION = 0,
-		  int SHOW_NOTES = 0,
-		  const char* name = 0, 
-		  WFlags fl = 0);
+  DateBookEvent(const EffectiveEvent &ev,
+                QWidget* parent = 0,
+                int SHOW_LOCATION = 0,
+                int SHOW_NOTES = 0,
+                const char* name = 0,
+                WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
 private slots:
     void editMe();
 private:
+    QString ampmTime(QTime);
     const EffectiveEvent event;
+    bool ampm;
 };
 
 class DateBookEventLater: public ClickableLabel {
   Q_OBJECT
 public:
-    DateBookEventLater(const EffectiveEvent &ev, 
+    DateBookEventLater(const EffectiveEvent &ev,
 		       QWidget* parent = 0,
 		       int SHOW_LOCATION = 0,
 		       int SHOW_NOTES = 0,
-		       const char* name = 0, 
+		       const char* name = 0,
 		       WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
 private slots:
     void editMe();
 private:
+    QString ampmTime(QTime);
     const EffectiveEvent event;
+    bool ampm;
 };
 
 #endif // TODAY_H
 
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 755c860..ae8763b 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -24,171 +24,171 @@
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qscrollview.h>
 #include <qvbox.h>
 #include <qapplication.h>
 
 #include <qpe/resource.h>
 
 /*
  *  Constructs a TodayBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
 TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   : QWidget( parent, name, fl )
 {
   QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
   QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook
   QPixmap todo = Resource::loadPixmap( "TodoList" );   // todo
   QPixmap config = Resource::loadPixmap( "today/config" );  // config icon
   QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon
 
-  QPalette pal = this->palette();
-  QColor col = pal.color(QPalette::Active, QColorGroup::Background);
-  pal.setColor(QPalette::Active, QColorGroup::Button, col);
-  pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
-  pal.setColor(QPalette::Normal, QColorGroup::Button, col);
-  pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
-  this->setPalette(pal);
+  //QPalette pal = this->palette();
+  // QColor col = pal.color(QPalette::Active, QColorGroup::Background);
+  //pal.setColor(QPalette::Active, QColorGroup::Button, col);
+  //pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
+  //pal.setColor(QPalette::Normal, QColorGroup::Button, col);
+  //pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
+  //this->setPalette(pal);
 
 
   QWidget *d = QApplication::desktop();
   int w=d->width();
   int h=d->height();
   resize( w , h );
 
   // hehe, qt is ...
   getridoffuckingstrippeldlinesbutton =  new QPushButton (this, "asdfsad" );
   getridoffuckingstrippeldlinesbutton->setGeometry( QRect( -5, 10, 0, 0 ) );
 
   QVBoxLayout * layout = new QVBoxLayout(this);
 
   // --- logo Section ---
   QPalette pal2;
   QColorGroup cg;
   cg.setColor( QColorGroup::Text, white );
   cg.setBrush( QColorGroup::Background, QBrush( QColor( 238, 238, 230), logo ) );
   pal2.setActive( cg );
   // today logo
   Frame = new QLabel( this, "Frame" );
   Frame->setPalette( pal2 );
   Frame->setFrameShape( QFrame::StyledPanel );
   Frame->setFrameShadow( QFrame::Raised );
   Frame->setLineWidth( 0 );
   Frame->setMaximumHeight(50);
   Frame->setMinimumHeight(50);
   // date
   TextLabel1 = new QLabel( Frame, "TextLabel1" );
   TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) );
   QFont TextLabel1_font(  TextLabel1->font() );
   TextLabel1_font.setBold( TRUE );
   TextLabel1->setFont( TextLabel1_font );
   TextLabel1->setBackgroundOrigin( QLabel::ParentOrigin );
   TextLabel1->setTextFormat( RichText );
 
   OwnerField = new QLabel(this , "Owner" );
   OwnerField->setGeometry(QRect(0,0, this->width(), 12 ));
   OwnerField->setAlignment(int (QLabel::AlignTop | QLabel::AlignLeft ) );
   OwnerField->setMaximumHeight(12);
 
   // --- dates section ---
   Frame4 = new QFrame( this, "Frame4" );
-  Frame4->setPalette( pal );
+//  Frame4->setPalette( pal );
   Frame4->setFrameShape( QScrollView::StyledPanel );
   Frame4->setFrameShadow( QScrollView::Sunken );
   Frame4->setBackgroundOrigin( QScrollView::ParentOrigin );
   Frame4->setFrameStyle( QFrame::NoFrame );
   Frame4->setGeometry (QRect( 0, 8, this->width() , this->height()) );
 
   sv1 = new QScrollView( Frame4 );
   sv1->setResizePolicy(QScrollView::AutoOneFit);
   sv1->setHScrollBarMode( QScrollView::AlwaysOff );
   // need to find a better way!!!
   sv1->setGeometry (QRect( 40, 2, Frame4->width()-40 , (Frame4->height()/3)+20  ) );
   sv1->setFrameShape(QFrame::NoFrame);
 
   DatesButton = new QPushButton (Frame4, "DatesButton" );
   DatesButton->setGeometry( QRect( 2, 4, 36, 32 ) );
   DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin );
-  DatesButton->setPalette( pal );
+//  DatesButton->setPalette( pal );
   DatesButton->setPixmap( datebook  );
   DatesButton->setFlat( TRUE );
 
   // --- mail section ---)
   MailFrame = new QFrame( this ,"MailFrame" );
   MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
   MailFrame->setGeometry (QRect( 0, 0, this->width() , 15) );
   MailFrame->setFrameStyle( QFrame::NoFrame );
 
   QFrame* Line1 = new QFrame( MailFrame);
   Line1->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
   Line1->setFrameStyle( QFrame::HLine | QFrame::Sunken );
 
   MailButton = new QPushButton (MailFrame, "MailButton" );
   MailButton->setGeometry( QRect( 2, 3, 36, 19 ) );
-  MailButton->setPalette( pal );
+//  MailButton->setPalette( pal );
   MailButton->setPixmap( mail  );
   MailButton->setFlat( TRUE );
 
   MailField = new QLabel( MailFrame, "MailField" );
   MailField->setGeometry( QRect( 40, 4, MailFrame->width(), 12) );
   MailField->setText( tr( "Opiemail not installed" ) );
   MailField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
   MailField->setMaximumHeight(40);
   MailField->setMinimumHeight(15);
 
   // --- todo section --
   Frame15 = new QFrame( this, "Frame15" );
   Frame15->setFrameStyle( QFrame::NoFrame );
   Frame15->setGeometry (QRect( 40, 3, this->width() , this->height()) );
 
   QFrame* Line2 = new QFrame( Frame15);
   Line2->setGeometry( QRect( -5, 0, MailFrame->width()+5, 5 ) );
   Line2->setFrameStyle( QFrame::HLine | QFrame::Sunken );
 
   TodoButton = new QPushButton (Frame15, "TodoButton" );
   TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) );
-  TodoButton->setPalette( pal );
+//  TodoButton->setPalette( pal );
   TodoButton->setPixmap( todo  );
   TodoButton->setFlat( TRUE );
 
   QScrollView* sv2 = new QScrollView( Frame15 );
   sv2->setResizePolicy(QScrollView::AutoOneFit);
   sv2->setHScrollBarMode( QScrollView::AlwaysOff );
   sv2->setGeometry (QRect( 40, 3, Frame15->width()-40 , (Frame15->height()/3) ) );
   sv2->setFrameShape(QFrame::NoFrame);
 
   TodoField = new QLabel( sv2->viewport(), "TodoField" );
   sv2->addChild(TodoField);
   TodoField->setFrameShadow( QLabel::Plain );
   //TodoField->setText( tr( "No current todos" ) );
   TodoField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
 
   PushButton1 = new QPushButton (Frame15, "PushButton1" );
   PushButton1->setGeometry( QRect( 2, 68, 25, 21 ) );
   PushButton1->setPixmap( config  );
-  PushButton1->setPalette( pal );
+//  PushButton1->setPalette( pal );
   PushButton1->setAutoDefault( TRUE );
   PushButton1->setFlat( TRUE );
 
   // -- layout --
   layout->addWidget(Frame);
   layout->addWidget(OwnerField);
   layout->addWidget(Frame4);
   layout->addWidget(MailFrame);
   layout->addWidget(Frame15);
 
   layout->setStretchFactor(Frame4,5);
   layout->setStretchFactor(MailFrame,1);
   layout->setStretchFactor(Frame15,4);
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 TodayBase::~TodayBase()
 {
 }