icons added

2 files changed, 21 insertions, 15 deletions

diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 70f00c6..6559119 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -175,325 +175,328 @@ void KOTodoViewItem::setMyPixmap()
  
   int pixSize = 0;
   QPixmap pPix =  QPixmap(  size, size );
   if ( mTodo->description().length() > 0 ) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::darkGreen );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   } 
   if ( mTodo->isAlarmEnabled() ) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::red );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   }  
   if ( mTodo->doesRecur() ) {
       pixi.resize(size, pixSize+size);
       pPix.fill( Qt::blue );
       p.begin( &pixi );
       p. drawPixmap ( 0, pixSize, pPix);
       p.end();
       pixSize += size;
   } 
   //   }
   if ( pixi.width() > 1 ) {
       setPixmap ( 0,pixi ) ; 
   } else {
       setPixmap ( 0,QPixmap() ) ; 
   }
 }
 void KOTodoViewItem::stateChange(bool state)
 {
     // qDebug("KOTodoViewItem::stateChange %d ", state);
   // do not change setting on startup
   if ( m_init ) return;
   if (isOn()!=state) {
       setOn(state);
       //qDebug("SETON ");
       return;
   }
   if ( mTodo->isCompleted() == state ) {
       //qDebug("STATECHANGE:nothing to do ");
       return;
   }
   QString keyd = "==";
   QString keyt = "==";
   //qDebug("KOTodoViewItem::stateChange %s ", text(0).latin1());
   if ( mTodo->doesRecur()  ){
       QDateTime start = mTodo->dtStart();
       mTodo->setCompleted(state);
       if ( start != mTodo->dtStart() ) {
           if ( state  && !mTodo->isCompleted() ) {
               setOn( false );
               state = false;
           }
       }
   } else
       mTodo->setCompleted(state);
 
   if (state) mTodo->setCompleted(QDateTime::currentDateTime());
 
   if (mTodo->hasDueDate()) {
     setText(3, mTodo->dtDueDateStr());
     QDate d = mTodo->dtDue().date();
     keyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     setSortKey(3,keyd);
     if (mTodo->doesFloat()) {
       setText(4,"");
     }
     else {
       setText(4,mTodo->dtDueTimeStr());
       QTime t = mTodo->dtDue().time();
       keyt.sprintf("%02d%02d",t.hour(),t.minute());
       setSortKey(4,keyt);
     }
   }
  if (mTodo->hasStartDate()) {
      QString skeyt = "==";
      QString skeyd = "==";
      setText(5, mTodo->dtStartDateStr());
      QDate d = mTodo->dtStart().date();
      skeyd.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
      
      if (mTodo->doesFloat()) {
          setText(6,"");
      }
      else {
          setText(6,mTodo->dtStartTimeStr());
          QTime t = mTodo->dtStart().time();
          skeyt.sprintf("%02d%02d",t.hour(),t.minute());
          
      }
      setSortKey(5,skeyd);
      setSortKey(6,skeyt);
   } 
   if (mTodo->isCompleted()) setSortKey(1,QString::number(9)+keyd+keyt);
   else setSortKey(1,QString::number(mTodo->priority())+keyd+keyt);
   
   setText(2,i18n("%1 %").arg(QString::number(mTodo->percentComplete())));
   if (mTodo->percentComplete()<100) {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(mTodo->percentComplete()));
   }
   else {
     if (mTodo->isCompleted()) setSortKey(2,QString::number(999));
     else setSortKey(2,QString::number(99));
   }
   if ( state ) {
       QListViewItem * myChild = firstChild();
       KOTodoViewItem *item;
       while( myChild ) {
           //qDebug("stateCH ");
           item = static_cast<KOTodoViewItem*>(myChild);
           item->stateChange(state);
           myChild = myChild->nextSibling();
       }
   } else {
       QListViewItem * myChild = parent();
       if ( myChild )
           (static_cast<KOTodoViewItem*>(myChild))->stateChange(state);
   }
   mTodoView->modified(true);
   setMyPixmap();
   mTodoView->setTodoModified( mTodo );
 }
 
 bool KOTodoViewItem::isAlternate()
 {
 
   KOTodoListView *lv = static_cast<KOTodoListView *>(listView());
   if (lv && lv->alternateBackground().isValid())
   {
     KOTodoViewItem *above = 0;
     above = static_cast<KOTodoViewItem *>(itemAbove());
     m_known = above ? above->m_known : true;
     if (m_known)
     {
        m_odd = above ? !above->m_odd : false;
     }
     else
     {
        KOTodoViewItem *item;
        bool previous = true;
        if (QListViewItem::parent())
        {
           item = static_cast<KOTodoViewItem *>(QListViewItem::parent());
           if (item)
              previous = item->m_odd;
           item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
        }
        else
        {
           item = static_cast<KOTodoViewItem *>(lv->firstChild());
        }
 
        while(item)
        {
           item->m_odd = previous = !previous;
           item->m_known = true;
           item = static_cast<KOTodoViewItem *>(item->nextSibling());
        }
     }
     return m_odd;
   }
   return false;
 }
 
 void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
   QColorGroup _cg = cg;
   QColorGroup::ColorRole role; 
   if ( KOPrefs::instance()->mTodoViewUsesForegroundColor )
       role = QColorGroup::Text;
   else
       role = QColorGroup::Base;
   //#ifndef KORG_NOLVALTERNATION
   if (isAlternate())
       _cg.setColor(QColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground());
   bool setColor = KOPrefs::instance()->mTodoViewUsesCatColors;
   QColor colorToSet;
    if ( setColor ) {
       QStringList categories = mTodo->categories();
       QString cat = categories.first();
       if ( !cat.isEmpty()) {
           colorToSet = *(KOPrefs::instance()->categoryColor(cat) );
       } else
           setColor = false;  
    }
