From d18536f758f4cf64d5c59d7a7c814e6ff12f9a3d Mon Sep 17 00:00:00 2001 From: zautrix Date: Tue, 22 Mar 2005 09:31:41 +0000 Subject: layout fixes --- diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 90b36ac..8100e25 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -314,6 +314,7 @@ void CalendarView::init() mLeftFrame = new KDGanttMinimizeSplitter( Qt::Vertical, mMainFrame); mLeftFrame->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); } + mMainFrame->setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); //QBoxLayout * leftFrameLayout; topLayout->addWidget( mMainFrame ); //mainBoxLayout->addWidget (mLeftFrame); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index b147427..ab0dd50 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -45,6 +45,7 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent, mNavigatorView = new KDateNavigator( this, name ); connectNavigatorView( mNavigatorView ); + //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); } DateNavigatorContainer::~DateNavigatorContainer() @@ -175,17 +176,24 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) //qDebug(" wattdatt %d new %d %d ", size().width() ,e->size().width() , minSize.width() ); //qDebug("COUNT %d %d %d %d ", verticalCount, horizontalCount , mVerticalCount, mHorizontalCount ); bool fontchange = false; + if ( horizontalCount == 1) + horizontalCount = size().width() / mNavigatorView->yourFullSizeHint().width(); QFont fo; if ( horizontalCount != mHorizontalCount || verticalCount != mVerticalCount ) { uint count = horizontalCount * verticalCount; if ( count == 0 ) { bool ok; - fo = mNavigatorView->yourFontHint( size() , &ok); + fo = mNavigatorView->yourFontHint( size() , &ok ); //mNavigatorView->resize( size() ); //if ( ! ok ) // return; - minSize = mNavigatorView->sizeHintTwoButtons(); + int butt = 2; + horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width(); + if ( horizontalCount <= 1 ) + minSize = mNavigatorView->sizeHintTwoButtons( 4 ); + else + minSize = mNavigatorView->sizeHintTwoButtons(); verticalCount = size().height() / minSize.height(); horizontalCount = size().width() / minSize.width(); if ( horizontalCount == 0 ) @@ -231,6 +239,7 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) mHorizontalCount = horizontalCount; mVerticalCount = verticalCount; } + //qDebug("COUNT %d ", mExtraViews.count()); int height = size().height() / verticalCount; int width = size().width() / horizontalCount; diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index fe83e09..231095f 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -116,6 +116,7 @@ KDateNavigator::KDateNavigator( QWidget *parent, const char *name ) updateConfig(); enableRollover(FollowMonth); mySizeHint = sizeHintTwoButtons(); + myFullSizeHint = sizeHintTwoButtons( 4 ); mFontChanged = false; } void KDateNavigator::changeFont ( QFont fo ) @@ -134,9 +135,13 @@ QFont KDateNavigator::yourFontHint( QSize si , bool *b) setFont( fo ); mFontChanged = true; mNavigatorBar->resetFont( fo ); - QSize sh = sizeHintTwoButtons(); + QSize sh = sizeHintTwoButtons( 2 ); //qDebug("fp %d %d %d %d %d", fontPoint, si.width() , sh.width() , si.height() , sh.height() ); if ( si.width() > sh.width() && si.height() > sh.height()) { + if ( si.width() / sh.width() == 1 ) { + if ( si.width() < sizeHintTwoButtons( 4 ).width()) + continue; + } *b = true; //qDebug("fooooooooooooooooooooooouuuuund "); break; @@ -157,11 +162,11 @@ QSize KDateNavigator::sizeHint() const //qDebug("KDateNavigator+++++++++++++ %d %d", wid , hei); return QSize ( wid, hei ); } -QSize KDateNavigator::sizeHintTwoButtons() const +QSize KDateNavigator::sizeHintTwoButtons( int butnum ) const { QFontMetrics fm ( font() ); QSize day = daymatrix->sizeHint(); - QSize nav = mNavigatorBar->sizeHintTwoButtons(); + QSize nav = mNavigatorBar->sizeHintTwoButtons( butnum ); int wid = fm.width( "30") + day.width()+3; int hei = fm.height() +day.height()+nav.height()+2; if ( wid < nav.width() ) diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 77b9b7c..10bc1be 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h @@ -64,13 +64,14 @@ class KDateNavigator: public QFrame KCal::DateList selectedDates() const { return mSelectedDates; } NavigatorBar *navigatorBar() const { return mNavigatorBar; } void setMonthSignalOffset ( int off ) { mMonthSignalOffset = off%12;} - QSize yourSizeHint() { return mySizeHint; } + QSize yourSizeHint()const { return mySizeHint; }; + QSize yourFullSizeHint() const { return myFullSizeHint;}; QFont yourFontHint( QSize , bool * b); bool fontChanged() {return mFontChanged; } void unsetFontChanged() { mFontChanged = false; } KODayMatrix *dayMatrix() { return daymatrix ;} QSize sizeHint() const; - QSize sizeHintTwoButtons() const; + QSize sizeHintTwoButtons( int butnum = 2 ) const; void changeFont ( QFont fo ); public slots: void selectDates( const KCal::DateList & ); @@ -123,6 +124,7 @@ class KDateNavigator: public QFrame private: QSize mySizeHint; + QSize myFullSizeHint; bool mFontChanged; int mMonthSignalOffset; NavigatorBar *mNavigatorBar; diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 120bc89..a2e0ae0 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -414,7 +414,8 @@ void KODayMatrix::updateView(QDate actdate) } else { #ifdef DESKTOP_VERSION //mRepaintTimer->start( 100 ); - mUpdateTimer->start( 100 ); + //updateViewTimed(); + mUpdateTimer->start( 20 ); #else mRepaintTimer->start( 350 ); mUpdateTimer->start( 1200 ); @@ -843,8 +844,8 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) if ( col >= 7 - colModulo ) addCol = col - 6 + colModulo-1; } - if ( col == 0 ) - addCol = 1; + + addCol += 1; p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight+1); p.setPen(tmppen); } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 76982b4..9fd1f68 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -305,7 +305,7 @@ void MonthViewItem::paint(QPainter *p) p->drawText( x, yPos, text() ); if ( mIncidence->cancelled() ) { int wid = fm.width( text() ); - p->drawLine( x, heihei/2 ,x+wid, heihei/2 ); + p->drawLine( x, heihei/2-1 ,x+wid, heihei/2-1 ); } } diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 1b4ee52..06f5ef8 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -175,9 +175,9 @@ QSize NavigatorBar::sizeHint() const //qDebug("ret %d %d ", wid, mCurrentHei); return QSize ( wid, mCurrentHei ); } -QSize NavigatorBar::sizeHintTwoButtons() const +QSize NavigatorBar::sizeHintTwoButtons( int butNum ) const { - return QSize ( mCurrentMinWid + 2 * mCurrentButtonMinWid , mCurrentHei ); + return QSize ( mCurrentMinWid + butNum * mCurrentButtonMinWid , mCurrentHei ); } void NavigatorBar::resetFont ( QFont fo ) { diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h index bf6d173..9ccef14 100644 --- a/korganizer/navigatorbar.h +++ b/korganizer/navigatorbar.h @@ -41,7 +41,7 @@ class NavigatorBar: public QWidget void showButtons( bool left, bool right ); void resetFont ( QFont fo ); QSize sizeHint() const; - QSize sizeHintTwoButtons() const; + QSize sizeHintTwoButtons( int butNum = 2 ) const; public slots: void selectDates( const KCal::DateList & ); -- cgit v0.9.0.2