From 34975323367e4a903886cd317b34192f1271a1f2 Mon Sep 17 00:00:00 2001
From: erik <erik>
Date: Mon, 23 Apr 2007 20:46:34 +0000
Subject: 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!
---
(limited to 'core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp')

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
@@ -5,10 +5,10 @@
 
 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 );
 
@@ -18,10 +18,10 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 }
 
 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 );
 
@@ -35,7 +35,7 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
 {
     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 &)));
@@ -52,7 +52,7 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
     }
 
     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 &)));
@@ -75,7 +75,7 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
 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 &)));
@@ -99,7 +99,7 @@ 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 &)));
--
cgit v0.9.0.2