summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-04-27 17:06:35 (UTC)
committer harlekin <harlekin>2002-04-27 17:06:35 (UTC)
commit32f808191e255c82044f281f6032f336b75f2fc6 (patch) (unidiff)
tree26edc161e8c646325eef15a4b50a14baad6594c4
parent0fb2ea5d51271cfad323b69c4c191c946f45a5a0 (diff)
downloadopie-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 .-)
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
@@ -128,13 +128,13 @@ void Today::setOwnerField(QString &message) {
128 * If registered against that today ist started on each resume. 128 * If registered against that today ist started on each resume.
129 */ 129 */
130void Today::autoStart() { 130void 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");
138 e << QString("today"); 138 e << QString("today");
139 e << AUTOSTART_TIMER; 139 e << AUTOSTART_TIMER;
140 } else { 140 } else {
@@ -476,12 +476,13 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
476 ClickableLabel(parent,name,fl), event(ev) { 476 ClickableLabel(parent,name,fl), event(ev) {
477 477
478 QString msg; 478 QString msg;
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
485 486
486 if (!ONLY_LATER) { 487 if (!ONLY_LATER) {
487 msg += "<B>" + (ev).description() + "</B>"; 488 msg += "<B>" + (ev).description() + "</B>";
@@ -542,12 +543,13 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
542 ClickableLabel(parent,name,fl), event(ev) { 543 ClickableLabel(parent,name,fl), event(ev) {
543 544
544 QString msg; 545 QString msg;
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
551 553
552 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { 554 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
553 // show only later appointments 555 // 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 )
41{ 41{
42 QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo 42 QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo
43 QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook 43 QPixmap datebook = Resource::loadPixmap("DateBook"); // datebook
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();
59 int h=d->height(); 51 int h=d->height();
60 resize( w , h ); 52 resize( w , h );
61 53
@@ -76,12 +68,29 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
76 Frame->setPalette( pal2 ); 68 Frame->setPalette( pal2 );
77 Frame->setFrameShape( QFrame::StyledPanel ); 69 Frame->setFrameShape( QFrame::StyledPanel );
78 Frame->setFrameShadow( QFrame::Raised ); 70 Frame->setFrameShadow( QFrame::Raised );
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 ) );
85 QFont TextLabel1_font( TextLabel1->font() ); 94 QFont TextLabel1_font( TextLabel1->font() );
86 TextLabel1_font.setBold( TRUE ); 95 TextLabel1_font.setBold( TRUE );
87 TextLabel1->setFont( TextLabel1_font ); 96 TextLabel1->setFont( TextLabel1_font );