author | harlekin <harlekin> | 2002-04-27 17:06:35 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-04-27 17:06:35 (UTC) |
commit | 32f808191e255c82044f281f6032f336b75f2fc6 (patch) (side-by-side diff) | |
tree | 26edc161e8c646325eef15a4b50a14baad6594c4 /core/pim | |
parent | 0fb2ea5d51271cfad323b69c4c191c946f45a5a0 (diff) | |
download | opie-32f808191e255c82044f281f6032f336b75f2fc6.zip opie-32f808191e255c82044f281f6032f336b75f2fc6.tar.gz opie-32f808191e255c82044f281f6032f336b75f2fc6.tar.bz2 |
fixes for the logo part, looks better now on screen > 240 pixel width. Also now all the i18n guys can finally translate the Today string .-)
-rw-r--r-- | core/pim/today/today.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 27 |
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 @@ -128,13 +128,13 @@ void Today::setOwnerField(QString &message) { * If registered against that today ist started on each resume. */ 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"); e << QString("today"); e << AUTOSTART_TIMER; } else { @@ -476,12 +476,13 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, ClickableLabel(parent,name,fl), event(ev) { QString msg; //QTime time = QTime::currentTime(); Config config( "qpe" ); + config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); if (!ONLY_LATER) { msg += "<B>" + (ev).description() + "</B>"; @@ -542,12 +543,13 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, ClickableLabel(parent,name,fl), event(ev) { QString msg; QTime time = QTime::currentTime(); Config config( "qpe" ); + config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { // show only later appointments 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 @@ -41,21 +41,13 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) { QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook 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(); int h=d->height(); resize( w , h ); @@ -76,12 +68,29 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) Frame->setPalette( pal2 ); Frame->setFrameShape( QFrame::StyledPanel ); Frame->setFrameShadow( QFrame::Raised ); 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 ) ); QFont TextLabel1_font( TextLabel1->font() ); TextLabel1_font.setBold( TRUE ); TextLabel1->setFont( TextLabel1_font ); |