summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp6
-rw-r--r--korganizer/koagendaitem.cpp8
-rw-r--r--korganizer/koagendaview.cpp1
-rw-r--r--korganizer/komonthview.cpp26
-rw-r--r--korganizer/komonthview.h3
-rw-r--r--korganizer/koviewmanager.cpp1
6 files changed, 36 insertions, 9 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 548c364..d1caff3 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -50,6 +50,8 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
mUpdateTimer;
mUpdateTimer = new QTimer( this );
connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
+ mFirstSelectedDate = QDate::currentDate();
+ mSelectedDateCount = 1;
}
DateNavigatorContainer::~DateNavigatorContainer()
@@ -140,7 +142,7 @@ void DateNavigatorContainer::setCalendar( Calendar *cal )
}
void DateNavigatorContainer::checkUpdateDayMatrixDates()
{
- qDebug("wid %d hei %d ", width(), height());
+ //qDebug("KODNC: wid %d hei %d ", width(), height());
mUpdateTimer->stop();
//return;
if ( width() < 3 || height() < 3 )
@@ -148,7 +150,7 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
static int lastWid = 0;
static int lastHei = 0;
if ( lastWid == width() && height() == lastHei ) {
- qDebug("no layout computing needed. ");
+ qDebug("KODNC: No layout computing needed. ");
} else {
lastWid = width();
lastHei = height();
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 7e6fa48..82d1eab 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -504,15 +504,15 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
rw = rw + xx;
rx -= xx;
xx = 0;
- if ( rw < 0 ) {
- qDebug("KOAgendaItem::Width1 < 0. Returning ");
+ if ( rw <= 1 ) {
+ qDebug("KOAgendaItem::Width1 <= 1 (%d). Returning. %s",rw,mDisplayedText.latin1());
return;
}
}
if ( paintFrom->width() < xx+rw ) {
rw = paintFrom->width() - xx;
- if ( rw < 0 ) {
- qDebug("KOAgendaItem::Width2 < 0. Returning ");
+ if ( rw <= 1 ) {
+ qDebug("KOAgendaItem::Width2 <= 1 (%d). Returning.%s ",rw,mDisplayedText.latin1() );
return;
}
}
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index eb3a6cd..5508210 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -267,6 +267,7 @@ EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
if (mLocation == Top) mPixmap = SmallIcon("1uparrow");
else mPixmap = SmallIcon("1downarrow");
mEnabled.resize(mColumns);
+ mEnabled.fill( false );
setMinimumHeight(mPixmap.height());
}
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9fd1f68..8ee5bc3 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -994,6 +994,11 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
#endif
emit incidenceSelected( 0 );
+
+ mComputeLayoutTimer = new QTimer( this );
+ connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout()));
+
+
#ifndef DESKTOP_VERSION
resize( QApplication::desktop()->size() );
#else
@@ -1351,13 +1356,25 @@ void KOMonthView::updateView()
void KOMonthView::resizeEvent(QResizeEvent * e)
{
- //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
+ qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
+ if ( isVisible() ) {
+ qDebug("KOMonthView::isVisible ");
+ slotComputeLayout();
+ } else
+ mComputeLayoutTimer->start( 100 );
+}
+
+void KOMonthView::slotComputeLayout()
+{
+ mComputeLayoutTimer->stop();
+ qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
computeLayout();
clPending = true;
if ( mShowWeekView )
mCellsW[0]->setFocus();
else
mCells[0]->setFocus();
+
}
void KOMonthView::computeLayoutWeek()
{
@@ -1378,8 +1395,10 @@ void KOMonthView::computeLayoutWeek()
if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei )
return;
- if ( lastWid == width() && lastHei == height() )
+ if ( lastWid == width() && lastHei == height() ) {
+ qDebug("KOListWeekView::No compute layout needed ");
return;
+ }
lastWid = width();
lastHei = height();
@@ -1505,12 +1524,13 @@ void KOMonthView::computeLayout()
return;
}
if ( lastWid == width() && lastHei == height() ){
+ qDebug("KOMonthview::No compute layout needed ");
return;
}
lastWid = width();
lastHei = height();
- //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
+ qDebug("KOMonthView::computeLayout() MMM ------------------- ");
QFontMetrics fm ( mWeekLabels[0]->font() );
int weeklabelwid = fm.width( "888" );
wid -= weeklabelwid;
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index a92421b..89912e0 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -27,6 +27,7 @@
#include <qpoint.h>
#include <qwidgetstack.h>
#include <qlayout.h>
+#include <qtimer.h>
#include <qintdict.h>
#include <qpushbutton.h>
#include <qvaluelist.h>
@@ -251,6 +252,7 @@ class KOMonthView: public KOEventView
void switchView();
protected slots:
+ void slotComputeLayout();
void selectInternalWeekNum ( int );
void processSelectionChange();
signals:
@@ -265,6 +267,7 @@ class KOMonthView: public KOEventView
void updateDayLabels();
private:
+ QTimer* mComputeLayoutTimer;
NavigatorBar* mNavigatorBar;
int currentWeek();
bool clPending;
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index cc0ce9b..94d74f1 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -241,6 +241,7 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView )
} else {
mMainView->leftFrame()->show();
}
+ //if ( mCurrentView == mMonthView ) qApp->processEvents();
emit signalFullScreen( !fullScreen );
if ( callUpdateView )
mMainView->updateView();