Fix for bug 1844. The display of 12hour (AM/PM) time was broken. It was

because the views never bother to check.

This fix incorporates the patch submitted by harlekin. Thanks!

1 files changed, 9 insertions, 7 deletions

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstview.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstview.cpp
index 82b9c6d..469a60a 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklstview.cpp
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstview.cpp
@@ -9,2 +9,3 @@
 #include <qpe/config.h>

+#include <qpe/qpeapplication.h>

 

@@ -14,6 +15,6 @@
 DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,

-                     const QDate &d, bool onM,

+                     const QDate &d, bool onM, bool showAmPm,

                      QWidget* parent,

                      const char* name, WFlags fl)

-    : QWidget( parent, name, fl )

+    : QWidget( parent, name, fl ), ampm(showAmPm)

 {

@@ -73,2 +74,3 @@ void DateBookWeekLstView::setEvents(QValueList<EffectiveEvent> &ev, const QDate
         tlayout->addWidget(hdr);

+        connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool)));

 

@@ -77,3 +79,3 @@ void DateBookWeekLstView::setEvents(QValueList<EffectiveEvent> &ev, const QDate
             if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {  // Skip events ending at 00:00 starting at another day.

-                DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,w);

+                DateBookWeekLstEvent *l=new DateBookWeekLstEvent(ampm,*it,weeklistviewconfig,w);

                 tlayout->addWidget(l);

@@ -89,6 +91,2 @@ void DateBookWeekLstView::setEvents(QValueList<EffectiveEvent> &ev, const QDate
         m_MainLayout->addWidget(w);

-/*

-        QSpacerItem * tmp = new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding);

-        m_MainLayout->addItem(tmp);

-*/

     }

@@ -97,2 +95,6 @@ void DateBookWeekLstView::setEvents(QValueList<EffectiveEvent> &ev, const QDate
 

+void DateBookWeekLstView::slotClockChanged( bool ap ) {

+    ampm = ap;

+}

+

 DateBookWeekLstView::~DateBookWeekLstView()