2 files changed, 21 insertions, 10 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 0ab7a2a..01d1a13 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -130,9 +130,9 @@ void Today::setOwnerField(QString &message) {
 void Today::autoStart() {
     Config cfg("today");
     cfg.setGroup("Autostart");
     int AUTOSTART = cfg.readNumEntry("autostart",1);
-    qDebug(QString("%1").arg(AUTOSTART));
+//    qDebug(QString("%1").arg(AUTOSTART));
     if (AUTOSTART) {
         QCopEnvelope e("QPE/System", "autoStart(QString, QString, QString)");
         e << QString("add");
         e << QString("today");
@@ -478,8 +478,9 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
   QString msg;
   //QTime time = QTime::currentTime();
 
    Config config( "qpe" );
+   config.setGroup( "Time" );
   // if 24 h format
    ampm = config.readBoolEntry( "AMPM", TRUE );
 
 
@@ -544,8 +545,9 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
   QString msg;
   QTime time = QTime::currentTime();
 
   Config config( "qpe" );
+  config.setGroup( "Time" );
   // if 24 h format
   ampm = config.readBoolEntry( "AMPM", TRUE );
 
 
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index ae8763b..c6ea11f 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -43,17 +43,9 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   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);
-
+  QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla
 
   QWidget *d = QApplication::desktop();
   int w=d->width();
   int h=d->height();
@@ -78,8 +70,25 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   Frame->setFrameShadow( QFrame::Raised );
   Frame->setLineWidth( 0 );
   Frame->setMaximumHeight(50);
   Frame->setMinimumHeight(50);
+
+  // Today text
+  QLabel* TodayLabel = new QLabel( Frame, "TodayText" );
+  TodayLabel->setGeometry( QRect( 10, 0, 168, 40 ) );
+  QFont TodayLabel_font(  TodayLabel->font() );
+  TodayLabel_font.setBold( TRUE );
+  TodayLabel_font.setPointSize(40);
+  TodayLabel->setFont( TodayLabel_font );
+  TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin );
+  TodayLabel->setText("<font color=#FFFFFF>" + tr("Today") +"</font>");
+
+  // Opiezilla
+  QLabel* Opiezilla = new QLabel( Frame, "OpieZilla");
+  Opiezilla->setPixmap( opiezilla );
+  Opiezilla->setGeometry( this->width()-50 ,1, 45, 47);
+  Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
+
   // date
   TextLabel1 = new QLabel( Frame, "TextLabel1" );
   TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) );
   QFont TextLabel1_font(  TextLabel1->font() );