| -rw-r--r-- | korganizer/mainwindow.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index c6ae868..a4e0834 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -196,3 +196,6 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : } - + if ( p->mShowIconOnetoolbar ) { + viewToolBar = iconToolBar ; + navigatorToolBar = iconToolBar ; + } else { if ( p->mToolBarHorV ) { @@ -225,3 +228,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : 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 ); |