summaryrefslogtreecommitdiff
authorerik <erik>2007-04-23 20:46:34 (UTC)
committer erik <erik>2007-04-23 20:46:34 (UTC)
commit34975323367e4a903886cd317b34192f1271a1f2 (patch) (unidiff)
tree8898d9010cdb89b371e0bccdbf717f87359d8513
parentd38e40fe9ee475230425fa83e924c49e5946b87c (diff)
downloadopie-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 (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklst.cpp15
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklst.h1
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklstdblview.cpp16
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklstdblview.h5
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklstevent.cpp183
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklstevent.h3
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklstview.cpp18
-rw-r--r--core/pim/datebook/modules/weeklst/datebookweeklstview.h7
8 files changed, 140 insertions, 108 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
@@ -9,8 +9,9 @@
9#include <opie2/odebug.h> 9#include <opie2/odebug.h>
10 10
11#include <qpe/datebookmonth.h> 11#include <qpe/datebookmonth.h>
12#include <qpe/config.h> 12#include <qpe/config.h>
13#include <qpe/qpeapplication.h>
13 14
14#include <qlayout.h> 15#include <qlayout.h>
15#include <qtoolbutton.h> 16#include <qtoolbutton.h>
16 17
@@ -67,9 +68,11 @@ void DateBookWeekLst::setDbl(bool on) {
67 getEvents(); 68 getEvents();
68 } 69 }
69} 70}
70 71
71void DateBookWeekLst::redraw() {getEvents();} 72void DateBookWeekLst::redraw() {
73 getEvents();
74}
72 75
73QDate DateBookWeekLst::date() { 76QDate DateBookWeekLst::date() {
74 return bdate; 77 return bdate;
75} 78}
@@ -105,11 +108,11 @@ void DateBookWeekLst::getEvents() {
105 el2 = db->getEffectiveEvents(start2, stop); 108 el2 = db->getEffectiveEvents(start2, stop);
106 } 109 }
107 if (!m_CurrentView) { 110 if (!m_CurrentView) {
108 if (dbl) { 111 if (dbl) {
109 m_CurrentView=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll); 112 m_CurrentView=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,ampm,scroll);
110 } else { 113 } else {
111 m_CurrentView=new DateBookWeekLstDblView(el,start,bStartOnMonday,scroll); 114 m_CurrentView=new DateBookWeekLstDblView(el,start,bStartOnMonday,ampm,scroll);
112 } 115 }
113 m_CurrentView->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); 116 m_CurrentView->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
114 connect (m_CurrentView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); 117 connect (m_CurrentView, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
115 connect (m_CurrentView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); 118 connect (m_CurrentView, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
@@ -118,8 +121,9 @@ void DateBookWeekLst::getEvents() {
118 connect (m_CurrentView, SIGNAL(redraw()), this, SLOT(redraw())); 121 connect (m_CurrentView, SIGNAL(redraw()), this, SLOT(redraw()));
119 connect (m_CurrentView, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int))); 122 connect (m_CurrentView, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
120 connect (m_CurrentView, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)), 123 connect (m_CurrentView, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
121 this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&))); 124 this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
125 connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool)));
122 scroll->addChild(m_CurrentView); 126 scroll->addChild(m_CurrentView);
123 } else { 127 } else {
124 if (dbl) { 128 if (dbl) {
125 m_CurrentView->setEvents(el,el2,start,bStartOnMonday); 129 m_CurrentView->setEvents(el,el2,start,bStartOnMonday);
@@ -129,8 +133,13 @@ void DateBookWeekLst::getEvents() {
129 } 133 }
130 scroll->updateScrollBars(); 134 scroll->updateScrollBars();
131} 135}
132 136
137void DateBookWeekLst::slotClockChanged( bool ap ) {
138 ampm = ap;
139 getEvents();
140}
141
133void DateBookWeekLst::dateChanged(QDate &newdate) { 142void DateBookWeekLst::dateChanged(QDate &newdate) {
134 dateset = true; 143 dateset = true;
135 bdate=newdate; 144 bdate=newdate;
136 odebug << "Date changed " << oendl; 145 odebug << "Date changed " << oendl;
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
@@ -34,8 +34,9 @@ public slots:
34 void dateChanged(QDate &date); 34 void dateChanged(QDate &date);
35 35
36protected slots: 36protected slots:
37 void keyPressEvent(QKeyEvent *); 37 void keyPressEvent(QKeyEvent *);
38 void slotClockChanged(bool);
38 void setDbl(bool on); 39 void setDbl(bool on);
39 40
40signals: 41signals:
41 void showDate(int y, int m, int d); 42 void showDate(int y, int m, int d);
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
@@ -4,12 +4,12 @@
4#include <qlayout.h> 4#include <qlayout.h>
5 5
6DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, 6DateBookWeekLstDblView::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
15 leftView = 0; 15 leftView = 0;
@@ -17,12 +17,12 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
17 setEvents(ev1,ev2,d,onM); 17 setEvents(ev1,ev2,d,onM);
18} 18}
19 19
20DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, 20DateBookWeekLstDblView::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
28 leftView = 0; 28 leftView = 0;
@@ -34,9 +34,9 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
34void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueList<EffectiveEvent> &ev2,QDate &d, bool onM) 34void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueList<EffectiveEvent> &ev2,QDate &d, bool onM)
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 &)));
42 connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); 42 connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
@@ -51,9 +51,9 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
51 leftView->setEvents(ev1,d,onM); 51 leftView->setEvents(ev1,d,onM);
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 &)));
59 connect (rightView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); 59 connect (rightView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
@@ -74,9 +74,9 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QValueLis
74 74
75void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM) 75void 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 &)));
82 connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); 82 connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
@@ -98,9 +98,9 @@ void DateBookWeekLstDblView::setEvents(QValueList<EffectiveEvent> &ev1,QDate &d,
98 98
99void DateBookWeekLstDblView::setRightEvents(QValueList<EffectiveEvent> &ev1,QDate &d, bool onM) 99void 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 &)));
106 connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); 106 connect (leftView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
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
@@ -15,13 +15,13 @@ class DateBookWeekLstDblView: public QWidget {
15 Q_OBJECT 15 Q_OBJECT
16public: 16public:
17 DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, 17 DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
18 QValueList<EffectiveEvent> &ev2, 18 QValueList<EffectiveEvent> &ev2,
19 QDate &d, bool onM, 19 QDate &d, bool onM, bool showAmPm,
20 QWidget* parent = 0, const char* name = 0, 20 QWidget* parent = 0, const char* name = 0,
21 WFlags fl = 0 ); 21 WFlags fl = 0 );
22 DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, 22 DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
23 QDate &d, bool onM, 23 QDate &d, bool onM, bool showAmPm,
24 QWidget* parent = 0, const char* name = 0, 24 QWidget* parent = 0, const char* name = 0,
25 WFlags fl = 0 ); 25 WFlags fl = 0 );
26 virtual ~DateBookWeekLstDblView(); 26 virtual ~DateBookWeekLstDblView();
27 void setEvents(QValueList<EffectiveEvent> &ev1,QValueList<EffectiveEvent> &ev2,QDate &d, bool onM); 27 void setEvents(QValueList<EffectiveEvent> &ev1,QValueList<EffectiveEvent> &ev2,QDate &d, bool onM);
@@ -42,7 +42,8 @@ signals:
42 42
43protected: 43protected:
44 QHBoxLayout*m_MainLayout; 44 QHBoxLayout*m_MainLayout;
45 DateBookWeekLstView *leftView,*rightView; 45 DateBookWeekLstView *leftView,*rightView;
46 bool ampm;
46}; 47};
47 48
48#endif 49#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
@@ -1,85 +1,98 @@
1#include "datebookweeklstevent.h" 1#include "datebookweeklstevent.h"
2#include "datebooktypes.h" 2#include "datebooktypes.h"
3 3
4#include <opie2/odebug.h> 4#include <opie2/odebug.h>
5 5
6#include <qpe/ir.h> 6#include <qpe/ir.h>
7 7
8#include <qstring.h> 8#include <qstring.h>
9#include <qpopupmenu.h> 9#include <qpopupmenu.h>
10 10
11DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, 11DateBookWeekLstEvent::DateBookWeekLstEvent(bool ap, const EffectiveEvent &ev,
12 int weeklistviewconfig, 12 int weeklistviewconfig,
13 QWidget* parent, 13 QWidget* parent,
14 const char* name, 14 const char* name,
15 WFlags fl ) : OClickableLabel(parent,name,fl), event(ev) 15 WFlags fl ) : OClickableLabel(parent,name,fl), event(ev), ampm(ap)
16{ 16{
17 // old values... lastday = "__|__", middle=" |---", Firstday="00:00", 17 // old values... lastday = "__|__", middle=" |---", Firstday="00:00",
18 QString s,start,middle,end,day; 18 QString s,start,middle,end,day;
19 19
20 odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl; 20 odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl;
21 if(weeklistviewconfig==NONE) { // No times displayed. 21 if(weeklistviewconfig==NORMAL) { // "Normal", only display start time.
22// start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute()); 22 if ( ampm ) {
23// middle.sprintf("<--->"); 23 int shour = ev.start().hour();
24// end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute()); 24 int smin = ev.start().minute();
25// day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute()); 25 if ( shour >= 12 ) {
26 } else if(weeklistviewconfig==NORMAL) { // "Normal", only display start time. 26 if ( shour > 12 ) {
27 start.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute()); 27 shour -= 12;
28 middle.sprintf(" |---"); 28 }
29 end.sprintf("__|__"); 29 start.sprintf( "%.2d:%.2d PM", shour, smin );
30 day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute()); 30 day.sprintf("%.2d:%.2d PM",shour,smin);
31 } else if(weeklistviewconfig==EXTENDED) { // Extended mode, display start and end times. 31 } else {
32 start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute()); 32 if ( shour == 0 ) {
33 middle.sprintf("<--->"); 33 shour = 12;
34 end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute()); 34 }
35 day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute()); 35 start.sprintf( "%.2d:%.2d AM", shour, smin );
36 } 36 day.sprintf("%.2d:%.2d AM",shour,smin);
37 37 }
38 if(ev.event().type() == Event::Normal) { 38 } else {
39 if(ev.startDate()==ev.date() && ev.endDate()==ev.date()) { // day event. 39 start.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
40 s=day; 40 day.sprintf("%.2d:%.2d",ev.start().hour(),ev.start().minute());
41 } else if(ev.startDate()==ev.date()) { // start event. 41 }
42 s=start; 42 middle.sprintf(" |---");
43 } else if(ev.endDate()==ev.date()) { // end event. 43 end.sprintf("__|__");
44 s=end; 44 } else if(weeklistviewconfig==EXTENDED) { // Extended mode, display start and end times.
45 } else { // middle day. 45 start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
46 s=middle; 46 middle.sprintf("<--->");
47 } 47 end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
48 } else { 48 day.sprintf("%.2d:%.2d-%.2d:%.2d",ev.start().hour(),ev.start().minute(),ev.end().hour(),ev.end().minute());
49 s=""; 49 }
50 } 50
51 setText(QString(s) + " " + ev.description()); 51 if(ev.event().type() == Event::Normal) {
52// connect(this, SIGNAL(clicked()), this, SLOT(editMe())); 52 if(ev.startDate()==ev.date() && ev.endDate()==ev.date()) { // day event.
53 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); 53 s=day;
54} 54 } else if(ev.startDate()==ev.date()) { // start event.
55void DateBookWeekLstEvent::editMe() { 55 s=start;
56 emit editEvent(event.event()); 56 } else if(ev.endDate()==ev.date()) { // end event.
57} 57 s=end;
58void DateBookWeekLstEvent::duplicateMe() 58 } else { // middle day.
59{ 59 s=middle;
60 emit duplicateEvent(event.event()); 60 }
61} 61 } else {
62void DateBookWeekLstEvent::deleteMe() 62 s="";
63{ 63 }
64 emit removeEvent(event.event()); 64 setText(QString(s) + " " + ev.description());
65 emit redraw(); 65// connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
66} 66 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
67void DateBookWeekLstEvent::beamMe() 67}
68{ 68void DateBookWeekLstEvent::editMe() {
69 emit beamEvent( event.event() ); 69 emit editEvent(event.event());
70} 70}
71void DateBookWeekLstEvent::mousePressEvent( QMouseEvent *e ) 71void DateBookWeekLstEvent::duplicateMe()
72{ 72{
73 if (!event.event().isValidUid()) { 73 emit duplicateEvent(event.event());
74 // this is just such a holiday event. 74}
75 return; 75void DateBookWeekLstEvent::deleteMe()
76 } 76{
77 popmenue = new QPopupMenu; 77 emit removeEvent(event.event());
78 78 emit redraw();
79 popmenue->insertItem( tr( "Edit" ), this, SLOT(editMe())); 79}
80 popmenue->insertItem( tr( "Duplicate" ), this, SLOT(duplicateMe())); 80void DateBookWeekLstEvent::beamMe()
81 popmenue->insertItem( tr( "Delete" ), this, SLOT(deleteMe())); 81{
82 if(Ir::supported()) 82 emit beamEvent( event.event() );
83 popmenue->insertItem( tr( "Beam" ), this, SLOT(beamMe())); 83}
84 popmenue->popup( mapToGlobal( e->pos() )); 84void DateBookWeekLstEvent::mousePressEvent( QMouseEvent *e )
85} 85{
86 if (!event.event().isValidUid()) {
87 // this is just such a holiday event.
88 return;
89 }
90 popmenue = new QPopupMenu;
91
92 popmenue->insertItem( tr( "Edit" ), this, SLOT(editMe()));
93 popmenue->insertItem( tr( "Duplicate" ), this, SLOT(duplicateMe()));
94 popmenue->insertItem( tr( "Delete" ), this, SLOT(deleteMe()));
95 if(Ir::supported())
96 popmenue->insertItem( tr( "Beam" ), this, SLOT(beamMe()));
97 popmenue->popup( mapToGlobal( e->pos() ));
98}
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
@@ -8,9 +8,9 @@
8class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel 8class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel
9{ 9{
10 Q_OBJECT 10 Q_OBJECT
11public: 11public:
12 DateBookWeekLstEvent(const EffectiveEvent &ev, int weeklistviewconfig =1, 12 DateBookWeekLstEvent(bool ampm, const EffectiveEvent &ev, int weeklistviewconfig =1,
13 QWidget* parent = 0, const char* name = 0, 13 QWidget* parent = 0, const char* name = 0,
14 WFlags fl = 0); 14 WFlags fl = 0);
15signals: 15signals:
16 void editEvent(const Event &e); 16 void editEvent(const Event &e);
@@ -27,8 +27,9 @@ private:
27 const EffectiveEvent event; 27 const EffectiveEvent event;
28 QPopupMenu* popmenue; 28 QPopupMenu* popmenue;
29protected: 29protected:
30 void mousePressEvent( QMouseEvent *e ); 30 void mousePressEvent( QMouseEvent *e );
31 bool ampm;
31}; 32};
32 33
33 34
34#endif 35#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
@@ -6,17 +6,18 @@
6 6
7#include <opie2/odebug.h> 7#include <opie2/odebug.h>
8 8
9#include <qpe/config.h> 9#include <qpe/config.h>
10#include <qpe/qpeapplication.h>
10 11
11#include <qlayout.h> 12#include <qlayout.h>
12#include <qtl.h> 13#include <qtl.h>
13 14
14DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, 15DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
15 const QDate &d, bool onM, 16 const QDate &d, bool onM, bool showAmPm,
16 QWidget* parent, 17 QWidget* parent,
17 const char* name, WFlags fl) 18 const char* name, WFlags fl)
18 : QWidget( parent, name, fl ) 19 : QWidget( parent, name, fl ), ampm(showAmPm)
19{ 20{
20 childs.clear(); 21 childs.clear();
21 m_MainLayout = new QVBoxLayout( this ); 22 m_MainLayout = new QVBoxLayout( this );
22 setEvents(ev,d,onM); 23 setEvents(ev,d,onM);
@@ -64,19 +65,20 @@ void DateBookWeekLstView::setEvents(QValueList<EffectiveEvent> &ev, const QDate
64 w->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding)); 65 w->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
65 w->setPalette(white); 66 w->setPalette(white);
66 QVBoxLayout * tlayout = new QVBoxLayout(w); 67 QVBoxLayout * tlayout = new QVBoxLayout(w);
67 childs.append(w); 68 childs.append(w);
68 // Header 69 // Header
69 DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,w); 70 DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,w);
70 connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int))); 71 connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
71 connect(hdr, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)), 72 connect(hdr, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
72 this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&))); 73 this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
73 tlayout->addWidget(hdr); 74 tlayout->addWidget(hdr);
75 connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool)));
74 76
75 // Events 77 // Events
76 while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) { 78 while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
77 if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) { // Skip events ending at 00:00 starting at another day. 79 if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) { // Skip events ending at 00:00 starting at another day.
78 DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,w); 80 DateBookWeekLstEvent *l=new DateBookWeekLstEvent(ampm,*it,weeklistviewconfig,w);
79 tlayout->addWidget(l); 81 tlayout->addWidget(l);
80 connect (l, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&))); 82 connect (l, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
81 connect (l, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &))); 83 connect (l, SIGNAL(duplicateEvent(const Event &)), this, SIGNAL(duplicateEvent(const Event &)));
82 connect (l, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); 84 connect (l, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &)));
@@ -86,16 +88,16 @@ void DateBookWeekLstView::setEvents(QValueList<EffectiveEvent> &ev, const QDate
86 it++; 88 it++;
87 } 89 }
88 tlayout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding)); 90 tlayout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
89 m_MainLayout->addWidget(w); 91 m_MainLayout->addWidget(w);
90/*
91 QSpacerItem * tmp = new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding);
92 m_MainLayout->addItem(tmp);
93*/
94 } 92 }
95 setUpdatesEnabled(true); 93 setUpdatesEnabled(true);
96} 94}
97 95
96void DateBookWeekLstView::slotClockChanged( bool ap ) {
97 ampm = ap;
98}
99
98DateBookWeekLstView::~DateBookWeekLstView() 100DateBookWeekLstView::~DateBookWeekLstView()
99{} 101{}
100 102
101void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) 103void DateBookWeekLstView::keyPressEvent(QKeyEvent *e)
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
@@ -14,9 +14,11 @@ class QVBoxLayout;
14class DateBookWeekLstView: public QWidget 14class DateBookWeekLstView: public QWidget
15{ 15{
16 Q_OBJECT 16 Q_OBJECT
17public: 17public:
18 DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM, QWidget* parent = 0, const char* name = 0, 18 DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d,
19 bool onM, bool showAmPm, QWidget* parent = 0,
20 const char* name = 0,
19 WFlags fl = 0 ); 21 WFlags fl = 0 );
20 ~DateBookWeekLstView(); 22 ~DateBookWeekLstView();
21 23
22 void setEvents(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM); 24 void setEvents(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM);
@@ -29,15 +31,18 @@ signals:
29 void redraw(); 31 void redraw();
30 void showDate(int y, int m, int d); 32 void showDate(int y, int m, int d);
31 void addEvent(const QDateTime &start, const QDateTime &stop, 33 void addEvent(const QDateTime &start, const QDateTime &stop,
32 const QString &str, const QString &location); 34 const QString &str, const QString &location);
35
33protected: 36protected:
34 bool bStartOnMonday; 37 bool bStartOnMonday;
38 bool ampm;
35 QValueList<QObject*> childs; 39 QValueList<QObject*> childs;
36 40
37 QVBoxLayout*m_MainLayout; 41 QVBoxLayout*m_MainLayout;
38 42
39protected slots: 43protected slots:
40 void keyPressEvent(QKeyEvent *); 44 void keyPressEvent(QKeyEvent *);
45 void slotClockChanged( bool ap );
41}; 46};
42 47
43#endif 48#endif