-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklst.cpp | 1 | ||||
-rw-r--r-- | core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklst.cpp b/core/pim/datebook/modules/weeklst/datebookweeklst.cpp index 6556373..b36bf6d 100644 --- a/core/pim/datebook/modules/weeklst/datebookweeklst.cpp +++ b/core/pim/datebook/modules/weeklst/datebookweeklst.cpp | |||
@@ -1,37 +1,36 @@ | |||
1 | #include "namespace_hack.h" | 1 | #include "namespace_hack.h" |
2 | #include "datebookweeklst.h" | 2 | #include "datebookweeklst.h" |
3 | #include "datebookweeklstheader.h" | 3 | #include "datebookweeklstheader.h" |
4 | #include "datebookweeklstview.h" | 4 | #include "datebookweeklstview.h" |
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/resource.h> | ||
14 | 13 | ||
15 | #include <qlayout.h> | 14 | #include <qlayout.h> |
16 | #include <qtoolbutton.h> | 15 | #include <qtoolbutton.h> |
17 | 16 | ||
18 | using namespace Opie::Ui; | 17 | using namespace Opie::Ui; |
19 | 18 | ||
20 | DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDBHoliday *newDB, | 19 | DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDBHoliday *newDB, |
21 | QWidget *parent, | 20 | QWidget *parent, |
22 | const char *name ) | 21 | const char *name ) |
23 | : QWidget( parent, name ), | 22 | : QWidget( parent, name ), |
24 | db( newDB ), | 23 | db( newDB ), |
25 | startTime( 0 ), | 24 | startTime( 0 ), |
26 | ampm( ap ), | 25 | ampm( ap ), |
27 | bStartOnMonday(onM) | 26 | bStartOnMonday(onM) |
28 | { | 27 | { |
29 | setFocusPolicy(StrongFocus); | 28 | setFocusPolicy(StrongFocus); |
30 | dateset = false; | 29 | dateset = false; |
31 | layout = new QVBoxLayout( this ); | 30 | layout = new QVBoxLayout( this ); |
32 | layout->setMargin(0); | 31 | layout->setMargin(0); |
33 | 32 | ||
34 | header=new DateBookWeekLstHeader(onM, this); | 33 | header=new DateBookWeekLstHeader(onM, this); |
35 | layout->addWidget( header ); | 34 | layout->addWidget( header ); |
36 | connect(header, SIGNAL(dateChanged(QDate&)), this, SLOT(dateChanged(QDate&))); | 35 | connect(header, SIGNAL(dateChanged(QDate&)), this, SLOT(dateChanged(QDate&))); |
37 | connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool))); | 36 | connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool))); |
diff --git a/core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp b/core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp index 81e0c31..2da9c22 100644 --- a/core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp +++ b/core/pim/datebook/modules/weeklst/datebookweeklstheader.cpp | |||
@@ -1,48 +1,49 @@ | |||
1 | #include "datebookweeklstheader.h" | 1 | #include "datebookweeklstheader.h" |
2 | 2 | ||
3 | #include <qpe/resource.h> | 3 | #include <opie2/oresource.h> |
4 | |||
4 | #include <qpe/datebookmonth.h> | 5 | #include <qpe/datebookmonth.h> |
5 | 6 | ||
6 | #include <qtoolbutton.h> | 7 | #include <qtoolbutton.h> |
7 | #include <qlayout.h> | 8 | #include <qlayout.h> |
8 | 9 | ||
9 | /* implenented in datebookweek.cpp - HELL */ | 10 | /* implenented in datebookweek.cpp - HELL */ |
10 | bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false); | 11 | bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false); |
11 | 12 | ||
12 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl) | 13 | DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl) |
13 | : DateBookWeekLstHeaderBase(parent, name, fl) | 14 | : DateBookWeekLstHeaderBase(parent, name, fl) |
14 | { | 15 | { |
15 | setBackgroundMode( PaletteButton ); | 16 | setBackgroundMode( PaletteButton ); |
16 | labelDate->setBackgroundMode( PaletteButton ); | 17 | labelDate->setBackgroundMode( PaletteButton ); |
17 | forwardweek->setBackgroundMode( PaletteButton ); | 18 | forwardweek->setBackgroundMode( PaletteButton ); |
18 | forwardweek->setPixmap( Resource::loadPixmap("forward") ); | 19 | forwardweek->setPixmap( Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ) ); |
19 | forwardmonth->setBackgroundMode( PaletteButton ); | 20 | forwardmonth->setBackgroundMode( PaletteButton ); |
20 | forwardmonth->setPixmap( Resource::loadPixmap("fastforward") ); | 21 | forwardmonth->setPixmap( Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon ) ); |
21 | backweek->setBackgroundMode( PaletteButton ); | 22 | backweek->setBackgroundMode( PaletteButton ); |
22 | backweek->setPixmap( Resource::loadPixmap("back") ); | 23 | backweek->setPixmap( Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ) ); |
23 | backmonth->setBackgroundMode( PaletteButton ); | 24 | backmonth->setBackgroundMode( PaletteButton ); |
24 | backmonth->setPixmap( Resource::loadPixmap("fastback") ); | 25 | backmonth->setPixmap( Opie::Core::OResource::loadPixmap( "fastback", Opie::Core::OResource::SmallIcon ) ); |
25 | DateBookWeekLstHeaderBaseLayout->setSpacing(0); | 26 | DateBookWeekLstHeaderBaseLayout->setSpacing(0); |
26 | DateBookWeekLstHeaderBaseLayout->setMargin(0); | 27 | DateBookWeekLstHeaderBaseLayout->setMargin(0); |
27 | //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding)); | 28 | //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding)); |
28 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); | 29 | setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); |
29 | 30 | ||
30 | connect(backmonth, SIGNAL(clicked()), this, SLOT(prevMonth())); | 31 | connect(backmonth, SIGNAL(clicked()), this, SLOT(prevMonth())); |
31 | connect(backweek, SIGNAL(clicked()), this, SLOT(prevWeek())); | 32 | connect(backweek, SIGNAL(clicked()), this, SLOT(prevWeek())); |
32 | connect(forwardweek, SIGNAL(clicked()), this, SLOT(nextWeek())); | 33 | connect(forwardweek, SIGNAL(clicked()), this, SLOT(nextWeek())); |
33 | connect(forwardmonth, SIGNAL(clicked()), this, SLOT(nextMonth())); | 34 | connect(forwardmonth, SIGNAL(clicked()), this, SLOT(nextMonth())); |
34 | connect(labelDate, SIGNAL(clicked()), this, SLOT(pickDate())); | 35 | connect(labelDate, SIGNAL(clicked()), this, SLOT(pickDate())); |
35 | connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool))); | 36 | connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool))); |
36 | bStartOnMonday=onM; | 37 | bStartOnMonday=onM; |
37 | } | 38 | } |
38 | DateBookWeekLstHeader::~DateBookWeekLstHeader(){} | 39 | DateBookWeekLstHeader::~DateBookWeekLstHeader(){} |
39 | 40 | ||
40 | void DateBookWeekLstHeader::setDate(const QDate &d) { | 41 | void DateBookWeekLstHeader::setDate(const QDate &d) { |
41 | int year,week,dayofweek; | 42 | int year,week,dayofweek; |
42 | date=d; | 43 | date=d; |
43 | dayofweek=d.dayOfWeek(); | 44 | dayofweek=d.dayOfWeek(); |
44 | if(bStartOnMonday) | 45 | if(bStartOnMonday) |
45 | dayofweek--; | 46 | dayofweek--; |
46 | else if( dayofweek == 7 ) | 47 | else if( dayofweek == 7 ) |
47 | /* we already have the right day -7 would lead to the same week */ | 48 | /* we already have the right day -7 would lead to the same week */ |
48 | dayofweek = 0; | 49 | dayofweek = 0; |