author | zautrix <zautrix> | 2005-03-28 11:59:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-28 11:59:41 (UTC) |
commit | 314908d5d9139af7711c6e425260363bb014afce (patch) (unidiff) | |
tree | 8b4a72042d6f2e158c64b6b1cbfb7ef002d2fd61 /korganizer/mainwindow.cpp | |
parent | 9ff0641f33e63cc88e96d0066dba43b4699ca489 (diff) | |
download | kdepimpi-314908d5d9139af7711c6e425260363bb014afce.zip kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.gz kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.bz2 |
toolbar fix
-rw-r--r-- | korganizer/mainwindow.cpp | 70 |
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 | |||
@@ -195,34 +195,37 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
195 | filterPopupMenu = 0; | 195 | filterPopupMenu = 0; |
196 | } | 196 | } |
197 | 197 | if ( p->mShowIconOnetoolbar ) { | |
198 | if ( p->mToolBarHorV ) { | 198 | viewToolBar = iconToolBar ; |
199 | if ( p->mToolBarUpV ) | 199 | navigatorToolBar = iconToolBar ; |
200 | tbd = Bottom; | 200 | } else { |
201 | else | 201 | if ( p->mToolBarHorV ) { |
202 | tbd = Top; | 202 | if ( p->mToolBarUpV ) |
203 | } | 203 | tbd = Bottom; |
204 | else { | 204 | else |
205 | if ( p->mToolBarUpV ) | 205 | tbd = Top; |
206 | tbd = Right; | 206 | } |
207 | else | 207 | else { |
208 | tbd = Left; | 208 | if ( p->mToolBarUpV ) |
209 | } | 209 | tbd = Right; |
210 | viewToolBar = new QPEToolBar( this ); | 210 | else |
211 | addToolBar (viewToolBar , tbd ); | 211 | tbd = Left; |
212 | if ( p->mToolBarHorN ) { | 212 | } |
213 | if ( p->mToolBarUpN ) | 213 | viewToolBar = new QPEToolBar( this ); |
214 | tbd = Bottom; | 214 | addToolBar (viewToolBar , tbd ); |
215 | else | 215 | if ( p->mToolBarHorN ) { |
216 | tbd = Top; | 216 | if ( p->mToolBarUpN ) |
217 | } | 217 | tbd = Bottom; |
218 | else { | 218 | else |
219 | if ( p->mToolBarUpN ) | 219 | tbd = Top; |
220 | tbd = Right; | 220 | } |
221 | else | 221 | else { |
222 | tbd = Left; | 222 | if ( p->mToolBarUpN ) |
223 | tbd = Right; | ||
224 | else | ||
225 | tbd = Left; | ||
226 | } | ||
227 | navigatorToolBar = new QPEToolBar( this ); | ||
228 | addToolBar (navigatorToolBar , tbd ); | ||
223 | } | 229 | } |
224 | navigatorToolBar = new QPEToolBar( this ); | ||
225 | addToolBar (navigatorToolBar , tbd ); | ||
226 | |||
227 | 230 | ||
228 | 231 | ||
@@ -694,4 +697,5 @@ void MainWindow::initActions() | |||
694 | icon = loadPixmap( pathString + "newevent" ); | 697 | icon = loadPixmap( pathString + "newevent" ); |
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(); |
697 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); | 701 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); |
@@ -1194,4 +1198,6 @@ void MainWindow::initActions() | |||
1194 | if (p-> mShowIconFilter) | 1198 | if (p-> mShowIconFilter) |
1195 | configureToolBarMenu->setItemChecked( 7, true ); | 1199 | configureToolBarMenu->setItemChecked( 7, true ); |
1200 | if (p-> mShowIconOnetoolbar) | ||
1201 | configureToolBarMenu->setItemChecked( 6, true ); | ||
1196 | 1202 | ||
1197 | 1203 | ||
@@ -1955,6 +1961,9 @@ void MainWindow::selectFilter( int fil ) | |||
1955 | mView->toggleFilerEnabled( ); | 1961 | mView->toggleFilerEnabled( ); |
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 ); |
1960 | } | 1969 | } |
@@ -1984,4 +1993,5 @@ void MainWindow::configureToolBar( int item ) | |||
1984 | KOPrefs *p = KOPrefs::instance(); | 1993 | KOPrefs *p = KOPrefs::instance(); |
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 ); |
1987 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); | 1997 | p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 ); |