4 files changed, 47 insertions, 9 deletions

diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 6a0e9fc..0fa7ad5 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -50,6 +50,7 @@ int SHOW_LOCATION;
 int SHOW_NOTES;
 // show only later dates
 int ONLY_LATER;
+int AUTOSTART;
 /* 
  *  Constructs a Example which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
@@ -61,10 +62,27 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
   QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
   QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
  
+  
+  autoStart();
   draw();
 }
 
 
+void Today::autoStart() {
+  Config cfg("today");
+  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");
+  }
+}
+
 void Today::draw() {
   init();
   getDates();
@@ -76,9 +94,9 @@ void Today::draw() {
 
 void Today::init() {
   QDate date = QDate::currentDate();
-  QString time = (date.toString());
+  QString time = (tr( date.toString() ), white);
   
-  TextLabel1->setText("<qt><font color=white>" +time + "<font></qt>");
+  TextLabel1->setText(time);
   db = new DateBookDB;
   
   // read config
@@ -123,6 +141,8 @@ void Today::startConfig() {
   // only later
   conf->CheckBox3->setChecked(ONLY_LATER);
   
+  conf->CheckBoxAuto->setChecked(AUTOSTART);
+
   conf->exec();
   
   int maxlinestask = conf->SpinBox2->value();
@@ -131,6 +151,7 @@ void Today::startConfig() {
   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); 
@@ -138,9 +159,11 @@ void Today::startConfig() {
   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(); 
-  
+  autoStart();
   draw();
 }
 
@@ -224,7 +247,7 @@ void Today::getDates() {
       }
     }
     if (msg.isEmpty()) {
-      msg = "No more appointments today";
+      msg = tr("No more appointments today");
     }
     DatesField->setText(msg);
   }
@@ -340,16 +363,16 @@ void Today::getTodo() {
   
   if (count > 0) {
     if( count == 1 ) {
-      output = QString("There is <b> 1</b> active task:  <br>" );
+      output = tr("There is <b> 1</b> active task:  <br>" );
     } else {
-      output = QString("There are <b> %1</b> active tasks: <br>").arg(count);
+      output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
     }
     output += tmpout;
   } else {
-    output = ("No active tasks");
+    output = tr("No active tasks");
   }
   
-  TodoField->setText(output);
+  TodoField->setText(tr(output));
 }
 
 /*
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 6b8c0bf..07bfd61 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -48,6 +48,7 @@ class Today : public TodayBase
     void getDates();
     void getTodo();
     void getMail();
+    void autoStart();
     QList<TodoItem> loadTodo(const char *filename);
  private:
     DateBookDB *db;
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 4f2633d..7c690a7 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -122,7 +122,19 @@ todayconfig::todayconfig( QWidget* parent,  const char* name, bool modal, WFlags
   SpinBox7->setGeometry( QRect( 115, 20, 58, 25 ) ); 
   SpinBox7->setMaxValue( 80 );
   SpinBox7->setValue( 30 );
-  TabWidget3->insertTab( tab_3, tr( "All" ) );
+
+  TextLabel2 = new QLabel( Frame14, "AutoStart" );
+  TextLabel2->setGeometry( QRect( 20, 60, 100, 45 ) ); 
+  TextLabel2->setText( tr( "Should today be\n"
+                           "autostarted on\n"
+                           "resume ?"
+                           " (Opie only)" ) );
+  
+  CheckBoxAuto = new QCheckBox (Frame14, "CheckBoxAuto" );
+  CheckBoxAuto->setGeometry( QRect( 158, 60, 27, 21 ) );
+  
+  TabWidget3->insertTab( tab_3, tr( "Misc" ) );
+
 }
 
 /*  
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 7facf85..020097d 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -34,9 +34,11 @@ public:
     QFrame* Frame8;
     QLabel* TextLabel4;
     QLabel* TextLabel5;
+    QLabel* TextLabel2;
     QCheckBox* CheckBox3;
     QCheckBox* CheckBox2;
     QCheckBox* CheckBox1;
+    QCheckBox* CheckBoxAuto;
     QSpinBox* SpinBox1;
     QLabel* TextLabel3;
     QWidget* tab_2;