1 files changed, 40 insertions, 30 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index c6ae868..a4e0834 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -196,32 +196,35 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     }
-
-    if ( p->mToolBarHorV ) {
-        if ( p->mToolBarUpV )
-            tbd = Bottom;
-        else
-            tbd = Top;
-    }
-    else {
-        if ( p->mToolBarUpV )
-            tbd = Right;
-        else
-            tbd = Left;
-    }
-    viewToolBar = new QPEToolBar( this );
-    addToolBar (viewToolBar , tbd );
-    if ( p->mToolBarHorN ) {
-        if ( p->mToolBarUpN )
-            tbd = Bottom;
-        else
-            tbd = Top;
-    }
-    else {
-        if ( p->mToolBarUpN )
-            tbd = Right;
-        else
-            tbd = Left;
+    if ( p->mShowIconOnetoolbar ) {
+        viewToolBar = iconToolBar ;
+        navigatorToolBar = iconToolBar ;
+    } else {
+        if ( p->mToolBarHorV ) {
+            if ( p->mToolBarUpV )
+                tbd = Bottom;
+            else
+                tbd = Top;
+        }
+        else {
+            if ( p->mToolBarUpV )
+                tbd = Right;
+            else
+                tbd = Left;
+        }
+        viewToolBar = new QPEToolBar( this );
+        addToolBar (viewToolBar , tbd );
+        if ( p->mToolBarHorN ) {
+            if ( p->mToolBarUpN )
+                tbd = Bottom;
+            else
+                tbd = Top;
+        }
+        else {
+            if ( p->mToolBarUpN )
+                tbd = Right;
+            else
+                tbd = Left;
+        }
+        navigatorToolBar = new QPEToolBar( this );
+        addToolBar (navigatorToolBar , tbd );
     }
-    navigatorToolBar = new QPEToolBar( this );
-    addToolBar (navigatorToolBar , tbd );
-
 
@@ -695,2 +698,3 @@ void MainWindow::initActions()
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
+    configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
     configureToolBarMenu->insertSeparator();
@@ -1195,2 +1199,4 @@ void MainWindow::initActions()
         configureToolBarMenu->setItemChecked( 7, true );
+    if (p-> mShowIconOnetoolbar) 
+        configureToolBarMenu->setItemChecked( 6, true );
    
@@ -1956,4 +1962,7 @@ void MainWindow::selectFilter( int fil )
     } else {
-        if ( !mView->filterView()->filtersEnabled() )
+        if ( !mView->filterView()->filtersEnabled() ) {
+            mView->filterView()->blockSignals( true );
             mView->toggleFilerEnabled( );
+            mView->filterView()->blockSignals( false );
+        }
         mView->selectFilter(  fil-2 );
@@ -1985,2 +1994,3 @@ void MainWindow::configureToolBar( int item  )
     p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
+    p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 );
     p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );