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!

8 files changed, 63 insertions, 31 deletions

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklst.cpp b/core/pim/datebook/modules/weeklst/datebookweeklst.cpp
index b36bf6d..59f937f 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklst.cpp
+++ b/core/pim/datebook/modules/weeklst/datebookweeklst.cpp
@@ -7,12 +7,13 @@
 #include "datebook.h"
 
 #include <opie2/odebug.h>
 
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 
 #include <qlayout.h>
 #include <qtoolbutton.h>
 
 using namespace Opie::Ui;
 
@@ -65,13 +66,15 @@ void DateBookWeekLst::setDbl(bool on) {
     }
     if (!displayed||dbl) {
         getEvents();
     }
 }
 
-void DateBookWeekLst::redraw() {getEvents();}
+void DateBookWeekLst::redraw() {
+    getEvents();
+}
 
 QDate DateBookWeekLst::date() {
     return bdate;
 }
 
 // return the date at the beginning of the week...
@@ -103,36 +106,42 @@ void DateBookWeekLst::getEvents() {
         start2 = start.addDays(7);
         stop = start2.addDays(6);
         el2 = db->getEffectiveEvents(start2, stop);
     }
     if (!m_CurrentView) {
         if (dbl) {
-            m_CurrentView=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
+            m_CurrentView=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,ampm,scroll);
         } else {
-            m_CurrentView=new DateBookWeekLstDblView(el,start,bStartOnMonday,scroll);
+            m_CurrentView=new DateBookWeekLstDblView(el,start,bStartOnMonday,ampm,scroll);
         }
         m_CurrentView->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
         connect (m_CurrentView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
         connect (m_CurrentView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
         connect (m_CurrentView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
         connect (m_CurrentView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));
         connect (m_CurrentView, SIGNAL(redraw()), this, SLOT(redraw()));
         connect (m_CurrentView, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
         connect (m_CurrentView, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
             this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
+        connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool)));
         scroll->addChild(m_CurrentView);
     } else {
         if (dbl) {
             m_CurrentView->setEvents(el,el2,start,bStartOnMonday);
         } else {
             m_CurrentView->setEvents(el,start,bStartOnMonday);
         }
     }
     scroll->updateScrollBars();
 }
 
+void DateBookWeekLst::slotClockChanged( bool ap ) {
+    ampm = ap;
+    getEvents();
+}
+
 void DateBookWeekLst::dateChanged(QDate &newdate) {
     dateset = true;
     bdate=newdate;
     odebug << "Date changed " << oendl;
     getEvents();
 }
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklst.h b/core/pim/datebook/modules/weeklst/datebookweeklst.h
index 505810b..53bed05 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklst.h
+++ b/core/pim/datebook/modules/weeklst/datebookweeklst.h
@@ -32,12 +32,13 @@ public:
 public slots:
     void redraw();
     void dateChanged(QDate &date);
 
 protected slots:
     void keyPressEvent(QKeyEvent *);
+    void slotClockChanged(bool);
     void setDbl(bool on);
 
 signals:
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
     const QString &str, const QString &location);
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
index 6389822..5182df1 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp
@@ -2,29 +2,29 @@
 #include "datebookweeklstview.h"

 

 #include <qlayout.h>

 

 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

                            QValueList<EffectiveEvent> &ev2,

-                           QDate &d, bool onM,

+                           QDate &d, bool onM, bool showAmPm,

                            QWidget* parent,

                            const char* name, WFlags fl)

-    : QWidget( parent, name, fl )

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

 {

     m_MainLayout = new QHBoxLayout( this );

 

     leftView = 0;

     rightView = 0;

     setEvents(ev1,ev2,d,onM);

 }

 

 DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

-                           QDate &d, bool onM,

+                           QDate &d, bool onM, bool showAmPm,

                            QWidget* parent,

                            const char* name, WFlags fl)

