File r893430.diff of Package kdepim4

Subject: korganizer: navigatorbar - layout cleanup
From: wstephenson@suse.de
Bug: 
Patch-upstream: 893430
--- korganizer/navigatorbar.cpp	(revision 893429)
+++ korganizer/navigatorbar.cpp	(revision 893430)
@@ -82,11 +82,11 @@ NavigatorBar::NavigatorBar( QWidget *par
 
   // set up control frame layout
   QHBoxLayout *ctrlLayout = new QHBoxLayout( this );
-  ctrlLayout->addWidget( mPrevYear, 3 );
-  ctrlLayout->addWidget( mPrevMonth, 3 );
-  ctrlLayout->addWidget( mMonth, 3 );
-  ctrlLayout->addWidget( mNextMonth, 3 );
-  ctrlLayout->addWidget( mNextYear, 3 );
+  ctrlLayout->addWidget( mPrevYear );
+  ctrlLayout->addWidget( mPrevMonth );
+  ctrlLayout->addWidget( mMonth );
+  ctrlLayout->addWidget( mNextMonth );
+  ctrlLayout->addWidget( mNextYear );
 
   connect( mPrevYear, SIGNAL(clicked()), SIGNAL(goPrevYear()) );
   connect( mPrevMonth, SIGNAL(clicked()), SIGNAL(goPrevMonth()) );
@@ -116,7 +116,6 @@ void NavigatorBar::showButtons( bool lef
     mNextYear->hide();
     mNextMonth->hide();
   }
-
 }
 
 void NavigatorBar::selectDates( const KCal::DateList &dateList )
@@ -143,7 +142,7 @@ void NavigatorBar::selectDates( const KC
       mHasMinWidth = true;
     }
 
-    // compute the labels at the top of the navigator
+    // set the label text at the top of the navigator
     mMonth->setText( i18nc( "monthname year", "%1 %2",
                             calSys->monthName( mDate ),
                             calSys->yearString( mDate ) ) );
@@ -194,13 +193,8 @@ QToolButton *NavigatorBar::createNavigat
 
   button->setIcon(
     KIconLoader::global()->loadIcon( icon, KIconLoader::Desktop, KIconLoader::SizeSmall ) );
-
-  // By the default the button has a very wide minimum size (for whatever
-  // reasons). Override this, so that the date navigator doesn't need to be
-  // so wide anymore. The minimum size is dominated by the other elements of
-  // the date navigator then.
-  button->setMinimumSize( 10, 10 );
-
+  button->setIconSize( QSize( KIconLoader::SizeSmall, KIconLoader::SizeSmall ) );
+  button->setToolButtonStyle( Qt::ToolButtonIconOnly );
   button->setToolTip( toolTip );
 
   return button;
Index: korganizer/navigatorbar.cpp
===================================================================