summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp4
-rw-r--r--core/pim/today/todaybase.cpp27
2 files changed, 21 insertions, 10 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 0ab7a2a..01d1a13 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -131,7 +131,7 @@ void Today::autoStart() {
131 Config cfg("today"); 131 Config cfg("today");
132 cfg.setGroup("Autostart"); 132 cfg.setGroup("Autostart");
133 int AUTOSTART = cfg.readNumEntry("autostart",1); 133 int AUTOSTART = cfg.readNumEntry("autostart",1);
134 qDebug(QString("%1").arg(AUTOSTART)); 134// qDebug(QString("%1").arg(AUTOSTART));
135 if (AUTOSTART) { 135 if (AUTOSTART) {
136 QCopEnvelope e("QPE/System", "autoStart(QString, QString, QString)"); 136 QCopEnvelope e("QPE/System", "autoStart(QString, QString, QString)");
137 e << QString("add"); 137 e << QString("add");
@@ -479,6 +479,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
479 //QTime time = QTime::currentTime(); 479 //QTime time = QTime::currentTime();
480 480
481 Config config( "qpe" ); 481 Config config( "qpe" );
482 config.setGroup( "Time" );
482 // if 24 h format 483 // if 24 h format
483 ampm = config.readBoolEntry( "AMPM", TRUE ); 484 ampm = config.readBoolEntry( "AMPM", TRUE );
484 485
@@ -545,6 +546,7 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
545 QTime time = QTime::currentTime(); 546 QTime time = QTime::currentTime();
546 547
547 Config config( "qpe" ); 548 Config config( "qpe" );
549 config.setGroup( "Time" );
548 // if 24 h format 550 // if 24 h format
549 ampm = config.readBoolEntry( "AMPM", TRUE ); 551 ampm = config.readBoolEntry( "AMPM", TRUE );
550 552
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index ae8763b..c6ea11f 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -44,15 +44,7 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
44 QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo 44 QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo
45 QPixmap config = Resource::loadPixmap( "today/config" ); // config icon 45 QPixmap config = Resource::loadPixmap( "today/config" ); // config icon
46 QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon 46 QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon
47 47 QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla
48 //QPalette pal = this->palette();
49 // QColor col = pal.color(QPalette::Active, QColorGroup::Background);
50 //pal.setColor(QPalette::Active, QColorGroup::Button, col);
51 //pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
52 //pal.setColor(QPalette::Normal, QColorGroup::Button, col);
53 //pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
54 //this->setPalette(pal);
55
56 48
57 QWidget *d = QApplication::desktop(); 49 QWidget *d = QApplication::desktop();
58 int w=d->width(); 50 int w=d->width();
@@ -79,6 +71,23 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
79 Frame->setLineWidth( 0 ); 71 Frame->setLineWidth( 0 );
80 Frame->setMaximumHeight(50); 72 Frame->setMaximumHeight(50);
81 Frame->setMinimumHeight(50); 73 Frame->setMinimumHeight(50);
74
75 // Today text
76 QLabel* TodayLabel = new QLabel( Frame, "TodayText" );
77 TodayLabel->setGeometry( QRect( 10, 0, 168, 40 ) );
78 QFont TodayLabel_font( TodayLabel->font() );
79 TodayLabel_font.setBold( TRUE );
80 TodayLabel_font.setPointSize(40);
81 TodayLabel->setFont( TodayLabel_font );
82 TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin );
83 TodayLabel->setText("<font color=#FFFFFF>" + tr("Today") +"</font>");
84
85 // Opiezilla
86 QLabel* Opiezilla = new QLabel( Frame, "OpieZilla");
87 Opiezilla->setPixmap( opiezilla );
88 Opiezilla->setGeometry( this->width()-50 ,1, 45, 47);
89 Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
90
82 // date 91 // date
83 TextLabel1 = new QLabel( Frame, "TextLabel1" ); 92 TextLabel1 = new QLabel( Frame, "TextLabel1" );
84 TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) ); 93 TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) );