summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt2
-rw-r--r--korganizer/komonthview.cpp199
-rw-r--r--korganizer/komonthview.h10
3 files changed, 164 insertions, 47 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index e24ee43..3ba0841 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -9,8 +9,10 @@ the popup menu: Set alarm for selected...
Added to the event/todo viewer the option to send an email to
all attendees or all selected (with RSVP) attendees.
+Made the week-month mode changing in month view faster.
+
********** VERSION 2.0.2 ************
KO/Pi:
Fixed the layout problem of the day label buttons
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9c1e4c3..daa37fd 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -22,8 +22,9 @@
#include <qfontmetrics.h>
#include <qkeycode.h>
#include <qhbox.h>
#include <qvbox.h>
+#include <qwidgetstack.h>
#include <qpushbutton.h>
#include <qtooltip.h>
#include <qpainter.h>
#include <qwhatsthis.h>
@@ -267,10 +268,10 @@ int MonthViewItem::width(const QListBox *lb) const
return( x + lb->fontMetrics().width( text() ) + 1 );
}
-MonthViewCell::MonthViewCell( KOMonthView *parent)
- : QWidget( parent ),
+MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
+ : QWidget( par ),
mMonthView( parent )
{
QVBoxLayout *topLayout = new QVBoxLayout( this );
@@ -765,39 +766,58 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
: KOEventView( calendar, parent, name ),
mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
{
+
+ clPending = true;
+ mWidStack = new QWidgetStack( this );
+ QHBoxLayout* hb = new QHBoxLayout( this );
+ mMonthView = new QWidget( mWidStack );
+ mWeekView = new QWidget( mWidStack );
+#if QT_VERSION >= 0x030000
+ mWidStack->addWidget(mMonthView );
+ mWidStack->addWidget(mWeekView );
+#else
+ mWidStack->addWidget( mMonthView, 1 );
+ mWidStack->addWidget( mWeekView , 1 );
+#endif
+ hb->addWidget( mWidStack );
mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
if ( mShowWeekView )
mWeekStartsMonday = true;
updatePossible = false;
mCells.setAutoDelete( true );
mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
- // mDayLayout = new QGridLayout( this );
- // create the day of the week labels (Sun, Mon, etc) and add them to
- // the layout.
mDayLabels.resize( mDaysPerWeek );
+ mDayLabelsW.resize( mDaysPerWeek );
QFont bfont = font();
if ( QApplication::desktop()->width() < 650 ) {
bfont.setPointSize( bfont.pointSize() - 2 );
}
bfont.setBold( true );
int i;
for( i = 0; i < mDaysPerWeek; i++ ) {
- QLabel *label = new QLabel( this );
+ QLabel *label = new QLabel( mMonthView );
label->setFont(bfont);
label->setFrameStyle(QFrame::Panel|QFrame::Raised);
label->setLineWidth(1);
label->setAlignment(AlignCenter);
mDayLabels.insert( i, label );
+ label = new QLabel( mWeekView );
+ label->setFont(bfont);
+ label->setFrameStyle(QFrame::Panel|QFrame::Raised);
+ label->setLineWidth(1);
+ label->setAlignment(AlignCenter);
+ mDayLabelsW.insert( i, label );
}
bfont.setBold( false );
mWeekLabels.resize( mNumWeeks+1 );
+ mWeekLabelsW.resize( 2 );
for( i = 0; i < mNumWeeks+1; i++ ) {
- KOWeekButton *label = new KOWeekButton( this );
+ KOWeekButton *label = new KOWeekButton( mMonthView );
label->setFont(bfont);
connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) );
label->setFlat(true);
QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
@@ -805,15 +825,30 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
//label->setLineWidth(1);
//label->setAlignment(AlignCenter);
mWeekLabels.insert( i, label );
}
- mWeekLabels[mNumWeeks]->setText( i18n(""));
+ mWeekLabels[mNumWeeks]->setText( i18n("W"));
QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
+
+ for( i = 0; i < 1+1; i++ ) {
+ KOWeekButton *label = new KOWeekButton( mWeekView );
+ label->setFont(bfont);
+ connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int )) );
+ label->setFlat(true);
+ QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
+ //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
+ //label->setLineWidth(1);
+ //label->setAlignment(AlignCenter);
+ mWeekLabelsW.insert( i, label );
+ }
+ mWeekLabelsW[1]->setText( i18n("W"));
+
+
int row, col;
mCells.resize( mNumCells );
for( row = 0; row < mNumWeeks; ++row ) {
for( col = 0; col < mDaysPerWeek; ++col ) {
- MonthViewCell *cell = new MonthViewCell( this );
+ MonthViewCell *cell = new MonthViewCell( this, mMonthView );
mCells.insert( row * mDaysPerWeek + col, cell );
connect( cell, SIGNAL( defaultAction( Incidence * ) ),
SLOT( defaultAction( Incidence * ) ) );
@@ -822,14 +857,36 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
connect( cell, SIGNAL( showDaySignal( QDate ) ),
SIGNAL( showDaySignal( QDate ) ) );
}
}
+ mCellsW.resize( mDaysPerWeek );
+ for( col = 0; col < mDaysPerWeek; ++col ) {
+ MonthViewCell *cell = new MonthViewCell( this, mWeekView );
+ mCellsW.insert( col, cell );
+
+ connect( cell, SIGNAL( defaultAction( Incidence * ) ),
+ SLOT( defaultAction( Incidence * ) ) );
+ connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
+ SIGNAL( newEventSignal( QDateTime ) ) );
+ connect( cell, SIGNAL( showDaySignal( QDate ) ),
+ SIGNAL( showDaySignal( QDate ) ) );
+ }
//connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
mContextMenu = eventPopup();
// updateConfig(); //useless here
- mWeekLabels[mNumWeeks]->setText( i18n("W"));
+ //mWeekLabels[mNumWeeks]->setText( i18n("W"));
+#if 0
+ mWidStack = new QWidgetStack( this );
+ mMonthView = new QWidget( mWidStack );
+ mWeekView = new QWidget( mWidStack );
+#endif
+ if ( mShowWeekView )
+ mWidStack->raiseWidget( mWeekView );
+ else
+ mWidStack->raiseWidget( mMonthView );
+
emit incidenceSelected( 0 );
}
KOMonthView::~KOMonthView()
@@ -841,22 +898,30 @@ void KOMonthView::selectDateWeekNum ( int )
}
void KOMonthView::selectInternalWeekNum ( int n )
{
- emit selectWeekNum ( n );
switchView();
+ emit selectWeekNum ( n );
}
void KOMonthView::switchView()
{
+
if ( selectedCell( ) )
selectedCell()->deselect();
mShowWeekView = !mShowWeekView;
KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
//emit showNavigator( !mShowWeekView );
+ if ( clPending ) {
computeLayout();
updateConfig();
}
+ if ( mShowWeekView )
+ mWidStack->raiseWidget( mWeekView );
+ else
+ mWidStack->raiseWidget( mMonthView );
+ clPending = false;
+}
int KOMonthView::maxDatesHint()
{
return mNumCells;
@@ -935,26 +1000,63 @@ void KOMonthView::updateConfig()
void KOMonthView::updateDayLabels()
{
+ QPtrVector<QLabel> *mDayLabelsT;
+#if 0
+ if (mShowWeekView )
+ mDayLabelsT = &mDayLabelsW;
+ else
+ mDayLabelsT = &mDayLabels;
+#endif
+
+ mDayLabelsT = &mDayLabelsW;
for (int i = 0; i < 7; i++) {
if (mWeekStartsMonday) {
bool show = mShortDayLabels;
- if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > mDayLabels[i]->width() )
+ if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() )
show = true;
- mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
+ (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
} else {
- if (i==0) mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
- else mDayLabels[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+ if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
+ else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
}
}
+ mDayLabelsT = &mDayLabels;
+ for (int i = 0; i < 7; i++) {
+ if (mWeekStartsMonday) {
+ bool show = mShortDayLabels;
+ if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width() )
+ show = true;
+ (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
+ } else {
+ if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabels));
+ else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+
+ }
+ }
+
}
void KOMonthView::showDates(const QDate &start, const QDate &)
{
// kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
+ QPtrVector<MonthViewCell> *cells;
+ QPtrVector<QLabel> *dayLabels;
+ QPtrVector<KOWeekButton> *weekLabels;
+ int weekNum = 6;
+ if ( mShowWeekView ) {
+ weekNum = 1;
+ cells = &mCellsW;
+ dayLabels = &mDayLabelsW;
+ weekLabels = &mWeekLabelsW;
+ } else {
+ cells = &mCells;
+ dayLabels = &mDayLabels;
+ weekLabels = &mWeekLabels;
+ }
mStartDate = start;
int startWeekDay = mWeekStartsMonday ? 1 : 7;
@@ -964,21 +1066,21 @@ void KOMonthView::showDates(const QDate &start, const QDate &)
}
bool primary = false;
uint i;
- for( i = 0; i < mCells.size(); ++i ) {
+ for( i = 0; i < (*cells).size(); ++i ) {
QDate date = mStartDate.addDays( i );
- mCells[i]->setDate( date );
+ (*cells)[i]->setDate( date );
#ifndef KORG_NOPLUGINS
// add holiday, if present
QString hstring(KOCore::self()->holiday(date));
- mCells[i]->setHoliday( hstring );
+ (*cells)[i]->setHoliday( hstring );
#endif
}
QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
- for( i = 0; i < 6; ++i ) {
+ for( i = 0; i < weekNum; ++i ) {
int wno;
// remember, according to ISO 8601, the first week of the year is the
// first week that contains a thursday. Thus we must subtract off 4,
// not just 1.
@@ -986,9 +1088,9 @@ void KOMonthView::showDates(const QDate &start, const QDate &)
if (dayOfYear % 7 != 0)
wno = dayOfYear / 7 + 1;
else
wno =dayOfYear / 7;
- mWeekLabels[i]->setWeekNum( wno );
+ (*weekLabels)[i]->setWeekNum( wno );
date = date.addDays( 7 );
}
updateView();
}
@@ -1011,15 +1113,21 @@ void KOMonthView::updateView()
if ( !updatePossible )
return;
//QTime ti;
//ti.start();
+ QPtrVector<MonthViewCell> *cells;
+ if ( mShowWeekView ) {
+ cells = &mCellsW;
+ } else {
+ cells = &mCells;
+ }
#if 1
int i;
- int timeSpan = mCells.size()-1;
+ int timeSpan = (*cells).size()-1;
if ( KOPrefs::instance()->mMonthViewWeek )
timeSpan = 6;
for( i = 0; i < timeSpan + 1; ++i ) {
- mCells[i]->startUpdateCell();
+ (*cells)[i]->startUpdateCell();
}
QPtrList<Event> events = calendar()->events();
Event *event;
@@ -1046,9 +1154,9 @@ void KOMonthView::updateView()
if ( end > timeSpan ) end = timeSpan;
int iii;
//qDebug("found %s %d %d ",event->summary().latin1(), st, end );
for ( iii = st;iii<= end;++iii)
- mCells[iii]->insertEvent( event );
+ (*cells)[iii]->insertEvent( event );
}
}
} else {
if ( invalid )
@@ -1076,9 +1184,9 @@ void KOMonthView::updateView()
if ( st < 0 ) st = 0;
if ( end > timeSpan ) end = timeSpan;
int iii;
for ( iii = st;iii<= end;++iii)
- mCells[iii]->insertEvent( event );
+ (*cells)[iii]->insertEvent( event );
}
}
}
}
@@ -1089,40 +1197,44 @@ void KOMonthView::updateView()
//insertTodo( todo );
if ( todo->hasDueDate() ) {
int day = mStartDate.daysTo( todo->dtDue().date() );
if ( day >= 0 && day < timeSpan + 1) {
- mCells[day]->insertTodo( todo );
+ (*cells)[day]->insertTodo( todo );
}
}
}
for( i = 0; i < timeSpan+1; ++i ) {
- mCells[i]->finishUpdateCell();
+ (*cells)[i]->finishUpdateCell();
}
processSelectionChange();
- mCells[0]->setFocus();
+ (*cells)[0]->setFocus();
#else
// old code
//qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
int i;
- for( i = 0; i < mCells.count(); ++i ) {
- mCells[i]->updateCell();
+ for( i = 0; i < (*cells).count(); ++i ) {
+ (*cells)[i]->updateCell();
}
//qDebug("KOMonthView::updateView() ");
processSelectionChange();
// qDebug("---------------------------------------------------------------------+ ");
- mCells[0]->setFocus();
+ (*cells)[0]->setFocus();
#endif
//qDebug("update time %d ", ti.elapsed());
}
void KOMonthView::resizeEvent(QResizeEvent * e)
{
computeLayout();
+ clPending = true;
+ if ( mShowWeekView )
+ mCellsW[0]->setFocus();
+ else
mCells[0]->setFocus();
}
void KOMonthView::computeLayoutWeek()
{
@@ -1155,9 +1267,9 @@ void KOMonthView::computeLayoutWeek()
wid -= weeklabelwid;
int colWid = wid / daysToShow;
int lastCol = wid - ( colWid*6 );
- int dayLabelHei = mDayLabels[0]->sizeHint().height();
+ int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow );
int colModulo = wid % daysToShow;
int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
//qDebug("rowmod %d ", rowModulo);
@@ -1176,22 +1288,22 @@ void KOMonthView::computeLayoutWeek()
if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
++w;
}
if ( i >= 5 ) {
- mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
+ mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
x -= (w/2 );
}
else
- mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
+ mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h);
x += w;
}
x= 0;
y= dayLabelHei;
w = colWid;
h = cellHei;
- for ( i = 0; i < mCells.count(); ++i) {
+ for ( i = 0; i < mCellsW.count(); ++i) {
if ( i > 6 ) {
- mCells[i]->hide();
+ mCellsW[i]->hide();
continue;
}
w = colWid;
@@ -1202,19 +1314,19 @@ void KOMonthView::computeLayoutWeek()
++h;
if ( i >= 5 ) {
if ( i ==5 ) {
- mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 );
+ mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h/2 );
x -= w ;y += h/2;
} else {
if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
++w;
}
- mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 );
+ mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 );
y -= h/2;
}
} else
- mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
+ mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h );
x += w;
if ( x + w/2 > wid ) {
@@ -1223,16 +1335,13 @@ void KOMonthView::computeLayoutWeek()
}
}
y= dayLabelHei;
h = cellHei ;
- mWeekLabels[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
- for ( i = 1; i < 6; i++) {
- mWeekLabels[i]->hide();
- }
- mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
+ mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
+ mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
// qDebug("RRRRRRRRRRRRR %d %d old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
//qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
- mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ;
+ mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
updateDayLabels();
bool forceUpdate = !updatePossible;
updatePossible = true;
//mWeekLabels[mNumWeeks]->setText( i18n("M"));
@@ -1299,9 +1408,8 @@ void KOMonthView::computeLayout()
y= dayLabelHei;
w = colWid;
h = cellHei ;
for ( i = 0; i < mCells.count(); ++i) {
- mCells[i]->show();
w = colWid;
if ( ((i) % 7) >= 7-colModulo ) {
++w;
}
@@ -1330,9 +1438,8 @@ void KOMonthView::computeLayout()
}
y= dayLabelHei;
h = cellHei ;
for ( i = 0; i < 6; i++) {
- mWeekLabels[i]->show();
if ( i == (6-rowModulo))
++h;
mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
y += h;
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 1ed200b..b89b2bc 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -24,8 +24,9 @@
#include <qframe.h>
#include <qdatetime.h>
#include <qlistbox.h>
#include <qpoint.h>
+#include <qwidgetstack.h>
#include <qlayout.h>
#include <qintdict.h>
#include <qpushbutton.h>
#include <qvaluelist.h>
@@ -124,9 +125,9 @@ class KOMonthView;
class MonthViewCell : public QWidget
{
Q_OBJECT
public:
- MonthViewCell( KOMonthView * );
+ MonthViewCell(KOMonthView *,QWidget* );
void setDate( const QDate & );
QDate date() const;
@@ -255,8 +256,12 @@ class KOMonthView: public KOEventView
void viewChanged();
void updateDayLabels();
private:
+ bool clPending;
+ QWidgetStack * mWidStack;
+ QWidget* mMonthView;
+ QWidget* mWeekView;
bool mShowWeekView;
bool updatePossible;
int mDaysPerWeek;
int mNumWeeks;
@@ -268,8 +273,11 @@ class KOMonthView: public KOEventView
QPtrVector<MonthViewCell> mCells;
QPtrVector<QLabel> mDayLabels;
QPtrVector<KOWeekButton> mWeekLabels;
+ QPtrVector<MonthViewCell> mCellsW;
+ QPtrVector<QLabel> mDayLabelsW;
+ QPtrVector<KOWeekButton> mWeekLabelsW;
bool mShortDayLabels;
int mWidthLongDayLabel;