UI and code cleanup. Both UI and code is now more consistent. Also removed menus in favor of toolbuttons. (why were they even available as menus in the first place?)

1 files changed, 110 insertions, 102 deletions

diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 3c8fc89..a39ff40 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -29,62 +29,67 @@
 
-bool calcWeek(const QDate &d, int &week, int &year,
-              bool startOnMonday = false);
+bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false);
 
-DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent,
-                                             const char* name, WFlags fl)
+DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl)
     : DateBookWeekLstHeaderBase(parent, name, fl)
 {
-    setBackgroundMode( PaletteButton );
-    labelDate->setBackgroundMode( PaletteButton );
-    labelWeek->setBackgroundMode( PaletteButton );
-    forward->setBackgroundMode( PaletteButton );
-    forward->setPixmap( Resource::loadPixmap("forward") );
-    back->setBackgroundMode( PaletteButton );
-    back->setPixmap( Resource::loadPixmap("back") );
-    DateBookWeekLstHeaderBaseLayout->setSpacing(0);
-    DateBookWeekLstHeaderBaseLayout->setMargin(0);
-    //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding));
-    setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
-
-    connect(back, SIGNAL(clicked()), this, SLOT(prevWeek()));
-    connect(forward, SIGNAL(clicked()), this, SLOT(nextWeek()));
-    connect(labelWeek, SIGNAL(clicked()), this, SLOT(pickDate()));
-    connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool)));
-    onMonday=onM;
+        setBackgroundMode( PaletteButton );
+        labelDate->setBackgroundMode( PaletteButton );
+        forwardweek->setBackgroundMode( PaletteButton );
+        forwardweek->setPixmap( Resource::loadPixmap("forward") );
+        forwardmonth->setBackgroundMode( PaletteButton );
+        forwardmonth->setPixmap( Resource::loadPixmap("fastforward") );
+        backweek->setBackgroundMode( PaletteButton );
+        backweek->setPixmap( Resource::loadPixmap("back") );
+        backmonth->setBackgroundMode( PaletteButton );
+        backmonth->setPixmap( Resource::loadPixmap("fastback") );
+        DateBookWeekLstHeaderBaseLayout->setSpacing(0);
+        DateBookWeekLstHeaderBaseLayout->setMargin(0);
+        //setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding));
+        setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
+
+        connect(backmonth, SIGNAL(clicked()), this, SLOT(prevMonth()));
+        connect(backweek, SIGNAL(clicked()), this, SLOT(prevWeek()));
+        connect(forwardweek, SIGNAL(clicked()), this, SLOT(nextWeek()));
+        connect(forwardmonth, SIGNAL(clicked()), this, SLOT(nextMonth()));
+        connect(labelDate, SIGNAL(clicked()), this, SLOT(pickDate()));
+        connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool)));
+        bStartOnMonday=onM;
 }
 DateBookWeekLstHeader::~DateBookWeekLstHeader(){}
+
 void DateBookWeekLstHeader::setDate(const QDate &d) {
-    date=d;
-
-    int year,week;
-    calcWeek(d,week,year,onMonday);
-    labelWeek->setText(tr( "W: %1" ).arg( ( QString::number(week)) ) );
-
-    QDate start=date;
-    QDate stop=start.addDays(6);
-    labelDate->setText( QString::number(start.day()) + " " +
-                        start.monthName(start.month()) + " - " +
-                        QString::number(stop.day()) + " " +
-                        start.monthName(stop.month()) );
-    emit dateChanged(year,week);
+        int year,week,dayofweek;
+        date=d;
+        dayofweek=d.dayOfWeek();
+        if(bStartOnMonday) dayofweek--;
+        date=date.addDays(-dayofweek);
+
+        calcWeek(date,week,year,bStartOnMonday);
+        QDate start=date;
+        QDate stop=start.addDays(6);
+        labelDate->setText( QString::number(start.day()) + "." +
+                        start.monthName(start.month()) + "-" +
+                        QString::number(stop.day()) + "." +
+                        start.monthName(stop.month()) +" ("+
+                        tr("w")+":"+QString::number( week ) +")");
+        emit dateChanged(year,week);
 }
+
 void DateBookWeekLstHeader::pickDate() {
-    static QPopupMenu *m1 = 0;
-    static DateBookMonth *picker = 0;
-    if ( !m1 ) {
-        m1 = new QPopupMenu( this );
-        picker = new DateBookMonth( m1, 0, TRUE );
-        m1->insertItem( picker );
-        connect( picker, SIGNAL( dateClicked( int, int, int ) ),
-                 this, SLOT( setDate( int, int, int ) ) );
-        //connect( m1, SIGNAL( aboutToHide() ),
-        //this, SLOT( gotHide() ) );
-    }
-    picker->setDate( date.year(), date.month(), date.day() );
-    m1->popup(mapToGlobal(labelWeek->pos()+QPoint(0,labelWeek->height())));
-    picker->setFocus();
+        static QPopupMenu *m1 = 0;
+        static DateBookMonth *picker = 0;
+        if ( !m1 ) {
+                m1 = new QPopupMenu( this );
+                picker = new DateBookMonth( m1, 0, TRUE );
+                m1->insertItem( picker );
+                connect( picker, SIGNAL( dateClicked( int, int, int ) ),this, SLOT( setDate( int, int, int ) ) );
+                //connect( m1, SIGNAL( aboutToHide() ),
+                //this, SLOT( gotHide() ) );
+        }
+        picker->setDate( date.year(), date.month(), date.day() );
+        m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
+        picker->setFocus();
 }
 void DateBookWeekLstHeader::setDate(int y, int m, int d) {
-  QDate new_date(y,m,d);
-  setDate(new_date);
+        setDate(QDate(y,m,d));
 }
