author | harlekin <harlekin> | 2002-02-15 20:02:50 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-02-15 20:02:50 (UTC) |
commit | 50bc570309b0da3ecd4a9d0a0448b58a9a8ed2ab (patch) (unidiff) | |
tree | fefefb94f5d4c0eae01ef441900a0c7c9dd3e22b | |
parent | 8ccfea56d43fde77717cfd354b62ccb3f67585d1 (diff) | |
download | opie-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
-rw-r--r-- | core/pim/datebook/datebook.cpp | 13 |
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 @@ | |||
19 | ** $Id$ | 19 | ** $Id$ |
20 | ** | 20 | ** |
21 | **********************************************************************/ | 21 | **********************************************************************/ |
22 | 22 | ||
23 | #define QTOPIA_INTERNAL_FD | ||
24 | |||
23 | #include "datebook.h" | 25 | #include "datebook.h" |
24 | #include "datebookday.h" | 26 | #include "datebookday.h" |
25 | #include "datebooksettings.h" | 27 | #include "datebooksettings.h" |
26 | #include "datebookweek.h" | 28 | #include "datebookweek.h" |
@@ -109,8 +111,13 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
109 | QString::null, 0, this, 0 ); | 111 | QString::null, 0, this, 0 ); |
110 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); | 112 | connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) ); |
111 | a->addTo( sub_bar ); | 113 | a->addTo( sub_bar ); |
112 | 114 | ||
115 | a = new QAction( tr( "Today" ), Resource::loadPixmap( "to_day" ), QString::null, 0, g, 0 ); | ||
116 | connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) ); | ||
117 | a->addTo( sub_bar ); | ||
118 | a->addTo( view ); | ||
119 | |||
113 | a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 ); | 120 | a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 ); |
114 | connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) ); | 121 | connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) ); |
115 | a->addTo( sub_bar ); | 122 | a->addTo( sub_bar ); |
116 | a->addTo( view ); | 123 | a->addTo( view ); |
@@ -133,12 +140,8 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
133 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, g, 0 ); | 140 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, g, 0 ); |
134 | connect( a, SIGNAL(activated()), this, SLOT(slotFind()) ); | 141 | connect( a, SIGNAL(activated()), this, SLOT(slotFind()) ); |
135 | a->addTo( sub_bar ); | 142 | a->addTo( sub_bar ); |
136 | 143 | ||
137 | a = new QAction( tr( "Today" ), QString::null, 0, 0 ); | ||
138 | connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) ); | ||
139 | a->addTo( view ); | ||
140 | |||
141 | a = new QAction( tr( "Alarm and Start Time..." ), QString::null, 0, 0 ); | 144 | a = new QAction( tr( "Alarm and Start Time..." ), QString::null, 0, 0 ); |
142 | connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); | 145 | connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); |
143 | a->addTo( settings ); | 146 | a->addTo( settings ); |
144 | 147 | ||
@@ -255,9 +258,9 @@ QString DateBook::checkEvent(const Event &e) | |||
255 | 258 | ||
256 | QDate DateBook::currentDate() | 259 | QDate DateBook::currentDate() |
257 | { | 260 | { |
258 | QDate d = QDate::currentDate(); | 261 | QDate d = QDate::currentDate(); |
259 | 262 | ||
260 | if ( dayView && views->visibleWidget() == dayView ) { | 263 | if ( dayView && views->visibleWidget() == dayView ) { |
261 | d = dayView->date(); | 264 | d = dayView->date(); |
262 | } else if ( weekView && views->visibleWidget() == weekView ) { | 265 | } else if ( weekView && views->visibleWidget() == weekView ) { |
263 | d = weekView->date(); | 266 | d = weekView->date(); |