author | zautrix <zautrix> | 2005-02-07 21:52:19 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-07 21:52:19 (UTC) |
commit | d7a005e6c1a27d1084f30b940d54291a8d660f0e (patch) (unidiff) | |
tree | c6ce04abf039acde589431f104bbb066ba4917a1 /korganizer/datenavigator.cpp | |
parent | edaad9a9d7ede1b4bc50b9e758eaf32a5fbb547e (diff) | |
download | kdepimpi-d7a005e6c1a27d1084f30b940d54291a8d660f0e.zip kdepimpi-d7a005e6c1a27d1084f30b940d54291a8d660f0e.tar.gz kdepimpi-d7a005e6c1a27d1084f30b940d54291a8d660f0e.tar.bz2 |
fixes
-rw-r--r-- | korganizer/datenavigator.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index d2824de..8b7c993 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp | |||
@@ -142,32 +142,40 @@ void DateNavigator::selectWeekByDay( int weekDay, const QDate &d ) | |||
142 | // qDebug("selectWeekByDay( %d %s ", weekDay, d.toString().latin1()); | 142 | // qDebug("selectWeekByDay( %d %s ", weekDay, d.toString().latin1()); |
143 | int dateCount = mSelectedDates.count(); | 143 | int dateCount = mSelectedDates.count(); |
144 | bool weekStart = ( weekDay == KGlobal::locale()->weekStartDay() ); | 144 | bool weekStart = ( weekDay == KGlobal::locale()->weekStartDay() ); |
145 | if ( weekDay == 1 && dateCount == 5 ) selectWorkWeek( d ); | 145 | if ( weekDay == 1 && dateCount == 5 ) selectWorkWeek( d ); |
146 | else if ( weekStart && dateCount == 7 ) selectWeek( d ); | 146 | else if ( weekStart && dateCount == 7 ) selectWeek( d ); |
147 | else selectDates( d, dateCount ); | 147 | else selectDates( d, dateCount ); |
148 | } | 148 | } |
149 | 149 | ||
150 | void DateNavigator::selectWeek() | 150 | void DateNavigator::selectWeek() |
151 | { | 151 | { |
152 | QDate d = mSelectedDates.first(); | 152 | QDate d = mSelectedDates.first(); |
153 | selectWeek( d ); | 153 | selectWeek( d ); |
154 | } | 154 | } |
155 | void DateNavigator::selectWeek( int num ) | 155 | void DateNavigator::selectWeek( int num ) |
156 | { | 156 | { |
157 | int year = mSelectedDates.first().year(); | 157 | int year = mSelectedDates.first().year(); |
158 | QDate d = QDate ( year, 1,1); | ||
159 | while ( d.dayOfWeek() != 4 ) | ||
160 | d = d.addDays( 1 ); | ||
161 | selectWeek( d.addDays ( (num-1) *7 ) ); | ||
162 | } | ||
163 | void DateNavigator::selectWeekFromMonthView( int num ) | ||
164 | { | ||
165 | int year = mSelectedDates.first().year(); | ||
158 | if ( mSelectedDates.first().dayOfYear() > 300 && num < 10 ) | 166 | if ( mSelectedDates.first().dayOfYear() > 300 && num < 10 ) |
159 | ++year; | 167 | ++year; |
160 | if ( mSelectedDates.first().dayOfYear() < 70 && num > 40 ) | 168 | if ( mSelectedDates.first().dayOfYear() < 70 && num > 40 ) |
161 | --year; | 169 | --year; |
162 | QDate d = QDate ( year, 1,1); | 170 | QDate d = QDate ( year, 1,1); |
163 | while ( d.dayOfWeek() != 4 ) | 171 | while ( d.dayOfWeek() != 4 ) |
164 | d = d.addDays( 1 ); | 172 | d = d.addDays( 1 ); |
165 | selectWeek( d.addDays ( (num-1) *7 ) ); | 173 | selectWeek( d.addDays ( (num-1) *7 ) ); |
166 | } | 174 | } |
167 | void DateNavigator::selectWeek( const QDate &d ) | 175 | void DateNavigator::selectWeek( const QDate &d ) |
168 | { | 176 | { |
169 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); | 177 | int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); |
170 | 178 | ||
171 | int weekStart = KGlobal::locale()->weekStartDay(); | 179 | int weekStart = KGlobal::locale()->weekStartDay(); |
172 | QDate firstDate = d.addDays( weekStart - dayOfWeek ); | 180 | QDate firstDate = d.addDays( weekStart - dayOfWeek ); |
173 | 181 | ||