4 files changed, 48 insertions, 10 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
@@ -51,4 +51,5 @@ int SHOW_NOTES;
 // show only later dates
 int ONLY_LATER;
+int AUTOSTART;
 /* 
  *  Constructs a Example which is a child of 'parent', with the 
@@ -62,8 +63,25 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
   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();
@@ -77,7 +95,7 @@ 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;
   
@@ -124,4 +142,6 @@ void Today::startConfig() {
   conf->CheckBox3->setChecked(ONLY_LATER);
   
+  conf->CheckBoxAuto->setChecked(AUTOSTART);
+
   conf->exec();
   
@@ -132,5 +152,6 @@ void Today::startConfig() {
   int maxcharclip = conf->SpinBox7->value();
   int onlylater = conf->CheckBox3->isChecked();
-
+  int autostart =conf->CheckBoxAuto->isChecked();
+  
   cfg.writeEntry("maxlinestask",maxlinestask);
   cfg.writeEntry("maxcharclip", maxcharclip); 
@@ -139,7 +160,9 @@ void Today::startConfig() {
   cfg.writeEntry("shownotes", notes);
   cfg.writeEntry("onlylater", onlylater);
+  cfg.setGroup("Autostart");
+  cfg.writeEntry("autostart", autostart);
   // sync it to "disk"
   cfg.write(); 
-  
+  autoStart();
   draw();
 }
@@ -225,5 +248,5 @@ void Today::getDates() {
     }
     if (msg.isEmpty()) {
-      msg = "No more appointments today";
+      msg = tr("No more appointments today");
     }
     DatesField->setText(msg);
@@ -341,14 +364,14 @@ 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
@@ -49,4 +49,5 @@ class Today : public TodayBase
     void getTodo();
     void getMail();
+    void autoStart();
     QList<TodoItem> loadTodo(const char *filename);
  private:
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
@@ -123,5 +123,17 @@ todayconfig::todayconfig( QWidget* parent,  const char* name, bool modal, WFlags
   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
@@ -35,7 +35,9 @@ public:
     QLabel* TextLabel4;
     QLabel* TextLabel5;
+    QLabel* TextLabel2;
     QCheckBox* CheckBox3;
     QCheckBox* CheckBox2;
     QCheckBox* CheckBox1;
+    QCheckBox* CheckBoxAuto;
     QSpinBox* SpinBox1;
     QLabel* TextLabel3;