@@ -92,6 +97,14 @@ void DateBookWeekLstHeader::setDate(int y, int m, int d) {
 void DateBookWeekLstHeader::nextWeek() {
-    setDate(date.addDays(7));
+        setDate(date.addDays(7));
 }
 void DateBookWeekLstHeader::prevWeek() {
-    setDate(date.addDays(-7));
+        setDate(date.addDays(-7));
+}
+void DateBookWeekLstHeader::nextMonth()
+{
+        setDate(date.addDays(28));
+}
+void DateBookWeekLstHeader::prevMonth()
+{
+        setDate(date.addDays(-28));
 }
@@ -104,31 +117,29 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /*onM*/,
 
-    date=d;
-
-    static const char *wdays={"MTWTFSS"};
-    char day=wdays[d.dayOfWeek()-1];
-
-    label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +
-                    QString::number(d.day()) );
-    add->setText("+");
-
-    if (d == QDate::currentDate()) {
-        QPalette pal=label->palette();
-        pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
-        label->setPalette(pal);
-
-        /*
-          QFont f=label->font();
-          f.setItalic(true);
-          label->setFont(f);
-          label->setPalette(QPalette(QColor(0,0,255),label->backgroundColor()));
-        */
-    } else if (d.dayOfWeek() == 7) { // FIXME: Match any holiday
-        QPalette pal=label->palette();
-        pal.setColor(QColorGroup::Foreground, QColor(255,0,0));
-        label->setPalette(pal);
-    }
-
+        date=d;
+
+        static const char *wdays={"MTWTFSS"};
+        char day=wdays[d.dayOfWeek()-1];
+
+        label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) );
+        add->setText("+");
+
+        if (d == QDate::currentDate()) {
+                QPalette pal=label->palette();
+                pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
+                label->setPalette(pal);
+
+                /*
+                QFont f=label->font();
+                f.setItalic(true);
+                label->setFont(f);
+                label->setPalette(QPalette(QColor(0,0,255),label->backgroundColor()));
+                */
+        } else if (d.dayOfWeek() == 7) { // FIXME: Match any holiday
+                QPalette pal=label->palette();
+                pal.setColor(QColorGroup::Foreground, QColor(255,0,0));
+                label->setPalette(pal);
+        }
 
-    connect (label, SIGNAL(clicked()), this, SLOT(showDay()));
-    connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));
+        connect (label, SIGNAL(clicked()), this, SLOT(showDay()));
+        connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));
 }
@@ -136,4 +147,5 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /*onM*/,
 void DateBookWeekLstDayHdr::showDay() {
-    emit showDate(date.year(), date.month(), date.day());
+        emit showDate(date.year(), date.month(), date.day());
 }
+
 void DateBookWeekLstDayHdr::newEvent() {
@@ -206,3 +218,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 
-        onMonday=onM;
+        bStartOnMonday=onM;
         setPalette(white);
@@ -217,3 +229,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
         int dayOrder[7];
-        if (onMonday) {
+        if (bStartOnMonday) {
                 for (int d=0; d<7; d++) dayOrder[d]=d+1;
@@ -226,5 +238,4 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
         // Header
-        DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i), onMonday,this);
-        connect(hdr, SIGNAL(showDate(int,int,int)),
-                this, SIGNAL(showDate(int,int,int)));
+        DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i), bStartOnMonday,this);
+        connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
         connect(hdr, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
@@ -281,16 +292,14 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
       ampm( ap ),
-      onMonday(onM)
+      bStartOnMonday(onM)
 {
-    setFocusPolicy(StrongFocus);
-    layout = new QVBoxLayout( this );
-    layout->setMargin(0);
+        setFocusPolicy(StrongFocus);
+        layout = new QVBoxLayout( this );
+        layout->setMargin(0);
 
-    header=new DateBookWeekLstHeader(onM, this);
-    layout->addWidget( header );
-    connect(header, SIGNAL(dateChanged(int,int)), this, SLOT(dateChanged(int,int)));
-    connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
+        header=new DateBookWeekLstHeader(onM, this);
+        layout->addWidget( header );
+        connect(header, SIGNAL(dateChanged(int,int)), this, SLOT(dateChanged(int,int)));
+        connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
 
         scroll=new QScrollView(this);
-        //scroll->setVScrollBarMode(QScrollView::AlwaysOn);
-        //scroll->setHScrollBarMode(QScrollView::AlwaysOff);
         scroll->setResizePolicy(QScrollView::AutoOneFit);
@@ -312,3 +321,3 @@ void DateBookWeekLst::setDate(const QDate &d) {
         int w,y;
-        calcWeek(d,w,y,onMonday);
+        calcWeek(d,w,y,bStartOnMonday);
         year=y;
@@ -328,3 +337,3 @@ QDate DateBookWeekLst::date() const {
         int dow= d.dayOfWeek();
-        if (!onMonday)
+        if (!bStartOnMonday)
         if (dow==7) {
@@ -349,5 +358,5 @@ void DateBookWeekLst::getEvents() {
                 QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
-                view=new DateBookWeekLstDblView(el,el2,start,onMonday,scroll);
+                view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
         } else {
-                view=new DateBookWeekLstView(el,start,onMonday,scroll);
+                view=new DateBookWeekLstView(el,start,bStartOnMonday,scroll);
         }
@@ -388,3 +397,2 @@ void DateBookWeekLst::keyPressEvent(QKeyEvent *e)
         }
-}
-
+}
\ No newline at end of file