author | zautrix <zautrix> | 2004-12-04 13:59:01 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-12-04 13:59:01 (UTC) |
commit | a3b1470f3da722d044505f78bef9de51b2107802 (patch) (unidiff) | |
tree | 52965f580d00f865231661ff3d51af5c881e77cc | |
parent | 7828f46413766ee5db72dc9bd457eac0868f0646 (diff) | |
download | kdepimpi-a3b1470f3da722d044505f78bef9de51b2107802.zip kdepimpi-a3b1470f3da722d044505f78bef9de51b2107802.tar.gz kdepimpi-a3b1470f3da722d044505f78bef9de51b2107802.tar.bz2 |
monthview changes
-rw-r--r-- | bin/kdepim/WhatsNew.txt | 6 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 3 | ||||
-rw-r--r-- | korganizer/datenavigator.cpp | 6 | ||||
-rw-r--r-- | korganizer/datenavigator.h | 1 | ||||
-rw-r--r-- | korganizer/interfaces/korganizer/baseview.h | 1 | ||||
-rw-r--r-- | korganizer/komonthview.h | 1 |
6 files changed, 18 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index eb7cf13..4fff7e1 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt | |||
@@ -8,32 +8,38 @@ portrait/landscape mode on 640x480 PDA display. | |||
8 | Fixed some other small bugs. | 8 | Fixed some other small bugs. |
9 | 9 | ||
10 | Fixed an ugly bug in KOpieMail: | 10 | Fixed an ugly bug in KOpieMail: |
11 | KOpieMail was not able to write files (mails) to MSDOS file system, | 11 | KOpieMail was not able to write files (mails) to MSDOS file system, |
12 | like on an usual preformatted SD card. That should work now. | 12 | like on an usual preformatted SD card. That should work now. |
13 | To save your mail data on the Sd card do the following: | 13 | To save your mail data on the Sd card do the following: |
14 | Create a dir on the SD card: | 14 | Create a dir on the SD card: |
15 | mkdir /mnt/card/localmail | 15 | mkdir /mnt/card/localmail |
16 | Go to your home dir: | 16 | Go to your home dir: |
17 | cd | 17 | cd |
18 | Go to kopiemail data storage dir: | 18 | Go to kopiemail data storage dir: |
19 | cd kdepim/apps/kopiemail | 19 | cd kdepim/apps/kopiemail |
20 | Create a symlink to the SD card: | 20 | Create a symlink to the SD card: |
21 | ls -s /mnt/card/localmail | 21 | ls -s /mnt/card/localmail |
22 | Now KOpieMail will store all mails on the SD card. | 22 | Now KOpieMail will store all mails on the SD card. |
23 | 23 | ||
24 | KO/Pi Monthview: | ||
25 | Now "Go to Today" selects the current month from day 1-end, | ||
26 | not the current date + some days. | ||
27 | I.e. "Go to Today" shows now always | ||
28 | the current month with first day of month in the first row. | ||
29 | |||
24 | 30 | ||
25 | ********** VERSION 1.9.13 ************ | 31 | ********** VERSION 1.9.13 ************ |
26 | 32 | ||
27 | Fixed nasty PwM/Pi file reading bug, when | 33 | Fixed nasty PwM/Pi file reading bug, when |
28 | the used hash algo of file is different then the global | 34 | the used hash algo of file is different then the global |
29 | hash algo. | 35 | hash algo. |
30 | 36 | ||
31 | Added KA/Pi support for opie mailit mailapplication. | 37 | Added KA/Pi support for opie mailit mailapplication. |
32 | 38 | ||
33 | Fixed some bugs in OM/Pi. | 39 | Fixed some bugs in OM/Pi. |
34 | Now character conversion tables are available for the Zaurus | 40 | Now character conversion tables are available for the Zaurus |
35 | to make OM/Pi working properly. | 41 | to make OM/Pi working properly. |
36 | To get the character conversion in OM/Pi working, please download | 42 | To get the character conversion in OM/Pi working, please download |
37 | at the sourceforge project site the package | 43 | at the sourceforge project site the package |
38 | sr-character-conversion_SharpROM_arm.ipk.zip | 44 | sr-character-conversion_SharpROM_arm.ipk.zip |
39 | (or oz-character-conversion_OZ-gcc3xx_arm.ipk.zip for OZ roms) | 45 | (or oz-character-conversion_OZ-gcc3xx_arm.ipk.zip for OZ roms) |
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3908dbb..47cd488 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1978,32 +1978,35 @@ void CalendarView::writeFilterSettings(KConfig *config) | |||
1978 | config->setGroup("Filter_" + filter->name()); | 1978 | config->setGroup("Filter_" + filter->name()); |
1979 | config->writeEntry("Criteria",filter->criteria()); | 1979 | config->writeEntry("Criteria",filter->criteria()); |
1980 | config->writeEntry("CategoryList",filter->categoryList()); | 1980 | config->writeEntry("CategoryList",filter->categoryList()); |
1981 | filter = mFilters.next(); | 1981 | filter = mFilters.next(); |
1982 | } | 1982 | } |
1983 | config->setGroup("General"); | 1983 | config->setGroup("General"); |
1984 | config->writeEntry("CalendarFilters",filterList); | 1984 | config->writeEntry("CalendarFilters",filterList); |
1985 | 1985 | ||
1986 | config->setGroup("FilterView"); | 1986 | config->setGroup("FilterView"); |
1987 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); | 1987 | config->writeEntry("FilterEnabled",mFilterView->filtersEnabled()); |
1988 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); | 1988 | config->writeEntry("Current Filter",mFilterView->selectedFilter()->name()); |
1989 | } | 1989 | } |
1990 | 1990 | ||
1991 | 1991 | ||
1992 | void CalendarView::goToday() | 1992 | void CalendarView::goToday() |
1993 | { | 1993 | { |
1994 | if ( mViewManager->currentView()->isMonthView() ) | ||
1995 | mNavigator->selectTodayMonth(); | ||
1996 | else | ||
1994 | mNavigator->selectToday(); | 1997 | mNavigator->selectToday(); |
1995 | } | 1998 | } |
1996 | 1999 | ||
1997 | void CalendarView::goNext() | 2000 | void CalendarView::goNext() |
1998 | { | 2001 | { |
1999 | mNavigator->selectNext(); | 2002 | mNavigator->selectNext(); |
2000 | } | 2003 | } |
2001 | 2004 | ||
2002 | void CalendarView::goPrevious() | 2005 | void CalendarView::goPrevious() |
2003 | { | 2006 | { |
2004 | mNavigator->selectPrevious(); | 2007 | mNavigator->selectPrevious(); |
2005 | } | 2008 | } |
2006 | void CalendarView::goNextMonth() | 2009 | void CalendarView::goNextMonth() |
2007 | { | 2010 | { |
2008 | mNavigator->selectNextMonth(); | 2011 | mNavigator->selectNextMonth(); |
2009 | } | 2012 | } |
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index e26e20b..3156b2b 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp | |||
@@ -186,32 +186,38 @@ void DateNavigator::selectWorkWeek() | |||
186 | } | 186 | } |
187 | 187 | ||
188 | void DateNavigator::selectWorkWeek( const QDate &d ) | 188 | void DateNavigator::selectWorkWeek( const QDate &d ) |
189 | { | 189 | { |
190 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); | 190 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); |
191 | 191 | ||
192 | QDate firstDate = d.addDays( 1 - dayOfWeek ); | 192 | QDate firstDate = d.addDays( 1 - dayOfWeek ); |
193 | 193 | ||
194 | int weekStart = KGlobal::locale()->weekStartDay(); | 194 | int weekStart = KGlobal::locale()->weekStartDay(); |
195 | if ( weekStart != 1 && dayOfWeek >= weekStart ) { | 195 | if ( weekStart != 1 && dayOfWeek >= weekStart ) { |
196 | firstDate = firstDate.addDays( 7 ); | 196 | firstDate = firstDate.addDays( 7 ); |
197 | } | 197 | } |
198 | 198 | ||
199 | selectDates( firstDate, 5 ); | 199 | selectDates( firstDate, 5 ); |
200 | } | 200 | } |
201 | 201 | ||
202 | void DateNavigator::selectTodayMonth() | ||
203 | { | ||
204 | QDate date = QDate::currentDate().addDays( 1-QDate::currentDate().day() ); | ||
205 | selectDates( date , date.daysInMonth ()); | ||
206 | |||
207 | } | ||
202 | void DateNavigator::selectToday() | 208 | void DateNavigator::selectToday() |
203 | { | 209 | { |
204 | QDate d = QDate::currentDate(); | 210 | QDate d = QDate::currentDate(); |
205 | 211 | ||
206 | int dateCount = mSelectedDates.count(); | 212 | int dateCount = mSelectedDates.count(); |
207 | 213 | ||
208 | if ( dateCount == 5 ) selectWorkWeek( d ); | 214 | if ( dateCount == 5 ) selectWorkWeek( d ); |
209 | else if ( dateCount == 7 ) selectWeek( d ); | 215 | else if ( dateCount == 7 ) selectWeek( d ); |
210 | else selectDates( d, dateCount ); | 216 | else selectDates( d, dateCount ); |
211 | } | 217 | } |
212 | 218 | ||
213 | void DateNavigator::selectPreviousYear() | 219 | void DateNavigator::selectPreviousYear() |
214 | { | 220 | { |
215 | QDate firstSelected = mSelectedDates.first(); | 221 | QDate firstSelected = mSelectedDates.first(); |
216 | int weekDay = firstSelected.dayOfWeek(); | 222 | int weekDay = firstSelected.dayOfWeek(); |
217 | firstSelected = KOGlobals::self()->calendarSystem()->addYears( firstSelected, -1 ); | 223 | firstSelected = KOGlobals::self()->calendarSystem()->addYears( firstSelected, -1 ); |
diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h index 747e3d3..4a19e17 100644 --- a/korganizer/datenavigator.h +++ b/korganizer/datenavigator.h | |||
@@ -48,32 +48,33 @@ class DateNavigator : public QObject | |||
48 | void selectDates( const KCal::DateList & ); | 48 | void selectDates( const KCal::DateList & ); |
49 | void selectDate( const QDate & ); | 49 | void selectDate( const QDate & ); |
50 | 50 | ||
51 | void selectDates( int count ); | 51 | void selectDates( int count ); |
52 | void selectDates( const QDate &, int count ); | 52 | void selectDates( const QDate &, int count ); |
53 | 53 | ||
54 | void selectWeek(); | 54 | void selectWeek(); |
55 | void selectWeek( int weeknum ); | 55 | void selectWeek( int weeknum ); |
56 | void selectWeek( const QDate & ); | 56 | void selectWeek( const QDate & ); |
57 | 57 | ||
58 | void selectWorkWeek(); | 58 | void selectWorkWeek(); |
59 | void selectWorkWeek( const QDate & ); | 59 | void selectWorkWeek( const QDate & ); |
60 | 60 | ||
61 | void selectWeekByDay( int weekDay, const QDate & ); | 61 | void selectWeekByDay( int weekDay, const QDate & ); |
62 | 62 | ||
63 | void selectToday(); | 63 | void selectToday(); |
64 | void selectTodayMonth(); | ||
64 | 65 | ||
65 | void selectPreviousYear(); | 66 | void selectPreviousYear(); |
66 | void selectPreviousMonth(); | 67 | void selectPreviousMonth(); |
67 | void selectNextMonth(); | 68 | void selectNextMonth(); |
68 | void selectNextYear(); | 69 | void selectNextYear(); |
69 | 70 | ||
70 | void selectMonth(); | 71 | void selectMonth(); |
71 | void selectMonthByDate( const QDate & ); | 72 | void selectMonthByDate( const QDate & ); |
72 | 73 | ||
73 | void selectPrevious(); | 74 | void selectPrevious(); |
74 | void selectNext(); | 75 | void selectNext(); |
75 | void slotMonthSelect( int ); | 76 | void slotMonthSelect( int ); |
76 | void slotDaySelect( QDate d ); | 77 | void slotDaySelect( QDate d ); |
77 | 78 | ||
78 | signals: | 79 | signals: |
79 | void datesSelected( const KCal::DateList & ); | 80 | void datesSelected( const KCal::DateList & ); |
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index 09f8ba3..2ac9de1 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h | |||
@@ -121,32 +121,33 @@ class BaseView : public QWidget | |||
121 | 121 | ||
122 | @param calPrinter Calendar printer object used for printing | 122 | @param calPrinter Calendar printer object used for printing |
123 | */ | 123 | */ |
124 | virtual void print(CalPrinter *) | 124 | virtual void print(CalPrinter *) |
125 | { | 125 | { |
126 | KMessageBox::sorry(this, i18n("Unfortunately, we don't handle printing for\n" | 126 | KMessageBox::sorry(this, i18n("Unfortunately, we don't handle printing for\n" |
127 | "that view yet.\n")); | 127 | "that view yet.\n")); |
128 | } | 128 | } |
129 | 129 | ||
130 | /** | 130 | /** |
131 | Return number of currently shown dates. A return value of 0 means no idea. | 131 | Return number of currently shown dates. A return value of 0 means no idea. |
132 | */ | 132 | */ |
133 | virtual int currentDateCount() = 0; | 133 | virtual int currentDateCount() = 0; |
134 | 134 | ||
135 | /** Return if this view is a view for displaying events. */ | 135 | /** Return if this view is a view for displaying events. */ |
136 | virtual bool isEventView() { return false; } | 136 | virtual bool isEventView() { return false; } |
137 | virtual bool isMonthView() { return false; } | ||
137 | 138 | ||
138 | public slots: | 139 | public slots: |
139 | /** | 140 | /** |
140 | Show incidences for the given date range. The date range actually shown may be | 141 | Show incidences for the given date range. The date range actually shown may be |
141 | different from the requested range, depending on the particular requirements | 142 | different from the requested range, depending on the particular requirements |
142 | of the view. | 143 | of the view. |
143 | 144 | ||
144 | @param start Start of date range. | 145 | @param start Start of date range. |
145 | @param end End of date range. | 146 | @param end End of date range. |
146 | */ | 147 | */ |
147 | virtual void showDates( const QDate &start, const QDate &end ) = 0; | 148 | virtual void showDates( const QDate &start, const QDate &end ) = 0; |
148 | 149 | ||
149 | /** | 150 | /** |
150 | Show given events. Depending on the actual view it might not be possible to | 151 | Show given events. Depending on the actual view it might not be possible to |
151 | show all given events. | 152 | show all given events. |
152 | 153 | ||
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index d976246..e94952f 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -187,32 +187,33 @@ class KOMonthView: public KOEventView | |||
187 | ~KOMonthView(); | 187 | ~KOMonthView(); |
188 | 188 | ||
189 | /** Returns maximum number of days supported by the komonthview */ | 189 | /** Returns maximum number of days supported by the komonthview */ |
190 | virtual int maxDatesHint(); | 190 | virtual int maxDatesHint(); |
191 | 191 | ||
192 | /** Returns number of currently shown dates. */ | 192 | /** Returns number of currently shown dates. */ |
193 | virtual int currentDateCount(); | 193 | virtual int currentDateCount(); |
194 | 194 | ||
195 | /** returns the currently selected events */ | 195 | /** returns the currently selected events */ |
196 | virtual QPtrList<Incidence> selectedIncidences(); | 196 | virtual QPtrList<Incidence> selectedIncidences(); |
197 | 197 | ||
198 | /** returns dates of the currently selected events */ | 198 | /** returns dates of the currently selected events */ |
199 | virtual DateList selectedDates(); | 199 | virtual DateList selectedDates(); |
200 | 200 | ||
201 | virtual void printPreview(CalPrinter *calPrinter, | 201 | virtual void printPreview(CalPrinter *calPrinter, |
202 | const QDate &, const QDate &); | 202 | const QDate &, const QDate &); |
203 | bool isMonthView() { return true; } | ||
203 | 204 | ||
204 | MonthViewCell * selectedCell(); | 205 | MonthViewCell * selectedCell(); |
205 | public slots: | 206 | public slots: |
206 | virtual void updateView(); | 207 | virtual void updateView(); |
207 | virtual void updateConfig(); | 208 | virtual void updateConfig(); |
208 | virtual void showDates(const QDate &start, const QDate &end); | 209 | virtual void showDates(const QDate &start, const QDate &end); |
209 | virtual void showEvents(QPtrList<Event> eventList); | 210 | virtual void showEvents(QPtrList<Event> eventList); |
210 | 211 | ||
211 | void changeEventDisplay(Event *, int); | 212 | void changeEventDisplay(Event *, int); |
212 | 213 | ||
213 | void clearSelection(); | 214 | void clearSelection(); |
214 | 215 | ||
215 | void showContextMenu( Incidence * ); | 216 | void showContextMenu( Incidence * ); |
216 | 217 | ||
217 | void setSelectedCell( MonthViewCell * ); | 218 | void setSelectedCell( MonthViewCell * ); |
218 | 219 | ||