Diffstat (limited to 'core/pim/datebook/datebookweeklst.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 05e36be..dc141c0 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -25,49 +25,49 @@ | |||
25 | 25 | ||
26 | bool calcWeek(const QDate &d, int &week, int &year, | 26 | bool calcWeek(const QDate &d, int &week, int &year, |
27 | bool startOnMonday = false); | 27 | bool startOnMonday = false); |
28 | 28 | ||
29 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, | 29 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, |
30 | const char* name, WFlags fl) | 30 | const char* name, WFlags fl) |
31 | : DateBookWeekLstHeaderBase(parent, name, fl) | 31 | : DateBookWeekLstHeaderBase(parent, name, fl) |
32 | { | 32 | { |
33 | setBackgroundMode( PaletteButton ); | 33 | setBackgroundMode( PaletteButton ); |
34 | labelDate->setBackgroundMode( PaletteButton ); | 34 | labelDate->setBackgroundMode( PaletteButton ); |
35 | labelWeek->setBackgroundMode( PaletteButton ); | 35 | labelWeek->setBackgroundMode( PaletteButton ); |
36 | forward->setBackgroundMode( PaletteButton ); | 36 | forward->setBackgroundMode( PaletteButton ); |
37 | back->setBackgroundMode( PaletteButton ); | 37 | back->setBackgroundMode( PaletteButton ); |
38 | DateBookWeekLstHeaderBaseLayout->setSpacing(0); | 38 | DateBookWeekLstHeaderBaseLayout->setSpacing(0); |
39 | DateBookWeekLstHeaderBaseLayout->setMargin(0); | 39 | DateBookWeekLstHeaderBaseLayout->setMargin(0); |
40 | //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding)); | 40 | //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding)); |
41 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); | 41 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); |
42 | 42 | ||
43 | connect(back, SIGNAL(clicked()), this, SLOT(prevWeek())); | 43 | connect(back, SIGNAL(clicked()), this, SLOT(prevWeek())); |
44 | connect(forward, SIGNAL(clicked()), this, SLOT(nextWeek())); | 44 | connect(forward, SIGNAL(clicked()), this, SLOT(nextWeek())); |
45 | connect(labelWeek, SIGNAL(clicked()), this, SLOT(pickDate())); | 45 | connect(labelWeek, SIGNAL(clicked()), this, SLOT(pickDate())); |
46 | onMonday=onM; | 46 | onMonday=onM; |
47 | } | 47 | } |
48 | DateBookWeekLstHeader::~DateBookWeekLstHeader(){} | 48 | DateBookWeekLstHeader::~DateBookWeekLstHeader(){} |
49 | void DateBookWeekLstHeader::setDate(QDate d) { | 49 | void DateBookWeekLstHeader::setDate(const QDate &d) { |
50 | date=d; | 50 | date=d; |
51 | 51 | ||
52 | int year,week; | 52 | int year,week; |
53 | calcWeek(d,week,year,onMonday); | 53 | calcWeek(d,week,year,onMonday); |
54 | labelWeek->setText("W: " + QString::number(week)); | 54 | labelWeek->setText("W: " + QString::number(week)); |
55 | 55 | ||
56 | QDate start=date; | 56 | QDate start=date; |
57 | QDate stop=start.addDays(6); | 57 | QDate stop=start.addDays(6); |
58 | labelDate->setText( QString::number(start.day()) + " " + | 58 | labelDate->setText( QString::number(start.day()) + " " + |
59 | start.monthName(start.month()) + " - " + | 59 | start.monthName(start.month()) + " - " + |
60 | QString::number(stop.day()) + " " + | 60 | QString::number(stop.day()) + " " + |
61 | start.monthName(stop.month()) ); | 61 | start.monthName(stop.month()) ); |
62 | emit dateChanged(year,week); | 62 | emit dateChanged(year,week); |
63 | } | 63 | } |
64 | void DateBookWeekLstHeader::pickDate() { | 64 | void DateBookWeekLstHeader::pickDate() { |
65 | static QPopupMenu *m1 = 0; | 65 | static QPopupMenu *m1 = 0; |
66 | static DateBookMonth *picker = 0; | 66 | static DateBookMonth *picker = 0; |
67 | if ( !m1 ) { | 67 | if ( !m1 ) { |
68 | m1 = new QPopupMenu( this ); | 68 | m1 = new QPopupMenu( this ); |
69 | picker = new DateBookMonth( m1, 0, TRUE ); | 69 | picker = new DateBookMonth( m1, 0, TRUE ); |
70 | m1->insertItem( picker ); | 70 | m1->insertItem( picker ); |
71 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), | 71 | connect( picker, SIGNAL( dateClicked( int, int, int ) ), |
72 | this, SLOT( setDate( int, int, int ) ) ); | 72 | this, SLOT( setDate( int, int, int ) ) ); |
73 | //connect( m1, SIGNAL( aboutToHide() ), | 73 | //connect( m1, SIGNAL( aboutToHide() ), |
@@ -221,49 +221,49 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, | |||
221 | : QWidget( parent, name ), | 221 | : QWidget( parent, name ), |
222 | db( newDB ), | 222 | db( newDB ), |
223 | startTime( 0 ), | 223 | startTime( 0 ), |
224 | ampm( ap ), | 224 | ampm( ap ), |
225 | onMonday(onM) | 225 | onMonday(onM) |
226 | { | 226 | { |
227 | setFocusPolicy(StrongFocus); | 227 | setFocusPolicy(StrongFocus); |
228 | layout = new QVBoxLayout( this ); | 228 | layout = new QVBoxLayout( this ); |
229 | layout->setMargin(0); | 229 | layout->setMargin(0); |
230 | 230 | ||
231 | header=new DateBookWeekLstHeader(onM, this); | 231 | header=new DateBookWeekLstHeader(onM, this); |
232 | layout->addWidget( header ); | 232 | layout->addWidget( header ); |
233 | connect(header, SIGNAL(dateChanged(int,int)), this, SLOT(dateChanged(int,int))); | 233 | connect(header, SIGNAL(dateChanged(int,int)), this, SLOT(dateChanged(int,int))); |
234 | 234 | ||
235 | scroll=new QScrollView(this); | 235 | scroll=new QScrollView(this); |
236 | //scroll->setVScrollBarMode(QScrollView::AlwaysOn); | 236 | //scroll->setVScrollBarMode(QScrollView::AlwaysOn); |
237 | //scroll->setHScrollBarMode(QScrollView::AlwaysOff); | 237 | //scroll->setHScrollBarMode(QScrollView::AlwaysOff); |
238 | scroll->setResizePolicy(QScrollView::AutoOneFit); | 238 | scroll->setResizePolicy(QScrollView::AutoOneFit); |
239 | layout->addWidget(scroll); | 239 | layout->addWidget(scroll); |
240 | 240 | ||
241 | view=NULL; | 241 | view=NULL; |
242 | } | 242 | } |
243 | 243 | ||
244 | 244 | ||
245 | void DateBookWeekLst::setDate( QDate &d ) { | 245 | void DateBookWeekLst::setDate(const QDate &d) { |
246 | int w,y; | 246 | int w,y; |
247 | calcWeek(d,w,y,onMonday); | 247 | calcWeek(d,w,y,onMonday); |
248 | year=y; | 248 | year=y; |
249 | _week=w; | 249 | _week=w; |
250 | header->setDate(date()); | 250 | header->setDate(date()); |
251 | } | 251 | } |
252 | void DateBookWeekLst::redraw() {getEvents();} | 252 | void DateBookWeekLst::redraw() {getEvents();} |
253 | 253 | ||
254 | QDate DateBookWeekLst::date() const { | 254 | QDate DateBookWeekLst::date() const { |
255 | QDate d; | 255 | QDate d; |
256 | d.setYMD(year,1,1); | 256 | d.setYMD(year,1,1); |
257 | 257 | ||
258 | int dow= d.dayOfWeek(); | 258 | int dow= d.dayOfWeek(); |
259 | if (!onMonday) | 259 | if (!onMonday) |
260 | if (dow==7) dow=1; | 260 | if (dow==7) dow=1; |
261 | else dow++; | 261 | else dow++; |
262 | 262 | ||
263 | d=d.addDays( (_week-1)*7 - dow + 1 ); | 263 | d=d.addDays( (_week-1)*7 - dow + 1 ); |
264 | return d; | 264 | return d; |
265 | } | 265 | } |
266 | 266 | ||
267 | void DateBookWeekLst::getEvents() { | 267 | void DateBookWeekLst::getEvents() { |
268 | QDate start = date(); | 268 | QDate start = date(); |
269 | QDate stop = start.addDays(6); | 269 | QDate stop = start.addDays(6); |