summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-02-15 20:02:50 (UTC)
committer harlekin <harlekin>2002-02-15 20:02:50 (UTC)
commit50bc570309b0da3ecd4a9d0a0448b58a9a8ed2ab (patch) (side-by-side diff)
treefefefb94f5d4c0eae01ef441900a0c7c9dd3e22b
parent8ccfea56d43fde77717cfd354b62ccb3f67585d1 (diff)
downloadopie-50bc570309b0da3ecd4a9d0a0448b58a9a8ed2ab.zip
opie-50bc570309b0da3ecd4a9d0a0448b58a9a8ed2ab.tar.gz
opie-50bc570309b0da3ecd4a9d0a0448b58a9a8ed2ab.tar.bz2
added a icon for the today view to the menubar and change it in the view menu to first place
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp13
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
@@ -19,8 +19,10 @@
** $Id$
**
**********************************************************************/
+#define QTOPIA_INTERNAL_FD
+
#include "datebook.h"
#include "datebookday.h"
#include "datebooksettings.h"
#include "datebookweek.h"
@@ -109,8 +111,13 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
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 );
@@ -133,12 +140,8 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
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 );
@@ -255,9 +258,9 @@ 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 ) {
d = weekView->date();