author | erik <erik> | 2007-04-23 20:46:34 (UTC) |
---|---|---|
committer | erik <erik> | 2007-04-23 20:46:34 (UTC) |
commit | 34975323367e4a903886cd317b34192f1271a1f2 (patch) (unidiff) | |
tree | 8898d9010cdb89b371e0bccdbf717f87359d8513 /core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp | |
parent | d38e40fe9ee475230425fa83e924c49e5946b87c (diff) | |
download | opie-34975323367e4a903886cd317b34192f1271a1f2.zip opie-34975323367e4a903886cd317b34192f1271a1f2.tar.gz opie-34975323367e4a903886cd317b34192f1271a1f2.tar.bz2 |
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!
Diffstat (limited to 'core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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 @@ | |||
5 | 5 | ||
6 | DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, | 6 | DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, |
7 | QValueList<EffectiveEvent> &ev2, | 7 | QValueList<EffectiveEvent> &ev2, |
8 | QDate &d, bool onM, | 8 | QDate &d, bool onM, bool showAmPm, |
9 | QWidget* parent, | 9 | QWidget* parent, |
10 | const char* name, WFlags fl) | 10 | const char* name, WFlags fl) |
11 | : QWidget( parent, name, fl ) | 11 | : QWidget( parent, name, fl ), ampm( showAmPm ) |
12 | { | 12 | { |
13 | m_MainLayout = new QHBoxLayout( this ); | 13 | m_MainLayout = new QHBoxLayout( this ); |
14 | 14 | ||
@@ -18,10 +18,10 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, | |||
18 | } | 18 | } |
19 | 19 | ||
20 | DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, | 20 | DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, |
21 | QDate &d, bool onM, | 21 | QDate &d, bool onM, bool showAmPm, |
22 | QWidget* parent, | 22 | QWidget* parent, |
23 | const char* name, WFlags fl) | 23 | const char* name, WFlags fl) |
24 | : QWidget( parent, name, fl ) | 24 | : QWidget( parent, name, fl ), ampm( showAmPm ) |
25 | { | 25 | { |
26 | m_MainLayout = new QHBoxLayout( this ); | 26 | m_MainLayout = new QHBoxLayout( this ); |
27 | 27 | ||
@@ -35,7 +35,7 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis | |||
35 | { | 35 | { |
36 | setUpdatesEnabled(false); | 36 | setUpdatesEnabled(false); |
37 | if (!leftView) { | 37 | if (!leftView) { |
38 | leftView=new DateBookWeekLstView(ev1,d,onM,this); | 38 | leftView=new DateBookWeekLstView(ev1, d, onM, ampm, this); |
39 | m_MainLayout->addWidget(leftView); | 39 | m_MainLayout->addWidget(leftView); |
40 | connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); | 40 | connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); |
41 | connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); | 41 | connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); |
@@ -52,7 +52,7 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis | |||
52 | } | 52 | } |
53 | 53 | ||
54 | if (!rightView) { | 54 | if (!rightView) { |
55 | rightView=new DateBookWeekLstView(ev2,d.addDays(7),onM,this); | 55 | rightView=new DateBookWeekLstView(ev2, d.addDays(7), onM, ampm, this); |
56 | m_MainLayout->addWidget(rightView); | 56 | m_MainLayout->addWidget(rightView); |
57 | connect (rightView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); | 57 | connect (rightView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); |
58 | connect (rightView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); | 58 | connect (rightView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); |
@@ -75,7 +75,7 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis | |||
75 | void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM) | 75 | void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM) |
76 | { | 76 | { |
77 | if (!leftView) { | 77 | if (!leftView) { |
78 | leftView=new DateBookWeekLstView(ev1,d,onM,this); | 78 | leftView=new DateBookWeekLstView(ev1, d, onM, ampm, this); |
79 | m_MainLayout->addWidget(leftView); | 79 | m_MainLayout->addWidget(leftView); |
80 | connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); | 80 | connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); |
81 | connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); | 81 | connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); |
@@ -99,7 +99,7 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d, | |||
99 | void DateBookWeekLstDblView::setRightEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM) | 99 | void DateBookWeekLstDblView::setRightEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM) |
100 | { | 100 | { |
101 | if (!rightView) { | 101 | if (!rightView) { |
102 | rightView=new DateBookWeekLstView(ev1,d,onM,this); | 102 | rightView=new DateBookWeekLstView(ev1, d, onM, ampm, this); |
103 | m_MainLayout->addWidget(rightView); | 103 | m_MainLayout->addWidget(rightView); |
104 | connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); | 104 | connect (leftView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); |
105 | connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); | 105 | connect (leftView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); |