-rw-r--r-- | core/pim/today/TODO | 2 | ||||
-rw-r--r-- | core/pim/today/changelog | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 62 | ||||
-rw-r--r-- | core/pim/today/today.h | 4 | ||||
-rw-r--r-- | core/pim/today/todaybase.cpp | 24 |
5 files changed, 74 insertions, 20 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO index 48e8d20..6acbf5a 100644 --- a/core/pim/today/TODO +++ b/core/pim/today/TODO @@ -4,4 +4,2 @@ TODO for today: -* add am/pm mode instead of 24 h, take system default - * qcop integration for updating events? diff --git a/core/pim/today/changelog b/core/pim/today/changelog index b3da1fb..f04ff78 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog @@ -1 +1,3 @@ +* am/pm time optinal (autodetect) + 0.3.1 diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 7cef035..028947d 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -77,2 +77,4 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) + + db = NULL; @@ -446,4 +448,2 @@ Today::~Today() { - - /* @@ -462,2 +462,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, + Config config( "qpe" ); + // if 24 h format + ampm = config.readBoolEntry( "AMPM", TRUE ); + + if (!ONLY_LATER) { @@ -476,5 +481,5 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, // start time of event - msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) ) + msg += "<br>" + ampmTime(QTime((ev).event().start().time()) ); // end time of event - + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) ); + + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) ); } @@ -492,2 +497,22 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, +QString DateBookEvent::ampmTime(QTime tm) { + + QString s; + if( ampm ) { + int hour = tm.hour(); + if (hour == 0) + hour = 12; + if (hour > 12) + hour -= 12; + s.sprintf( "%2d:%02d %s", hour, tm.minute(), + (tm.hour() >= 12) ? "PM" : "AM" ); + return s; + } else { + s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); + return s; + } + +} + + DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, @@ -503,2 +528,7 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, + Config config( "qpe" ); + // if 24 h format + ampm = config.readBoolEntry( "AMPM", TRUE ); + + if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { @@ -518,5 +548,5 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, // start time of event - msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) ) + msg += "<br>" + ampmTime(QTime((ev).event().start().time()) ) // end time of event - + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) ); + + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) ); } @@ -534,2 +564,22 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, +QString DateBookEventLater::ampmTime(QTime tm) { + + QString s; + if( ampm ) { + int hour = tm.hour(); + if (hour == 0) + hour = 12; + if (hour > 12) + hour -= 12; + s.sprintf( "%2d:%02d %s", hour, tm.minute(), + (tm.hour() >= 12) ? "PM" : "AM" ); + return s; + } else { + s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); + return s; + } + +} + + void DateBookEvent::editMe() { diff --git a/core/pim/today/today.h b/core/pim/today/today.h index 090e8f9..d265d67 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h @@ -90,3 +90,5 @@ private slots: private: + QString ampmTime(QTime); const EffectiveEvent event; + bool ampm; }; @@ -107,3 +109,5 @@ private slots: private: + QString ampmTime(QTime); const EffectiveEvent event; + bool ampm; }; diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index 755c860..ae8763b 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp @@ -47,9 +47,9 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) - 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); + //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); @@ -97,3 +97,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) Frame4 = new QFrame( this, "Frame4" ); - Frame4->setPalette( pal ); +// Frame4->setPalette( pal ); Frame4->setFrameShape( QScrollView::StyledPanel ); @@ -114,3 +114,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) DatesButton->setBackgroundOrigin( QPushButton::WidgetOrigin ); - DatesButton->setPalette( pal ); +// DatesButton->setPalette( pal ); DatesButton->setPixmap( datebook ); @@ -130,3 +130,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) MailButton->setGeometry( QRect( 2, 3, 36, 19 ) ); - MailButton->setPalette( pal ); +// MailButton->setPalette( pal ); MailButton->setPixmap( mail ); @@ -152,3 +152,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) TodoButton->setGeometry( QRect( 2, 4, 36, 32 ) ); - TodoButton->setPalette( pal ); +// TodoButton->setPalette( pal ); TodoButton->setPixmap( todo ); @@ -171,3 +171,3 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl ) PushButton1->setPixmap( config ); - PushButton1->setPalette( pal ); +// PushButton1->setPalette( pal ); PushButton1->setAutoDefault( TRUE ); |