-
-   int odue = mTodo->hasDueSubTodo( !isOpen());
+   bool openMode = !isOpen();
+   // maybe we are in flat-display-mode
+   if ( !firstChild() )
+       openMode = false;
+   int odue = mTodo->hasDueSubTodo( openMode );
    if (odue == 2) {
        colorToSet = KOPrefs::instance()->mTodoOverdueColor;
        setColor = true;
    } else if ( odue == 1 ) {
        colorToSet = KOPrefs::instance()->mTodoDueTodayColor;     
        setColor = true;
    }
  
 
   if ( setColor ) {
       _cg.setColor(role,colorToSet );
       if ( role == QColorGroup::Base) {
           int rgb = colorToSet.red();
           rgb += colorToSet.blue()/2;
           rgb += colorToSet.green();
           if ( rgb < 200 )
               _cg.setColor(QColorGroup::Text,Qt::white );
       }
   }
   //#endif
   if ( column > 0 ){
       if ( column == 2 && !KOPrefs::instance()->mTodoViewShowsPercentage ) {
           p->save();
           int progress = (int)(( (width-6)*mTodo->percentComplete())/100.0 + 0.5);
           
           p->fillRect( 0, 0, width, height(), _cg.base() ); // background
           // p->setPen(Qt::black );  //border
           // p->setBrush( KOPrefs::instance()->mHighlightColorKGlobalSettings::baseColor() );  //filling
           QColor fc = KOPrefs::instance()->mHighlightColor;
           if ( mTodo->percentComplete() == 100 )
               fc = darkGreen;
           p->drawRect( 2, 2, width-4, height()-4);
           p->fillRect( 3, 3, progress, height()-6, 
                        fc );
           p->restore();
       } else {
           QCheckListItem::paintCell(p, _cg, column, width, alignment);
       }
       return;
   }
 
   int align = alignment;
    
     if ( !p )
 	return;
     
     p->fillRect( 0, 0, width, height(), _cg.brush( QColorGroup::Base ) );
 
     QListView *lv = listView();
     if ( !lv )
 	return;
     int marg = 2;//lv->itemMargin();
     int r = 0;
     QCheckListItem::Type myType = QCheckListItem::CheckBox;
     int BoxSize = 20;
     int boxOffset = 2;
     int xOffset = 2;
     if (qApp->desktop()->width() < 300 ) {
          BoxSize = 14;
          boxOffset = -1;
          xOffset = 1;
          // marg = 0;
     }
     if ( height() < BoxSize ) {
         boxOffset = boxOffset - ((BoxSize -  height())/2) ;
         // qDebug("boxOffset %d  height %d", boxOffset, height() );
         BoxSize = height();
 
     }
     //bool winStyle = lv->style() == WindowsStyle;
 
     int lineStart = 5;
     if ( myType == Controller ) {
         if ( !pixmap( 0 ) )
             r += BoxSize + 4;
     } else {
         ASSERT( lv ); //###
         //	QFontMetrics fm( lv->font() );
         //	int d = fm.height();
         int x = 0;
         int y = (height() - BoxSize) / 2;
         //	p->setPen( QPen( _cg.text(), winStyle ? 2 : 1 ) );
         if ( myType == CheckBox ) {
             if ( isEnabled() )
                 p->setPen( QPen( _cg.text(), 1 ) );
             else
                 p->setPen( QPen( listView()->palette().color( QPalette::Disabled, QColorGroup::Text ), 1 ) );
             p->drawRect( x+marg, y+2, BoxSize-4, BoxSize-4 );
             lineStart = x+marg;
             /////////////////////
                 x++;
                 y++;
                 if ( isOn() ) {
                     QPointArray a( 7*2 );
                     int i, xx, yy;
                     xx = x+xOffset+marg+(boxOffset/2);
                     yy = y+5+boxOffset;
                     for ( i=0; i<3; i++ ) {
                         a.setPoint( 2*i,   xx, yy );
                         a.setPoint( 2*i+1, xx, yy+2 );
                         // qDebug(" ");
                         xx++; yy++;
                     }
                     yy -= 2;
                     for ( i=3; i<7; i++ ) {
                         a.setPoint( 2*i,   xx, yy );
                         a.setPoint( 2*i+1, xx, yy+2 );
                         xx++; yy--;
                     }
                     p->setPen( darkGreen );
                     p->drawLineSegments( a );
                 }
                 ////////////////////////
         } 
         r += BoxSize + 4;
     }
 
     p->translate( r, 0 );
     p->setPen( QPen( _cg.text() ) );
     QListViewItem::paintCell( p, _cg, column, width - r, align );
     if ( mTodo->cancelled () ) {
         p->setPen( black );
         QRect br = p->boundingRect( 1,1,1,1,0,mTodo->summary() );
         int wid = br.width() +lineStart;
         if (  wid > width-3 )
             wid = width-3;
         p->drawLine( lineStart, height()/2+1, wid, height()/2+1  );
 
     }
 
 }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 006a8dd..019f41f 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -330,430 +330,433 @@ bool MainWindow::beamReceiveEnabled()
 }
 
 void MainWindow::toggleBeamReceive()
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
         qDebug("disable BeamReceive ");
         delete infrared;
         infrared = 0;
         brAction->setOn(false);
         return;
     } 
     qDebug("enable BeamReceive ");
     brAction->setOn(true);
     infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
 #endif
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
     if ( ! globalFlagBlockStartup )
         if ( mClosed )
             mView->goToday();
 #endif
     QWidget::showMaximized () ;
     mClosed = false;
 }
 void MainWindow::closeEvent( QCloseEvent* ce )
 {
 
 
 
     if ( ! KOPrefs::instance()->mAskForQuit ) {
         saveOnClose();
         mClosed = true;
         ce->accept();
         return;
 
     }
 
     switch( QMessageBox::information( this, "KO/Pi",
                                       i18n("Do you really want\nto close KO/Pi?"),
                                       i18n("Close"), i18n("No"),
                                       0, 0 ) ) {
     case 0:
         saveOnClose();
         mClosed = true;
         ce->accept();
         break;
     case 1:
         ce->ignore();
         break;
     case 2:
 
     default:
         break;
     }
 
 
 }
 
 void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 {
     QDataStream stream( data, IO_ReadOnly );
     // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
     //QString datamess;
     //qDebug("message ");
     qDebug("KO: QCOP message received: %s ", cmsg.data()  );
  
     if ( cmsg == "setDocument(QString)" ) {
         QDataStream stream( data, IO_ReadOnly );
         QString fileName;
         stream >> fileName;
         //qDebug("filename %s ", fileName.latin1());
         showMaximized();
         raise();
         KOPrefs::instance()->mLastSyncedLocalFile = fileName ;
         mSyncManager->slotSyncMenu( 1002 );
         return;
     }
 
     if ( cmsg == "-writeFile" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         showMaximized();
         raise();
         return;
 
     }
     if ( cmsg == "-writeFileSilent" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         // mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         //showMaximized();
         //raise();
         hide();
         return;
     }
     if ( cmsg == "-newCountdown" ) {
         qDebug("newCountdown ");
 
     }
     QString msg ;
     QString allmsg = cmsg;
     while ( allmsg.length() > 0 ) {
         int nextC = allmsg.find( "-", 1 );
         if ( nextC == -1 ) {
             msg = allmsg;
             allmsg = "";
         } else{
             msg = allmsg.left( nextC );
             allmsg = allmsg.mid( nextC,  allmsg.length()-nextC );
         }
         //qDebug("msg: %s  all: %s ", msg.latin1(), allmsg.latin1() );
         if ( msg == "-newEvent" ) {
             mView->newEvent();
         }
         if ( msg == "-newTodo" ) {
             mView->newTodo();
 
         }
         if ( msg == "-showWN" ) {
             mView->viewManager()->showWhatsNextView();
         }
         if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         if ( msg == "-showList"  ) {
             mView->viewManager()->showListView();
         }
         else if ( msg == "-showDay" ) {
             mView->viewManager()->showDayView();
         }
         else if ( msg == "-showWWeek"  ) {
             mView->viewManager()->showWorkWeekView();
         }
         else if ( msg == "-ringSync"  ) {
             mSyncManager->multiSync( false );
         }
         else if ( msg == "-showWeek" ) {
             mView->viewManager()->showWeekView();
         }
         else if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         else if ( msg == "-showJournal"  ) {
             mView->dateNavigator()->selectDates( 1 );
             mView->dateNavigator()->selectToday();
             mView->viewManager()->showJournalView();
         }
         else if ( msg == "-showKO" ) {
             mView->viewManager()->showNextXView();
         }
         else if ( msg == "-showWNext" || msg == "nextView()" ) {
             mView->viewManager()->showWhatsNextView();
         }
         else if ( msg == "-showNextXView" ) {
             mView->viewManager()->showNextXView();
         }
 
 
     }
 
     showMaximized();
     raise();
 }
 
 QPixmap MainWindow::loadPixmap( QString name )
 {
     return SmallIcon( name );
 
 }
 void MainWindow::initActions()
 {
     //KOPrefs::instance()->mShowFullMenu
     iconToolBar->clear();
     KOPrefs *p = KOPrefs::instance();
     //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
 
     QPopupMenu *viewMenu = new QPopupMenu( this );
     QPopupMenu *actionMenu = new QPopupMenu( this );
     QPopupMenu *importMenu = new QPopupMenu( this );
     selectFilterMenu = new QPopupMenu( this );
     selectFilterMenu->setCheckable( true );
     syncMenu = new QPopupMenu( this );
     configureAgendaMenu = new QPopupMenu( this );
     configureToolBarMenu = new QPopupMenu( this );
     QPopupMenu *helpMenu = new QPopupMenu( this );
+
+    QIconSet icon;
+    int pixWid = 22, pixHei = 22;
+    QString pathString = "";
+    if ( !p->mToolBarMiniIcons ) {
+        if ( QApplication::desktop()->width() < 480 ) {
+            pathString += "icons16/";
+            pixWid = 18; pixHei = 16;
+        }
+    } else {
+        pathString += "iconsmini/";
+        pixWid = 18; pixHei = 16;
+    }
     if ( KOPrefs::instance()->mShowFullMenu ) {
         QMenuBar *menuBar1;
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
         menuBar1->insertItem( i18n("Actions"), actionMenu );
 #ifdef DESKTOP_VERSION
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
 #else
         menuBar1->insertItem( i18n("Sync"), syncMenu );
         menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
 #endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         QPEMenuBar *menuBar1;
         menuBar1 = new QPEMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
-        menuBar1->insertItem( i18n("ME"), menuBar);
+        icon = loadPixmap( pathString + "z_menu" );
+        menuBar1->insertItem( icon.pixmap(), menuBar);
+        //menuBar1->insertItem( i18n("ME"), menuBar);
         menuBar->insertItem( i18n("File"), importMenu );
         menuBar->insertItem( i18n("View"), viewMenu );
         menuBar->insertItem( i18n("Actions"), actionMenu );
         menuBar->insertItem( i18n("Synchronize"), syncMenu );
         menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
         menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar->insertItem( i18n("Help"), helpMenu );
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
-    QIconSet icon;
-    int pixWid = 22, pixHei = 22;
-    QString pathString = "";
-    if ( !p->mToolBarMiniIcons ) {
-        if ( QApplication::desktop()->width() < 480 ) {
-            pathString += "icons16/";
-            pixWid = 18; pixHei = 16;
-        }
-    } else {
-        pathString += "iconsmini/";
-        pixWid = 18; pixHei = 16;
-    }
     mWeekBgColor = iconToolBar->backgroundColor();
     mWeekPixmap.resize( pixWid , pixHei );
     mWeekPixmap.fill( mWeekBgColor );
     icon = mWeekPixmap;
     mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
     if ( p-> mShowIconWeekNum )
         mWeekAction->addTo( iconToolBar );
     mWeekFont = font();
 
     int fontPoint = mWeekFont.pointSize();
     QFontMetrics f( mWeekFont );
     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 ) ) );
 
     //#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..."), 0, this );
     action->addTo( actionMenu );
     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->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();
 
     icon = loadPixmap( pathString + "navi" );
     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" );
     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" );
     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( signalAgendaView( bool ) ),
              mToggleAllday, 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();
     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 + "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 + "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() ) );
 
     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 + "xdays" );
     configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 );
     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 + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 );
     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() ) );
 
 #if 0
     action = new QAction( "view_timespan", "Time Span", 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTimeSpanView() ) );
 #endif