toolbar fix

3 files changed, 42 insertions, 30 deletions

diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 2168094..1e68a44 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -82,24 +82,25 @@ KOPrefs::KOPrefs() :
   addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
   addItemBool("ShowIconBack",&mShowIconBack,true);
   addItemBool("ShowIconToday",&mShowIconToday,true);
   addItemBool("ShowIconForward",&mShowIconForward,true);
   addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
   addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
   addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
   addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
   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); 
 
 #ifndef DESKTOP_VERSION
   addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
   addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
   addItemBool("ToolBarHor",&mToolBarHor, true );
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("ToolBarHorV",&mToolBarHorV, true );
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 8dfdf69..fbce6ea 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -177,24 +177,25 @@ class KOPrefs : public KPimPrefs
     bool mShowIconTodoview;
     bool mShowIconBackFast;
     bool mShowIconBack;
     bool mShowIconToday;
     bool mShowIconForward;
     bool mShowIconForwardFast;
     bool mShowIconWhatsThis;
     bool mShowIconWeekNum;
     bool mShowIconNextDays;
     bool mShowIconNext;
     bool mShowIconJournal;
     bool mShowIconFilter;
+    bool mShowIconOnetoolbar;
     
     bool mShowIconStretch;
 
     bool mToolBarHor;
     bool mToolBarUp;
     bool mToolBarHorV;
     bool mToolBarUpV;
     bool mToolBarHorN;
     bool mToolBarUpN;
     bool mToolBarHorF;
     bool mToolBarUpF;
     bool mToolBarMiniIcons;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index c6ae868..a4e0834 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -185,54 +185,57 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
             
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
         filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+"Ax" ) );
         addToolBar (filterToolBar , tbd );
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
     } else {
         filterToolBar = 0;
         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 );
-
 
   
 
     mCalendarModifiedFlag = false;
     QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
     splash->setAlignment ( AlignCenter );
     setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
     showMaximized();
 #endif
 
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
@@ -684,24 +687,25 @@ void MainWindow::initActions()
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );
     actionMenu->insertSeparator();
 
     action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( undo_delete() ) );
     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);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( actionMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
     configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
     QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
@@ -1184,24 +1188,26 @@ void MainWindow::initActions()
     }
     else {
         iconToolBar->setHorizontalStretchable (true );
         viewToolBar->setHorizontalStretchable (true );
         navigatorToolBar->setHorizontalStretchable (true );
         iconToolBar->setVerticalStretchable (true );
         viewToolBar->setVerticalStretchable (true );
         navigatorToolBar->setVerticalStretchable (true );
         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() ) );
     connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
     configureAgenda( p->mHourSize );
     connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
 
 void MainWindow::exportToPhone( int mode )
 {
 
@@ -1945,26 +1951,29 @@ void MainWindow::fillFilterMenuPopup()
     if ( !checkitem )
         filterPopupMenu->setItemChecked( 0, true ); 
 }
 void MainWindow::selectFilter( int fil )
 {
 
     if ( fil == 0 ) {
         mView->editFilters( );
     } 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()
 {
     if ( filterMenubar ) {
         if ( !mView->filterView()->filtersEnabled() ) {
             filterMenubar->changeItem( 0, i18n("No Filter") );
         } else {
             CalFilter *curfilter = mView->filterView()->selectedFilter();
             if ( curfilter ) {
                 filterMenubar->changeItem( 0, curfilter->name() );
@@ -1974,24 +1983,25 @@ void MainWindow::updateFilterToolbar()
 }
 void MainWindow::selectFilterPopup( int fil )
 {
     selectFilter( fil + 1 );
    
 }
 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 );
     p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
     p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
     p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
     p-> mShowIconDay6= configureToolBarMenu->isItemChecked( 75 );
     p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
     p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
     p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
     p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );