2 files changed, 13 insertions, 3 deletions

diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index ea3a329..d675517 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -169,1042 +169,1050 @@ void KDGanttSplitterHandle::toggle()
     }
     repaint();
 }
 
 void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e )
 {
     mMouseDown = false;
     if ( _activeButton != 0 ) {
         if ( onButton( e->pos() ) == _activeButton )
         {
             toggle();
         }
         _activeButton = 0;
         updateCursor( e->pos() );
     }
     else {
         if ( !opaque() && e->button() == LeftButton ) {
             QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
         }
     }
     if ( s->rubberBand() )
         s->rubberBand()->hide();
     repaint();
 }
 
 int KDGanttSplitterHandle::onButton( const QPoint& p )
 {
     QValueList<QPointArray> list = buttonRegions();
     int index = 1;
     int add = 12;
     for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         QRect rect = (*it).boundingRect();
         rect.setLeft( rect.left()- add );
         rect.setRight( rect.right() + add);
         rect.setTop( rect.top()- add );
         rect.setBottom( rect.bottom() + add);
         if ( rect.contains( p ) ) {
             return index;
         }
         index++;
     }
     return 0;
 }
 
 
 QValueList<QPointArray> KDGanttSplitterHandle::buttonRegions()
 {
     QValueList<QPointArray> list;
 
     int sw = 8;
     int yyy = 1;
     int xxx = 1;
     int voffset[] = { (int) -sw*3, (int) sw*3 };
     for ( int i = 0; i < 2; i++ ) {
         QPointArray arr;
         if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ||
              _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Left) {
             int mid = height()/2 + voffset[i];
             arr.setPoints( 3,
                            1-xxx, mid - sw + 4,
                            sw-3-xxx, mid,
                            1-xxx, mid + sw -4);
         }
         else if ( !_collapsed &&  s->minimizeDirection() == KDGanttMinimizeSplitter::Left ||
                   _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Right ) {
             int mid = height()/2 + voffset[i];
             arr.setPoints( 3,
                            sw-4, mid - sw + 4,
                            0, mid,
                            sw-4, mid + sw - 4);
         }
         else if ( !_collapsed &&  s->minimizeDirection() == KDGanttMinimizeSplitter::Up ||
                   _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Down) {
             int mid = width()/2 + voffset[i];
             arr.setPoints( 3,
                            mid - sw + 4, sw-4,
                            mid, 0,
                            mid + sw - 4, sw-4 );
         }
         else if ( !_collapsed && s->minimizeDirection() == KDGanttMinimizeSplitter::Down ||
                   _collapsed  && s->minimizeDirection() == KDGanttMinimizeSplitter::Up ) {
             int mid = width()/2 + voffset[i];
             arr.setPoints( 3,
                            mid - sw + 4, 1-yyy,
                            mid, sw-3-yyy,
                            mid + sw -4, 1-yyy);
         }
         list.append( arr );
     }
     return list;
 }
 
 void KDGanttSplitterHandle::paintEvent( QPaintEvent * )
 {
     QPixmap buffer( size() );
     QPainter p( &buffer );
 
     //LR
     // Draw the splitter rectangle
     p.setBrush( colorGroup().background() );
     p.setPen( colorGroup().foreground() );
     //p.drawRect( rect() );
     buffer.fill( colorGroup().background() );
     //buffer.fill( backgroundColor() );
     // parentWidget()->style().drawPrimitive( QStyle::PE_Panel, &p, rect(), parentWidget()->colorGroup());
 
     int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
 
     // arrow color
     QColor col;
     if ( _activeButton )
         col = colorGroup().background().dark( 250 );
     else {
         if ( mMouseDown )
             col = Qt::white;
         else
             col = colorGroup().background().dark( 150 );
     }
     //QColor col = backgroundColor().dark( 130 );
     p.setBrush( col );
     p.setPen( col  );
 
     QValueList<QPointArray> list = buttonRegions();
     int index = 1;
     if ( mUseOffset )
         p.translate( 0, 1 );
     for ( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) { 
            
             /*
             if ( ! _collapsed ) {
             p.save();
             // p.translate( parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftHorizontal ),
             //           parentWidget()->style().pixelMetric( QStyle::PM_ButtonShiftVertical ) );
             p.translate( -1, 0 );
             p.drawPolygon( *it, true );
             p.restore(); } else
             */
             p.drawPolygon( *it, true );
                 
         }
         else {
             /*
             if ( ! _collapsed ) {
             p.save();
             p.translate( -1, 0 );
             p.drawPolygon( *it, true );
             p.restore();
             } else
             */
             p.drawPolygon( *it, true );
                 
         }
         index++;
     }
 
     // Draw the lines between the arrows
     if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Left ||
          s->minimizeDirection() == KDGanttMinimizeSplitter::Right ) {
         int mid = height()/2;
         p.drawLine ( 1, mid - sw, 1, mid + sw );
         p.drawLine ( 3, mid - sw, 3, mid + sw );
     }
     else if ( s->minimizeDirection() == KDGanttMinimizeSplitter::Up ||
               s->minimizeDirection() == KDGanttMinimizeSplitter::Down ) {
         int mid = width()/2;
         p.drawLine( mid -sw, 1, mid +sw, 1 );
         p.drawLine( mid -sw, 3, mid +sw, 3 );
     }
     bitBlt( this, 0, 0, &buffer );
 
 }
 #endif
 
 class QSplitterLayoutStruct
 {
 public:
     KDGanttMinimizeSplitter::ResizeMode mode;
     QCOORD sizer;
     bool isSplitter;
     QWidget *wid;
 };
 
 class QSplitterData
 {
 public:
     QSplitterData() : opaque( FALSE ), firstShow( TRUE ) {}
 
     QPtrList<QSplitterLayoutStruct> list;
     bool opaque;
     bool firstShow;
 };
 
 void kdganttGeomCalc( QMemArray<QLayoutStruct> &chain, int start, int count, int pos,
                  int space, int spacer );
 #endif // DOXYGEN_SKIP_INTERNAL
 
 
 /*!
   \class KDGanttMinimizeSplitter KDGanttMinimizeSplitter.h
   \brief The KDGanttMinimizeSplitter class implements a splitter
   widget with minimize buttons.
 
   This class (and its documentation) is largely a copy of Qt's
   QSplitter; the copying was necessary because QSplitter is not
   extensible at all. QSplitter and its documentation are licensed
   according to the GPL and the Qt Professional License (if you hold
   such a license) and are (C) Trolltech AS.
 
   A splitter lets the user control the size of child widgets by
   dragging the boundary between the children. Any number of widgets
   may be controlled.
 
   To show a QListBox, a QListView and a QTextEdit side by side:
 
   \code
     KDGanttMinimizeSplitter *split = new KDGanttMinimizeSplitter( parent );
     QListBox *lb = new QListBox( split );
     QListView *lv = new QListView( split );
     QTextEdit *ed = new QTextEdit( split );
   \endcode
 
   In KDGanttMinimizeSplitter, the boundary can be either horizontal or
   vertical.  The default is horizontal (the children are side by side)
   but you can use setOrientation( QSplitter::Vertical ) to set it to
   vertical.
 
   Use setResizeMode() to specify
   that a widget should keep its size when the splitter is resized.
 
   Although KDGanttMinimizeSplitter normally resizes the children only
   at the end of a resize operation, if you call setOpaqueResize( TRUE
   ) the widgets are resized as often as possible.
 
   The initial distribution of size between the widgets is determined
   by the initial size of each widget. You can also use setSizes() to
   set the sizes of all the widgets. The function sizes() returns the
   sizes set by the user.
 
   If you hide() a child, its space will be distributed among the other
   children. It will be reinstated when you show() it again. It is also
   possible to reorder the widgets within the splitter using
   moveToFirst() and moveToLast().
 */
 
 
 
 static QSize minSize( const QWidget* /*w*/ )
 {
     return QSize(0,0);
 }
 
 // This is the original version of minSize
 static QSize minSizeHint( const QWidget* w )
 {
     QSize min = w->minimumSize();
     QSize s;
     if ( min.height() <= 0 || min.width() <= 0 )
         s = w->minimumSizeHint();
     if ( min.height() > 0 )
         s.setHeight( min.height() );
     if ( min.width() > 0 )
         s.setWidth( min.width() );
     return s.expandedTo(QSize(0,0));
 }
 
 
 /*!
   Constructs a horizontal splitter with the \a parent and \a
   name arguments being passed on to the QFrame constructor.
 */
 KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( QWidget *parent, const char *name )
     :QFrame(parent,name,WPaintUnclipped)
 {
     mRubberBand = 0;
     mFirstHandle = 0;
 #if QT_VERSION >= 232
      orient = Horizontal;
      init();
 #endif
 }
 
 /*!
   Constructs a splitter with orientation \a o with the \a parent
   and \a name arguments being passed on to the QFrame constructor.
 */
 KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Orientation o, QWidget *parent, const char *name )
     :QFrame(parent,name,WPaintUnclipped)
 { 
     
     mRubberBand = 0;
     mFirstHandle = 0;
 #if QT_VERSION >= 232
      orient = o;
      init();
 #endif
 }
 
 /*!
   Destroys the splitter and any children.
 */
 KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter()
 {
 #if QT_VERSION >= 232
     data->list.setAutoDelete( TRUE );
     delete data;
 #endif
     if ( mRubberBand )
         delete mRubberBand;
 }
 
 
 #if QT_VERSION >= 232
 void KDGanttMinimizeSplitter::init()
 {
     data = new QSplitterData;
     if ( orient == Horizontal )
         setSizePolicy( QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Minimum) );
     else
         setSizePolicy( QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Expanding) );
 #ifndef DESKTOP_VERSION
      setOpaqueResize( false );
 #else
      setOpaqueResize( true );
 #endif
 }
 #endif
 
 
 void KDGanttMinimizeSplitter::toggle()
 {
     if ( mFirstHandle  )
         mFirstHandle->toggle();
     else
         qDebug("KDGanttMinimizeSplitter::toggle::sorry, handle not available ");
         
 }
 
 
 /*!
   \brief the orientation of the splitter
 
   By default the orientation is horizontal (the widgets are side by side).
   The possible orientations are Qt:Vertical and Qt::Horizontal (the default).
 */
 void KDGanttMinimizeSplitter::setOrientation( Orientation o )
 {
 #if QT_VERSION >= 232
     if ( orient == o )
         return;
     orient = o;
 
     if ( orient == Horizontal )
         setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
     else
         setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( s->isSplitter )
             ((KDGanttSplitterHandle*)s->wid)->setOrientation( o );
         s = data->list.next();  // ### next at end of loop, no iterator
     }
     recalc( isVisible() );
 #endif
 }
 
 
 #if QT_VERSION >= 232
 /*!
   \reimp
 */
 void KDGanttMinimizeSplitter::resizeEvent( QResizeEvent * )
 {
     doResize();
 }
 
 
 /*
   Inserts the widget \a w at the end (or at the beginning if \a first
   is TRUE) of the splitter's list of widgets.
 
   It is the responsibility of the caller of this function to make sure
   that \a w is not already in the splitter and to call recalcId if
   needed.  (If \a first is TRUE, then recalcId is very probably
   needed.)
 */
 QSplitterLayoutStruct *KDGanttMinimizeSplitter::addWidget( QWidget *w, bool first )
 {
     QSplitterLayoutStruct *s;
     KDGanttSplitterHandle *newHandle = 0;
     if ( data->list.count() > 0 ) {
         s = new QSplitterLayoutStruct;
         s->mode = KeepSize;
         QString tmp = "qt_splithandle_";
         tmp += w->name();
         newHandle = new KDGanttSplitterHandle( orientation(), this, tmp.latin1() );
     if ( ! mFirstHandle )
         mFirstHandle = newHandle;
         s->wid = newHandle;
         newHandle->setId(data->list.count());
         s->isSplitter = TRUE;
         s->sizer = pick( newHandle->sizeHint() );
         if ( first )
             data->list.insert( 0, s );
         else
             data->list.append( s );
     }
     s = new QSplitterLayoutStruct;
     s->mode = Stretch;
     s->wid = w;
     if ( !testWState( WState_Resized ) && w->sizeHint().isValid() )
         s->sizer = pick( w->sizeHint() );
     else
         s->sizer = pick( w->size() );
     s->isSplitter = FALSE;
     if ( first )
         data->list.insert( 0, s );
     else
         data->list.append( s );
     if ( newHandle && isVisible() )
         newHandle->show(); //will trigger sending of post events
     return s;
 }
 
 
 /*!
   Tells the splitter that a child widget has been inserted or removed.
   The event is passed in \a c.
 */
 void KDGanttMinimizeSplitter::childEvent( QChildEvent *c )
 {
     if ( c->type() == QEvent::ChildInserted ) {
         if ( !c->child()->isWidgetType() )
             return;
 
         if ( ((QWidget*)c->child())->testWFlags( WType_TopLevel ) )
             return;
 
         QSplitterLayoutStruct *s = data->list.first();
         while ( s ) {
             if ( s->wid == c->child() )
                 return;
             s = data->list.next();
         }
         addWidget( (QWidget*)c->child() );
         recalc( isVisible() );
 
     } else if ( c->type() == QEvent::ChildRemoved ) {
         QSplitterLayoutStruct *p = 0;
         if ( data->list.count() > 1 )
             p = data->list.at(1); //remove handle _after_ first widget.
         QSplitterLayoutStruct *s = data->list.first();
         while ( s ) {
             if ( s->wid == c->child() ) {
                 data->list.removeRef( s );
                 delete s;
                 if ( p && p->isSplitter ) {
                     data->list.removeRef( p );
                     delete p->wid; //will call childEvent
                     delete p;
                 }
                 recalcId();
                 doResize();
                 return;
             }
             p = s;
             s = data->list.next();
         }
     }
 }
 
 
 /*!
   Shows a rubber band at position \a p. If \a p is negative, the
   rubber band is removed.
 */
 void KDGanttMinimizeSplitter::setRubberband( int p )
 {
 #ifdef DESKTOP_VERSION
     QPainter paint( this );
     paint.setPen( gray );
     paint.setBrush( gray );
     paint.setRasterOp( XorROP );
     QRect r = contentsRect();
     const int rBord = 3; //Themable????
 #if QT_VERSION >= 0x030000
     int sw = style().pixelMetric(QStyle::PM_SplitterWidth, this);
 #else
     int sw = style().splitterWidth();
 #endif
     if ( orient == Horizontal ) {
         if ( opaqueOldPos >= 0 )
             paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(),
                             2*rBord, r.height() );
         if ( p >= 0 )
             paint.drawRect( p  + sw/2 - rBord, r.y(), 2*rBord, r.height() );
     } else {
         if ( opaqueOldPos >= 0 )
             paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord,
                             r.width(), 2*rBord );
         if ( p >= 0 )
             paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
     }
     opaqueOldPos = p;
 #else 
     if ( !mRubberBand  ) {
         mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
         mRubberBand->setFrameStyle( Box | Raised );
-        mRubberBand->setPalette( QPalette ( Qt::green.light(),Qt::green.dark() ) );
+        mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
     }
     QRect r = contentsRect();
-    const int rBord = 5; //Themable????
+    static int rBord = 0; //Themable????
+    if ( !rBord ) {
+        if (QApplication::desktop()->width() <= 320 )
+            rBord = 4;
+        else
+            rBord = 5;
+    }
     int sw = style().splitterWidth();
     if ( orient == Horizontal ) {
         if ( p >= 0 ) {
             QPoint geo =  mapToGlobal (QPoint ( p  + sw/2 - rBord, r.y()));
             mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() );
         }
     } else {
         if ( p >= 0 ) {
             QPoint geo =  mapToGlobal (QPoint ( r.x(), p + sw/2 - rBord));
            mRubberBand->setGeometry( geo.x(), geo.y(), r.width(), 2*rBord);
         }
     }
     opaqueOldPos = p;
-    mRubberBand->show();
+    if ( ! mRubberBand->isVisible() ) {
+        mRubberBand->show();
+    }
 #endif
 }
 
 
 /*! \reimp */
 bool KDGanttMinimizeSplitter::event( QEvent *e )
 {
     if ( e->type() == QEvent::LayoutHint || ( e->type() == QEvent::Show && data->firstShow ) ) {
         recalc( isVisible() );
         if ( e->type() == QEvent::Show )
             data->firstShow = FALSE;
     }
     return QWidget::event( e );
 }
 
 
 /*!
   \obsolete
 
   Draws the splitter handle in the rectangle described by \a x, \a y,
   \a w, \a h using painter \a p.
   \sa QStyle::drawPrimitive()
 */
 void KDGanttMinimizeSplitter::drawSplitter( QPainter *p,
                               QCOORD x, QCOORD y, QCOORD w, QCOORD h )
 {
 #if 0
     // LR
     style().drawPrimitive(QStyle::PE_Splitter, p, QRect(x, y, w, h), colorGroup(),
                           (orientation() == Qt::Horizontal ?
                            QStyle::Style_Horizontal : 0));
 #endif
 }
 
 
 /*!
   Returns the id of the splitter to the right of or below the widget \a w,
   or 0 if there is no such splitter
   (i.e. it is either not in this KDGanttMinimizeSplitter or it is at the end).
 */
 int KDGanttMinimizeSplitter::idAfter( QWidget* w ) const
 {
     QSplitterLayoutStruct *s = data->list.first();
     bool seen_w = FALSE;
     while ( s ) {
         if ( s->isSplitter && seen_w )
             return data->list.at();
         if ( !s->isSplitter && s->wid == w )
             seen_w = TRUE;
         s = data->list.next();
     }
     return 0;
 }
 
 
 /*!
   Moves the left/top edge of the splitter handle with id \a id as
   close as possible to position \a p, which is the distance from the
   left (or top) edge of the widget.
 
   For Arabic and Hebrew the layout is reversed, and using this
   function to set the position of the splitter might lead to
   unexpected results, since in Arabic and Hebrew the position of
   splitter one is to the left of the position of splitter zero.
 
   \sa idAfter()
 */
 void KDGanttMinimizeSplitter::moveSplitter( QCOORD p, int id )
 {
     p = adjustPos( p, id );
     QSplitterLayoutStruct *s = data->list.at(id);
     int oldP = orient == Horizontal ? s->wid->x() : s->wid->y();
     bool upLeft;
     if ( false && orient == Horizontal ) {
         p += s->wid->width();
         upLeft = p > oldP;
     } else
         upLeft = p < oldP;
 
     moveAfter( p, id, upLeft );
     moveBefore( p-1, id-1, upLeft );
 
     storeSizes();
 }
 
 
 void KDGanttMinimizeSplitter::setG( QWidget *w, int p, int s, bool isSplitter )
 {
     if ( orient == Horizontal ) {
         if ( false && orient == Horizontal && !isSplitter )
             p = contentsRect().width() - p - s;
         w->setGeometry( p, contentsRect().y(), s, contentsRect().height() );
     } else
         w->setGeometry( contentsRect().x(), p, contentsRect().width(), s );
 }
 
 
 /*
   Places the right/bottom edge of the widget at \a id at position \a pos.
 
   \sa idAfter()
 */
 void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft )
 {
     if( id < 0 )
         return;
     QSplitterLayoutStruct *s = data->list.at(id);
     if ( !s )
         return;
     QWidget *w = s->wid;
     if ( w->isHidden() ) {
         moveBefore( pos, id-1, upLeft );
     } else if ( s->isSplitter ) {
         int pos1, pos2;
         int dd = s->sizer;
         if( false && orient == Horizontal ) {
             pos1 = pos;
             pos2 = pos + dd;
         } else {
             pos2 = pos - dd;
             pos1 = pos2 + 1;
         }
         if ( upLeft ) {
             setG( w, pos1, dd, TRUE );
             moveBefore( pos2, id-1, upLeft );
         } else {
             moveBefore( pos2, id-1, upLeft );
             setG( w, pos1, dd, TRUE );
         }
     } else {
         int dd, newLeft, nextPos;
         if( false && orient == Horizontal ) {
             dd = w->geometry().right() - pos;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             newLeft = pos+1;
             nextPos = newLeft + dd;
         } else {
             dd = pos - pick( w->pos() ) + 1;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             newLeft = pos-dd+1;
             nextPos = newLeft - 1;
         }
         setG( w, newLeft, dd, TRUE );
         moveBefore( nextPos, id-1, upLeft );
     }
 }
 
 
 /*
   Places the left/top edge of the widget at \a id at position \a pos.
 
   \sa idAfter()
 */
 void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft )
 {
     QSplitterLayoutStruct *s = id < int(data->list.count()) ?
                                data->list.at(id) : 0;
     if ( !s )
         return;
     QWidget *w = s->wid;
     if ( w->isHidden() ) {
         moveAfter( pos, id+1, upLeft );
     } else if ( pick( w->pos() ) == pos ) {
         //No need to do anything if it's already there.
         return;
     } else if ( s->isSplitter ) {
         int dd = s->sizer;
         int pos1, pos2;
         if( false && orient == Horizontal ) {
             pos2 = pos - dd;
             pos1 = pos2 + 1;
         } else {
             pos1 = pos;
             pos2 = pos + dd;
         }
         if ( upLeft ) {
             setG( w, pos1, dd, TRUE );
             moveAfter( pos2, id+1, upLeft );
         } else {
             moveAfter( pos2, id+1, upLeft );
             setG( w, pos1, dd, TRUE );
         }
     } else {
         int left = pick( w->pos() );
         int right, dd,/* newRight,*/ newLeft, nextPos;
         if ( false && orient == Horizontal ) {
             dd = pos - left + 1;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             newLeft = pos-dd+1;
             nextPos = newLeft - 1;
         } else {
             right = pick( w->geometry().bottomRight() );
             dd = right - pos + 1;
             dd = QMAX( pick(minSize(w)), QMIN(dd, pick(w->maximumSize())));
             /*newRight = pos+dd-1;*/
             newLeft = pos;
             nextPos = newLeft + dd;
         }
         setG( w, newLeft, dd, TRUE );
         /*if( right != newRight )*/
         moveAfter( nextPos, id+1, upLeft );
     }
 }
 
 
 void KDGanttMinimizeSplitter::expandPos( int id, int*  min, int* max )
 {
     QSplitterLayoutStruct *s = data->list.at(id-1);
     QWidget* w = s->wid;
     *min = pick( w->mapToParent( QPoint(0,0) ) );
 
     if ( (uint) id == data->list.count() ) {
         pick( size() );
     }
     else {
         QSplitterLayoutStruct *s = data->list.at(id+1);
         QWidget* w = s->wid;
         *max = pick( w->mapToParent( QPoint( w->width(), w->height() ) ) ) -8;
     }
 }
 
 
 /*!
   Returns the valid range of the splitter with id \a id in \a *min and \a *max.
 
   \sa idAfter()
 */
 
 void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max )
 {
             int minB = 0;//before
     int maxB = 0;
     int minA = 0;
             int maxA = 0;//after
     int n = data->list.count();
     if ( id < 0 || id >= n )
         return;
     int i;
     for ( i = 0; i < id; i++ ) {
         QSplitterLayoutStruct *s = data->list.at(i);
         if ( s->wid->isHidden() ) {
             //ignore
         } else if ( s->isSplitter ) {
             minB += s->sizer;
             maxB += s->sizer;
         } else {
             minB += pick( minSize(s->wid) );
             maxB += pick( s->wid->maximumSize() );
         }
     }
     for ( i = id; i < n; i++ ) {
         QSplitterLayoutStruct *s = data->list.at(i);
         if ( s->wid->isHidden() ) {
             //ignore
         } else if ( s->isSplitter ) {
             minA += s->sizer;
             maxA += s->sizer;
         } else {
             minA += pick( minSize(s->wid) );
             maxA += pick( s->wid->maximumSize() );
         }
     }
     QRect r = contentsRect();
     if ( orient == Horizontal && false ) {
 #if QT_VERSION >= 0x030000
     int splitterWidth = style().pixelMetric(QStyle::PM_SplitterWidth, this);
 #else
     int splitterWidth = style().splitterWidth();
 #endif
       
         if ( min )
             *min = pick(r.topRight()) - QMIN( maxB, pick(r.size())-minA ) - splitterWidth;
         if ( max )
             *max = pick(r.topRight()) - QMAX( minB, pick(r.size())-maxA ) - splitterWidth;
     } else {
         if ( min )
             *min = pick(r.topLeft()) + QMAX( minB, pick(r.size())-maxA );
         if ( max )
             *max = pick(r.topLeft()) + QMIN( maxB, pick(r.size())-minA );
     }
 }
 
 
 /*!
   Returns the closest legal position to \a p of the splitter with id \a id.
 
   \sa idAfter()
 */
 
 int KDGanttMinimizeSplitter::adjustPos( int p, int id )
 {
     int min = 0;
     int max = 0;
     getRange( id, &min, &max );
     p = QMAX( min, QMIN( p, max ) );
 
     return p;
 }
 
 
 void KDGanttMinimizeSplitter::doResize()
 {
     QRect r = contentsRect();
     int i;
     int n = data->list.count();
     QMemArray<QLayoutStruct> a( n );
     for ( i = 0; i< n; i++ ) {
         a[i].init();
         QSplitterLayoutStruct *s = data->list.at(i);
         if ( s->wid->isHidden() ) {
             a[i].stretch = 0;
             a[i].sizeHint = a[i].minimumSize = 0;
             a[i].maximumSize = 0;
         } else if ( s->isSplitter ) {
             a[i].stretch = 0;
             a[i].sizeHint = a[i].minimumSize = a[i].maximumSize = s->sizer;
             a[i].empty = FALSE;
         } else if ( s->mode == KeepSize ) {
             a[i].stretch = 0;
             a[i].minimumSize = pick( minSize(s->wid) );
             a[i].sizeHint = s->sizer;
             a[i].maximumSize = pick( s->wid->maximumSize() );
             a[i].empty = FALSE;
         } else if ( s->mode == FollowSizeHint ) {
             a[i].stretch = 0;
             a[i].minimumSize = a[i].sizeHint = pick( s->wid->sizeHint() );
             a[i].maximumSize = pick( s->wid->maximumSize() );
             a[i].empty = FALSE;
         } else { //proportional
             a[i].stretch = s->sizer;
             a[i].maximumSize = pick( s->wid->maximumSize() );
             a[i].sizeHint = a[i].minimumSize = pick( minSize(s->wid) );
             a[i].empty = FALSE;
         }
     }
 
     kdganttGeomCalc( a, 0, n, pick( r.topLeft() ), pick( r.size() ), 0 );
 
     for ( i = 0; i< n; i++ ) {
         QSplitterLayoutStruct *s = data->list.at(i);
         setG( s->wid, a[i].pos, a[i].size );
     }
 
 }
 
 
 void KDGanttMinimizeSplitter::recalc( bool update )
 {
     int fi = 2*frameWidth();
     int maxl = fi;
     int minl = fi;
     int maxt = QWIDGETSIZE_MAX;
     int mint = fi;
     int n = data->list.count();
     bool first = TRUE;
     /*
       The splitter before a hidden widget is always hidden.
       The splitter before the first visible widget is hidden.
       The splitter before any other visible widget is visible.
     */
     for ( int i = 0; i< n; i++ ) {
         QSplitterLayoutStruct *s = data->list.at(i);
         if ( !s->isSplitter ) {
             QSplitterLayoutStruct *p = (i > 0) ? p = data->list.at( i-1 ) : 0;
             if ( p && p->isSplitter )
                 if ( first || s->wid->isHidden() )
                     p->wid->hide(); //may trigger new recalc
                 else
                     p->wid->show(); //may trigger new recalc
             if ( !s->wid->isHidden() )
                 first = FALSE;
         }
     }
 
     bool empty=TRUE;
     for ( int j = 0; j< n; j++ ) {
         QSplitterLayoutStruct *s = data->list.at(j);
         if ( !s->wid->isHidden() ) {
             empty = FALSE;
             if ( s->isSplitter ) {
                 minl += s->sizer;
                 maxl += s->sizer;
             } else {
                 QSize minS = minSize(s->wid);
                 minl += pick( minS );
                 maxl += pick( s->wid->maximumSize() );
                 mint = QMAX( mint, trans( minS ));
                 int tm = trans( s->wid->maximumSize() );
                 if ( tm > 0 )
                     maxt = QMIN( maxt, tm );
             }
         }
     }
     if ( empty ) {
         if ( parentWidget() != 0 && parentWidget()->inherits("KDGanttMinimizeSplitter") ) {
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
             // KDGanttMinimizeSplitter with no children yet
             maxl = QWIDGETSIZE_MAX;
         }
     } else {
         maxl = QMIN( maxl, QWIDGETSIZE_MAX );
     }
     if ( maxt < mint )
         maxt = mint;
 
     if ( orient == Horizontal ) {
         setMaximumSize( maxl, maxt );
         setMinimumSize( minl, mint );
     } else {
         setMaximumSize( maxt, maxl );
         setMinimumSize( mint, minl );
     }
     if ( update )
         doResize();
 }
 
 /*!
   Sets resize mode of \a w to \a mode.
 
   \sa ResizeMode
 */
 
 void KDGanttMinimizeSplitter::setResizeMode( QWidget *w, ResizeMode mode )
 {
     processChildEvents();
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( s->wid == w  ) {
             s->mode = mode;
             return;
         }
         s = data->list.next();
     }
     s = addWidget( w, TRUE );
     s->mode = mode;
 }
 
 
 /*!
   Returns TRUE if opaque resize is on; otherwise returns FALSE.
 
   \sa setOpaqueResize()
 */
 
 bool KDGanttMinimizeSplitter::opaqueResize() const
 {
     return data->opaque;
 }
 
 
 /*!
     If \a on is TRUE then opaque resizing is turned on; otherwise
     opaque resizing is turned off.
   Opaque resizing is initially turned off.
 
   \sa opaqueResize()
 */
 
 void KDGanttMinimizeSplitter::setOpaqueResize( bool on )
 {
     data->opaque = on;
 }
 
 
 /*!
   Moves widget \a w to the leftmost/top position.
 */
 
 void KDGanttMinimizeSplitter::moveToFirst( QWidget *w )
 {
     processChildEvents();
     bool found = FALSE;
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( s->wid == w  ) {
             found = TRUE;
             QSplitterLayoutStruct *p = data->list.prev();
             if ( p ) { // not already at first place
                 data->list.take(); //take p
                 data->list.take(); // take s
                 data->list.insert( 0, p );
                 data->list.insert( 0, s );
             }
             break;
         }
         s = data->list.next();
     }
      if ( !found )
         addWidget( w, TRUE );
      recalcId();
 }
 
 
 /*!
   Moves widget \a w to the rightmost/bottom position.
 */
 
 void KDGanttMinimizeSplitter::moveToLast( QWidget *w )
 {
     processChildEvents();
     bool found = FALSE;
     QSplitterLayoutStruct *s = data->list.first();
     while ( s ) {
         if ( s->wid == w  ) {
             found = TRUE;
             data->list.take(); // take s
             QSplitterLayoutStruct *p = data->list.current();
             if ( p ) { // the splitter handle after s
                 data->list.take(); //take p
                 data->list.append( p );
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index f453331..e6144de 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -1,294 +1,296 @@
 #include <qtabwidget.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qframe.h>
 
 
 #include "klocale.h"
 #include "kdebug.h"
 
 #include "kdialogbase.h"
 
 KDialogBase::KDialogBase()
 {
 }
 
 KDialogBase::KDialogBase( QWidget *parent, const char *name, bool modal,
              const QString &caption,
              int buttonMask, ButtonCode defaultButton,
              bool separator,
              const QString &user1,
              const QString &user2,
              const QString &user3) :
     KDialog( parent, name, modal )
 {
   init( caption, buttonMask, user1, user2 );
   if (findButton( defaultButton ) ) {
       (findButton( defaultButton ) )->setFocus();
       (findButton( defaultButton ) )->setDefault( true );
   }
 
 }
 
 KDialogBase::KDialogBase( int dialogFace, const QString &caption,
              int buttonMask, ButtonCode defaultButton,
              QWidget *parent, const char *name, bool modal,
              bool separator,
              const QString &user1,
              const QString &user2,
              const QString &user3) :
     KDialog( parent, name, modal )
 {
     init( caption, buttonMask, user1, user2 );
     if (findButton( defaultButton ) ) {
         (findButton( defaultButton ) )->setFocus();
         (findButton( defaultButton ) )->setDefault( true );
     }
 
 }
 
 KDialogBase::~KDialogBase()
 {
 }
 
 void KDialogBase::init( const QString &caption, int buttonMask,
                         const QString &user1 ,const QString &user2 )
 {
   mMainWidget = 0;
   mTabWidget = 0;
   mPlainPage = 0;
   mTopLayout = 0;
   if ( !caption.isEmpty() ) {
     setCaption( caption );
   }
 
   if ( buttonMask & User1 ) {
     mUser1Button = new QPushButton( user1, this );
     connect( mUser1Button, SIGNAL( clicked() ), SLOT( slotUser1() ) );
   } else {
     mUser1Button = 0;
   }
   if ( buttonMask & User2 ) {
     mUser2Button = new QPushButton( user2, this );
     connect( mUser2Button, SIGNAL( clicked() ), SLOT( slotUser2() ) );
   } else {
     mUser2Button = 0;
   }
 
   if ( buttonMask & Ok ) {
     mOkButton = new QPushButton( i18n("Ok"), this );
     connect( mOkButton, SIGNAL( clicked() ), SLOT( slotOk() ) );
     //mOkButton->setDefault( true );
   } else {
     mOkButton = 0;
   }
   if ( buttonMask & Default ) {
     mDefaultButton = new QPushButton( i18n("Default"), this );
     connect( mDefaultButton, SIGNAL( clicked() ), SIGNAL( defaultClicked() ) );
   } else {
     mDefaultButton = 0;
   }
 
   if ( buttonMask & Apply ) {
     mApplyButton = new QPushButton( i18n("Apply"), this );
     connect( mApplyButton, SIGNAL( clicked() ), SLOT( slotApply() ) );
   } else {
     mApplyButton = 0;
   }
 
   if ( buttonMask & Cancel ) {
     mCancelButton = new QPushButton( i18n("Cancel"), this );
     connect( mCancelButton, SIGNAL( clicked() ), SLOT( slotCancel() ) );
   } else {
     mCancelButton = 0;
   }
 
   if ( buttonMask & Close ) {
     mCloseButton = new QPushButton( i18n("Close"), this );
     connect( mCloseButton, SIGNAL( clicked() ), SLOT( slotClose() ) );
   } else {
     mCloseButton = 0;
   }
 }
 
 QTabWidget *KDialogBase::tabWidget()
 {
   if ( !mTabWidget ) {
     mTabWidget = new QTabWidget( this );
     setMainWidget( mTabWidget );
   }
   return mTabWidget;
 }
 
 void KDialogBase::hideButtons()
 {
     if ( mUser1Button ) mUser1Button->hide() ;
     if ( mUser2Button ) mUser2Button->hide() ;
     if ( mOkButton ) mOkButton->hide()  ;
     if ( mApplyButton )  mApplyButton->hide()  ;
     if ( mDefaultButton ) mDefaultButton->hide();
     if ( mCancelButton ) mCancelButton->hide()  ;
     if ( mCloseButton ) mCloseButton->hide()  ;
 
 }
 void KDialogBase::initLayout()
 {
 
   delete mTopLayout;
   mTopLayout = new QVBoxLayout( this );
   mTopLayout->setMargin( marginHint() );
   mTopLayout->setSpacing( spacingHint() );
 
   mTopLayout->addWidget( mMainWidget );
 
   QBoxLayout *buttonLayout = new QHBoxLayout;
   mTopLayout->addLayout( buttonLayout );
 
   if ( mUser1Button ) buttonLayout->addWidget( mUser1Button );
   if ( mUser2Button ) buttonLayout->addWidget( mUser2Button );
   if ( mOkButton ) buttonLayout->addWidget( mOkButton );
   if ( mApplyButton ) buttonLayout->addWidget( mApplyButton );
   if ( mDefaultButton ) buttonLayout->addWidget( mDefaultButton );
   if ( mCancelButton ) buttonLayout->addWidget( mCancelButton );
   if ( mCloseButton ) buttonLayout->addWidget( mCloseButton );
+  buttonLayout->setMargin( 0 );
+  buttonLayout->setSpacing( spacingHint() );
 }
 
 QFrame *KDialogBase::addPage( const QString &name )
 {
 //  kdDebug() << "KDialogBase::addPage(): " << name << endl;
   QFrame *frame = new QFrame( tabWidget() );
   tabWidget()->addTab( frame, name );
   return frame;
 }
 
 QFrame *KDialogBase::addPage( const QString &name, int, const QPixmap & )
 {
   return addPage( name );
 }
 
 
 void KDialogBase::setMainWidget( QWidget *widget )
 {
   kdDebug() << "KDialogBase::setMainWidget()" << endl;
 
   mMainWidget = widget;
   initLayout();
 }
 
 void KDialogBase::setButtonText( ButtonCode id, const QString &text )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     button->setText( text );
   }
 }
 
 void KDialogBase::enableButton( ButtonCode id, bool state )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     button->setEnabled( state );
   }
 }
 
 QPushButton *KDialogBase::findButton( ButtonCode id )
 {
   QPushButton *button = 0;
   switch ( id ) {
     case Ok:
       button = mOkButton;
       break;
     case Apply:
       button = mApplyButton;
       break;
     case User1:
       button = mUser1Button;
       break;
     case User2:
       button = mUser2Button;
       break;
     case Cancel:
       button = mCancelButton;
       break;
     case Default:
       button = mDefaultButton;
       break;
     case Close:
       button = mCloseButton;
       break;
     default:
       break;
   }
   return button;
 }
 
 void KDialogBase::enableButtonOK( bool state )
 {
   enableButton( Ok, state );
 }
 
 void KDialogBase::enableButtonApply( bool state )
 {
   enableButton( Apply, state );
 }
 
 void KDialogBase::showButton( ButtonCode id, bool show )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     if ( show ) button->show();
     else button->hide();
   }
 }
 
 int KDialogBase::pageIndex( QWidget *widget ) const
 {
   return 0;
 }
 
 
 bool KDialogBase::showPage( int index )
 {
     tabWidget()->setCurrentPage( index );return false;
 }
 
 QFrame *KDialogBase::plainPage()
 {
   if ( !mPlainPage ) {
     mPlainPage = new QFrame( this );
     setMainWidget( mPlainPage );
   }
   return mPlainPage;
 }
 
 void KDialogBase::slotOk()
 {
   emit okClicked();
   accept();
 }
 
 void KDialogBase::slotApply()
 {
   emit applyClicked();
 }
 
 void KDialogBase::slotCancel()
 {
   emit cancelClicked();
   reject();
 }
 
 void KDialogBase::slotClose()
 {
   emit closeClicked();
   reject();
 }
 
 void KDialogBase::slotUser1()
 {
   emit user1Clicked();
 }
 void KDialogBase::slotUser2()
 {
   emit user2Clicked();
 }