author | zecke <zecke> | 2002-06-23 18:18:27 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-23 18:18:27 (UTC) |
commit | f0e656b51a2dcee1dec594636cbc1ba8d4b11eef (patch) (side-by-side diff) | |
tree | 1eb83b120f8ce404324575799d75c32d4056d1f6 /core/pim/datebook/datebookweeklst.cpp | |
parent | 6fd46f6d23538ec6e0f48209f6c0f0d939a2effe (diff) | |
download | opie-f0e656b51a2dcee1dec594636cbc1ba8d4b11eef.zip opie-f0e656b51a2dcee1dec594636cbc1ba8d4b11eef.tar.gz opie-f0e656b51a2dcee1dec594636cbc1ba8d4b11eef.tar.bz2 |
Patch by <tboc@gmx.de> to configure the size
of the row of the dayview
Adds an option to jump to the current time in the dayview
and some small fixes ( zecke )
Diffstat (limited to 'core/pim/datebook/datebookweeklst.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 8e88377..58a9c53 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp @@ -21,6 +21,6 @@ #include <qtoolbutton.h> #include <qvbox.h> -#include <qsizepolicy.h> -#include <qabstractlayout.h> +#include <qsizepolicy.h> +#include <qabstractlayout.h> #include <qtl.h> @@ -28,5 +28,5 @@ bool calcWeek(const QDate &d, int &week, int &year, bool startOnMonday = false); -DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, +DateBookWeekLstHeader::DateBookWeekLstHeader(bool /*onM*/, QWidget* parent, const char* name, WFlags fl) : DateBookWeekLstHeaderBase(parent, name, fl) @@ -55,10 +55,10 @@ void DateBookWeekLstHeader::setDate(const QDate &d) { calcWeek(d,week,year,onMonday); labelWeek->setText("W: " + QString::number(week)); - + QDate start=date; QDate stop=start.addDays(6); - labelDate->setText( QString::number(start.day()) + " " + + labelDate->setText( QString::number(start.day()) + " " + start.monthName(start.month()) + " - " + - QString::number(stop.day()) + " " + + QString::number(stop.day()) + " " + start.monthName(stop.month()) ); emit dateChanged(year,week); @@ -93,7 +93,7 @@ void DateBookWeekLstHeader::prevWeek() { DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM, - QWidget* parent, - const char* name, - WFlags fl ) + QWidget* parent, + const char* name, + WFlags fl ) : DateBookWeekLstDayHdrBase(parent, name, fl) { @@ -103,5 +103,5 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM, char day=wdays[d.dayOfWeek()-1]; - label->setText( QString(QChar(day)) + " " + + label->setText( QString(QChar(day)) + " " + QString::number(d.day()) ); add->setText("+"); @@ -111,5 +111,5 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM, pal.setColor(QColorGroup::Foreground, QColor(0,0,255)); label->setPalette(pal); - + /* QFont f=label->font(); @@ -140,7 +140,7 @@ void DateBookWeekLstDayHdr::newEvent() { emit addEvent(start,stop,""); } -DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, - QWidget* parent, - const char* name, +DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, + QWidget* parent, + const char* name, WFlags fl) : OClickableLabel(parent,name,fl), @@ -166,7 +166,7 @@ void DateBookWeekLstEvent::editMe() { -DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, +DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM, - QWidget* parent, + QWidget* parent, const char* name, WFlags fl) : QWidget( parent, name, fl ) @@ -177,5 +177,5 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, QVBoxLayout *layout = new QVBoxLayout( this ); - + qBubbleSort(ev); QValueListIterator<EffectiveEvent> it; @@ -183,5 +183,5 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, int dayOrder[7]; - if (onMonday) + if (onMonday) for (int d=0; d<7; d++) dayOrder[d]=d+1; else { @@ -194,14 +194,14 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i), onMonday,this); - connect(hdr, SIGNAL(showDate(int,int,int)), + connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int))); - connect(hdr, SIGNAL(addEvent(const QDateTime &, + connect(hdr, SIGNAL(addEvent(const QDateTime &, const QDateTime &, - const QString &)), - this, SIGNAL(addEvent(const QDateTime &, + const QString &)), + this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &))); layout->addWidget(hdr); - + // Events while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) { @@ -212,5 +212,5 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, it++; } - + layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding)); } @@ -219,8 +219,8 @@ DateBookWeekLstView::~DateBookWeekLstView(){} void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();} -DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, - QValueList<EffectiveEvent> &ev2, +DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, + QValueList<EffectiveEvent> &ev2, QDate &d, bool onM, - QWidget* parent, + QWidget* parent, const char* name, WFlags fl) : QWidget( parent, name, fl ) @@ -252,6 +252,6 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, } -DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, - QWidget *parent, +DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, + QWidget *parent, const char *name ) : QWidget( parent, name ), @@ -267,8 +267,8 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, header=new DateBookWeekLstHeader(onM, this); layout->addWidget( header ); - connect(header, SIGNAL(dateChanged(int,int)), + connect(header, SIGNAL(dateChanged(int,int)), this, SLOT(dateChanged(int,int))); connect(header, SIGNAL(setDbl(bool)), - this, SLOT(setDbl(bool))); + this, SLOT(setDbl(bool))); scroll=new QScrollView(this); @@ -311,5 +311,5 @@ QDate DateBookWeekLst::date() const { if (dow==7) dow=1; else dow++; - + d=d.addDays( (_week-1)*7 - dow + 1 ); return d; |