summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagenda.cpp22
1 files changed, 5 insertions, 17 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 14f52b8..ed7a443 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -346,21 +346,12 @@ void KOAgenda::marcus_bains()
void KOAgenda::changeColumns(int columns)
{
if (columns == 0) {
- kdDebug() << "KOAgenda::changeColumns() called with argument 0" << endl;
+ qDebug("KOAgenda::changeColumns() called with argument 0 ");
return;
}
-
clear();
-
mColumns = columns;
-// setMinimumSize(mColumns * 10, mGridSpacingY + 1);
-// init();
-// update();
- //qDebug("KOAgenda::changeColumns ");
computeSizes();
- // QResizeEvent event( size(), size() );
-
- //QApplication::sendEvent( this, &event );
}
/*
@@ -1748,10 +1739,8 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
*/
KOAgendaItem *KOAgenda::insertItem (Incidence *event,QDate qd,int X,int YTop,int YBottom)
{
- //kdDebug() << "KOAgenda::insertItem:" << event->summary() << "-" << qd.toString() << " ;top, bottom:" << YTop << "," << YBottom << endl;
-
if (mAllDayMode) {
- kdDebug() << "KOAgenda: calling insertItem in all-day mode is illegal." << endl;
+ qDebug("KOAgenda: calling insertItem in all-day mode is illegal. ");
return 0;
}
@@ -1760,7 +1749,6 @@ KOAgendaItem *KOAgenda::insertItem (Incidence *event,QDate qd,int X,int YTop,int
int YSize = YBottom - YTop + 1;
if (YSize < 0) {
- kdDebug() << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " YSize<0" << endl;
YSize = 1;
}
int iheight = mGridSpacingY * YSize;
@@ -1890,9 +1878,9 @@ void KOAgenda::computeSizes()
{
if ( globalFlagBlockStartup )
return;
-
+ int frameOffset = frameWidth() * 2 +1;
if (mAllDayMode) {
- mGridSpacingX = (width()-3) / mColumns;
+ mGridSpacingX = (width()-frameOffset) / mColumns;
mGridSpacingY = height() - 2 * frameWidth() - 1;
resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY + 1);
// mGridSpacingY = height();
@@ -1910,7 +1898,7 @@ void KOAgenda::computeSizes()
}
KOPrefs::instance()->mAllDaySize = mGridSpacingY;
} else {
- mGridSpacingX = (width() - verticalScrollBar()->width()-3)/mColumns;
+ mGridSpacingX = (width() - verticalScrollBar()->width()-frameOffset)/mColumns;
if (height() > mGridSpacingY * mRows + 1 ) {
KOPrefs::instance()->mHourSize = ((height())/mRows)+1;
mGridSpacingY = KOPrefs::instance()->mHourSize ;