Skip to content

GitLab

Commit bb85eabe authored by Glen Ditchfield's avatar Glen Ditchfield 🐛
Browse files

Refactor Exclude Confidential/Private options

parent ab2f4cb6
Pipeline #68765 passed with stage
in 5 minutes and 33 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 156 deletions
src/printing/calprintdefaultplugins.cpp
View file @ bb85eabe
......@@ -728,8 +728,6 @@ void CalPrintDay::loadConfig()
mSingleLineLimit = grp.readEntry("Single line limit", false);
mShowNoteLines = grp.readEntry("Note Lines", false);
mExcludeTime = grp.readEntry("Exclude time", false);
mExcludeConfidential = grp.readEntry("Exclude confidential", true);
mExcludePrivate = grp.readEntry("Exclude private", true);
}
setSettingsWidget();
}
......@@ -752,8 +750,6 @@ void CalPrintDay::saveConfig()
grp.writeEntry("Single line limit", mSingleLineLimit);
grp.writeEntry("Note Lines", mShowNoteLines);
grp.writeEntry("Exclude time", mExcludeTime);
grp.writeEntry("Exclude confidential", mExcludeConfidential);
grp.writeEntry("Exclude private", mExcludePrivate);
}
}
......@@ -803,9 +799,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
mShowNoteLines,
mIncludeDescription,
mIncludeCategories,
mUseColors,
mExcludeConfidential,
mExcludePrivate);
mUseColors);
} else if (mDayPrintType == SingleTimetable) {
drawTimeTable(p,
mFromDate,
......@@ -816,9 +810,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
daysBox,
mIncludeDescription,
mIncludeCategories,
mExcludeTime,
mExcludeConfidential,
mExcludePrivate);
mExcludeTime);
}
if (mPrintFooter) {
drawFooter(p, footerBox);
......@@ -849,9 +841,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
daysBox,
mIncludeDescription,
mIncludeCategories,
mExcludeTime,
mExcludeConfidential,
mExcludePrivate);
mExcludeTime);
if (mPrintFooter) {
drawFooter(p, footerBox);
}
......@@ -962,8 +952,6 @@ void CalPrintWeek::loadConfig()
mIncludeDescription = grp.readEntry("Include Description", false);
mIncludeCategories = grp.readEntry("Include categories", false);
mExcludeTime = grp.readEntry("Exclude Time", false);
mExcludeConfidential = grp.readEntry("Exclude confidential", true);
mExcludePrivate = grp.readEntry("Exclude private", true);
}
setSettingsWidget();
}
......@@ -986,8 +974,6 @@ void CalPrintWeek::saveConfig()
grp.writeEntry("Include Description", mIncludeDescription);
grp.writeEntry("Include categories", mIncludeCategories);
grp.writeEntry("Exclude Time", mExcludeTime);
grp.writeEntry("Exclude confidential", mExcludeConfidential);
grp.writeEntry("Exclude private", mExcludePrivate);
}
}
......@@ -1043,7 +1029,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
drawHeader(p, title, curWeek.addDays(-6), QDate(), headerBox);
drawWeek(p, curWeek, mStartTime, mEndTime, weekBox, mSingleLineLimit, mShowNoteLines,
mIncludeDescription, mIncludeCategories, mUseColors, mExcludeConfidential, mExcludePrivate);
mIncludeDescription, mIncludeCategories, mUseColors);
if (mPrintFooter) {
drawFooter(p, footerBox);
......@@ -1069,7 +1055,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
drawHeader(p, title, curWeek, QDate(), headerBox);
drawTimeTable(p, fromWeek, curWeek, mIncludeAllEvents, mStartTime, mEndTime, weekBox, mIncludeDescription,
mIncludeCategories, mExcludeTime, mExcludeConfidential, mExcludePrivate);
mIncludeCategories, mExcludeTime);
if (mPrintFooter) {
drawFooter(p, footerBox);
......@@ -1095,7 +1081,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
drawSplitHeaderRight(p, fromWeek, curWeek, QDate(), width, hh);
drawTimeTable(p, fromWeek, endLeft, mIncludeAllEvents, mStartTime, mEndTime, weekBox, mIncludeDescription,
mIncludeCategories, mExcludeTime, mExcludeConfidential, mExcludePrivate);
mIncludeCategories, mExcludeTime);
if (mPrintFooter) {
drawFooter(p, footerBox);
}
......@@ -1110,9 +1096,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
weekBox1,
mIncludeDescription,
mIncludeCategories,
mExcludeTime,
mExcludeConfidential,
mExcludePrivate);
mExcludeTime);
if (mPrintFooter) {
drawFooter(p, footerBox);
......@@ -1204,8 +1188,6 @@ void CalPrintMonth::loadConfig()
mShowNoteLines = grp.readEntry("Note Lines", false);
mIncludeDescription = grp.readEntry("Include description", false);
mIncludeCategories = grp.readEntry("Include categories", false);
mExcludeConfidential = grp.readEntry("Exclude confidential", true);
mExcludePrivate = grp.readEntry("Exclude private", true);
}
setSettingsWidget();
}
......@@ -1223,8 +1205,6 @@ void CalPrintMonth::saveConfig()
grp.writeEntry("Note Lines", mShowNoteLines);
grp.writeEntry("Include description", mIncludeDescription);
grp.writeEntry("Include categories", mIncludeCategories);
grp.writeEntry("Exclude confidential", mExcludeConfidential);
grp.writeEntry("Exclude private", mExcludePrivate);
}
}
......@@ -1283,8 +1263,6 @@ void CalPrintMonth::print(QPainter &p, int width, int height)
mIncludeDescription,
mIncludeCategories,
mUseColors,
mExcludeConfidential,
mExcludePrivate,
monthBox);
if (mPrintFooter) {
......@@ -1418,8 +1396,6 @@ void CalPrintTodos::loadConfig()
mStrikeOutCompleted = grp.readEntry("Strike out completed summaries", true);
mTodoSortField = (eTodoSortField)grp.readEntry("Sort field", static_cast<int>(TodoFieldSummary));
mTodoSortDirection = (eTodoSortDirection)grp.readEntry("Sort direction", static_cast<int>(TodoDirectionAscending));
mExcludeConfidential = grp.readEntry("Exclude confidential", true);
mExcludePrivate = grp.readEntry("Exclude private", true);
}
setSettingsWidget();
}
......@@ -1441,8 +1417,6 @@ void CalPrintTodos::saveConfig()
grp.writeEntry("Strike out completed summaries", mStrikeOutCompleted);
grp.writeEntry("Sort field", static_cast<int>(mTodoSortField));
grp.writeEntry("Sort direction", static_cast<int>(mTodoSortDirection));
grp.writeEntry("Exclude confidential", mExcludeConfidential);
grp.writeEntry("Exclude private", mExcludePrivate);
}
}
......@@ -1618,9 +1592,7 @@ void CalPrintTodos::print(QPainter &p, int width, int height)
width,
height,
todoList,
nullptr,
mExcludeConfidential,
mExcludePrivate);
nullptr);
}
}
......
src/printing/calprintdefaultplugins.h
View file @ bb85eabe
......@@ -123,8 +123,6 @@ protected:
bool mIncludeTodos;
bool mIncludeAllEvents;
bool mExcludeTime;
bool mExcludeConfidential;
bool mExcludePrivate;
};
class CalPrintWeek : public CalPrintPluginBase
......@@ -182,8 +180,6 @@ protected:
bool mIncludeCategories;
bool mIncludeAllEvents;
bool mExcludeTime;
bool mExcludeConfidential;
bool mExcludePrivate;
};
class CalPrintMonth : public CalPrintPluginBase
......@@ -238,8 +234,6 @@ protected:
bool mSingleLineLimit;
bool mIncludeDescription;
bool mIncludeCategories;
bool mExcludeConfidential;
bool mExcludePrivate;
};
class CalPrintTodos : public CalPrintPluginBase
......@@ -309,8 +303,6 @@ protected:
bool mStrikeOutCompleted;
bool mSortField;
bool mSortDirection;
bool mExcludeConfidential;
bool mExcludePrivate;
};
class CalPrintIncidenceConfig : public QWidget, public Ui::CalPrintIncidenceConfig_Base
......
src/printing/calprintpluginbase.cpp
View file @ bb85eabe
......@@ -184,6 +184,8 @@ void CalPrintPluginBase::doLoadConfig()
mToDate = group.readEntry("ToDate", dt).date();
mUseColors = group.readEntry("UseColors", true);
mPrintFooter = group.readEntry("PrintFooter", true);
mExcludeConfidential = group.readEntry("Exclude confidential", true);
mExcludePrivate = group.readEntry("Exclude private", true);
loadConfig();
} else {
qCDebug(CALENDARSUPPORT_LOG) << "No config available in loadConfig!!!!";
......@@ -202,6 +204,8 @@ void CalPrintPluginBase::doSaveConfig()
group.writeEntry("ToDate", dt);
group.writeEntry("UseColors", mUseColors);
group.writeEntry("PrintFooter", mPrintFooter);
group.writeEntry("Exclude confidential", mExcludeConfidential);
group.writeEntry("Exclude private", mExcludePrivate);
mConfig->sync();
} else {
qCDebug(CALENDARSUPPORT_LOG) << "No config available in saveConfig!!!!";
......@@ -768,8 +772,6 @@ void CalPrintPluginBase::drawAllDayBox(QPainter &p,
QDate qd,
QRect box,
bool includeCategories,
bool excludeConfidential,
bool excludePrivate,
const QList<QDate> &workDays)
{
int lineSpacing = p.fontMetrics().lineSpacing();
......@@ -787,8 +789,8 @@ void CalPrintPluginBase::drawAllDayBox(QPainter &p,
for (const KCalendarCore::Event::Ptr &currEvent : std::as_const(eventList)) {
if (!currEvent
|| !currEvent->allDay()
|| (excludeConfidential && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
|| (mExcludeConfidential && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
QString str;
......@@ -816,8 +818,6 @@ void CalPrintPluginBase::drawAgendaDayBox(QPainter &p,
bool includeDescription,
bool includeCategories,
bool excludeTime,
bool excludeConfidential,
bool excludePrivate,
const QList<QDate> &workDays)
{
QTime myFromTime, myToTime;
......@@ -846,8 +846,8 @@ void CalPrintPluginBase::drawAgendaDayBox(QPainter &p,
for (const KCalendarCore::Event::Ptr &event : std::as_const(events)) {
Q_ASSERT(event);
if (!event
|| (excludeConfidential && event->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && event->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
|| (mExcludeConfidential && event->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && event->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
// skip items without times so that we do not adjust for all day items
......@@ -903,8 +903,8 @@ void CalPrintPluginBase::drawAgendaDayBox(QPainter &p,
for (const KCalendarCore::Event::Ptr &event : std::as_const(events)) {
if (!event
|| (excludeConfidential && event->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && event->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
|| (mExcludeConfidential && event->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && event->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
if (event->allDay()) {
......@@ -1023,9 +1023,7 @@ void CalPrintPluginBase::drawDayBox(QPainter &p,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate)
bool useColors)
{
QString dayNumStr;
const auto local = QLocale::system();
......@@ -1089,8 +1087,8 @@ void CalPrintPluginBase::drawDayBox(QPainter &p,
|| (!printRecurWeekly && currEvent->recurrenceType() == KCalendarCore::Recurrence::rWeekly)) {
continue;
}
if ((excludeConfidential && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
if ((mExcludeConfidential && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && currEvent->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
if (currEvent->allDay() || currEvent->isMultiDay()) {
......@@ -1146,8 +1144,8 @@ void CalPrintPluginBase::drawDayBox(QPainter &p,
|| (!printRecurWeekly && todo->recurrenceType() == KCalendarCore::Recurrence::rWeekly)) {
continue;
}
if ((excludeConfidential && todo->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && todo->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
if ((mExcludeConfidential && todo->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && todo->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
if (todo->hasStartDate() && !todo->allDay()) {
......@@ -1305,9 +1303,7 @@ void CalPrintPluginBase::drawWeek(QPainter &p,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate)
bool useColors)
{
QDate weekDate = qd;
const bool portrait = (box.height() > box.width());
......@@ -1346,9 +1342,7 @@ void CalPrintPluginBase::drawWeek(QPainter &p,
showNoteLines,
includeDescription,
includeCategories,
useColors,
excludeConfidential,
excludePrivate);
useColors);
} // for i through all weekdays
}
......@@ -1362,9 +1356,7 @@ void CalPrintPluginBase::drawDays(QPainter &p,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate)
bool useColors)
{
const int numberOfDays = start.daysTo(end) + 1;
int vcells;
......@@ -1401,9 +1393,7 @@ void CalPrintPluginBase::drawDays(QPainter &p,
showNoteLines,
includeDescription,
includeCategories,
useColors,
excludeConfidential,
excludePrivate);
useColors);
} // for i through all selected days
}
......@@ -1416,9 +1406,7 @@ void CalPrintPluginBase::drawTimeTable(QPainter &p,
const QRect &box,
bool includeDescription,
bool includeCategories,
bool excludeTime,
bool excludeConfidential,
bool excludePrivate)
bool excludeTime)
{
QTime myFromTime = fromTime;
QTime myToTime = toTime;
......@@ -1431,8 +1419,8 @@ void CalPrintPluginBase::drawTimeTable(QPainter &p,
for (const KCalendarCore::Event::Ptr &event : std::as_const(eventList)) {
Q_ASSERT(event);
if (!event
|| (excludeConfidential && event->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && event->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
|| (mExcludeConfidential && event->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && event->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
if (event->allDay()) {
......@@ -1503,7 +1491,7 @@ void CalPrintPluginBase::drawTimeTable(QPainter &p,
if (const auto h = holidayEvent(curDate)) {
eventList.prepend(h);
}
drawAllDayBox(p, eventList, curDate, allDayBox, includeCategories, excludeConfidential, excludePrivate, workDays);
drawAllDayBox(p, eventList, curDate, allDayBox, includeCategories, workDays);
}
QRect dayBox(allDayBox);
......@@ -1519,8 +1507,6 @@ void CalPrintPluginBase::drawTimeTable(QPainter &p,
includeDescription,
includeCategories,
excludeTime,
excludeConfidential,
excludePrivate,
workDays);
++i;
......@@ -1562,9 +1548,7 @@ void CalPrintPluginBase::drawMonth(QPainter &p,
const QRect &box,
int maxdays,
int subDailyFlags,
int holidaysFlags,
bool excludeConfidential,
bool excludePrivate)
int holidaysFlags)
{
p.save();
QRect subheaderBox(box);
......@@ -1655,11 +1639,9 @@ void CalPrintPluginBase::drawMonth(QPainter &p,
QVector<MonthEventStruct> monthentries;
for (const KCalendarCore::Event::Ptr &e : std::as_const(events)) {
if (!e) {
continue;
}
if ((excludeConfidential && e->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && e->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
if (!e
|| (mExcludeConfidential && e->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && e->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
if (e->recurs()) {
......@@ -1776,8 +1758,6 @@ void CalPrintPluginBase::drawMonthTable(QPainter &p,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate,
const QRect &box)
{
int yoffset = mSubHeaderHeight;
......@@ -1847,9 +1827,7 @@ void CalPrintPluginBase::drawMonthTable(QPainter &p,
showNoteLines,
includeDescription,
includeCategories,
useColors,
excludeConfidential,
excludePrivate);
useColors);
if (darkbg) {
p.setBackground(back);
darkbg = false;
......@@ -1929,9 +1907,7 @@ void CalPrintPluginBase::drawTodo(int &count,
int width,
int pageHeight,
const KCalendarCore::Todo::List &todoList,
TodoParentStart *r,
bool excludeConfidential,
bool excludePrivate)
TodoParentStart *r)
{
QString outStr;
const auto locale = QLocale::system();
......@@ -2089,8 +2065,8 @@ void CalPrintPluginBase::drawTodo(int &count,
}
if (subtodoOk) {
#endif
if ((excludeConfidential && subtodo->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (excludePrivate && subtodo->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
if ((mExcludeConfidential && subtodo->secrecy() == KCalendarCore::Incidence::SecrecyConfidential)
|| (mExcludePrivate && subtodo->secrecy() == KCalendarCore::Incidence::SecrecyPrivate)) {
continue;
}
t.append(subtodo);
......@@ -2139,9 +2115,7 @@ void CalPrintPluginBase::drawTodo(int &count,
width,
pageHeight,
todoList,
&startpt,
excludeConfidential,
excludePrivate);
&startpt);
}
startPoints.removeAll(&startpt);
}
......
src/printing/calprintpluginbase.h
View file @ bb85eabe
......@@ -307,14 +307,14 @@ public:
/**
Draw the all-day box for the agenda print view (the box on top which
doesn't have a time on the time scale associated).
Obeys configuration options #mExcludeConfidential, #excludePrivate.
@param p QPainter of the printout
@param eventList The list of all-day events that are supposed to be printed
inside this box
@param qd The date of the currently printed day
@param box coordinates of the all day box.
@param includeCategories Whether to print the event categories (tags) as well.
@param excludeConfidential Whether to exclude Incidence marked confidential.
@param excludePrivate Whether to exclude Incidence marked private.
@param workDays List of workDays
*/
void drawAllDayBox(QPainter &p,
......@@ -322,8 +322,6 @@ public:
QDate qd,
QRect box,
bool includeCategories,
bool excludeConfidential,
bool excludePrivate,
const QList<QDate> &workDays);
/**
......@@ -331,6 +329,7 @@ public:
Also draws a grid with half-hour spacing of the grid lines.
Does NOT draw allday events. Use drawAllDayBox for allday events.
Obeys configuration options #mExcludeConfidential, #excludePrivate.
@param p QPainter of the printout
@param eventList The list of the events that are supposed to be printed
inside this box
......@@ -349,8 +348,6 @@ public:
@param includeDescription Whether to print the event description as well.
@param includeCategories Whether to print the event categories (tags) as well.
@param excludeTime Whether the time is printed in the detail area.
@param excludeConfidential Whether to exclude Incidence marked confidential.
@param excludePrivate Whether to exclude Incidence marked private.
@param workDays List of workDays
*/
void drawAgendaDayBox(QPainter &p,
......@@ -363,8 +360,6 @@ public:
bool includeDescription,
bool includeCategories,
bool excludeTime,
bool excludeConfidential,
bool excludePrivate,
const QList<QDate> &workDays);
void drawAgendaItem(PrintCellItem *item,
......@@ -380,6 +375,8 @@ public:
/**
Draw the box containing a list of all events of the given day (with their times,
of course). Used in the Filofax and the month print style.
Obeys configuration options #mExcludeConfidential, #excludePrivate.
@param p QPainter of the printout
@param qd The date of the currently printed day. All events of the calendar
that appear on that day will be printed.
......@@ -395,8 +392,6 @@ public:
@param includeDescription Whether to print the event description as well.
@param includeCategories Whether to print the event categories (tags) as well.
@param useColors Whether to use event category colors to draw the events.
@param excludeConfidential Whether to exclude Incidence marked confidential.
@param excludePrivate Whether to exclude Incidence marked private.
*/
void drawDayBox(QPainter &p,
const QDate &qd,
......@@ -410,15 +405,15 @@ public:
bool showNoteLines = false,
bool includeDescription = false,
bool includeCategories = false,
bool useColors = true,
bool excludeDescription = true,
bool excludePrivate = true);
bool useColors = true);
/**
Draw the week (filofax) table of the week containing the date qd. The first
three days of the week will be shown in the first column (using drawDayBox),
the remaining four in the second column, where the last two days of the week
(typically Saturday and Sunday) only get half the height of the other day boxes.
Obeys configuration options #mExcludeConfidential, #excludePrivate.
@param p QPainter of the printout
@param qd Arbitrary date within the week to be printed.
@param fromTime Start time of the displayed time range
......@@ -429,8 +424,6 @@ public:
@param includeDescription Whether to print the event description as well.
@param includeCategories Whether to print the event categories (tags) as well.
@param useColors Whether to use event category colors to draw the events.
@param excludeConfidential Whether to exclude Incidence marked confidential.
@param excludePrivate Whether to exclude Incidence marked private.
*/
void drawWeek(QPainter &p,
const QDate &qd,
......@@ -441,12 +434,12 @@ public:
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate);
bool useColors);
/**
Draw the (filofax) table for a bunch of days, using drawDayBox.
Obeys configuration options #mExcludeConfidential, #excludePrivate.
@param p QPainter of the printout
@param start Start date
@param end End date
......@@ -458,8 +451,6 @@ public:
@param includeDescription Whether to print the event description as well.
@param includeCategories Whether to print the event categories (tags) as well.
@param useColors Whether to use event category colors to draw the events.
@param excludeConfidential Whether to exclude Incidence marked confidential.
@param excludePrivate Whether to exclude Incidence marked private.
*/
void drawDays(QPainter &p,
const QDate &start,
......@@ -471,9 +462,7 @@ public:
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate);
bool useColors);
/**
Draw the timetable view of the given time range from fromDate to toDate.
......@@ -482,6 +471,8 @@ public:
and the events are displayed as boxes (like in korganizer's day/week view).
The first cell of each column contains the all-day events (using
drawAllDayBox with expandable=false).
Obeys configuration options #mExcludeConfidential, #excludePrivate.
@param p QPainter of the printout
@param fromDate First day to be included in the page
@param toDate Last day to be included in the page
......@@ -493,8 +484,6 @@ public:
@param includeDescription Whether to print the event description as well.
@param includeCategories Whether to print the event categories (tags) as well.
@param excludeTime Whether the time is printed in the detail area.
@param excludeConfidential Whether to exclude Incidence marked confidential.
@param excludePrivate Whether to exclude Incidence marked private.
*/
void drawTimeTable(QPainter &p,
const QDate &fromDate,
......@@ -505,9 +494,7 @@ public:
const QRect &box,
bool includeDescription,
bool includeCategories,
bool excludeTime,
bool excludeConfidential,
bool excludePrivate);
bool excludeTime);
/**
Draw the month table of the month containing the date qd. Each day gets one
......@@ -515,6 +502,8 @@ public:
in a matrix, with the first column being the first day of the
week (so it might display some days of the previous and the next month).
Above the matrix there is a bar showing the weekdays (drawn using drawDaysOfWeek).
Obeys configuration options #mExcludeConfidential, #excludePrivate.
@param p QPainter of the printout
@param qd Arbitrary date within the month to be printed.
@param fromTime Start time of the displayed time range
......@@ -527,8 +516,6 @@ public:
@param includeDescription Whether descriptions are printed.
@param includeCategories Whether to print the event categories (tags) as well.
@param useColors Whether to use event category colors to draw the events.
@param excludeConfidential Whether to exclude Incidence marked confidential.
@param excludePrivate Whether to exclude Incidence marked private.
@param box coordinates of the month.
*/
void drawMonthTable(QPainter &p,
......@@ -543,13 +530,13 @@ public: