1 files changed, 30 insertions, 0 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e52968..8a4c7eb 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -725,19 +725,33 @@ void MainWindow::initActions()
              mView, SLOT( goToday() ) );
     viewMenu->insertSeparator();
 
+    // ***********************
+    if ( KOPrefs::instance()->mVerticalScreen ) {
+         icon = SmallIcon( "1updownarrow" );
+    } else {
+        icon = SmallIcon("1leftrightarrow" );
+    }
+    configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
+    QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
+    FSaction->addTo( viewMenu );
+    connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
+
     icon = loadPixmap( pathString + "navi" );
+    configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
     action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleDateNavigatorWidget() ) );
     mToggleNav = action ;
     icon = loadPixmap( pathString + "filter" );
+    configureToolBarMenu->insertItem(icon, i18n("Toggle FilterView"), 26 );
     action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
     mToggleFilter = action;
     icon = loadPixmap( pathString + "allday" );
+    configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
     action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
@@ -761,6 +775,12 @@ void MainWindow::initActions()
     action->addTo( iconToolBar  );
     viewMenu->insertSeparator();
 
+    if ( p-> mShowIconToggleFull )
+        FSaction->addTo( iconToolBar );
+    if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
+    if ( p->mShowIconFilterview ) mToggleFilter->addTo( iconToolBar );
+    if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
+
 
     icon = loadPixmap( pathString + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
@@ -1152,6 +1172,12 @@ void MainWindow::initActions()
 
     configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6);
 
+
+    if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true);
+    if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true);
+    if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true);
+    if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true);
+
     if (p-> mShowIconNewEvent)
         configureToolBarMenu->setItemChecked( 10, true );
     if (p->mShowIconNewTodo )
@@ -2018,6 +2044,10 @@ void MainWindow::configureToolBar( int item  )
     p-> mShowIconFilter = configureToolBarMenu->isItemChecked( 7 );
     p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
     p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
+    p->mShowIconNavigator = configureToolBarMenu->isItemChecked( 22 );
+    p->mShowIconAllday = configureToolBarMenu->isItemChecked( 24 );
+    p->mShowIconFilterview = configureToolBarMenu->isItemChecked( 26 );
+    p->mShowIconToggleFull = configureToolBarMenu->isItemChecked( 28 );
     p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
     p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
     p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );