layout fix

2 files changed, 26 insertions, 0 deletions

diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index 4a51bba..e4abbf7 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -112,124 +112,146 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam
       mSelectMonth->setFlat( true);
       mPrevYear->setFlat( true);
       mPrevMonth->setFlat( true);
       mPrevWeek->setFlat( true);
   } else {
       mPrevWeek->hide();
       mNextWeek->hide();
   }
 
   resetFont( font() );
 
   
   // set up control frame layout
   QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
   ctrlLayout->addWidget( mPrevYear, 3 );
   ctrlLayout->addWidget( mPrevMonth, 3 );
   ctrlLayout->addWidget( mPrevWeek, 3 );
   //ctrlLayout->addStretch( 1 );
   // ctrlLayout->addSpacing( 1 );
   // ctrlLayout->addWidget( mDateLabel );
   ctrlLayout->addWidget( mSelectMonth );
   //  ctrlLayout->addSpacing( 1 );
   // ctrlLayout->addStretch( 1 );
   ctrlLayout->addWidget( mNextWeek, 3 );
   ctrlLayout->addWidget( mNextMonth, 3 );
   ctrlLayout->addWidget( mNextYear, 3 );
 
   connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) );
   connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) );
   connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) );
   connect( mPrevWeek, SIGNAL( clicked() ), SIGNAL( goPrevWeek() ) );
   connect( mNextWeek, SIGNAL( clicked() ), SIGNAL( goNextWeek() ) );
   connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) );
   connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) );
   mPrevYear->setFocusPolicy(NoFocus);
   mPrevMonth->setFocusPolicy(NoFocus);
   mNextMonth->setFocusPolicy(NoFocus);
   mPrevWeek->setFocusPolicy(NoFocus);
   mNextWeek->setFocusPolicy(NoFocus);
   mNextYear->setFocusPolicy(NoFocus);
   mSelectMonth->setFocusPolicy(NoFocus);
   setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
 
 }
 
 NavigatorBar::~NavigatorBar()
 {
 }
+QSize NavigatorBar::sizeHint() const
+{
+    int wid = mCurrentMinWid ;
+    if ( mPrevYear->isVisible() )
+        wid += mCurrentButtonMinWid;
+    if ( mPrevMonth->isVisible() )
+        wid += mCurrentButtonMinWid;
+    if ( mPrevWeek->isVisible() )
+        wid += mCurrentButtonMinWid;
+    if ( mNextMonth->isVisible() )
+        wid += mCurrentButtonMinWid;
+    if ( mNextWeek->isVisible() )
+        wid += mCurrentButtonMinWid;
+    if ( mNextYear->isVisible() )
+        wid += mCurrentButtonMinWid;
+    //qDebug("ret %d %d ", wid, mCurrentHei);
+    int add = 2;
+  return   QSize ( wid+add, mCurrentHei+add );
+}
 void NavigatorBar::resetFont ( QFont fo )
 {
 
  QFont tfont = fo;
  if ( QApplication::desktop()->width() >= 480 )
      tfont.setPointSize(tfont.pointSize()+2);
  tfont.setBold(true);
 
  mSelectMonth->setFont( tfont );
   // Set minimum width to width of widest month name label
   int i;
   int maxwidth = 0;
   QFontMetrics fm ( mSelectMonth->font() );
   int width = fm.width("September '00" );
   maxwidth = width+2;
   int size = fm.height()+2;
   if ( QApplication::desktop()->width() >= 480 ) { 
       size += 6;
       maxwidth+= 6;
   }
   mSelectMonth->setMinimumWidth( maxwidth );
   mSelectMonth->setFixedHeight( size );
   mPrevYear->setFixedHeight(  size );
   mPrevMonth->setFixedHeight( size );
   mPrevWeek->setFixedHeight( size );
   mNextMonth->setFixedHeight( size );
   mNextWeek->setFixedHeight( size );
   mNextYear->setFixedHeight ( size );
+  mCurrentHei = size;
+  mCurrentMinWid =  maxwidth;
+  mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2;
 }
   
 void NavigatorBar::showButtons( bool left, bool right )
 {
   if ( left ) {
     mPrevYear->show();
     mPrevMonth->show();
   } else {
     mPrevYear->hide();
     mPrevMonth->hide();
   }
 
   if ( right ) {
     mNextYear->show();
     mNextMonth->show();
   } else {
     mNextYear->hide();
     mNextMonth->hide();
   }
   if ( !left && !right ) {
       //mSelectMonth->setMaximumWidth( 1024 );
       mSelectMonth->setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
   }
 }
 
 void NavigatorBar::selectMonth()
 {
 
     int month;
   KPopupFrame* popup = new KPopupFrame(this);
   KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup);
   // -----
   picker->resize(picker->sizeHint());
   popup->setMainWidget(picker);
   picker->setFocus();
   connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
   if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height()))))
     {
         month = picker->getResult();
         emit monthSelected ( month );
     } else {
       KNotifyClient::beep();
     }
   delete popup;
 }
 void NavigatorBar::selectDates( const KCal::DateList &dateList )
 {
   if (dateList.count() > 0) {
diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h
index 0b2f60b..5d5aff4 100644
--- a/korganizer/navigatorbar.h
+++ b/korganizer/navigatorbar.h
@@ -1,71 +1,75 @@
 /*
     This file is part of KOrganizer.
 
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef NAVIGATORBAR_H
 #define NAVIGATORBAR_H
 
 #include <libkcal/incidencebase.h>
 
 #include <qwidget.h>
 
 class QPushButton;
 class QFrame;
 class QLabel;
 
 class NavigatorBar: public QWidget
 {
     Q_OBJECT
   public:
     NavigatorBar( const QDate & date, QWidget *parent = 0, const char *name = 0 );
     ~NavigatorBar();
     void showButtons( bool left, bool right );
     void resetFont ( QFont fo );
+    QSize sizeHint() const;
 
   public slots:
     void selectDates( const KCal::DateList & );
     void selectMonth();
 
   signals:
     void goNextMonth();
     void goPrevMonth();
     void goNextWeek();
     void goPrevWeek();
     void goNextYear();
     void goPrevYear();
     void monthSelected( int );
 
   private:
+    int mCurrentHei;
+    int mCurrentMinWid;
+    int mCurrentButtonMinWid;
     QFrame *mCtrlFrame;
 
     QPushButton *mPrevYear;
     QPushButton *mPrevMonth;
     QPushButton *mNextMonth;
     QPushButton *mPrevWeek;
     QPushButton *mNextWeek;
     QPushButton *mNextYear;
     QPushButton *mSelectMonth;
 
     //QLabel *mDateLabel;
 };
 
 #endif