1 files changed, 10 insertions, 9 deletions

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 13e186d..f945383 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -685,220 +685,221 @@ void MainWindow::initActions()
     int fontWid =  f.width( "30" );
     while ( fontWid > pixWid ) {
         --fontPoint;
         mWeekFont.setPointSize( fontPoint );
         QFontMetrics f( mWeekFont );
         fontWid =  f.width( "30" );
         //qDebug("dec-- ");
     }
 
     connect( mWeekAction, SIGNAL( activated() ),
              this, SLOT( weekAction() ) );
 
     connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
     if ( p->mShowIconFilterview ) {
         icon = loadPixmap( pathString + "filter" );
         actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
         connect( actionFilterMenuTB, SIGNAL( activated() ),
                  this, SLOT( fillFilterMenuTB() ) );
         actionFilterMenuTB->addTo( iconToolBar  );
         selectFilterMenuTB = new QPopupMenu( this );
         selectFilterMenuTB->setCheckable( true ); 
         connect ( selectFilterMenuTB, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     }
 
     //#endif
     // ******************
     QAction *action;
     // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
     configureToolBarMenu->setCheckable( true );
 
    
     configureAgendaMenu->setCheckable( true );
     int iii ;
     for ( iii = 1;iii<= 10 ;++iii ){
         configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
     }
     //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
 
     connect( configureAgendaMenu, SIGNAL( aboutToShow()),
              this, SLOT( showConfigureAgenda( ) ) );
 
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );  
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_global_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 );
     nt_action->addTo( actionMenu );
     connect( nt_action, SIGNAL( activated() ),
              mView, SLOT( newTodo() ) );
 
     icon = loadPixmap( pathString + "today" );
     QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
     today_action->addTo( viewMenu );
     connect( today_action, SIGNAL( activated() ),
              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("Filter menu icon"), 26 );
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
     mToggleFilter = action;
+    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 + "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() ),
              mView, SLOT( toggleAllDaySize() ) );
     mToggleAllday = action;
 
 
     connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
              mToggleNav, SLOT( setEnabled ( bool ) ) );
-    connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
-             mToggleFilter, SLOT( setEnabled ( bool ) ) );
+    //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
+    //       mToggleFilter, SLOT( setEnabled ( bool ) ) );
     connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
              mToggleAllday, SLOT( setEnabled ( bool ) ) );
     // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
     //       configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
 
     viewMenu->insertSeparator();
     icon = loadPixmap( pathString + "picker" );
     action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( showDatePicker() ) );
     action->addTo( iconToolBar  );
     viewMenu->insertSeparator();
 
     if ( p-> mShowIconToggleFull )
         FSaction->addTo( iconToolBar );
     if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
    
     //********************
     if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
 
 
     icon = loadPixmap( pathString + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
     QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
     whatsnext_action->addTo( viewMenu );
     connect( whatsnext_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWhatsNextView() ) );
 
     icon = loadPixmap( pathString + "xdays" );
     configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
     QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
     xdays_action->addTo( viewMenu );
     connect( xdays_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showNextXView() ) );
    
 
     icon = loadPixmap( pathString + "journal" );
     configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
     QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
     viewjournal_action->addTo( viewMenu );
     connect( viewjournal_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showJournalView() ) );
 
 
     icon = loadPixmap( pathString + "day" );
     configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
     QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
     day1_action->addTo( viewMenu );
     //  action->addTo( toolBar );
     connect( day1_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showDayView() ) );
 
     icon = loadPixmap( pathString + "workweek" );
     configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
     QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
     day5_action->addTo( viewMenu );
     connect( day5_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWorkWeekView() ) );
 
     icon = loadPixmap( pathString + "week" );
     configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
     QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
     day7_action->addTo( viewMenu );
     connect( day7_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWeekView() ) );
     
     icon = loadPixmap( pathString + "workweek2" );
     configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
     QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
     day6_action->addTo( viewMenu );
     connect( day6_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthViewWeek() ) );
 
     icon = loadPixmap( pathString + "month" );
     configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
     QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
     month_action->addTo( viewMenu );
     connect( month_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthView() ) );
 
      icon = loadPixmap( pathString + "list" );
     configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
     QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
     showlist_action->addTo( viewMenu );
     connect( showlist_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showListView() ) );
 
     icon = loadPixmap( pathString + "todo" );
     configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
     QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
     todoview_action->addTo( viewMenu );
     connect( todoview_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTodoView() ) );