| -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 @@ -195,5 +195,8 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : filterPopupMenu = 0; } - + if ( p->mShowIconOnetoolbar ) { + viewToolBar = iconToolBar ; + navigatorToolBar = iconToolBar ; + } else { if ( p->mToolBarHorV ) { if ( p->mToolBarUpV ) @@ -224,5 +227,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : navigatorToolBar = new QPEToolBar( this ); addToolBar (navigatorToolBar , tbd ); - + } @@ -694,4 +697,5 @@ void MainWindow::initActions() icon = loadPixmap( pathString + "newevent" ); configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); + configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); configureToolBarMenu->insertSeparator(); configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); @@ -1194,4 +1198,6 @@ void MainWindow::initActions() if (p-> mShowIconFilter) configureToolBarMenu->setItemChecked( 7, true ); + if (p-> mShowIconOnetoolbar) + configureToolBarMenu->setItemChecked( 6, true ); @@ -1955,6 +1961,9 @@ void MainWindow::selectFilter( int fil ) mView->toggleFilerEnabled( ); } else { - if ( !mView->filterView()->filtersEnabled() ) + if ( !mView->filterView()->filtersEnabled() ) { + mView->filterView()->blockSignals( true ); mView->toggleFilerEnabled( ); + mView->filterView()->blockSignals( false ); + } mView->selectFilter( fil-2 ); } @@ -1984,4 +1993,5 @@ void MainWindow::configureToolBar( int item ) KOPrefs *p = KOPrefs::instance(); p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); + p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); |