Skip to content

GitLab

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

Allow printing of tags, and obey the Colors checkbox

parent e7d2b6e0
Pipeline #65995 passed with stage
in 7 minutes and 13 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 105 deletions
src/printing/calprintdayconfig_base.ui
View file @ fa9ad2e0
......@@ -291,7 +291,7 @@ p, li { white-space: pre-wrap; }
<string>Include Information</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mIncludeTodos">
<property name="enabled">
<bool>false</bool>
......@@ -304,7 +304,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="0">
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mExcludeTime">
<property name="whatsThis">
<string>Check this option to exclude the time in description box</string>
......@@ -323,7 +323,20 @@ p, li { white-space: pre-wrap; }
<string>Check this option if you want to see the item descriptions printed.</string>
</property>
<property name="text">
<string>Include &amp;descriptions</string>
<string>&amp;Descriptions</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="mIncludeCategories">
<property name="toolTip">
<string>Print item tags</string>
</property>
<property name="whatsThis">
<string>Check this option if you want to see the item tags printed.</string>
</property>
<property name="text">
<string>Ta&amp;gs</string>
</property>
</widget>
</item>
......
src/printing/calprintdefaultplugins.cpp
View file @ fa9ad2e0
......@@ -674,6 +674,7 @@ void CalPrintDay::readSettingsWidget()
mIncludeAllEvents = cfg->mIncludeAllEvents->isChecked();
mIncludeDescription = cfg->mIncludeDescription->isChecked();
mIncludeCategories = cfg->mIncludeCategories->isChecked();
mSingleLineLimit = cfg->mSingleLineLimit->isChecked();
mIncludeTodos = cfg->mIncludeTodos->isChecked();
mUseColors = cfg->mColors->isChecked();
......@@ -701,6 +702,7 @@ void CalPrintDay::setSettingsWidget()
cfg->mIncludeAllEvents->setChecked(mIncludeAllEvents);
cfg->mIncludeDescription->setChecked(mIncludeDescription);
cfg->mIncludeCategories->setChecked(mIncludeCategories);
cfg->mSingleLineLimit->setChecked(mSingleLineLimit);
cfg->mIncludeTodos->setChecked(mIncludeTodos);
cfg->mColors->setChecked(mUseColors);
......@@ -723,6 +725,7 @@ void CalPrintDay::loadConfig()
mStartTime = grp.readEntry("Start time", startTm).time();
mEndTime = grp.readEntry("End time", endTm).time();
mIncludeDescription = grp.readEntry("Include description", false);
mIncludeCategories = grp.readEntry("Include categories", false);
mIncludeTodos = grp.readEntry("Include todos", false);
mIncludeAllEvents = grp.readEntry("Include all events", false);
mDayPrintType = static_cast<eDayPrintType>(grp.readEntry("Print type", static_cast<int>(Timetable)));
......@@ -746,6 +749,7 @@ void CalPrintDay::saveConfig()
dt.setTime(mEndTime);
grp.writeEntry("End time", dt);
grp.writeEntry("Include description", mIncludeDescription);
grp.writeEntry("Include categories", mIncludeCategories);
grp.writeEntry("Include todos", mIncludeTodos);
grp.writeEntry("Include all events", mIncludeAllEvents);
grp.writeEntry("Print type", int(mDayPrintType));
......@@ -802,6 +806,8 @@ void CalPrintDay::print(QPainter &p, int width, int height)
mSingleLineLimit,
mShowNoteLines,
mIncludeDescription,
mIncludeCategories,
mUseColors,
mExcludeConfidential,
mExcludePrivate);
} else if (mDayPrintType == SingleTimetable) {
......@@ -813,6 +819,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
mEndTime,
daysBox,
mIncludeDescription,
mIncludeCategories,
mExcludeTime,
mExcludeConfidential,
mExcludePrivate);
......@@ -889,6 +896,9 @@ void CalPrintDay::print(QPainter &p, int width, int height)
} else {
str = i18nc("summary, location", "%1, %2", cleanString(event->summary()), cleanString(event->location()));
}
if (mIncludeCategories && !event->categoriesStr().isEmpty()) {
str = i18nc("summary, categories", "%1, %2", str, cleanString(event->categoriesStr()));
}
printEventString(p, eventBox, str);
eventBox.setTop(eventBox.bottom());
eventBox.setBottom(eventBox.top() + lineSpacing);
......@@ -909,6 +919,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
curEndTime,
dayBox,
mIncludeDescription,
mIncludeCategories,
mExcludeTime,
mExcludeConfidential,
mExcludePrivate,
......@@ -975,6 +986,7 @@ void CalPrintWeek::readSettingsWidget()
mUseColors = cfg->mColors->isChecked();
mPrintFooter = cfg->mPrintFooter->isChecked();
mIncludeDescription = cfg->mIncludeDescription->isChecked();
mIncludeCategories = cfg->mIncludeCategories->isChecked();
mExcludeTime = cfg->mExcludeTime->isChecked();
mExcludeConfidential = cfg->mExcludeConfidential->isChecked();
mExcludePrivate = cfg->mExcludePrivate->isChecked();
......@@ -1001,6 +1013,7 @@ void CalPrintWeek::setSettingsWidget()
cfg->mColors->setChecked(mUseColors);
cfg->mPrintFooter->setChecked(mPrintFooter);
cfg->mIncludeDescription->setChecked(mIncludeDescription);
cfg->mIncludeCategories->setChecked(mIncludeCategories);
cfg->mExcludeTime->setChecked(mExcludeTime);
cfg->mExcludeConfidential->setChecked(mExcludeConfidential);
cfg->mExcludePrivate->setChecked(mExcludePrivate);
......@@ -1022,6 +1035,7 @@ void CalPrintWeek::loadConfig()
mIncludeTodos = grp.readEntry("Include todos", false);
mWeekPrintType = (eWeekPrintType)(grp.readEntry("Print type", (int)Filofax));
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);
......@@ -1044,6 +1058,7 @@ void CalPrintWeek::saveConfig()
grp.writeEntry("Include todos", mIncludeTodos);
grp.writeEntry("Print type", int(mWeekPrintType));
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);
......@@ -1105,7 +1120,8 @@ 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, mExcludeConfidential, mExcludePrivate);
drawWeek(p, curWeek, mStartTime, mEndTime, weekBox, mSingleLineLimit, mShowNoteLines,
mIncludeDescription, mIncludeCategories, mUseColors, mExcludeConfidential, mExcludePrivate);
if (mPrintFooter) {
drawFooter(p, footerBox);
......@@ -1130,7 +1146,8 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
}
drawHeader(p, title, curWeek, QDate(), headerBox);
drawTimeTable(p, fromWeek, curWeek, false, mStartTime, mEndTime, weekBox, mIncludeDescription, mExcludeTime, mExcludeConfidential, mExcludePrivate);
drawTimeTable(p, fromWeek, curWeek, false, mStartTime, mEndTime, weekBox, mIncludeDescription,
mIncludeCategories, mExcludeTime, mExcludeConfidential, mExcludePrivate);
if (mPrintFooter) {
drawFooter(p, footerBox);
......@@ -1155,7 +1172,8 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
int hh = headerHeight();
drawSplitHeaderRight(p, fromWeek, curWeek, QDate(), width, hh);
drawTimeTable(p, fromWeek, endLeft, false, mStartTime, mEndTime, weekBox, mIncludeDescription, mExcludeTime, mExcludeConfidential, mExcludePrivate);
drawTimeTable(p, fromWeek, endLeft, false, mStartTime, mEndTime, weekBox, mIncludeDescription,
mIncludeCategories, mExcludeTime, mExcludeConfidential, mExcludePrivate);
if (mPrintFooter) {
drawFooter(p, weekBox1);
}
......@@ -1169,6 +1187,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
mEndTime,
weekBox1,
mIncludeDescription,
mIncludeCategories,
mExcludeTime,
mExcludeConfidential,
mExcludePrivate);
......@@ -1223,6 +1242,7 @@ void CalPrintMonth::readSettingsWidget()
mUseColors = cfg->mColors->isChecked();
mPrintFooter = cfg->mPrintFooter->isChecked();
mIncludeDescription = cfg->mIncludeDescription->isChecked();
mIncludeCategories = cfg->mIncludeCategories->isChecked();
mExcludeConfidential = cfg->mExcludeConfidential->isChecked();
mExcludePrivate = cfg->mExcludePrivate->isChecked();
}
......@@ -1244,6 +1264,7 @@ void CalPrintMonth::setSettingsWidget()
cfg->mColors->setChecked(mUseColors);
cfg->mPrintFooter->setChecked(mPrintFooter);
cfg->mIncludeDescription->setChecked(mIncludeDescription);
cfg->mIncludeCategories->setChecked(mIncludeCategories);
cfg->mExcludeConfidential->setChecked(mExcludeConfidential);
cfg->mExcludePrivate->setChecked(mExcludePrivate);
}
......@@ -1260,6 +1281,7 @@ void CalPrintMonth::loadConfig()
mSingleLineLimit = grp.readEntry("Single line limit", false);
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);
}
......@@ -1278,6 +1300,7 @@ void CalPrintMonth::saveConfig()
grp.writeEntry("Single line limit", mSingleLineLimit);
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);
}
......@@ -1336,6 +1359,8 @@ void CalPrintMonth::print(QPainter &p, int width, int height)
mSingleLineLimit,
mShowNoteLines,
mIncludeDescription,
mIncludeCategories,
mUseColors,
mExcludeConfidential,
mExcludePrivate,
monthBox);
......@@ -1647,7 +1672,7 @@ void CalPrintTodos::print(QPainter &p, int width, int height)
// Skip sub-to-dos. They will be printed recursively in drawTodo()
if (todo->relatedTo().isEmpty()) { // review(AKONADI_PORT)
count++;
drawTodo2(count,
drawTodo(count,
todo,
p,
sortField,
......
src/printing/calprintdefaultplugins.h
View file @ fa9ad2e0
......@@ -118,6 +118,7 @@ protected:
enum eDayPrintType { Filofax = 0, Timetable, SingleTimetable } mDayPrintType;
QTime mStartTime, mEndTime;
bool mIncludeDescription;
bool mIncludeCategories;
bool mSingleLineLimit;
bool mIncludeTodos;
bool mIncludeAllEvents;
......@@ -178,6 +179,7 @@ protected:
bool mSingleLineLimit;
bool mIncludeTodos;
bool mIncludeDescription;
bool mIncludeCategories;
bool mExcludeTime;
bool mExcludeConfidential;
bool mExcludePrivate;
......@@ -234,6 +236,7 @@ protected:
bool mIncludeTodos;
bool mSingleLineLimit;
bool mIncludeDescription;
bool mIncludeCategories;
bool mExcludeConfidential;
bool mExcludePrivate;
};
......
src/printing/calprintmonthconfig_base.ui
View file @ fa9ad2e0
......@@ -193,8 +193,8 @@ p, li { white-space: pre-wrap; }
<property name="title">
<string>Include Information</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QGridLayout" name="includeInfoLayout">
<item row="0" column="0">
<widget class="QCheckBox" name="mIncludeDescription">
<property name="toolTip">
<string>Print item descriptions</string>
......@@ -203,11 +203,24 @@ p, li { white-space: pre-wrap; }
<string>Check this option if you want to see the item descriptions printed.</string>
</property>
<property name="text">
<string>Include &amp;descriptions</string>
<string>&amp;Descriptions</string>
</property>
</widget>
</item>
<item>
<item row="0" column="1">
<widget class="QCheckBox" name="mIncludeCategories">
<property name="toolTip">
<string>Print item tags</string>
</property>
<property name="whatsThis">
<string>Check this option if you want to see the item tags printed.</string>
</property>
<property name="text">
<string>Ta&amp;gs</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mIncludeTodos">
<property name="enabled">
<bool>false</bool>
......@@ -223,7 +236,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="mRecurDaily">
<property name="toolTip">
<string>Print daily recurring items</string>
......@@ -236,7 +249,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mRecurWeekly">
<property name="toolTip">
<string>Print weekly recurring items</string>
......
src/printing/calprintpluginbase.cpp
View file @ fa9ad2e0
......@@ -575,27 +575,6 @@ int CalPrintPluginBase::drawHeader(QPainter &p, const QString &title, QDate mont
drawShadedBox(p, BOX_BORDER_WIDTH, backColor, box);
#if 0
// current month title left justified, prev month, next month right justified
QRect monthbox2(box.right() - 10 - smallMonthWidth, box.top(),
smallMonthWidth, box.height());
if (month2.isValid()) {
drawSmallMonth(p, QDate(month2.year(), month2.month(), 1), monthbox2);
textRect.setRight(monthbox2.left());
}
QRect monthbox1(monthbox2.left() - 10 - smallMonthWidth, box.top(),
smallMonthWidth, box.height());
if (month1.isValid()) {
drawSmallMonth(p, QDate(month1.year(), month1.month(), 1), monthbox1);
textRect.setRight(monthbox1.left());
}
// Set the margins
p.setFont(newFont);
textRect.adjust(5, 0, 0, 0);
p.drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::TextWordWrap, title);
p.setFont(oldFont);
#endif
// prev month left, current month centered, next month right
QRect monthbox2(box.right() - 10 - smallMonthWidth, box.top(), smallMonthWidth, box.height());
if (month2.isValid()) {
......@@ -844,6 +823,7 @@ void CalPrintPluginBase::drawAgendaDayBox(QPainter &p,
const QTime &toTime,
const QRect &oldbox,
bool includeDescription,
bool includeCategories,
bool excludeTime,
bool excludeConfidential,
bool excludePrivate,
......@@ -949,7 +929,7 @@ void CalPrintPluginBase::drawAgendaDayBox(QPainter &p,
QListIterator<CellItem *> it2(cells);
while (it2.hasNext()) {
auto placeItem = static_cast<PrintCellItem *>(it2.next());
drawAgendaItem(placeItem, p, startPrintDate, endPrintDate, minlen, box, includeDescription, excludeTime);
drawAgendaItem(placeItem, p, startPrintDate, endPrintDate, minlen, box, includeDescription, includeCategories, excludeTime);
}
}
......@@ -960,6 +940,7 @@ void CalPrintPluginBase::drawAgendaItem(PrintCellItem *item,
float minlen,
const QRect &box,
bool includeDescription,
bool includeCategories,
bool excludeTime)
{
KCalendarCore::Event::Ptr event = item->event();
......@@ -1003,6 +984,9 @@ void CalPrintPluginBase::drawAgendaItem(PrintCellItem *item,
cleanStr(event->location()));
}
}
if (includeCategories && !event->categoriesStr().isEmpty()) {
str = i18nc("summary, categories", "%1, %2", str, event->categoriesStr());
}
if (includeDescription && !event->description().isEmpty()) {
str += QLatin1Char('\n');
if (event->descriptionIsRich()) {
......@@ -1041,6 +1025,8 @@ void CalPrintPluginBase::drawDayBox(QPainter &p,
bool singleLineLimit,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate)
{
......@@ -1116,11 +1102,16 @@ void CalPrintPluginBase::drawDayBox(QPainter &p,
timeText = local.toString(currEvent->dtStart().toLocalTime().time(), QLocale::ShortFormat) + QLatin1Char(' ');
}
p.save();
setColorsByIncidenceCategory(p, currEvent);
if (useColors) {
setColorsByIncidenceCategory(p, currEvent);
}
QString summaryStr = currEvent->summary();
if (!currEvent->location().isEmpty()) {
summaryStr = i18nc("summary, location", "%1, %2", summaryStr, currEvent->location());
}
if (includeCategories && !currEvent->categoriesStr().isEmpty()) {
summaryStr = i18nc("summary, categories", "%1, %2", summaryStr, currEvent->categoriesStr());
}
drawIncidence(p, box, timeText, summaryStr, currEvent->description(), textY, singleLineLimit, includeDescription, currEvent->descriptionIsRich());
p.restore();
visibleEventsCounter++;
......@@ -1242,24 +1233,18 @@ void CalPrintPluginBase::drawIncidence(QPainter &p,
} else {
QTextDocument textDoc;
QTextCursor textCursor(&textDoc);
if (richDescription) {
QTextCursor textCursor(&textDoc);
textCursor.insertText(summaryText);
if (includeDescription && !description.isEmpty()) {
textCursor.insertText(QStringLiteral("\n"));
textCursor.insertText(summaryText);
if (includeDescription && !description.isEmpty()) {
textCursor.insertText(QStringLiteral("\n"));
if (richDescription) {
textCursor.insertHtml(description);
}
} else {
textCursor.insertText(summaryText);
if (includeDescription && !descText.isEmpty()) {
textCursor.insertText(QStringLiteral("\n"));
} else {
textCursor.insertText(descText);
}
}
textDoc.setPageSize(QSize(summaryBound.width(), summaryBound.height()));
p.save();
QRect clipBox(0, 0, summaryBound.width(), summaryBound.height());
p.setFont(p.font());
p.translate(summaryBound.x(), summaryBound.y());
summaryBound.setHeight(textDoc.documentLayout()->documentSize().height());
if (summaryBound.bottom() > dayBox.bottom()) {
......@@ -1280,7 +1265,13 @@ void CalPrintPluginBase::drawIncidence(QPainter &p,
p.drawText(timeBound, flags, time);
}
p.translate(summaryBound.x(), summaryBound.y());
textDoc.drawContents(&p, clipBox);
QAbstractTextDocumentLayout::PaintContext ctx;
ctx.palette.setColor(QPalette::Text, p.pen().color());
p.setClipRect(clipBox);
ctx.clip = clipBox;
textDoc.documentLayout()->draw(&p, ctx);
p.restore();
boxOverflow = textDoc.pageCount() > 1;
}
......@@ -1316,6 +1307,8 @@ void CalPrintPluginBase::drawWeek(QPainter &p,
bool singleLineLimit,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate)
{
......@@ -1355,6 +1348,8 @@ void CalPrintPluginBase::drawWeek(QPainter &p,
singleLineLimit,
showNoteLines,
includeDescription,
includeCategories,
useColors,
excludeConfidential,
excludePrivate);
} // for i through all weekdays
......@@ -1369,6 +1364,8 @@ void CalPrintPluginBase::drawDays(QPainter &p,
bool singleLineLimit,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate)
{
......@@ -1406,6 +1403,8 @@ void CalPrintPluginBase::drawDays(QPainter &p,
singleLineLimit,
showNoteLines,
includeDescription,
includeCategories,
useColors,
excludeConfidential,
excludePrivate);
} // for i through all selected days
......@@ -1419,6 +1418,7 @@ void CalPrintPluginBase::drawTimeTable(QPainter &p,
const QTime &toTime,
const QRect &box,
bool includeDescription,
bool includeCategories,
bool excludeTime,
bool excludeConfidential,
bool excludePrivate)
......@@ -1481,6 +1481,7 @@ void CalPrintPluginBase::drawTimeTable(QPainter &p,
myToTime,
dayBox,
includeDescription,
includeCategories,
excludeTime,
excludeConfidential,
excludePrivate,
......@@ -1737,6 +1738,8 @@ void CalPrintPluginBase::drawMonthTable(QPainter &p,
bool singleLineLimit,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate,
const QRect &box)
......@@ -1807,6 +1810,8 @@ void CalPrintPluginBase::drawMonthTable(QPainter &p,
singleLineLimit,
showNoteLines,
includeDescription,
includeCategories,
useColors,
excludeConfidential,
excludePrivate);
if (darkbg) {
......@@ -1869,33 +1874,6 @@ void CalPrintPluginBase::drawTodoLines(QPainter &p,
}
void CalPrintPluginBase::drawTodo(int &count,
const KCalendarCore::Todo::Ptr &todo,
QPainter &p,
KCalendarCore::TodoSortField sortField,
KCalendarCore::SortDirection sortDir,
bool connectSubTodos,
bool strikeoutCompleted,
bool desc,
int posPriority,
int posSummary,
int posDueDt,
int posPercentComplete,
int level,
int x,
int &y,
int width,
int pageHeight,
const KCalendarCore::Todo::List &todoList,
TodoParentStart *r,
bool excludeConfidential,
bool excludePrivate)
{
drawTodo2(count, todo, p, sortField, sortDir, connectSubTodos, strikeoutCompleted,
desc, posPriority, posSummary, -1, -1, posDueDt, posPercentComplete,
level, x, y, width, pageHeight, todoList, r, excludeConfidential, excludePrivate);
}
void CalPrintPluginBase::drawTodo2(int &count,
const KCalendarCore::Todo::Ptr &todo,
QPainter &p,
KCalendarCore::TodoSortField sortField,
......@@ -2105,7 +2083,7 @@ void CalPrintPluginBase::drawTodo2(int &count,
if (++subcount == sl.size()) {
startpt.mHasLine = false;
}
drawTodo2(count,
drawTodo(count,
isl,
p,
sortField,
......
src/printing/calprintpluginbase.h
View file @ fa9ad2e0
......@@ -353,6 +353,7 @@ public:
to include all events if expandable==true
@param box coordinates of the agenda day box.
@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.
......@@ -366,6 +367,7 @@ public:
const QTime &toTime,
const QRect &box,
bool includeDescription,
bool includeCategories,
bool excludeTime,
bool excludeConfidential,
bool excludePrivate,
......@@ -378,6 +380,7 @@ public:
float minlen,
const QRect &box,
bool includeDescription,
bool includeCategories,
bool excludeTime);
/**
......@@ -396,6 +399,8 @@ public:
@param singleLineLimit Whether Incidence text wraps or truncates.
@param showNoteLines Whether note lines are printed.
@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.
*/
......@@ -410,6 +415,8 @@ public:
bool singleLineLimit = true,
bool showNoteLines = false,
bool includeDescription = false,
bool includeCategories = false,
bool useColors = true,
bool excludeDescription = true,
bool excludePrivate = true);
......@@ -426,6 +433,8 @@ public:
@param singleLineLimit Whether Incidence text wraps or truncates.
@param showNoteLines Whether note lines are printed.
@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.
*/
......@@ -437,6 +446,8 @@ public:
bool singleLineLimit,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate);
......@@ -451,6 +462,8 @@ public:
@param singleLineLimit Whether Incidence text wraps or truncates.
@param showNoteLines Whether note lines are printed.
@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.
*/
......@@ -463,6 +476,8 @@ public:
bool singleLineLimit,
bool showNoteLines,
bool includeDescription,
bool includeCategories,
bool useColors,
bool excludeConfidential,
bool excludePrivate);
......@@ -482,6 +497,7 @@ public:
@param toTime End time of the displayed time range