summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/today.cpp39
-rw-r--r--core/pim/today/today.h1
-rw-r--r--core/pim/today/todayconfig.cpp14
-rw-r--r--core/pim/today/todayconfig.h2
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;
50int SHOW_NOTES; 50int SHOW_NOTES;
51// show only later dates 51// show only later dates
52int ONLY_LATER; 52int ONLY_LATER;
53int AUTOSTART;
53/* 54/*
54 * Constructs a Example which is a child of 'parent', with the 55 * Constructs a Example which is a child of 'parent', with the
55 * name 'name' and widget flags set to 'f' 56 * name 'name' and widget flags set to 'f'
@@ -61,10 +62,27 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
61 QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); 62 QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
62 QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); 63 QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
63 64
65
66 autoStart();
64 draw(); 67 draw();
65} 68}
66 69
67 70
71void Today::autoStart() {
72 Config cfg("today");
73 cfg.setGroup("Autostart");
74 AUTOSTART = cfg.readNumEntry("autostart",1);
75 if (AUTOSTART) {
76 QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
77 e << QString("add");
78 e << QString("today");
79 } else {
80 QCopEnvelope e("QPE/System", "autoStart(QString,QString)");
81 e << QString("remove");
82 e << QString("today");
83 }
84}
85
68void Today::draw() { 86void Today::draw() {
69 init(); 87 init();
70 getDates(); 88 getDates();
@@ -76,9 +94,9 @@ void Today::draw() {
76 94
77void Today::init() { 95void Today::init() {
78 QDate date = QDate::currentDate(); 96 QDate date = QDate::currentDate();
79 QString time = (date.toString()); 97 QString time = (tr( date.toString() ), white);
80 98
81 TextLabel1->setText("<qt><font color=white>" +time + "<font></qt>"); 99 TextLabel1->setText(time);
82 db = new DateBookDB; 100 db = new DateBookDB;
83 101
84 // read config 102 // read config
@@ -123,6 +141,8 @@ void Today::startConfig() {
123 // only later 141 // only later
124 conf->CheckBox3->setChecked(ONLY_LATER); 142 conf->CheckBox3->setChecked(ONLY_LATER);
125 143
144 conf->CheckBoxAuto->setChecked(AUTOSTART);
145
126 conf->exec(); 146 conf->exec();
127 147
128 int maxlinestask = conf->SpinBox2->value(); 148 int maxlinestask = conf->SpinBox2->value();
@@ -131,6 +151,7 @@ void Today::startConfig() {
131 int notes = conf->CheckBox2->isChecked(); 151 int notes = conf->CheckBox2->isChecked();
132 int maxcharclip = conf->SpinBox7->value(); 152 int maxcharclip = conf->SpinBox7->value();
133 int onlylater = conf->CheckBox3->isChecked(); 153 int onlylater = conf->CheckBox3->isChecked();
154 int autostart =conf->CheckBoxAuto->isChecked();
134 155
135 cfg.writeEntry("maxlinestask",maxlinestask); 156 cfg.writeEntry("maxlinestask",maxlinestask);
136 cfg.writeEntry("maxcharclip", maxcharclip); 157 cfg.writeEntry("maxcharclip", maxcharclip);
@@ -138,9 +159,11 @@ void Today::startConfig() {
138 cfg.writeEntry("showlocation",location); 159 cfg.writeEntry("showlocation",location);
139 cfg.writeEntry("shownotes", notes); 160 cfg.writeEntry("shownotes", notes);
140 cfg.writeEntry("onlylater", onlylater); 161 cfg.writeEntry("onlylater", onlylater);
162 cfg.setGroup("Autostart");
163 cfg.writeEntry("autostart", autostart);
141 // sync it to "disk" 164 // sync it to "disk"
142 cfg.write(); 165 cfg.write();
143 166 autoStart();
144 draw(); 167 draw();
145} 168}
146 169
@@ -224,7 +247,7 @@ void Today::getDates() {
224 } 247 }
225 } 248 }
226 if (msg.isEmpty()) { 249 if (msg.isEmpty()) {
227 msg = "No more appointments today"; 250 msg = tr("No more appointments today");
228 } 251 }
229 DatesField->setText(msg); 252 DatesField->setText(msg);
230 } 253 }
@@ -340,16 +363,16 @@ void Today::getTodo() {
340 363
341 if (count > 0) { 364 if (count > 0) {
342 if( count == 1 ) { 365 if( count == 1 ) {
343 output = QString("There is <b> 1</b> active task: <br>" ); 366 output = tr("There is <b> 1</b> active task: <br>" );
344 } else { 367 } else {
345 output = QString("There are <b> %1</b> active tasks: <br>").arg(count); 368 output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
346 } 369 }
347 output += tmpout; 370 output += tmpout;
348 } else { 371 } else {
349 output = ("No active tasks"); 372 output = tr("No active tasks");
350 } 373 }
351 374
352 TodoField->setText(output); 375 TodoField->setText(tr(output));
353} 376}
354 377
355/* 378/*
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
48 void getDates(); 48 void getDates();
49 void getTodo(); 49 void getTodo();
50 void getMail(); 50 void getMail();
51 void autoStart();
51 QList<TodoItem> loadTodo(const char *filename); 52 QList<TodoItem> loadTodo(const char *filename);
52 private: 53 private:
53 DateBookDB *db; 54 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
122 SpinBox7->setGeometry( QRect( 115, 20, 58, 25 ) ); 122 SpinBox7->setGeometry( QRect( 115, 20, 58, 25 ) );
123 SpinBox7->setMaxValue( 80 ); 123 SpinBox7->setMaxValue( 80 );
124 SpinBox7->setValue( 30 ); 124 SpinBox7->setValue( 30 );
125 TabWidget3->insertTab( tab_3, tr( "All" ) ); 125
126 TextLabel2 = new QLabel( Frame14, "AutoStart" );
127 TextLabel2->setGeometry( QRect( 20, 60, 100, 45 ) );
128 TextLabel2->setText( tr( "Should today be\n"
129 "autostarted on\n"
130 "resume ?"
131 " (Opie only)" ) );
132
133 CheckBoxAuto = new QCheckBox (Frame14, "CheckBoxAuto" );
134 CheckBoxAuto->setGeometry( QRect( 158, 60, 27, 21 ) );
135
136 TabWidget3->insertTab( tab_3, tr( "Misc" ) );
137
126} 138}
127 139
128/* 140/*
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:
34 QFrame* Frame8; 34 QFrame* Frame8;
35 QLabel* TextLabel4; 35 QLabel* TextLabel4;
36 QLabel* TextLabel5; 36 QLabel* TextLabel5;
37 QLabel* TextLabel2;
37 QCheckBox* CheckBox3; 38 QCheckBox* CheckBox3;
38 QCheckBox* CheckBox2; 39 QCheckBox* CheckBox2;
39 QCheckBox* CheckBox1; 40 QCheckBox* CheckBox1;
41 QCheckBox* CheckBoxAuto;
40 QSpinBox* SpinBox1; 42 QSpinBox* SpinBox1;
41 QLabel* TextLabel3; 43 QLabel* TextLabel3;
42 QWidget* tab_2; 44 QWidget* tab_2;