-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 | 70 |
5 files changed, 47 insertions, 32 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 @@ -2,7 +2,10 @@ 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 @@ -1313,7 +1313,7 @@ { "1 hour\n","1 Stunde\n" }, { "%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 @@ -91,6 +91,7 @@ KOPrefs::KOPrefs() : addItemBool("ShowIconJournal",&mShowIconJournal,true); addItemBool("ShowIconStretch",&mShowIconStretch,true); addItemBool("ShowIconFilter",&mShowIconFilter,false); + addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); addItemInt("LastLoadedLanguage",&mOldLanguage,0); addItemBool("AskForQuit",&mAskForQuit,false); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 8dfdf69..fbce6ea 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -186,6 +186,7 @@ class KOPrefs : public KPimPrefs bool mShowIconNext; 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 @@ -194,36 +194,39 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : filterMenubar = 0; filterPopupMenu = 0; } - - if ( p->mToolBarHorV ) { - if ( p->mToolBarUpV ) - tbd = Bottom; - else - tbd = Top; - } - else { - if ( p->mToolBarUpV ) - tbd = Right; - else - tbd = Left; - } - viewToolBar = new QPEToolBar( this ); - addToolBar (viewToolBar , tbd ); - if ( p->mToolBarHorN ) { - if ( p->mToolBarUpN ) - tbd = Bottom; - else - tbd = Top; - } - else { - if ( p->mToolBarUpN ) - tbd = Right; - else - tbd = Left; + if ( p->mShowIconOnetoolbar ) { + viewToolBar = iconToolBar ; + navigatorToolBar = iconToolBar ; + } else { + if ( p->mToolBarHorV ) { + if ( p->mToolBarUpV ) + tbd = Bottom; + else + tbd = Top; + } + else { + if ( p->mToolBarUpV ) + tbd = Right; + else + tbd = Left; + } + viewToolBar = new QPEToolBar( this ); + addToolBar (viewToolBar , tbd ); + if ( p->mToolBarHorN ) { + if ( p->mToolBarUpN ) + tbd = Bottom; + else + tbd = Top; + } + else { + if ( p->mToolBarUpN ) + tbd = Right; + else + tbd = Left; + } + navigatorToolBar = new QPEToolBar( this ); + addToolBar (navigatorToolBar , tbd ); } - navigatorToolBar = new QPEToolBar( this ); - addToolBar (navigatorToolBar , tbd ); - @@ -693,6 +696,7 @@ 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 ); configureToolBarMenu->insertSeparator(); @@ -1193,6 +1197,8 @@ void MainWindow::initActions() } if (p-> mShowIconFilter) configureToolBarMenu->setItemChecked( 7, true ); + if (p-> mShowIconOnetoolbar) + configureToolBarMenu->setItemChecked( 6, true ); if ( filterMenubar ) @@ -1954,8 +1960,11 @@ void MainWindow::selectFilter( int fil ) if ( mView->filterView()->filtersEnabled() ) 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 ); } } @@ -1983,6 +1992,7 @@ void MainWindow::configureToolBar( int item ) configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( 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 ); p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 ); |