summaryrefslogtreecommitdiffabout
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
parent9ff0641f33e63cc88e96d0066dba43b4699ca489 (diff)
downloadkdepimpi-314908d5d9139af7711c6e425260363bb014afce.zip
kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.gz
kdepimpi-314908d5d9139af7711c6e425260363bb014afce.tar.bz2
toolbar fix
Diffstat (more/less context) (show 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.cpp16
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
@@ -1,9 +1,12 @@
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 ************
Fixed another SMTP problem in OM/Pi.
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
@@ -1312,9 +1312,9 @@
{ "%1 hours\n","%1 Stunden\n" },
{ "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
@@ -90,8 +90,9 @@ KOPrefs::KOPrefs() :
addItemBool("ShowIconNext",&mShowIconNext,true);
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
@@ -185,8 +185,9 @@ class KOPrefs : public KPimPrefs
bool mShowIconNextDays;
bool mShowIconNext;
bool mShowIconJournal;
bool mShowIconFilter;
+ bool mShowIconOnetoolbar;
bool mShowIconStretch;
bool mToolBarHor;
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) :
filterToolBar = 0;
filterMenubar = 0;
filterPopupMenu = 0;
}
-
+ if ( p->mShowIconOnetoolbar ) {
+ viewToolBar = iconToolBar ;
+ navigatorToolBar = iconToolBar ;
+ } else {
if ( p->mToolBarHorV ) {
if ( p->mToolBarUpV )
tbd = Bottom;
else
@@ -222,9 +225,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
tbd = Left;
}
navigatorToolBar = new QPEToolBar( this );
addToolBar (navigatorToolBar , tbd );
-
+ }
mCalendarModifiedFlag = false;
@@ -692,8 +695,9 @@ void MainWindow::initActions()
actionMenu->insertSeparator();
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();
configureToolBarMenu->insertItem(i18n("Week Number"), 400);
@@ -1192,8 +1196,10 @@ void MainWindow::initActions()
configureToolBarMenu->setItemChecked( 5, true );
}
if (p-> mShowIconFilter)
configureToolBarMenu->setItemChecked( 7, true );
+ if (p-> mShowIconOnetoolbar)
+ configureToolBarMenu->setItemChecked( 6, true );
if ( filterMenubar )
connect( mView->filterView(), SIGNAL( filterChanged() ), SLOT( updateFilterToolbar() ) );
@@ -1953,10 +1959,13 @@ void MainWindow::selectFilter( int fil )
} else if ( fil == 1 ){
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 );
}
}
void MainWindow::updateFilterToolbar()
@@ -1982,8 +1991,9 @@ 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 );
p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );