summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp4
-rw-r--r--core/pim/today/todaybase.cpp1
-rw-r--r--core/pim/today/todayconfig.cpp1
3 files changed, 2 insertions, 4 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 66a4152..51aba69 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -286,70 +286,70 @@ void Today::getDates() {
286 286
287 int count=0; 287 int count=0;
288 288
289 if ( list.count() > 0 ) { 289 if ( list.count() > 0 ) {
290 290
291 for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); 291 for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
292 it!=list.end(); ++it ) { 292 it!=list.end(); ++it ) {
293 293
294 294
295 if ( count <= MAX_LINES_MEET ) { 295 if ( count <= MAX_LINES_MEET ) {
296 296
297 QTime time = QTime::currentTime(); 297 QTime time = QTime::currentTime();
298 298
299 if (!ONLY_LATER) { 299 if (!ONLY_LATER) {
300 count++; 300 count++;
301 DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES); 301 DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES);
302 layoutDates->addWidget(l); 302 layoutDates->addWidget(l);
303 connect (l, SIGNAL(editEvent(const Event &)), 303 connect (l, SIGNAL(editEvent(const Event &)),
304 this, SLOT(editEvent(const Event &))); 304 this, SLOT(editEvent(const Event &)));
305 } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) { 305 } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
306 count++; 306 count++;
307 307
308 // show only later appointments 308 // show only later appointments
309 DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES); 309 DateBookEventLater *l=new DateBookEventLater(*it, AllDateBookEvents, SHOW_LOCATION, SHOW_NOTES);
310 layoutDates->addWidget(l); 310 layoutDates->addWidget(l);
311 connect (l, SIGNAL(editEvent(const Event &)), 311 connect (l, SIGNAL(editEvent(const Event &)),
312 this, SLOT(editEvent(const Event &))); 312 this, SLOT(editEvent(const Event &)));
313 } 313 }
314 } 314 }
315 } 315 }
316 if (ONLY_LATER && count==0) { 316 if (ONLY_LATER && count==0) {
317 QLabel* noMoreEvents = new QLabel(AllDateBookEvents); 317 QLabel* noMoreEvents = new QLabel(AllDateBookEvents);
318 noMoreEvents->setText("No more appointments today"); 318 noMoreEvents->setText(tr("No more appointments today"));
319 layoutDates->addWidget(noMoreEvents); 319 layoutDates->addWidget(noMoreEvents);
320 } 320 }
321 } else { 321 } else {
322 QLabel* noEvents = new QLabel(AllDateBookEvents); 322 QLabel* noEvents = new QLabel(AllDateBookEvents);
323 noEvents->setText("No appointments today"); 323 noEvents->setText(tr("No appointments today"));
324 layoutDates->addWidget(noEvents); 324 layoutDates->addWidget(noEvents);
325 } 325 }
326 326
327 layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding)); 327 layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
328 sv1->addChild(AllDateBookEvents); 328 sv1->addChild(AllDateBookEvents);
329 AllDateBookEvents->show(); 329 AllDateBookEvents->show();
330} 330}
331 331
332 332
333void Today::getMail() { 333void Today::getMail() {
334 Config cfg("opiemail"); 334 Config cfg("opiemail");
335 cfg.setGroup("today"); 335 cfg.setGroup("today");
336 336
337 // how many lines should be showed in the task section 337 // how many lines should be showed in the task section
338 int NEW_MAILS = cfg.readNumEntry("newmails",0); 338 int NEW_MAILS = cfg.readNumEntry("newmails",0);
339 int OUTGOING = cfg.readNumEntry("outgoing",0); 339 int OUTGOING = cfg.readNumEntry("outgoing",0);
340 340
341 QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING); 341 QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
342 342
343 MailField->setText(output); 343 MailField->setText(output);
344} 344}
345 345
346 346
347/* 347/*
348 * Get the todos 348 * Get the todos
349 */ 349 */
350void Today::getTodo() { 350void Today::getTodo() {
351 351
352 QString output; 352 QString output;
353 QString tmpout; 353 QString tmpout;
354 int count = 0; 354 int count = 0;
355 int ammount = 0; 355 int ammount = 0;
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index c0b8d34..dfcc34e 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -1,58 +1,57 @@
1/* 1/*
2 * todaybase.cpp * 2 * todaybase.cpp *
3 * --------------------- 3 * ---------------------
4 * 4 *
5 * begin : Sun 10 17:20:00 CEST 2002 5 * begin : Sun 10 17:20:00 CEST 2002
6 * copyright : (c) 2002 by Maximilian Reiß 6 * copyright : (c) 2002 by Maximilian Reiß
7 * email : max.reiss@gmx.de 7 * email : max.reiss@gmx.de
8 * 8 *
9 */ 9 */
10/*************************************************************************** 10/***************************************************************************
11 * * 11 * *
12 * This program is free software; you can redistribute it and/or modify * 12 * This program is free software; you can redistribute it and/or modify *
13 * it under the terms of the GNU General Public License as published by * 13 * it under the terms of the GNU General Public License as published by *
14 * the Free Software Foundation; either version 2 of the License, or * 14 * the Free Software Foundation; either version 2 of the License, or *
15 * (at your option) any later version. * 15 * (at your option) any later version. *
16 * * 16 * *
17 ***************************************************************************/ 17 ***************************************************************************/
18 18
19#include "todaybase.h" 19#include "todaybase.h"
20 20
21#include <qframe.h> 21#include <qframe.h>
22#include <qlabel.h> 22#include <qlabel.h>
23#include <qpushbutton.h> 23#include <qpushbutton.h>
24#include <qlayout.h> 24#include <qlayout.h>
25#include <qvariant.h> 25#include <qvariant.h>
26#include <qtooltip.h>
27#include <qwhatsthis.h> 26#include <qwhatsthis.h>
28#include <qimage.h> 27#include <qimage.h>
29#include <qpixmap.h> 28#include <qpixmap.h>
30#include <qscrollview.h> 29#include <qscrollview.h>
31#include <qvbox.h> 30#include <qvbox.h>
32#include <qapplication.h> 31#include <qapplication.h>
33 32
34#include <qpe/resource.h> 33#include <qpe/resource.h>
35 34
36/* 35/*
37 * Constructs a TodayBase which is a child of 'parent', with the 36 * Constructs a TodayBase which is a child of 'parent', with the
38 * name 'name' and widget flags set to 'f' 37 * name 'name' and widget flags set to 'f'
39 */ 38 */
40TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) 39TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
41 : QWidget( parent, name, fl ) 40 : QWidget( parent, name, fl )
42{ 41{
43 QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo 42 QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
44 QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook 43 QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook
45 QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo 44 QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo
46 QPixmap config = Resource::loadPixmap( "today/config" ); // config icon 45 QPixmap config = Resource::loadPixmap( "today/config" ); // config icon
47 QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon 46 QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon
48 47
49 QPalette pal = this->palette(); 48 QPalette pal = this->palette();
50 QColor col = pal.color(QPalette::Active, QColorGroup::Background); 49 QColor col = pal.color(QPalette::Active, QColorGroup::Background);
51 pal.setColor(QPalette::Active, QColorGroup::Button, col); 50 pal.setColor(QPalette::Active, QColorGroup::Button, col);
52 this->setPalette(pal); 51 this->setPalette(pal);
53 52
54 53
55 QWidget *d = QApplication::desktop(); 54 QWidget *d = QApplication::desktop();
56 int w=d->width(); 55 int w=d->width();
57 int h=d->height(); 56 int h=d->height();
58 resize( w , h ); 57 resize( w , h );
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 7c690a7..a908d98 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -1,51 +1,50 @@
1/**************************************************************************** 1/****************************************************************************
2** Form implementation generated from reading ui file 'todayconfig.ui' 2** Form implementation generated from reading ui file 'todayconfig.ui'
3** 3**
4** Created: Thu Feb 14 15:04:33 2002 4** Created: Thu Feb 14 15:04:33 2002
5** by: The User Interface Compiler (uic) 5** by: The User Interface Compiler (uic)
6** 6**
7** WARNING! All changes made in this file will be lost! 7** WARNING! All changes made in this file will be lost!
8****************************************************************************/ 8****************************************************************************/
9#include "todayconfig.h" 9#include "todayconfig.h"
10 10
11#include <qcheckbox.h> 11#include <qcheckbox.h>
12#include <qframe.h> 12#include <qframe.h>
13#include <qlabel.h> 13#include <qlabel.h>
14#include <qspinbox.h> 14#include <qspinbox.h>
15#include <qtabwidget.h> 15#include <qtabwidget.h>
16#include <qwidget.h> 16#include <qwidget.h>
17#include <qlayout.h> 17#include <qlayout.h>
18#include <qvariant.h> 18#include <qvariant.h>
19#include <qtooltip.h>
20#include <qwhatsthis.h> 19#include <qwhatsthis.h>
21 20
22/* 21/*
23 * Constructs a todayconfig which is a child of 'parent', with the 22 * Constructs a todayconfig which is a child of 'parent', with the
24 * name 'name' and widget flags set to 'f' 23 * name 'name' and widget flags set to 'f'
25 * 24 *
26 * The dialog will by default be modeless, unless you set 'modal' to 25 * The dialog will by default be modeless, unless you set 'modal' to
27 * TRUE to construct a modal dialog. 26 * TRUE to construct a modal dialog.
28 */ 27 */
29todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags fl ) 28todayconfig::todayconfig( QWidget* parent, const char* name, bool modal, WFlags fl )
30 : QDialog( parent, name, modal, fl ) 29 : QDialog( parent, name, modal, fl )
31{ 30{
32 if ( !name ) 31 if ( !name )
33 setName( "todayconfig" ); 32 setName( "todayconfig" );
34 resize( 175, 232 ); 33 resize( 175, 232 );
35 setCaption( tr( "Today config" ) ); 34 setCaption( tr( "Today config" ) );
36 35
37 TabWidget3 = new QTabWidget( this, "TabWidget3" ); 36 TabWidget3 = new QTabWidget( this, "TabWidget3" );
38 TabWidget3->setGeometry( QRect( 0, 0, 220, 320 ) ); 37 TabWidget3->setGeometry( QRect( 0, 0, 220, 320 ) );
39 TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) ); 38 TabWidget3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, TabWidget3->sizePolicy().hasHeightForWidth() ) );
40 TabWidget3->setAutoMask( FALSE ); 39 TabWidget3->setAutoMask( FALSE );
41 TabWidget3->setTabShape( QTabWidget::Rounded ); 40 TabWidget3->setTabShape( QTabWidget::Rounded );
42 41
43 tab = new QWidget( TabWidget3, "tab" ); 42 tab = new QWidget( TabWidget3, "tab" );
44 43
45 Frame8 = new QFrame( tab, "Frame8" ); 44 Frame8 = new QFrame( tab, "Frame8" );
46 Frame8->setGeometry( QRect( -5, 0, 200, 300 ) ); 45 Frame8->setGeometry( QRect( -5, 0, 200, 300 ) );
47 Frame8->setFrameShape( QFrame::StyledPanel ); 46 Frame8->setFrameShape( QFrame::StyledPanel );
48 Frame8->setFrameShadow( QFrame::Raised ); 47 Frame8->setFrameShadow( QFrame::Raised );
49 48
50 TextLabel4 = new QLabel( Frame8, "TextLabel4" ); 49 TextLabel4 = new QLabel( Frame8, "TextLabel4" );
51 TextLabel4->setGeometry( QRect( 20, 65, 100, 60 ) ); 50 TextLabel4->setGeometry( QRect( 20, 65, 100, 60 ) );