-    : QWidget( parent, name, fl )

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

 {

     m_MainLayout = new QHBoxLayout( this );

 

     leftView = 0;

     rightView = 0;

     setEvents(ev1,d,onM);

@@ -32,13 +32,13 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 

 /* setting the variant with both views */

 void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueList<EffectiveEvent> &ev2,QDate &d, bool onM)

 {

     setUpdatesEnabled(false);

     if (!leftView) {

-        leftView=new DateBookWeekLstView(ev1,d,onM,this);

+        leftView=new DateBookWeekLstView(ev1, d, onM, ampm, this);

         m_MainLayout->addWidget(leftView);

         connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (leftView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (leftView, SIGNAL(redraw()), this, SIGNAL(redraw()));

@@ -49,13 +49,13 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
     } else {

         leftView->hide();

         leftView->setEvents(ev1,d,onM);

     }

 

     if (!rightView) {

-        rightView=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);

+        rightView=new DateBookWeekLstView(ev2, d.addDays(7), onM, ampm, this);

         m_MainLayout->addWidget(rightView);

         connect (rightView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (rightView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (rightView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (rightView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (rightView, SIGNAL(redraw()), this, SIGNAL(redraw()));

@@ -72,13 +72,13 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
     setUpdatesEnabled(true);

 }

 

 void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM)

 {

     if (!leftView) {

-        leftView=new DateBookWeekLstView(ev1,d,onM,this);

+        leftView=new DateBookWeekLstView(ev1, d, onM, ampm, this);

         m_MainLayout->addWidget(leftView);

         connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (leftView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (leftView, SIGNAL(redraw()), this, SIGNAL(redraw()));

@@ -96,13 +96,13 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d,
     }

 }

 

 void DateBookWeekLstDblView::setRightEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM)

 {

     if (!rightView) {

-        rightView=new DateBookWeekLstView(ev1,d,onM,this);

+        rightView=new DateBookWeekLstView(ev1, d, onM, ampm, this);

         m_MainLayout->addWidget(rightView);

         connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

         connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

         connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

         connect (leftView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

         connect (leftView, SIGNAL(redraw()), this, SIGNAL(redraw()));

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h
index 808556e..9eb17e0 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstdblview.h
@@ -13,17 +13,17 @@ class QHBoxLayout;
 

 class DateBookWeekLstDblView: public QWidget {

         Q_OBJECT

 public:

     DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

                QValueList<EffectiveEvent> &ev2,

-               QDate &d, bool onM,

+               QDate &d, bool onM, bool showAmPm,

                QWidget* parent = 0, const char* name = 0,

                WFlags fl = 0 );

     DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,

-               QDate &d, bool onM,

+               QDate &d, bool onM, bool showAmPm,

                QWidget* parent = 0, const char* name = 0,

                WFlags fl = 0 );

     virtual ~DateBookWeekLstDblView();

     void setEvents(QValueList<EffectiveEvent> &ev1,QValueList<EffectiveEvent> &ev2,QDate &d, bool onM);

     void setEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM);

     void setRightEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM);

@@ -40,9 +40,10 @@ signals:
     void addEvent(const QDateTime &start, const QDateTime &stop,

           const QString &str, const QString &location);

 

 protected:

     QHBoxLayout*m_MainLayout;

     DateBookWeekLstView *leftView,*rightView;

+    bool ampm;

 };

 

 #endif

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp
index 797f766..881e8f1 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp
@@ -5,32 +5,45 @@
 

 #include <qpe/ir.h>

 

 #include <qstring.h>

 #include <qpopupmenu.h>

 

-DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,

+DateBookWeekLstEvent::DateBookWeekLstEvent(bool ap, const EffectiveEvent &ev,
                         int weeklistviewconfig,

                         QWidget* parent,

                         const char* name,

-                        WFlags fl ) : OClickableLabel(parent,name,fl), event(ev)

+                        WFlags fl ) : OClickableLabel(parent,name,fl), event(ev), ampm(ap)
 {

     // old values... lastday = "__|__", middle="   |---", Firstday="00:00",

     QString s,start,middle,end,day;

 

     odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl;

-    if(weeklistviewconfig==NONE) {  // No times displayed.

-//      start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());

-//      middle.sprintf("<--->");

-//      end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());

-//      day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());

-    } else if(weeklistviewconfig==NORMAL) { // "Normal", only display start time.

+    if(weeklistviewconfig==NORMAL) { // "Normal", only display start time.
+        if ( ampm ) {
+            int shour = ev.start().hour();
+            int smin = ev.start().minute();
+            if ( shour >= 12 ) {
+                if ( shour > 12 ) {
+                    shour -= 12;
+                }
+                start.sprintf( "%.2d:%.2d PM", shour, smin );
+                day.sprintf("%.2d:%.2d PM",shour,smin);
+            } else {
+                if ( shour == 0 ) {
+                    shour = 12;
+                }
+             start.sprintf( "%.2d:%.2d AM", shour, smin );
+             day.sprintf("%.2d:%.2d AM",shour,smin);
+            }
+        } else {
         start.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());

+            day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
+        }
         middle.sprintf("   |---");

         end.sprintf("__|__");

-        day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());

     } else if(weeklistviewconfig==EXTENDED) { // Extended mode, display start and end times.

         start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());

         middle.sprintf("<--->");

         end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());

         day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());

     }

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstevent.h b/core/pim/datebook/modules/weeklst/datebookweeklstevent.h
index 77f6283..1e3cd5d 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklstevent.h
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstevent.h
@@ -6,13 +6,13 @@
 #include <qpe/event.h>

 

 class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel

 {

   Q_OBJECT

 public:

-    DateBookWeekLstEvent(const EffectiveEvent &ev, int weeklistviewconfig =1,

+    DateBookWeekLstEvent(bool ampm, const EffectiveEvent &ev, int weeklistviewconfig =1,

              QWidget* parent = 0, const char* name = 0,

              WFlags fl = 0);

 signals:

     void editEvent(const Event &e);

     void duplicateEvent(const Event &e);

     void removeEvent(const Event &e);

@@ -25,10 +25,11 @@ private slots:
     void beamMe();

 private:

     const EffectiveEvent event;

     QPopupMenu* popmenue;

 protected:

     void mousePressEvent( QMouseEvent *e );

+    bool ampm;

 };

 

 

 #endif

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
@@ -4,21 +4,22 @@
 #include "datebookweeklstheader.h"

 #include "datebookweeklstevent.h"

 

 #include <opie2/odebug.h>

 

 #include <qpe/config.h>

+#include <qpe/qpeapplication.h>

 

 #include <qlayout.h>

 #include <qtl.h>

 

 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)

 {

     childs.clear();

     m_MainLayout = new QVBoxLayout( this );

     setEvents(ev,d,onM);

 }

 

