summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (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
@@ -51,4 +51,6 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
mUpdateTimer = new QTimer( this );
connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() ));
+ mFirstSelectedDate = QDate::currentDate();
+ mSelectedDateCount = 1;
}
@@ -141,5 +143,5 @@ 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;
@@ -149,5 +151,5 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
static int lastHei = 0;
if ( lastWid == width() && height() == lastHei ) {
- qDebug("no layout computing needed. ");
+ qDebug("KODNC: No layout computing needed. ");
} else {
lastWid = width();
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index 7e6fa48..82d1eab 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -505,6 +505,6 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
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;
}
@@ -512,6 +512,6 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e )
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
@@ -268,4 +268,5 @@ EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
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
@@ -995,4 +995,9 @@ KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
emit incidenceSelected( 0 );
+
+ mComputeLayoutTimer = new QTimer( this );
+ connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout()));
+
+
#ifndef DESKTOP_VERSION
resize( QApplication::desktop()->size() );
@@ -1352,5 +1357,16 @@ 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;
@@ -1359,4 +1375,5 @@ void KOMonthView::resizeEvent(QResizeEvent * e)
else
mCells[0]->setFocus();
+
}
void KOMonthView::computeLayoutWeek()
@@ -1379,6 +1396,8 @@ void KOMonthView::computeLayoutWeek()
return;
- if ( lastWid == width() && lastHei == height() )
+ if ( lastWid == width() && lastHei == height() ) {
+ qDebug("KOListWeekView::No compute layout needed ");
return;
+ }
lastWid = width();
lastHei = height();
@@ -1506,4 +1525,5 @@ void KOMonthView::computeLayout()
}
if ( lastWid == width() && lastHei == height() ){
+ qDebug("KOMonthview::No compute layout needed ");
return;
}
@@ -1511,5 +1531,5 @@ void KOMonthView::computeLayout()
lastWid = width();
lastHei = height();
- //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
+ qDebug("KOMonthView::computeLayout() MMM ------------------- ");
QFontMetrics fm ( mWeekLabels[0]->font() );
int weeklabelwid = fm.width( "888" );
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index a92421b..89912e0 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -28,4 +28,5 @@
#include <qwidgetstack.h>
#include <qlayout.h>
+#include <qtimer.h>
#include <qintdict.h>
#include <qpushbutton.h>
@@ -252,4 +253,5 @@ class KOMonthView: public KOEventView
protected slots:
+ void slotComputeLayout();
void selectInternalWeekNum ( int );
void processSelectionChange();
@@ -266,4 +268,5 @@ class KOMonthView: public KOEventView
private:
+ QTimer* mComputeLayoutTimer;
NavigatorBar* mNavigatorBar;
int currentWeek();
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index cc0ce9b..94d74f1 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -242,4 +242,5 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView )
mMainView->leftFrame()->show();
}
+ //if ( mCurrentView == mMonthView ) qApp->processEvents();
emit signalFullScreen( !fullScreen );
if ( callUpdateView )