Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed remains of KdepimLibs in plasmaclock

Browse source
This commit is contained in:
Ivailo Monev 2014-11-13 22:53:20 +02:00
parent d980b91001
commit dcd75bdefb
1 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libs/plasmaclock/calendartable.cpp
View file

@ -19,7 +19,6 @@
*/
#include "calendartable.h"
#include "config-calendartable.h"
//Qt
#include <QtCore/QDate>
@ -43,11 +42,7 @@
#include <Plasma/DataEngine>
#include <Plasma/DataEngineManager>
#ifdef HAVE_KDEPIMLIBS
#include "ui_calendarHolidaysConfig.h"
#else
#include "ui_calendarConfig.h"
#endif
#include <cmath>
@ -420,11 +415,7 @@ class CalendarTablePrivate
QPointF lastSeenMousePos;
#ifdef HAVE_KDEPIMLIBS
Ui::calendarHolidaysConfig calendarConfigUi;
#else
Ui::calendarConfig calendarConfigUi;
#endif
Plasma::Svg *svg;
float opacity; //transparency for the inactive text
@ -962,21 +953,6 @@ void CalendarTable::createConfigurationInterface(KConfigDialog *parent)
d->calendarConfigUi.displayEvents->setChecked(d->displayEvents);
#ifdef HAVE_KDEPIMLIBS
QHashIterator<QString, Plasma::DataEngine::Data> it(d->holidaysRegions);
while (it.hasNext()) {
it.next();
if (it.value().value("UseForDaysOff").toBool()) {
d->calendarConfigUi.holidayRegionWidget->setRegionUseFlags(it.key(), KHolidays::HolidayRegionSelector::UseDaysOff);
} else {
d->calendarConfigUi.holidayRegionWidget->setRegionUseFlags(it.key(), KHolidays::HolidayRegionSelector::UseInformationOnly);
}
}
d->calendarConfigUi.holidayRegionWidget->setDescriptionHidden(true);
connect(d->calendarConfigUi.holidayRegionWidget, SIGNAL(selectionChanged()), parent, SLOT(settingsModified()));
#endif
connect(d->calendarConfigUi.calendarComboBox, SIGNAL(activated(int)), parent, SLOT(settingsModified()));
connect(d->calendarConfigUi.displayEvents, SIGNAL(stateChanged(int)), parent, SLOT(settingsModified()));
}
@ -986,24 +962,6 @@ void CalendarTable::configAccepted(KConfigGroup cg)
setCalendar(d->calendarConfigUi.calendarComboBox->itemData(d->calendarConfigUi.calendarComboBox->currentIndex()).toInt());
setDisplayEvents(d->calendarConfigUi.displayEvents->isChecked());
#ifdef HAVE_KDEPIMLIBS
clearHolidaysRegions();
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::UseDaysOff) {
addHolidaysRegion(it.key(), true);
displayHolidays = true;
} else if (it.value() == KHolidays::HolidayRegionSelector::UseInformationOnly) {
addHolidaysRegion(it.key(), false);
displayHolidays = true;
}
}
setDisplayHolidays(displayHolidays);
#endif
writeConfiguration(cg);
}