-rw-r--r-- | korganizer/koagendaview.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 8001c8f..acf43bd 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -346,80 +346,79 @@ void EventIndicator::changeColumns(int columns) | |||
346 | update(); | 346 | update(); |
347 | } | 347 | } |
348 | 348 | ||
349 | void EventIndicator::enableColumn(int column, bool enable) | 349 | void EventIndicator::enableColumn(int column, bool enable) |
350 | { | 350 | { |
351 | mEnabled[column] = enable; | 351 | mEnabled[column] = enable; |
352 | } | 352 | } |
353 | 353 | ||
354 | 354 | ||
355 | //////////////////////////////////////////////////////////////////////////// | 355 | //////////////////////////////////////////////////////////////////////////// |
356 | //////////////////////////////////////////////////////////////////////////// | 356 | //////////////////////////////////////////////////////////////////////////// |
357 | //////////////////////////////////////////////////////////////////////////// | 357 | //////////////////////////////////////////////////////////////////////////// |
358 | 358 | ||
359 | KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | 359 | KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : |
360 | KOEventView (cal,parent,name) | 360 | KOEventView (cal,parent,name) |
361 | { | 361 | { |
362 | mBlockUpdating = true; | 362 | mBlockUpdating = true; |
363 | mStartHour = 8; | 363 | mStartHour = 8; |
364 | mSelectedDates.append(QDate::currentDate()); | 364 | mSelectedDates.append(QDate::currentDate()); |
365 | 365 | ||
366 | mLayoutDayLabels = 0; | 366 | mLayoutDayLabels = 0; |
367 | mDayLabelsFrame = 0; | 367 | mDayLabelsFrame = 0; |
368 | mDayLabels = 0; | 368 | mDayLabels = 0; |
369 | bool isRTL = KOGlobals::self()->reverseLayout(); | 369 | bool isRTL = KOGlobals::self()->reverseLayout(); |
370 | 370 | QPixmap expandPix; | |
371 | if ( KOPrefs::instance()->mVerticalScreen ) { | 371 | if ( KOPrefs::instance()->mVerticalScreen ) { |
372 | mExpandedPixmap = SmallIcon( "1downarrow" ); | 372 | expandPix = SmallIcon( "1updownarrow" ); |
373 | mNotExpandedPixmap = SmallIcon( "1uparrow" ); | ||
374 | } else { | 373 | } else { |
375 | mExpandedPixmap = SmallIcon( isRTL ? "1leftarrow" : "1rightarrow" ); | 374 | expandPix = SmallIcon("1leftrightarrow" ); |
376 | mNotExpandedPixmap = SmallIcon( isRTL ? "1rightarrow" : "1leftarrow" ); | ||
377 | } | 375 | } |
378 | 376 | ||
379 | QBoxLayout *topLayout = new QVBoxLayout(this); | 377 | QBoxLayout *topLayout = new QVBoxLayout(this); |
380 | 378 | ||
381 | // Create day name labels for agenda columns | 379 | // Create day name labels for agenda columns |
382 | // Create agenda splitter | 380 | // Create agenda splitter |
383 | 381 | ||
384 | mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this); | 382 | mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this); |
385 | mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 383 | mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
386 | topLayout->addWidget( mSplitterAgenda ); | 384 | topLayout->addWidget( mSplitterAgenda ); |
387 | mAllDayFrame = new QHBox(mSplitterAgenda); | 385 | mAllDayFrame = new QHBox(mSplitterAgenda); |
388 | mAllDayFrame->setFocusPolicy(NoFocus); | 386 | mAllDayFrame->setFocusPolicy(NoFocus); |
389 | QWidget *agendaFrame = new QWidget(mSplitterAgenda); | 387 | QWidget *agendaFrame = new QWidget(mSplitterAgenda); |
390 | agendaFrame->setFocusPolicy(NoFocus); | 388 | agendaFrame->setFocusPolicy(NoFocus); |
391 | 389 | ||
392 | // Create all-day agenda widget | 390 | // Create all-day agenda widget |
393 | mDummyAllDayLeft = new QVBox( mAllDayFrame ); | 391 | mDummyAllDayLeft = new QVBox( mAllDayFrame ); |
394 | 392 | ||
395 | mExpandButton = new QPushButton(mDummyAllDayLeft); | 393 | mExpandButton = new QPushButton(mDummyAllDayLeft); |
396 | mExpandButton->setPixmap( mNotExpandedPixmap ); | 394 | mExpandButton->setPixmap( expandPix ); |
397 | int widebut = mExpandButton->sizeHint().width(); | 395 | int widebut = mExpandButton->sizeHint().width()+4; |
396 | int heibut = mExpandButton->sizeHint().height()+4; | ||
397 | if ( heibut > widebut ) | ||
398 | widebut = heibut ; | ||
398 | if ( QApplication::desktop()->width() < 480 ) | 399 | if ( QApplication::desktop()->width() < 480 ) |
399 | widebut = widebut*2; | 400 | widebut = widebut*3/2; |
400 | else | ||
401 | widebut = (widebut*3) / 2; | ||
402 | //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, | 401 | //mExpandButton->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, |
403 | // QSizePolicy::Fixed ) ); | 402 | // QSizePolicy::Fixed ) ); |
404 | mExpandButton->setFixedSize( widebut, widebut); | 403 | mExpandButton->setFixedSize( widebut, widebut); |
405 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); | 404 | connect( mExpandButton, SIGNAL( clicked() ), SIGNAL( toggleExpand() ) ); |
406 | mExpandButton->setFocusPolicy(NoFocus); | 405 | mExpandButton->setFocusPolicy(NoFocus); |
407 | mAllDayAgenda = new KOAgenda(1,mAllDayFrame); | 406 | mAllDayAgenda = new KOAgenda(1,mAllDayFrame); |
408 | mAllDayAgenda->setFocusPolicy(NoFocus); | 407 | mAllDayAgenda->setFocusPolicy(NoFocus); |
409 | QLabel *dummyAllDayRight = new QLabel (mAllDayFrame); | 408 | QLabel *dummyAllDayRight = new QLabel (mAllDayFrame); |
410 | 409 | ||
411 | // Create event context menu for all day agenda | 410 | // Create event context menu for all day agenda |
412 | mAllDayAgendaPopup = eventPopup(); | 411 | mAllDayAgendaPopup = eventPopup(); |
413 | connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), | 412 | connect(mAllDayAgenda,SIGNAL(showIncidencePopupSignal(Incidence *)), |
414 | mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); | 413 | mAllDayAgendaPopup,SLOT(showIncidencePopup(Incidence *))); |
415 | 414 | ||
416 | // Create agenda frame | 415 | // Create agenda frame |
417 | QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3); | 416 | QGridLayout *agendaLayout = new QGridLayout(agendaFrame,4,3); |
418 | // QHBox *agendaFrame = new QHBox(splitterAgenda); | 417 | // QHBox *agendaFrame = new QHBox(splitterAgenda); |
419 | 418 | ||
420 | // create event indicator bars | 419 | // create event indicator bars |
421 | mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame); | 420 | mEventIndicatorTop = new EventIndicator(EventIndicator::Top,agendaFrame); |
422 | #ifndef DESKTOP_VERSION | 421 | #ifndef DESKTOP_VERSION |
423 | // FIX | 422 | // FIX |
424 | mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); | 423 | mEventIndicatorTop->setPaintWidget( mSplitterAgenda ); |
425 | #endif | 424 | #endif |
@@ -1435,57 +1434,48 @@ void KOAgendaView::setHolidayMasks() | |||
1435 | } | 1434 | } |
1436 | 1435 | ||
1437 | #ifndef KORG_NOPLUGINS | 1436 | #ifndef KORG_NOPLUGINS |
1438 | bool showHoliday = KOPrefs::instance()->mExcludeHolidays && | 1437 | bool showHoliday = KOPrefs::instance()->mExcludeHolidays && |
1439 | !KOCore::self()->holiday(date).isEmpty(); | 1438 | !KOCore::self()->holiday(date).isEmpty(); |
1440 | #endif | 1439 | #endif |
1441 | bool showDay = showSaturday || showSunday || showHoliday; | 1440 | bool showDay = showSaturday || showSunday || showHoliday; |
1442 | 1441 | ||
1443 | if (showDay) { | 1442 | if (showDay) { |
1444 | mHolidayMask.at(i) = true; | 1443 | mHolidayMask.at(i) = true; |
1445 | } else { | 1444 | } else { |
1446 | mHolidayMask.at(i) = false; | 1445 | mHolidayMask.at(i) = false; |
1447 | } | 1446 | } |
1448 | } | 1447 | } |
1449 | 1448 | ||
1450 | mAgenda->setHolidayMask(&mHolidayMask); | 1449 | mAgenda->setHolidayMask(&mHolidayMask); |
1451 | mAllDayAgenda->setHolidayMask(&mHolidayMask); | 1450 | mAllDayAgenda->setHolidayMask(&mHolidayMask); |
1452 | } | 1451 | } |
1453 | 1452 | ||
1454 | void KOAgendaView::setContentsPos(int y) | 1453 | void KOAgendaView::setContentsPos(int y) |
1455 | { | 1454 | { |
1456 | mAgenda->setContentsPos(0,y); | 1455 | mAgenda->setContentsPos(0,y); |
1457 | } | 1456 | } |
1458 | 1457 | ||
1459 | void KOAgendaView::setExpandedButton( bool expanded ) | ||
1460 | { | ||
1461 | if ( expanded ) { | ||
1462 | mExpandButton->setPixmap( mExpandedPixmap ); | ||
1463 | } else { | ||
1464 | mExpandButton->setPixmap( mNotExpandedPixmap ); | ||
1465 | } | ||
1466 | } | ||
1467 | |||
1468 | void KOAgendaView::clearSelection() | 1458 | void KOAgendaView::clearSelection() |
1469 | { | 1459 | { |
1470 | mAgenda->deselectItem(); | 1460 | mAgenda->deselectItem(); |
1471 | mAllDayAgenda->deselectItem(); | 1461 | mAllDayAgenda->deselectItem(); |
1472 | } | 1462 | } |
1473 | 1463 | ||
1474 | void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart, | 1464 | void KOAgendaView::newTimeSpanSelectedAllDay(int gxStart, int gyStart, |
1475 | int gxEnd, int gyEnd) | 1465 | int gxEnd, int gyEnd) |
1476 | { | 1466 | { |
1477 | mTimeSpanInAllDay = true; | 1467 | mTimeSpanInAllDay = true; |
1478 | newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd); | 1468 | newTimeSpanSelected(gxStart,gyStart,gxEnd,gyEnd); |
1479 | } | 1469 | } |
1480 | 1470 | ||
1481 | 1471 | ||
1482 | 1472 | ||
1483 | 1473 | ||
1484 | void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart, | 1474 | void KOAgendaView::newTimeSpanSelected(int gxStart, int gyStart, |
1485 | int gxEnd, int gyEnd) | 1475 | int gxEnd, int gyEnd) |
1486 | { | 1476 | { |
1487 | if (!mSelectedDates.count()) return; | 1477 | if (!mSelectedDates.count()) return; |
1488 | 1478 | ||
1489 | QDate dayStart = mSelectedDates[gxStart]; | 1479 | QDate dayStart = mSelectedDates[gxStart]; |
1490 | QDate dayEnd = mSelectedDates[gxEnd]; | 1480 | QDate dayEnd = mSelectedDates[gxEnd]; |
1491 | 1481 | ||