summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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() {
Config cfg("today");
cfg.setGroup("Autostart");
int AUTOSTART = cfg.readNumEntry("autostart",1);
- qDebug(QString("%1").arg(AUTOSTART));
+// qDebug(QString("%1").arg(AUTOSTART));
if (AUTOSTART) {
QCopEnvelope e("QPE/System", "autoStart(QString, QString, QString)");
e << QString("add");
@@ -479,6 +479,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
//QTime time = QTime::currentTime();
Config config( "qpe" );
+ config.setGroup( "Time" );
// if 24 h format
ampm = config.readBoolEntry( "AMPM", TRUE );
@@ -545,6 +546,7 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
QTime time = QTime::currentTime();
Config config( "qpe" );
+ config.setGroup( "Time" );
// if 24 h format
ampm = config.readBoolEntry( "AMPM", TRUE );
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 )
QPixmap todo = Resource::loadPixmap( "TodoList" ); // todo
QPixmap config = Resource::loadPixmap( "today/config" ); // config icon
QPixmap mail = Resource::loadPixmap( "today/mail" ); // mail icon
-
- //QPalette pal = this->palette();
- // QColor col = pal.color(QPalette::Active, QColorGroup::Background);
- //pal.setColor(QPalette::Active, QColorGroup::Button, col);
- //pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
- //pal.setColor(QPalette::Normal, QColorGroup::Button, col);
- //pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
- //this->setPalette(pal);
-
+ QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla
QWidget *d = QApplication::desktop();
int w=d->width();
@@ -79,6 +71,23 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
Frame->setLineWidth( 0 );
Frame->setMaximumHeight(50);
Frame->setMinimumHeight(50);
+
+ // Today text
+ QLabel* TodayLabel = new QLabel( Frame, "TodayText" );
+ TodayLabel->setGeometry( QRect( 10, 0, 168, 40 ) );
+ QFont TodayLabel_font( TodayLabel->font() );
+ TodayLabel_font.setBold( TRUE );
+ TodayLabel_font.setPointSize(40);
+ TodayLabel->setFont( TodayLabel_font );
+ TodayLabel->setBackgroundOrigin( QLabel::ParentOrigin );
+ TodayLabel->setText("<font color=#FFFFFF>" + tr("Today") +"</font>");
+
+ // Opiezilla
+ QLabel* Opiezilla = new QLabel( Frame, "OpieZilla");
+ Opiezilla->setPixmap( opiezilla );
+ Opiezilla->setGeometry( this->width()-50 ,1, 45, 47);
+ Opiezilla->setBackgroundOrigin( QLabel::ParentOrigin );
+
// date
TextLabel1 = new QLabel( Frame, "TextLabel1" );
TextLabel1->setGeometry( QRect( 10, 35, 168, 12 ) );