@@ -68,36 +69,37 @@ void DateBookWeekLstView::setEvents(QValueList<EffectiveEvent> &ev, const QDate
     // Header

         DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,w);

         connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));

         connect(hdr, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),

             this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));

         tlayout->addWidget(hdr);

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

 

         // Events

         while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {

             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);

                 connect (l, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));

                 connect (l, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));

                 connect (l, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));

                 connect (l, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &)));

                 connect (l, SIGNAL(redraw()), this, SIGNAL(redraw()));

             }

             it++;

         }

         tlayout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));

         m_MainLayout->addWidget(w);

-/*

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

-        m_MainLayout->addItem(tmp);

-*/

     }

     setUpdatesEnabled(true);

 }

 

+void DateBookWeekLstView::slotClockChanged( bool ap ) {

+    ampm = ap;

+}

+

 DateBookWeekLstView::~DateBookWeekLstView()

 {}

 

 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e)

 {

     e->ignore();

diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstview.h b/core/pim/datebook/modules/weeklst/datebookweeklstview.h
index 3d47842..900101d 100644
--- a/core/pim/datebook/modules/weeklst/datebookweeklstview.h
+++ b/core/pim/datebook/modules/weeklst/datebookweeklstview.h
@@ -12,13 +12,15 @@ class QKeyEvent;
 class QVBoxLayout;

 

 class DateBookWeekLstView: public QWidget

 {

     Q_OBJECT

 public:

-    DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM, QWidget* parent = 0, const char* name = 0,

+    DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d,

+                        bool onM, bool showAmPm, QWidget* parent = 0,

+                        const char* name = 0,

             WFlags fl = 0 );

     ~DateBookWeekLstView();

 

     void setEvents(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM);

 

 signals:

@@ -27,17 +29,20 @@ signals:
     void removeEvent(const Event &e);

     void beamEvent(const Event &e);

     void redraw();

     void showDate(int y, int m, int d);

     void addEvent(const QDateTime &start, const QDateTime &stop,

     const QString &str, const QString &location);

+

 protected:

     bool bStartOnMonday;

+    bool ampm;

     QValueList<QObject*> childs;

 

     QVBoxLayout*m_MainLayout;

 

 protected slots:

     void keyPressEvent(QKeyEvent *);

+    void slotClockChanged( bool ap );

 };

 

 #endif