summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-21 13:08:02 (UTC)
committer zautrix <zautrix>2005-03-21 13:08:02 (UTC)
commit098a3c6dd844a880beb2851be53314613c3a038d (patch) (side-by-side diff)
treebac6a915e906760c48b1756c5b0564b04def0b63
parentad4ecbb0cbf79f37140041eb9a14e71e6fd393f1 (diff)
downloadkdepimpi-098a3c6dd844a880beb2851be53314613c3a038d.zip
kdepimpi-098a3c6dd844a880beb2851be53314613c3a038d.tar.gz
kdepimpi-098a3c6dd844a880beb2851be53314613c3a038d.tar.bz2
fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp3
-rw-r--r--korganizer/kdatenavigator.cpp2
-rw-r--r--korganizer/kodaymatrix.cpp6
3 files changed, 6 insertions, 5 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp
index 5941337..d4173e8 100644
--- a/korganizer/datenavigatorcontainer.cpp
+++ b/korganizer/datenavigatorcontainer.cpp
@@ -157,13 +157,14 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl;
kdDebug(5850) << " CURRENT SIZE: " << size() << endl;
kdDebug(5850) << " MINIMUM SIZEHINT: " << minimumSizeHint() << endl;
kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl;
kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl;
#endif
- QSize minSize = mNavigatorView->sizeHintTwoButtons();
+ //QSize minSize = mNavigatorView->sizeHintTwoButtons();
+ QSize minSize = mNavigatorView->yourSizeHint();
// kdDebug(5850) << " NAVIGATORVIEW minimumSizeHint: " << minSize << endl;
int verticalCount = size().height() / minSize.height();
int horizontalCount = size().width() / minSize.width();
//qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() );
diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index a5dbc5d..4b50b5a 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -112,13 +112,13 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name )
topLayout->addMultiCellWidget(daymatrix,2,7,1,7);
// read settings from configuration file.
updateConfig();
enableRollover(FollowMonth);
- mySizeHint = sizeHint();
+ mySizeHint = sizeHintTwoButtons();
mFontChanged = false;
}
void KDateNavigator::changeFont ( QFont fo )
{
setFont( fo );
mNavigatorBar->resetFont( fo );
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 582b2ef..9baff20 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -442,23 +442,23 @@ void KODayMatrix::updateEvents()
}
}
const QDate& KODayMatrix::getDate(int offset)
{
if (offset < 0 || offset > NUMDAYS-1) {
- qDebug("Wrong offset2 ");
+ qDebug("Wrong offset2 %d", offset);
return days[0];
}
return days[offset];
}
QString KODayMatrix::getHolidayLabel(int offset)
{
if (offset < 0 || offset > NUMDAYS-1) {
- qDebug("Wrong offset1 ");
- return 0;
+ qDebug("Wrong offset1 %d", offset);
+ return QString();
}
return mHolidays[offset];
}
int KODayMatrix::getDayIndexFrom(int x, int y)
{