-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) : | |||
196 | } | 196 | } |
197 | 197 | if ( p->mShowIconOnetoolbar ) { | |
198 | viewToolBar = iconToolBar ; | ||
199 | navigatorToolBar = iconToolBar ; | ||
200 | } else { | ||
198 | if ( p->mToolBarHorV ) { | 201 | if ( p->mToolBarHorV ) { |
@@ -225,3 +228,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
225 | addToolBar (navigatorToolBar , tbd ); | 228 | addToolBar (navigatorToolBar , tbd ); |
226 | 229 | } | |
227 | 230 | ||
@@ -695,2 +698,3 @@ void MainWindow::initActions() | |||
695 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 698 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
699 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); | ||
696 | configureToolBarMenu->insertSeparator(); | 700 | configureToolBarMenu->insertSeparator(); |
@@ -1195,2 +1199,4 @@ void MainWindow::initActions() | |||
1195 | configureToolBarMenu->setItemChecked( 7, true ); | 1199 | configureToolBarMenu->setItemChecked( 7, true ); |
1200 | if (p-> mShowIconOnetoolbar) | ||
1201 | configureToolBarMenu->setItemChecked( 6, true ); | ||
1196 | 1202 | ||
@@ -1956,4 +1962,7 @@ void MainWindow::selectFilter( int fil ) | |||
1956 | } else { | 1962 | } else { |
1957 | if ( !mView->filterView()->filtersEnabled() ) | 1963 | if ( !mView->filterView()->filtersEnabled() ) { |
1964 | mView->filterView()->blockSignals( true ); | ||
1958 | mView->toggleFilerEnabled( ); | 1965 | mView->toggleFilerEnabled( ); |
1966 | mView->filterView()->blockSignals( false ); | ||
1967 | } | ||
1959 | mView->selectFilter( fil-2 ); | 1968 | mView->selectFilter( fil-2 ); |
@@ -1985,2 +1994,3 @@ void MainWindow::configureToolBar( int item ) | |||
1985 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); | 1994 | p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 ); |
1995 | p-> mShowIconOnetoolbar = configureToolBarMenu->isItemChecked( 6 ); | ||
1986 | p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); | 1996 | p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 ); |