[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/plasmaclock
From:       John Layt <john () layt ! net>
Date:       2010-12-06 20:42:56
Message-ID: 20101206204256.AF16AAC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204348 by jlayt:

BIC: Adapt plasma calendar to change in KHoliday::HolidayRegionSelector widget

You will need kdepimlibs r1204347 for this change.



 M  +6 -6      calendartable.cpp  


--- trunk/KDE/kdebase/workspace/libs/plasmaclock/calendartable.cpp #1204347:1204348
@@ -850,9 +850,9 @@
     while (it.hasNext()) {
         it.next();
         if (it.value().value("UseForDaysOff").toBool()) {
-            d->calendarConfigUi.holidayRegionWidget->setHolidayRegionStatus(it.key(), \
KHolidays::HolidayRegionSelector::RegionSelectedSecondary); +            \
d->calendarConfigUi.holidayRegionWidget->setRegionUseFlags(it.key(), \
KHolidays::HolidayRegionSelector::UseDaysOff);  } else {
-            d->calendarConfigUi.holidayRegionWidget->setHolidayRegionStatus(it.key(), \
KHolidays::HolidayRegionSelector::RegionSelected); +            \
d->calendarConfigUi.holidayRegionWidget->setRegionUseFlags(it.key(), \
KHolidays::HolidayRegionSelector::UseInformationOnly);  }
     }
     d->calendarConfigUi.holidayRegionWidget->setDescriptionHidden(true);
@@ -865,15 +865,15 @@
 
 #ifdef HAVE_KDEPIMLIBS
     clearHolidaysRegions();
-    QHash<QString, KHolidays::HolidayRegionSelector::SelectionStatus> regions = \
                d->calendarConfigUi.holidayRegionWidget->holidayRegionsStatus();
-    QHashIterator<QString, KHolidays::HolidayRegionSelector::SelectionStatus> \
it(regions); +    QHash<QString, KHolidays::HolidayRegionSelector::RegionUseFlags> \
regions = d->calendarConfigUi.holidayRegionWidget->regionUseFlags(); +    \
QHashIterator<QString, KHolidays::HolidayRegionSelector::RegionUseFlags> it(regions); \
bool displayHolidays = false;  while (it.hasNext()) {
         it.next();
-        if (it.value() == KHolidays::HolidayRegionSelector::RegionSelectedSecondary) \
{ +        if (it.value() == KHolidays::HolidayRegionSelector::UseDaysOff) {
             addHolidaysRegion(it.key(), true);
             displayHolidays = true;
-        } else if (it.value() == KHolidays::HolidayRegionSelector::RegionSelected) {
+        } else if (it.value() == \
KHolidays::HolidayRegionSelector::UseInformationOnly) {  addHolidaysRegion(it.key(), \
false);  displayHolidays = true;
         }


[prev in list] [next in list] [prev in thread] [next in thread]