Diffstat (limited to 'core/pim/datebook/modules/weeklst/datebookweeklst.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklst.cpp | 15 |
1 files changed, 12 insertions, 3 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 | |||
@@ -5,16 +5,17 @@ | |||
5 | #include "datebookweeklstdblview.h" | 5 | #include "datebookweeklstdblview.h" |
6 | 6 | ||
7 | #include "datebook.h" | 7 | #include "datebook.h" |
8 | 8 | ||
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 | ||
17 | using namespace Opie::Ui; | 18 | using namespace Opie::Ui; |
18 | 19 | ||
19 | DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDBHoliday *newDB, | 20 | DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDBHoliday *newDB, |
20 | QWidget *parent, | 21 | QWidget *parent, |
@@ -63,17 +64,19 @@ void DateBookWeekLst::setDbl(bool on) { | |||
63 | if (m_CurrentView) { | 64 | if (m_CurrentView) { |
64 | displayed = m_CurrentView->toggleDoubleView(on); | 65 | displayed = m_CurrentView->toggleDoubleView(on); |
65 | } | 66 | } |
66 | if (!displayed||dbl) { | 67 | if (!displayed||dbl) { |
67 | getEvents(); | 68 | getEvents(); |
68 | } | 69 | } |
69 | } | 70 | } |
70 | 71 | ||
71 | void DateBookWeekLst::redraw() {getEvents();} | 72 | void DateBookWeekLst::redraw() { |
73 | getEvents(); | ||
74 | } | ||
72 | 75 | ||
73 | QDate DateBookWeekLst::date() { | 76 | QDate DateBookWeekLst::date() { |
74 | return bdate; | 77 | return bdate; |
75 | } | 78 | } |
76 | 79 | ||
77 | // return the date at the beginning of the week... | 80 | // return the date at the beginning of the week... |
78 | // copied from DateBookWeek | 81 | // copied from DateBookWeek |
79 | QDate DateBookWeekLst::weekDate() const | 82 | QDate DateBookWeekLst::weekDate() const |
@@ -101,40 +104,46 @@ void DateBookWeekLst::getEvents() { | |||
101 | 104 | ||
102 | if (dbl) { | 105 | if (dbl) { |
103 | start2 = start.addDays(7); | 106 | start2 = start.addDays(7); |
104 | stop = start2.addDays(6); | 107 | stop = start2.addDays(6); |
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 &))); |
116 | connect (m_CurrentView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); | 119 | connect (m_CurrentView, SIGNAL(removeEvent(const Event &)), this, SIGNAL(removeEvent(const Event &))); |
117 | connect (m_CurrentView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &))); | 120 | connect (m_CurrentView, SIGNAL(beamEvent(const Event &)), this, SIGNAL(beamEvent(const Event &))); |
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); |
126 | } else { | 130 | } else { |
127 | m_CurrentView->setEvents(el,start,bStartOnMonday); | 131 | m_CurrentView->setEvents(el,start,bStartOnMonday); |
128 | } | 132 | } |
129 | } | 133 | } |
130 | scroll->updateScrollBars(); | 134 | scroll->updateScrollBars(); |
131 | } | 135 | } |
132 | 136 | ||
137 | void DateBookWeekLst::slotClockChanged( bool ap ) { | ||
138 | ampm = ap; | ||
139 | getEvents(); | ||
140 | } | ||
141 | |||
133 | void DateBookWeekLst::dateChanged(QDate &newdate) { | 142 | void 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; |
137 | getEvents(); | 146 | getEvents(); |
138 | } | 147 | } |
139 | 148 | ||
140 | void DateBookWeekLst::keyPressEvent(QKeyEvent *e) | 149 | void DateBookWeekLst::keyPressEvent(QKeyEvent *e) |