added a icon for the today view to the menubar and change it in the view menu to first place

1 files changed, 8 insertions, 5 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 6ec6cc2..e8d808f 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -1,188 +1,191 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
 
+#define QTOPIA_INTERNAL_FD
+
 #include "datebook.h"
 #include "datebookday.h"
 #include "datebooksettings.h"
 #include "datebookweek.h"
 #include "dateentryimpl.h"
 
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/qpedebug.h>
 #include <qpe/event.h>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/timestring.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/tzselect.h>
 #include <qpe/xmlreader.h>
 
 #include <qaction.h>
 #include <qcopchannel_qws.h>
 #include <qdatetime.h>
 #include <qdialog.h>
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qtextcodec.h>
 #include <qtextstream.h>
 #include <qtl.h>
 #include <qwidgetstack.h>
 #include <qwindowsystem_qws.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 #define DAY 1
 #define WEEK 2
 #define MONTH 3
 
 
 DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     : QMainWindow( parent, "datebook", f ),
       aPreset( FALSE ),
       presetTime( -1 ),
       startTime( 8 ), // an acceptable default
       syncing(FALSE),
       inSearch(FALSE)
 {
     QTime t;
     t.start();
     db = new DateBookDB;
     qDebug("loading db t=%d", t.elapsed() );
     loadSettings();
     setCaption( tr("Calendar") );
     setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
     setToolBarsMovable( FALSE );
 
     QPEToolBar *bar = new QPEToolBar( this );
     bar->setHorizontalStretchable( TRUE );
 
     QPEMenuBar *mb = new QPEMenuBar( bar );
     mb->setMargin( 0 );
 
     QPEToolBar *sub_bar = new QPEToolBar(this);
 
     QPopupMenu *view = new QPopupMenu( this );
     QPopupMenu *settings = new QPopupMenu( this );
 
     mb->insertItem( tr( "View" ), view );
     mb->insertItem( tr( "Settings" ), settings );
 
     QActionGroup *g = new QActionGroup( this );
     g->setExclusive( TRUE );
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
     a->addTo( sub_bar );
 
+    a = new QAction( tr( "Today" ), Resource::loadPixmap( "to_day" ),  QString::null, 0, g, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
+    a->addTo( sub_bar );
+    a->addTo( view );
+   
     a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     a->setOn( TRUE );
     dayAction = a;
     a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewWeek() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     weekAction = a;
     a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewMonth() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     monthAction = a;
 
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
     a->addTo( sub_bar );
 
-    a = new QAction( tr( "Today" ), QString::null, 0, 0 );
-    connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
-    a->addTo( view );
-
     a = new QAction( tr( "Alarm and Start Time..." ), QString::null, 0, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
     a->addTo( settings );
 
     views = new QWidgetStack( this );
     setCentralWidget( views );
 
     dayView = 0;
     weekView = 0;
     monthView = 0;
 
     viewDay();
     connect( qApp, SIGNAL(clockChanged(bool)),
              this, SLOT(changeClock(bool)) );
     connect( qApp, SIGNAL(weekChanged(bool)),
              this, SLOT(changeWeek(bool)) );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
              this, SLOT(appMessage(const QCString&, const QByteArray&)) );
 #endif
 
     // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
         this, SLOT(receive(const QCString&, const QByteArray&)) );
 #endif
 #endif
 
     qDebug("done t=%d", t.elapsed() );
 
 }
 
 void DateBook::receive( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "timeChange(QString)" ) {
         // update active view!
         if ( dayAction->isOn() )
             viewDay();
         else if ( weekAction->isOn() )
             viewWeek();
         else if ( monthAction->isOn() )
             viewMonth();
     }
 }
@@ -211,97 +214,97 @@ void DateBook::slotSettings()
         saveSettings();
 
         // make the change obvious
         if ( views->visibleWidget() ) {
             if ( views->visibleWidget() == dayView )
                 dayView->redraw();
             else if ( views->visibleWidget() == weekView )
                 weekView->redraw();
         }
     }
 }
 
 void DateBook::fileNew()
 {
     slotNewEventFromKey("");
 }
 
 QString DateBook::checkEvent(const Event &e)
 {
     /* check if overlaps with itself */
     bool checkFailed = FALSE;
 
     /* check the next 12 repeats. should catch most problems */
     QDate current_date = e.start().date();
     Event previous = e;
     for(int i = 0; i < 12; i++)
     {
         QDateTime next;
         if (!nextOccurance(previous, current_date.addDays(1), next)) {
             break;  // no more repeats
         }
         if(next < previous.end()) {
             checkFailed = TRUE;
             break;
         }
         current_date = next.date();
     }
 
     if(checkFailed)
         return tr("Event duration is potentially longer\n"
                   "than interval between repeats.");
 
     return QString::null;
 }
 
 QDate DateBook::currentDate()
 {
     QDate d = QDate::currentDate();
-
+    
     if ( dayView && views->visibleWidget() == dayView ) {
         d = dayView->date();
     } else if ( weekView && views->visibleWidget() == weekView ) {
         d = weekView->date();
     } else if ( monthView && views->visibleWidget() == monthView ) {
         d = monthView->selectedDate();
     }
 
     return d;
 }
 
 void DateBook::viewDay()
 {
     initDay();
     dayAction->setOn( TRUE );
     QDate d = currentDate();
     dayView->setDate( d );
     views->raiseWidget( dayView );
     dayView->redraw();
 }
 
 void DateBook::viewWeek()
 {
     initWeek();
     weekAction->setOn( TRUE );
     QDate d = currentDate();
     weekView->setDate( d );
     views->raiseWidget( weekView );
     weekView->redraw();
 }
 
 void DateBook::viewMonth()
 {
     initMonth();
     monthAction->setOn( TRUE );
     QDate d = currentDate();
     monthView->setDate( d.year(), d.month(), d.day() );
     views->raiseWidget( monthView );
     monthView->redraw();
 }
 
 void DateBook::editEvent( const Event &e )
 {
     if (syncing) {
         QMessageBox::warning( this, tr("Calendar"),
                               tr( "Can not edit data, currently syncing") );
         return;
     }