summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-03-28 11:59:41 (UTC)
committer zautrix <zautrix>2005-03-28 11:59:41 (UTC)
commit314908d5d9139af7711c6e425260363bb014afce (patch) (side-by-side diff)
tree8b4a72042d6f2e158c64b6b1cbfb7ef002d2fd61 /korganizer
parent9ff0641f33e63cc88e96d0066dba43b4699ca489 (diff)
downloadkdepimpi-314908d5d9139af7711c6e425260363bb014afce.zip
kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.gz
kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.bz2
toolbar fix
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/mainwindow.cpp16
3 files changed, 15 insertions, 3 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 2168094..1e68a44 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -93,2 +93,3 @@ KOPrefs::KOPrefs() :
addItemBool("ShowIconFilter",&mShowIconFilter,false);
+ addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true);
addItemInt("LastLoadedLanguage",&mOldLanguage,0);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 8dfdf69..fbce6ea 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -188,2 +188,3 @@ class KOPrefs : public KPimPrefs
bool mShowIconFilter;
+ bool mShowIconOnetoolbar;
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 );