| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
| -rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
| -rw-r--r-- | korganizer/koprefs.h | 1 | ||||
| -rw-r--r-- | korganizer/mainwindow.cpp | 16 |
5 files changed, 20 insertions, 5 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 0a01bab..da27fea 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -3,5 +3,8 @@ Info about the changes in new versions of KDE-Pim/Pi ********** VERSION 2.0.22 ************ - +KO/Pi: +Fix for creating events/todos via the abgenda context menu. +Added option to split toolbar to 3 toolbars. +Added option to show one small filter-view-toolbar. ********** VERSION 2.0.21 ************ diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 5ef60be..732bb3f 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1314,5 +1314,5 @@ { "%1 minutes\n","%1 Minuten\n" }, { "1 minute\n","1 Minute\n" }, -{ "","" }, +{ "Only one toolbar","Nur eine Toolbar" }, { "","" }, { "","" }, diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 2168094..1e68a44 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -92,4 +92,5 @@ KOPrefs::KOPrefs() : addItemBool("ShowIconStretch",&mShowIconStretch,true); 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 @@ -187,4 +187,5 @@ class KOPrefs : public KPimPrefs bool mShowIconJournal; bool mShowIconFilter; + bool mShowIconOnetoolbar; bool mShowIconStretch; 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 ); |