author | zautrix <zautrix> | 2005-09-24 21:22:20 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-09-24 21:22:20 (UTC) |
commit | 7140721e3421557624a49c5dcc7a38caee8f0ce7 (patch) (unidiff) | |
tree | 584fc9709aaebee0eefa64e933c4b627ffb0eee0 | |
parent | 396aeedb3351ecf9024a3975a5bce9166f0d8aef (diff) | |
download | kdepimpi-7140721e3421557624a49c5dcc7a38caee8f0ce7.zip kdepimpi-7140721e3421557624a49c5dcc7a38caee8f0ce7.tar.gz kdepimpi-7140721e3421557624a49c5dcc7a38caee8f0ce7.tar.bz2 |
fix of utf8 month name
-rw-r--r-- | korganizer/navigatorbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index b03870f..f6a1a6a 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -209,71 +209,71 @@ void NavigatorBar::resetFont ( QFont fo ) | |||
209 | mSelectMonth->setMinimumWidth( maxwidth ); | 209 | mSelectMonth->setMinimumWidth( maxwidth ); |
210 | mSelectMonth->setFixedHeight( size ); | 210 | mSelectMonth->setFixedHeight( size ); |
211 | mPrevYear->setFixedHeight( size ); | 211 | mPrevYear->setFixedHeight( size ); |
212 | mPrevMonth->setFixedHeight( size ); | 212 | mPrevMonth->setFixedHeight( size ); |
213 | mPrevWeek->setFixedHeight( size ); | 213 | mPrevWeek->setFixedHeight( size ); |
214 | mNextMonth->setFixedHeight( size ); | 214 | mNextMonth->setFixedHeight( size ); |
215 | mNextWeek->setFixedHeight( size ); | 215 | mNextWeek->setFixedHeight( size ); |
216 | mNextYear->setFixedHeight ( size ); | 216 | mNextYear->setFixedHeight ( size ); |
217 | mCurrentHei = size +2; | 217 | mCurrentHei = size +2; |
218 | mCurrentMinWid = maxwidth+2; | 218 | mCurrentMinWid = maxwidth+2; |
219 | mCurrentButtonMinWid = mPrevYear->sizeHint().width(); | 219 | mCurrentButtonMinWid = mPrevYear->sizeHint().width(); |
220 | } | 220 | } |
221 | 221 | ||
222 | void NavigatorBar::showButtons( bool left, bool right ) | 222 | void NavigatorBar::showButtons( bool left, bool right ) |
223 | { | 223 | { |
224 | if ( left ) { | 224 | if ( left ) { |
225 | mPrevYear->show(); | 225 | mPrevYear->show(); |
226 | mPrevMonth->show(); | 226 | mPrevMonth->show(); |
227 | } else { | 227 | } else { |
228 | mPrevYear->hide(); | 228 | mPrevYear->hide(); |
229 | mPrevMonth->hide(); | 229 | mPrevMonth->hide(); |
230 | } | 230 | } |
231 | 231 | ||
232 | if ( right ) { | 232 | if ( right ) { |
233 | mNextYear->show(); | 233 | mNextYear->show(); |
234 | mNextMonth->show(); | 234 | mNextMonth->show(); |
235 | } else { | 235 | } else { |
236 | mNextYear->hide(); | 236 | mNextYear->hide(); |
237 | mNextMonth->hide(); | 237 | mNextMonth->hide(); |
238 | } | 238 | } |
239 | if ( !left && !right ) { | 239 | if ( !left && !right ) { |
240 | //mSelectMonth->setMaximumWidth( 1024 ); | 240 | //mSelectMonth->setMaximumWidth( 1024 ); |
241 | mSelectMonth->setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); | 241 | mSelectMonth->setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); |
242 | } | 242 | } |
243 | } | 243 | } |
244 | 244 | ||
245 | void NavigatorBar::selectMonth() | 245 | void NavigatorBar::selectMonth() |
246 | { | 246 | { |
247 | 247 | ||
248 | int month; | 248 | int month; |
249 | KPopupFrame* popup = new KPopupFrame(this); | 249 | KPopupFrame* popup = new KPopupFrame(this); |
250 | KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup); | 250 | KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(popup); |
251 | // ----- | 251 | // ----- |
252 | picker->resize(picker->sizeHint()); | 252 | picker->resize(picker->sizeHint()); |
253 | popup->setMainWidget(picker); | 253 | popup->setMainWidget(picker); |
254 | picker->setFocus(); | 254 | picker->setFocus(); |
255 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); | 255 | connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int))); |
256 | if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height())))) | 256 | if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height())))) |
257 | { | 257 | { |
258 | month = picker->getResult(); | 258 | month = picker->getResult(); |
259 | emit monthSelected ( month ); | 259 | emit monthSelected ( month ); |
260 | } else { | 260 | } else { |
261 | KNotifyClient::beep(); | 261 | KNotifyClient::beep(); |
262 | } | 262 | } |
263 | delete popup; | 263 | delete popup; |
264 | } | 264 | } |
265 | void NavigatorBar::selectDates( const KCal::DateList &dateList ) | 265 | void NavigatorBar::selectDates( const KCal::DateList &dateList ) |
266 | { | 266 | { |
267 | if (dateList.count() > 0) { | 267 | if (dateList.count() > 0) { |
268 | QDate date = dateList.first(); | 268 | QDate date = dateList.first(); |
269 | 269 | ||
270 | const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); | 270 | const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); |
271 | 271 | ||
272 | // compute the label at the top of the navigator | 272 | // compute the label at the top of the navigator |
273 | QString dtstr = i18n(calSys->monthName( date )) + " '" + | 273 | QString dtstr = calSys->monthName( date ) + " '" + |
274 | QString::number( calSys->year( date ) ).right(2); | 274 | QString::number( calSys->year( date ) ).right(2); |
275 | 275 | ||
276 | mSelectMonth->setText( dtstr ); | 276 | mSelectMonth->setText( dtstr ); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | 279 | ||