summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt5
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/mainwindow.cpp70
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
@@ -3,5 +3,8 @@ Info about the changes in new versions of KDE-Pim/Pi
3********** VERSION 2.0.22 ************ 3********** VERSION 2.0.22 ************
4 4
5 5KO/Pi:
6Fix for creating events/todos via the abgenda context menu.
7Added option to split toolbar to 3 toolbars.
8Added option to show one small filter-view-toolbar.
6 9
7********** VERSION 2.0.21 ************ 10********** 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 @@
1314{ "%1 minutes\n","%1 Minuten\n" }, 1314{ "%1 minutes\n","%1 Minuten\n" },
1315{ "1 minute\n","1 Minute\n" }, 1315{ "1 minute\n","1 Minute\n" },
1316{ "","" }, 1316{ "Only one toolbar","Nur eine Toolbar" },
1317{ "","" }, 1317{ "","" },
1318{ "","" }, 1318{ "","" },
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() :
92 addItemBool("ShowIconStretch",&mShowIconStretch,true); 92 addItemBool("ShowIconStretch",&mShowIconStretch,true);
93 addItemBool("ShowIconFilter",&mShowIconFilter,false); 93 addItemBool("ShowIconFilter",&mShowIconFilter,false);
94 addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true);
94 addItemInt("LastLoadedLanguage",&mOldLanguage,0); 95 addItemInt("LastLoadedLanguage",&mOldLanguage,0);
95 96
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
187 bool mShowIconJournal; 187 bool mShowIconJournal;
188 bool mShowIconFilter; 188 bool mShowIconFilter;
189 bool mShowIconOnetoolbar;
189 190
190 bool mShowIconStretch; 191 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,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 );