3 files changed, 11 insertions, 5 deletions
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 1424b95..352c9c1 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -66,5 +66,5 @@ TodayBase::TodayBase( QWidget* parent,  const char* name, WFlags fl )
   TodayLabel->setFont( TodayLabel_font );
   TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin );
-  TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today²") +"</font>" );
+  TodayLabel->setText( "<font color=#FFFFFF>" + tr("Today") +"</font>" );
 
   // date
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 097965b..d15e2ab 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -31,4 +31,5 @@
 #include <qtoolbutton.h>
 #include <qtooltip.h>
+#include <qwhatsthis.h>
 
 class ToolButton : public QToolButton {
@@ -51,6 +52,6 @@ public:
  *
  */
-TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags fl )
-    : QDialog( parent, name, modal, fl ) {
+TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
+    : QDialog( parent, name, modal, WStyle_ContextHelp ) {
 
     setCaption( tr( "Today config" ) );
@@ -81,15 +82,20 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal, WFlags
     TextLabel2 = new QLabel( hbox_auto, "AutoStart" );
     TextLabel2->setText( tr( "autostart on \nresume?\n (Opie only)" ) );
+    QWhatsThis::add( TextLabel2 , tr( "Check this if today should be autostarted on resume." ) );
     CheckBoxAuto = new QCheckBox( hbox_auto, "CheckBoxAuto" );
+    QWhatsThis::add( CheckBoxAuto, tr( "Check this if today should be autostarted on resume." ) );
     QHBox *hbox_inactive = new QHBox( tab_3 );
     TimeLabel = new QLabel( hbox_inactive, "TimeLabel" );
     TimeLabel->setText( tr( "minutes inactive" ) );
+    QWhatsThis::add( TimeLabel , tr( "How many minutes has the PDA been suspended before the autostart feature kicks in on resume" ) );
     SpinBoxTime = new QSpinBox( hbox_inactive, "TimeSpinner" );
+    QWhatsThis::add( SpinBoxTime , tr( "How many minutes has the PDA been suspended before the autostart feature kicks in on resume" ) );
     QHBox *hbox_iconSize = new QHBox( tab_3 );
     QLabel *iconSizeLabel = new QLabel( hbox_iconSize, "iconSizeLabel" );
     iconSizeLabel->setText( tr( "Icon size" ) );
-    //  iconSizeLabel->setToolTip( tr( "Set the icon size in pixel" ) );
+    QWhatsThis::add( iconSizeLabel, tr( "Set the icon size in pixel" ) );
     SpinBoxIconSize = new QSpinBox( hbox_iconSize, "TimeSpinner" );
     SpinBoxIconSize->setMaxValue( 32 );
+    QWhatsThis::add( SpinBoxIconSize, tr( "Set the icon size in pixel" ) );
 
     tab3Layout->addWidget( hbox_auto );
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index aa227dd..827e106 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -33,5 +33,5 @@ class TodayConfig : public QDialog {
 
 public:
-    TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE );
     ~TodayConfig();