From 50bc570309b0da3ecd4a9d0a0448b58a9a8ed2ab Mon Sep 17 00:00:00 2001 From: harlekin Date: Fri, 15 Feb 2002 20:02:50 +0000 Subject: added a icon for the today view to the menubar and change it in the view menu to first place --- 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 @@ -20,6 +20,8 @@ ** **********************************************************************/ +#define QTOPIA_INTERNAL_FD + #include "datebook.h" #include "datebookday.h" #include "datebooksettings.h" @@ -110,6 +112,11 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) 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 ); @@ -134,10 +141,6 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) 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 ); @@ -256,7 +259,7 @@ QString DateBook::checkEvent(const Event &e) QDate DateBook::currentDate() { QDate d = QDate::currentDate(); - + if ( dayView && views->visibleWidget() == dayView ) { d = dayView->date(); } else if ( weekView && views->visibleWidget() == weekView ) { -- cgit v0.9.0.2