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 | 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 | |||
@@ -193,9 +193,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
193 | filterToolBar = 0; | 193 | filterToolBar = 0; |
194 | filterMenubar = 0; | 194 | filterMenubar = 0; |
195 | filterPopupMenu = 0; | 195 | filterPopupMenu = 0; |
196 | } | 196 | } |
197 | 197 | if ( p->mShowIconOnetoolbar ) { | |
198 | viewToolBar = iconToolBar ; | ||
199 | navigatorToolBar = iconToolBar ; | ||
200 | } else { | ||
198 | if ( p->mToolBarHorV ) { | 201 | if ( p->mToolBarHorV ) { |
199 | if ( p->mToolBarUpV ) | 202 | if ( p->mToolBarUpV ) |
200 | tbd = Bottom; | 203 | tbd = Bottom; |
201 | else | 204 | else |
@@ -222,9 +225,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : | |||
222 | tbd = Left; | 225 | tbd = Left; |
223 | } | 226 | } |
224 | navigatorToolBar = new QPEToolBar( this ); | 227 | navigatorToolBar = new QPEToolBar( this ); |
225 | addToolBar (navigatorToolBar , tbd ); | 228 | addToolBar (navigatorToolBar , tbd ); |
226 | 229 | } | |
227 | 230 | ||
228 | 231 | ||
229 | 232 | ||
230 | mCalendarModifiedFlag = false; | 233 | mCalendarModifiedFlag = false; |
@@ -692,8 +695,9 @@ void MainWindow::initActions() | |||
692 | actionMenu->insertSeparator(); | 695 | actionMenu->insertSeparator(); |
693 | 696 | ||
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 ); |
698 | configureToolBarMenu->insertSeparator(); | 702 | configureToolBarMenu->insertSeparator(); |
699 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); | 703 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); |
@@ -1192,8 +1196,10 @@ void MainWindow::initActions() | |||
1192 | configureToolBarMenu->setItemChecked( 5, true ); | 1196 | configureToolBarMenu->setItemChecked( 5, true ); |
1193 | } | 1197 | } |
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 | ||
1198 | if ( filterMenubar ) | 1204 | if ( filterMenubar ) |
1199 | connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); | 1205 | connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) ); |
@@ -1953,10 +1959,13 @@ void MainWindow::selectFilter( int fil ) | |||
1953 | } else if ( fil == 1 ){ | 1959 | } else if ( fil == 1 ){ |
1954 | if ( mView->filterView()->filtersEnabled() ) | 1960 | if ( mView->filterView()->filtersEnabled() ) |
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 | } |
1961 | } | 1970 | } |
1962 | void MainWindow::updateFilterToolbar() | 1971 | void MainWindow::updateFilterToolbar() |
@@ -1982,8 +1991,9 @@ void MainWindow::configureToolBar( int item ) | |||
1982 | 1991 | ||
1983 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) ); | 1992 | configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( 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 ); |
1988 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); | 1998 | p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); |
1989 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); | 1999 | p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 ); |