From kde-commits Tue Oct 31 21:32:34 2017 From: Montel Laurent Date: Tue, 31 Oct 2017 21:32:34 +0000 To: kde-commits Subject: [eventviews] /: GIT_SILENT: coding style (silent) Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=150948558428289 Git commit 1a1add32bed69c9381b1d590e1557db64e753609 by Montel Laurent. Committed on 31/10/2017 at 21:32. Pushed by mlaurent into branch 'master'. GIT_SILENT: coding style M +163 -122 src/agenda/agenda.cpp M +14 -17 src/agenda/agenda.h M +106 -77 src/agenda/agendaitem.cpp M +5 -14 src/agenda/agendaitem.h M +145 -128 src/agenda/agendaview.cpp M +12 -24 src/agenda/agendaview.h M +5 -2 src/agenda/alternatelabel.cpp M +1 -4 src/agenda/alternatelabel.h M +13 -10 src/agenda/calendardecoration.cpp M +6 -12 src/agenda/calendardecoration.h M +18 -17 src/agenda/decorationlabel.cpp M +3 -8 src/agenda/decorationlabel.h M +24 -21 src/agenda/timelabels.cpp M +3 -5 src/agenda/timelabels.h M +4 -5 src/agenda/timelabelszone.cpp M +1 -5 src/agenda/timelabelszone.h M +26 -18 src/agenda/timescaleconfigdialog.cpp M +1 -4 src/agenda/timescaleconfigdialog.h M +2 -1 src/agenda/viewcalendar.cpp M +2 -6 src/agenda/viewcalendar.h M +15 -18 src/eventview.cpp M +7 -15 src/eventview.h M +16 -14 src/eventview_p.cpp M +1 -4 src/eventview_p.h M +10 -6 src/helper.cpp M +6 -10 src/helper.h M +10 -9 src/journal/journalframe.cpp M +3 -6 src/journal/journalframe.h M +6 -4 src/journal/journalview.cpp M +8 -9 src/journal/journalview.h M +60 -47 src/list/listview.cpp M +3 -6 src/list/listview.h M +23 -23 src/month/monthgraphicsitems.cpp M +3 -4 src/month/monthgraphicsitems.h M +74 -65 src/month/monthitem.cpp M +11 -16 src/month/monthitem.h M +45 -45 src/month/monthscene.cpp M +12 -7 src/month/monthscene.h M +46 -46 src/month/monthview.cpp M +5 -6 src/month/monthview.h M +4 -5 src/multiagenda/configdialoginterface.h M +29 -23 src/multiagenda/multiagendaview.cpp M +4 -6 src/multiagenda/multiagendaview.h M +76 -52 src/prefs.cpp M +1 -5 src/prefs.h M +15 -8 src/timeline/timelineitem.cpp M +4 -8 src/timeline/timelineitem.h M +24 -26 src/timeline/timelineview.cpp M +1 -5 src/timeline/timelineview.h M +27 -23 src/timeline/timelineview_p.cpp M +2 -7 src/timeline/timelineview_p.h M +45 -25 src/todo/incidencetreemodel.cpp M +3 -1 src/todo/incidencetreemodel_p.h M +34 -51 src/todo/tododelegates.cpp M +6 -12 src/todo/tododelegates.h M +74 -64 src/todo/todomodel.cpp M +2 -2 src/todo/todomodel.h M +1 -2 src/todo/todomodel_p.h M +117 -98 src/todo/todoview.cpp M +11 -17 src/todo/todoview.h M +0 -1 src/todo/todoviewquickaddline.cpp M +3 -1 src/todo/todoviewquickaddline.h M +10 -9 src/todo/todoviewquicksearch.cpp M +5 -5 src/todo/todoviewquicksearch.h M +37 -39 src/todo/todoviewsortfilterproxymodel.cpp M +14 -12 src/todo/todoviewview.cpp M +6 -4 src/viewerapp/main.cpp M +7 -7 src/viewerapp/mainwindow.cpp M +2 -4 src/viewerapp/mainwindow.h M +31 -23 src/whatsnext/whatsnextview.cpp M +7 -7 src/whatsnext/whatsnextview.h M +2 -2 tests/createcolorgui_test.cpp https://commits.kde.org/eventviews/1a1add32bed69c9381b1d590e1557db64e753609 diff --git a/src/agenda/agenda.cpp b/src/agenda/agenda.cpp index efdc2da..063f71e 100644 --- a/src/agenda/agenda.cpp +++ b/src/agenda/agenda.cpp @@ -66,8 +66,11 @@ class Q_DECL_HIDDEN MarcusBains::Private { public: Private(EventView *eventView, Agenda *agenda) - : mEventView(eventView), mAgenda(agenda), - mTimer(nullptr), mTimeBox(nullptr), mOldTodayCol(-1) + : mEventView(eventView) + , mAgenda(agenda) + , mTimer(nullptr) + , mTimeBox(nullptr) + , mOldTodayCol(-1) { } = @@ -99,7 +102,8 @@ int MarcusBains::Private::todayColumn() const } = MarcusBains::MarcusBains(EventView *eventView, Agenda *agenda) - : QFrame(agenda), d(new Private(eventView, agenda)) + : QFrame(agenda) + , d(new Private(eventView, agenda)) { d->mTimeBox =3D new QLabel(d->mAgenda); d->mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom); @@ -175,7 +179,9 @@ void MarcusBains::updateLocationRecalc(bool recalculate) QPalette pal1 =3D d->mTimeBox->palette(); pal1.setColor(QPalette::WindowText, color); d->mTimeBox->setPalette(pal1); - d->mTimeBox->setText(QLocale::system().toString(time, showSeconds ? QL= ocale::LongFormat : QLocale::ShortFormat)); + d->mTimeBox->setText(QLocale::system().toString(time, + showSeconds ? QLocale:= :LongFormat : QLocale:: + ShortFormat)); d->mTimeBox->adjustSize(); if (y - d->mTimeBox->height() >=3D 0) { y -=3D d->mTimeBox->height(); @@ -202,16 +208,34 @@ void MarcusBains::updateLocationRecalc(bool recalcula= te) class Q_DECL_HIDDEN Agenda::Private { public: - Private(AgendaView *agendaView, QScrollArea *scrollArea, - int columns, int rows, int rowSize, bool isInteractive) - : mAgendaView(agendaView), mScrollArea(scrollArea), mAllDayMode(fa= lse), - mColumns(columns), mRows(rows), mGridSpacingX(0.0), mGridSpacing= Y(rowSize), - mDesiredGridSpacingY(rowSize), mChanger(nullptr), - mResizeBorderWidth(0), mScrollBorderWidth(0), mScrollDelay(0), m= ScrollOffset(0), - mWorkingHoursEnable(false), mHolidayMask(nullptr), mWorkingHours= YTop(0), - mWorkingHoursYBottom(0), mHasSelection(0), mSelectedId(-1), mMar= cusBains(nullptr), - mActionType(Agenda::NOP), mItemMoved(false), mOldLowerScrollValu= e(0), - mOldUpperScrollValue(0), mReturnPressed(false), mIsInteractive(i= sInteractive) + Private(AgendaView *agendaView, QScrollArea *scrollArea, int columns, = int rows, int rowSize, + bool isInteractive) + : mAgendaView(agendaView) + , mScrollArea(scrollArea) + , mAllDayMode(false) + , mColumns(columns) + , mRows(rows) + , mGridSpacingX(0.0) + , mGridSpacingY(rowSize) + , mDesiredGridSpacingY(rowSize) + , mChanger(nullptr) + , mResizeBorderWidth(0) + , mScrollBorderWidth(0) + , mScrollDelay(0) + , mScrollOffset(0) + , mWorkingHoursEnable(false) + , mHolidayMask(nullptr) + , mWorkingHoursYTop(0) + , mWorkingHoursYBottom(0) + , mHasSelection(0) + , mSelectedId(-1) + , mMarcusBains(nullptr) + , mActionType(Agenda::NOP) + , mItemMoved(false) + , mOldLowerScrollValue(0) + , mOldUpperScrollValue(0) + , mReturnPressed(false) + , mIsInteractive(isInteractive) { if (mGridSpacingY < 4 || mGridSpacingY > 30) { mGridSpacingY =3D 10; @@ -318,10 +342,10 @@ public: /* Create an agenda widget with rows rows and columns columns. */ -Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea, - int columns, int rows, int rowSize, bool isInteractive) - : QWidget(scrollArea), - d(new Private(agendaView, scrollArea, columns, rows, rowSize, isInte= ractive)) +Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int column= s, int rows, int rowSize, + bool isInteractive) + : QWidget(scrollArea) + , d(new Private(agendaView, scrollArea, columns, rows, rowSize, isInte= ractive)) { setMouseTracking(true); = @@ -332,10 +356,10 @@ Agenda::Agenda(AgendaView *agendaView, QScrollArea *s= crollArea, Create an agenda widget with columns columns and one row. This is used f= or all-day events. */ -Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea, - int columns, bool isInteractive) - : QWidget(scrollArea), d(new Private(agendaView, scrollArea, columns, = 1, 24, - isInteractive)) +Agenda::Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int column= s, bool isInteractive) + : QWidget(scrollArea) + , d(new Private(agendaView, scrollArea, columns, 1, 24, + isInteractive)) { d->mAllDayMode =3D true; = @@ -572,7 +596,8 @@ bool Agenda::eventFilter_drag(QObject *obj, QDropEvent = *de) case QEvent::DragLeave: return false; break; - case QEvent::Drop: { + case QEvent::Drop: + { if (!CalendarSupport::canDecode(md)) { return false; } @@ -597,8 +622,8 @@ bool Agenda::eventFilter_drag(QObject *obj, QDropEvent = *de) Q_EMIT droppedIncidences(incidences, gridPosition, d->mAllDayM= ode); } return true; + break; } - break; = case QEvent::DragResponse: default: @@ -615,7 +640,7 @@ bool Agenda::eventFilter_wheel(QObject *object, QWheelE= vent *e) bool accepted =3D false; if ((e->modifiers() & Qt::ShiftModifier) =3D=3D Qt::ShiftModifier) { if (object !=3D this) { - viewportPos =3D ((QWidget *) object)->mapToParent(e->pos()); + viewportPos =3D ((QWidget *)object)->mapToParent(e->pos()); } else { viewportPos =3D e->pos(); } @@ -640,6 +665,7 @@ bool Agenda::eventFilter_wheel(QObject *object, QWheelE= vent *e) } return accepted; } + #endif = bool Agenda::eventFilter_key(QObject *, QKeyEvent *ke) @@ -656,7 +682,7 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseE= vent *me) viewportPos =3D me->pos(); } = - switch (me->type()) { + switch (me->type()) { case QEvent::MouseButtonPress: if (object !=3D this) { if (me->button() =3D=3D Qt::RightButton) { @@ -719,7 +745,8 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseE= vent *me) Q_EMIT mousePosSignal(gridToContents(contentsToGrid(viewportPos))); break; = - case QEvent::MouseMove: { + case QEvent::MouseMove: + { if (!d->mIsInteractive) { return true; } @@ -729,7 +756,8 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseE= vent *me) QPoint indicatorPos =3D gridToContents(contentsToGrid(viewportPos)= ); if (object !=3D this) { AgendaItem::QPtr moveItem =3D qobject_cast(objec= t); - KCalCore::Incidence::Ptr incidence =3D moveItem ? moveItem->i= ncidence() : KCalCore::Incidence::Ptr(); + KCalCore::Incidence::Ptr incidence + =3D moveItem ? moveItem->incidence() : KCalCore::Incidence= ::Ptr(); if (incidence && !incidence->isReadOnly()) { if (!d->mActionItem) { setNoActionCursor(moveItem, viewportPos); @@ -743,14 +771,12 @@ bool Agenda::eventFilter_mouse(QObject *object, QMous= eEvent *me) firstItem =3D d->mActionItem; } indicatorPos =3D gridToContents( - QPoint(firstItem->cellXLeft(), = firstItem->cellYTop())); - + QPoint(firstItem->cellXLeft(), firstItem->cell= YTop())); } else if (d->mActionType =3D=3D RESIZEBOTTOM) { // RESIZETOP is handled correctly, only resizebott= om works differently indicatorPos =3D gridToContents( - QPoint(d->mActionItem->cellXLef= t(), d->mActionItem->cellYBottom() + 1)); + QPoint(d->mActionItem->cellXLeft(), d->mAction= Item->cellYBottom() + 1)); } - } // If we have an action item } // If move item && !read only } else { @@ -758,9 +784,9 @@ bool Agenda::eventFilter_mouse(QObject *object, QMouseE= vent *me) performSelectAction(viewportPos); = // show cursor at end of timespan - if (((d->mStartCell.y() < d->mEndCell.y()) && - (d->mEndCell.x() >=3D d->mStartCell.x())) || - (d->mEndCell.x() > d->mStartCell.x())) { + if (((d->mStartCell.y() < d->mEndCell.y()) + && (d->mEndCell.x() >=3D d->mStartCell.x())) + || (d->mEndCell.x() > d->mStartCell.x())) { indicatorPos =3D gridToContents(QPoint(d->mEndCell.x()= , d->mEndCell.y() + 1)); } else { indicatorPos =3D gridToContents(d->mEndCell); @@ -797,11 +823,11 @@ bool Agenda::ptInSelection(const QPoint &gpos) const return false; } else if (gpos.x() < d->mSelectionStartCell.x() || gpos.x() > d->mSel= ectionEndCell.x()) { return false; - } else if ((gpos.x() =3D=3D d->mSelectionStartCell.x()) && - (gpos.y() < d->mSelectionStartCell.y())) { + } else if ((gpos.x() =3D=3D d->mSelectionStartCell.x()) + && (gpos.y() < d->mSelectionStartCell.y())) { return false; - } else if ((gpos.x() =3D=3D d->mSelectionEndCell.x()) && - (gpos.y() > d->mSelectionEndCell.y())) { + } else if ((gpos.x() =3D=3D d->mSelectionEndCell.x()) + && (gpos.y() > d->mSelectionEndCell.y())) { return false; } return true; @@ -815,7 +841,7 @@ void Agenda::startSelectAction(const QPoint &viewportPo= s) d->mSelectionStartPoint =3D viewportPos; d->mHasSelection =3D true; = - QPoint pos =3D viewportPos; + QPoint pos =3D viewportPos; QPoint gpos =3D contentsToGrid(pos); = // Store new selection @@ -834,8 +860,8 @@ void Agenda::performSelectAction(const QPoint &pos) // Scroll if cursor was moved to upper or lower end of agenda. if (pos.y() - contentsY() < d->mScrollBorderWidth && contentsY() > 0) { d->mScrollUpTimer.start(d->mScrollDelay); - } else if (contentsY() + d->mScrollArea->viewport()->height() - - d->mScrollBorderWidth < pos.y()) { + } else if (contentsY() + d->mScrollArea->viewport()->height() + -d->mScrollBorderWidth < pos.y()) { d->mScrollDownTimer.start(d->mScrollDelay); } else { d->mScrollUpTimer.stop(); @@ -844,8 +870,8 @@ void Agenda::performSelectAction(const QPoint &pos) = if (gpos !=3D d->mEndCell) { d->mEndCell =3D gpos; - if (d->mStartCell.x() > d->mEndCell.x() || - (d->mStartCell.x() =3D=3D d->mEndCell.x() && d->mStartCell= .y() > d->mEndCell.y())) { + if (d->mStartCell.x() > d->mEndCell.x() + || (d->mStartCell.x() =3D=3D d->mEndCell.x() && d->mStartCell.= y() > d->mEndCell.y())) { // backward selection d->mSelectionStartCell =3D d->mEndCell; d->mSelectionEndCell =3D d->mStartCell; @@ -868,23 +894,22 @@ void Agenda::endSelectAction(const QPoint ¤tPos) Q_EMIT newTimeSpanSignal(d->mSelectionStartCell, d->mSelectionEndCell); = if (d->preferences()->selectionStartsEditor()) { - if ((d->mSelectionStartPoint - currentPos).manhattanLength() > - QApplication::startDragDistance()) { + if ((d->mSelectionStartPoint - currentPos).manhattanLength() + > QApplication::startDragDistance()) { Q_EMIT newEventSignal(); } } } = -Agenda::MouseActionType Agenda::isInResizeArea(bool horizontal, - const QPoint &pos, - const AgendaItem::QPtr &item) +Agenda::MouseActionType Agenda::isInResizeArea(bool horizontal, const QPoi= nt &pos, + const AgendaItem::QPtr &ite= m) { if (!item) { return NOP; } QPoint gridpos =3D contentsToGrid(pos); QPoint contpos =3D gridToContents( - gridpos + QPoint((QApplication::isRightToLeft()) = ? 1 : 0, 0)); + gridpos + QPoint((QApplication::isRightToLeft()) ? 1 : 0, 0)); = if (horizontal) { int clXLeft =3D item->cellXLeft(); @@ -901,8 +926,8 @@ Agenda::MouseActionType Agenda::isInResizeArea(bool hor= izontal, } else { return RESIZELEFT; } - } else if ((d->mGridSpacingX - gridDistanceX) < d->mResizeBorderWi= dth && - clXRight =3D=3D gridpos.x()) { + } else if ((d->mGridSpacingX - gridDistanceX) < d->mResizeBorderWi= dth + && clXRight =3D=3D gridpos.x()) { if (QApplication::isRightToLeft()) { return RESIZELEFT; } else { @@ -913,11 +938,11 @@ Agenda::MouseActionType Agenda::isInResizeArea(bool h= orizontal, } } else { int gridDistanceY =3D int(pos.y() - contpos.y()); - if (gridDistanceY < d->mResizeBorderWidth && - item->cellYTop() =3D=3D gridpos.y() && !item->firstMultiIt= em()) { + if (gridDistanceY < d->mResizeBorderWidth + && item->cellYTop() =3D=3D gridpos.y() && !item->firstMultiIte= m()) { return RESIZETOP; - } else if ((d->mGridSpacingY - gridDistanceY) < d->mResizeBorderWi= dth && - item->cellYBottom() =3D=3D gridpos.y() && !item->lastMu= ltiItem()) { + } else if ((d->mGridSpacingY - gridDistanceY) < d->mResizeBorderWi= dth + && item->cellYBottom() =3D=3D gridpos.y() && !item->las= tMultiItem()) { return RESIZEBOTTOM; } else { return MOVE; @@ -949,8 +974,8 @@ void Agenda::performItemAction(const QPoint &pos) = // Cursor left active agenda area. // This starts a drag. - if (pos.y() < 0 || pos.y() >=3D contentsY() + d->mScrollArea->viewport= ()->height() || - pos.x() < 0 || pos.x() >=3D width()) { + if (pos.y() < 0 || pos.y() >=3D contentsY() + d->mScrollArea->viewport= ()->height() + || pos.x() < 0 || pos.x() >=3D width()) { if (d->mActionType =3D=3D MOVE) { d->mScrollUpTimer.stop(); d->mScrollDownTimer.stop(); @@ -976,8 +1001,8 @@ void Agenda::performItemAction(const QPoint &pos) const int distanceToTop =3D pos.y() - contentsY(); if (distanceToTop < d->mScrollBorderWidth && distanceToTop > -d->mScro= llBorderWidth) { d->mScrollUpTimer.start(d->mScrollDelay); - } else if (contentsY() + d->mScrollArea->viewport()->height() - - d->mScrollBorderWidth < pos.y()) { + } else if (contentsY() + d->mScrollArea->viewport()->height() + -d->mScrollBorderWidth < pos.y()) { d->mScrollDownTimer.start(d->mScrollDelay); } else { d->mScrollUpTimer.stop(); @@ -991,7 +1016,8 @@ void Agenda::performItemAction(const QPoint &pos) KMessageBox::information(this, i18n("Unable to lock item for mod= ification. " "You cannot make any changes= ."), - i18n("Locking Failed"), QStringLi= teral("AgendaLockingFailed")); + i18n("Locking Failed"), + QStringLiteral("AgendaLockingFail= ed")); d->mScrollUpTimer.stop(); d->mScrollDownTimer.stop(); d->mActionItem->resetMove(); @@ -1036,18 +1062,22 @@ void Agenda::performItemAction(const QPoint &pos) // cell's y values are first and last cell of the = bar, // so if newY=3D-1, they need to be the same if (newFirst) { - newFirst->setCellXY(moveItem->cellXLeft() - 1,= rows() + newY, rows() - 1); + newFirst->setCellXY(moveItem->cellXLeft() - 1,= rows() + newY, + rows() - 1); d->mItems.append(newFirst); moveItem->resize(int(d->mGridSpacingX * newFir= st->cellWidth()), int(d->mGridSpacingY * newFir= st->cellHeight())); QPoint cpos =3D gridToContents( - QPoint(newFirst->cellXLeft()= , newFirst->cellYTop())); + QPoint(newFirst->cellXLeft(), newFirst->ce= llYTop())); newFirst->setParent(this); newFirst->move(cpos.x(), cpos.y()); } else { - newFirst =3D insertItem(moveItem->incidence(),= moveItem->occurrenceDateTime(), - moveItem->cellXLeft() - = 1, rows() + newY, rows() - 1, - moveItem->itemPos(), mov= eItem->itemCount(), false); + newFirst =3D insertItem( + moveItem->incidence(), moveItem->occurrenc= eDateTime(), + moveItem->cellXLeft() - 1, rows() + newY, + rows() - 1, + moveItem->itemPos(), moveItem->itemCount(), + false); } if (newFirst) { newFirst->show(); @@ -1092,13 +1122,15 @@ void Agenda::performItemAction(const QPoint &pos) d->mItems.append(newLast); moveItem->resize(int(d->mGridSpacingX * newLas= t->cellWidth()), int(d->mGridSpacingY * newLas= t->cellHeight())); - QPoint cpos =3D gridToContents(QPoint(newLast-= >cellXLeft(), newLast->cellYTop())); + QPoint cpos + =3D gridToContents(QPoint(newLast->cellXLe= ft(), newLast->cellYTop())); newLast->setParent(this); newLast->move(cpos.x(), cpos.y()); } else { - newLast =3D insertItem(moveItem->incidence(), = moveItem->occurrenceDateTime(), - moveItem->cellXLeft() + 1= , 0, newY - rows() - 1, - moveItem->itemPos(), move= Item->itemCount(), false); + newLast =3D insertItem( + moveItem->incidence(), moveItem->occurrenc= eDateTime(), + moveItem->cellXLeft() + 1, 0, newY - rows(= ) - 1, + moveItem->itemPos(), moveItem->itemCount()= , false); } moveItem->appendMoveItem(newLast); newLast->show(); @@ -1160,8 +1192,8 @@ void Agenda::endItemAction() KCalCore::Incidence::Ptr incidence =3D d->mActionItem->incidence(); const auto recurrenceId =3D d->mActionItem->occurrenceDateTime(); = - d->mItemMoved =3D d->mItemMoved && !(d->mStartCell.x() =3D=3D d->mEndC= ell.x() && - d->mStartCell.y() =3D=3D d->mEndCel= l.y()); + d->mItemMoved =3D d->mItemMoved && !(d->mStartCell.x() =3D=3D d->mEndC= ell.x() + && d->mStartCell.y() =3D=3D d->mEnd= Cell.y()); = bool addIncidence =3D false; if (d->mItemMoved) { @@ -1174,7 +1206,7 @@ void Agenda::endItemAction() if (CalendarSupport::hasEvent(incidence)) { mainIncidence =3D cal->event(incidence->uid()); } else if (CalendarSupport::hasTodo(incidence)) { - mainIncidence =3D cal->todo(incidence->uid()); + mainIncidence =3D cal->todo(incidence->uid()); } incidence =3D mainIncidence; } @@ -1189,7 +1221,8 @@ void Agenda::endItemAction() modify =3D true; break; case KCalUtils::RecurrenceActions::SelectedOccurrence: - case KCalUtils::RecurrenceActions::FutureOccurrences: { + case KCalUtils::RecurrenceActions::FutureOccurrences: + { const bool thisAndFuture =3D (res =3D=3D KCalUtils::Recurr= enceActions::FutureOccurrences); modify =3D true; multiModify =3D true; @@ -1202,7 +1235,8 @@ void Agenda::endItemAction() = if (newItem.isValid() && newItem !=3D item) { = //it is not a new exception item =3D newItem; - newInc->setCustomProperty("VOLATILE", "AKONADI-ID"= , QString::number(newItem.id())); + newInc->setCustomProperty("VOLATILE", "AKONADI-ID", + QString::number(newItem.= id())); addIncidence =3D false; } else { addIncidence =3D true; @@ -1322,7 +1356,8 @@ void Agenda::setActionCursor(int actionType, bool act= ing) = void Agenda::setNoActionCursor(const AgendaItem::QPtr &moveItem, const QPo= int &pos) { - const KCalCore::Incidence::Ptr item =3D moveItem ? moveItem->incidence= () : KCalCore::Incidence::Ptr(); + const KCalCore::Incidence::Ptr item + =3D moveItem ? moveItem->incidence() : KCalCore::Incidence::Ptr(); = const bool noResize =3D CalendarSupport::hasTodo(item); = @@ -1373,7 +1408,7 @@ void Agenda::placeAgendaItem(const AgendaItem::QPtr &= item, double subCellWidth) QPoint pt =3D gridToContents(QPoint(item->cellXLeft(), item->cellYTop(= ))); // right lower corner QPoint pt1 =3D gridToContents( - QPoint(item->cellXLeft() + item->cellWidth(), item->c= ellYBottom() + 1)); + QPoint(item->cellXLeft() + item->cellWidth(), item->cellYBottom() = + 1)); = double subCellPos =3D item->subCell() * subCellWidth; = @@ -1441,7 +1476,8 @@ void Agenda::placeSubCells(const AgendaItem::QPtr &pl= aceItem) } } = - QList items =3D CalendarSupport::CellItem= ::placeItem(cells, placeItem); + QList items + =3D CalendarSupport::CellItem::placeItem(cells, placeItem); = placeItem->setConflictItems(QList()); double newSubCellWidth =3D calcSubCellWidth(placeItem); @@ -1527,15 +1563,15 @@ void Agenda::drawContents(QPainter *p, int cx, int = cy, int cw, int ch) = if (pt2.y() < pt1.y()) { // overnight working hours - if (((gxStart =3D=3D 0) && !d->mHolidayMask->at(d->mHo= lidayMask->count() - 1)) || - ((gxStart > 0) && (gxStart < int(d->mHolidayMa= sk->count())) && - (!d->mHolidayMask->at(gxStart - 1)))) { + if (((gxStart =3D=3D 0) && !d->mHolidayMask->at(d->mHo= lidayMask->count() - 1)) + || ((gxStart > 0) && (gxStart < int(d->mHolidayMas= k->count())) + && (!d->mHolidayMask->at(gxStart - 1)))) { if (pt2.y() > cy) { dbp.fillRect(xStart, cy, xWidth, pt2.y() - cy = + 1, workColor); } } - if ((gxStart < int(d->mHolidayMask->count() - 1)) && - (!d->mHolidayMask->at(gxStart))) { + if ((gxStart < int(d->mHolidayMask->count() - 1)) + && (!d->mHolidayMask->at(gxStart))) { if (pt1.y() < cy + ch - 1) { dbp.fillRect(xStart, pt1.y(), xWidth, cy + ch = - pt1.y() + 1, workColor); } @@ -1543,7 +1579,8 @@ void Agenda::drawContents(QPainter *p, int cx, int cy= , int cw, int ch) } else { // last entry in holiday mask denotes the previous day= not visible // (needed for overnight shifts) - if (gxStart < int(d->mHolidayMask->count() - 1) && !d-= >mHolidayMask->at(gxStart)) { + if (gxStart < int(d->mHolidayMask->count() - 1) + && !d->mHolidayMask->at(gxStart)) { dbp.fillRect(xStart, pt1.y(), xWidth, pt2.y() - pt= 1.y() + 1, workColor); } } @@ -1556,7 +1593,7 @@ void Agenda::drawContents(QPainter *p, int cx, int cy= , int cw, int ch) if (d->preferences()->colorAgendaBusyDays() && !d->mAllDayMode) { for (int i =3D 0; i < busyDayMask.count(); ++i) { if (busyDayMask[i]) { - const QPoint pt1(cx + d->mGridSpacingX * i, 0); + const QPoint pt1(cx + d->mGridSpacingX *i, 0); // const QPoint pt2(cx + mGridSpacingX * (i+1), ch); QColor busyColor =3D d->preferences()->viewBgBusyColor(); busyColor.setAlpha(EventViews::BUSY_BACKGROUND_ALPHA); @@ -1622,8 +1659,8 @@ void Agenda::drawContents(QPainter *p, int cx, int cy= , int cw, int ch) */ QPoint Agenda::contentsToGrid(const QPoint &pos) const { - int gx =3D int(QApplication::isRightToLeft() ? - d->mColumns - pos.x() / d->mGridSpacingX : pos.x() / d->m= GridSpacingX); + int gx =3D int(QApplication::isRightToLeft() + ? d->mColumns - pos.x() / d->mGridSpacingX : pos.x() / d-= >mGridSpacingX); int gy =3D int(pos.y() / d->mGridSpacingY); return QPoint(gx, gy); } @@ -1633,8 +1670,8 @@ QPoint Agenda::contentsToGrid(const QPoint &pos) const */ QPoint Agenda::gridToContents(const QPoint &gpos) const { - int x =3D int(QApplication::isRightToLeft() ? - (d->mColumns - gpos.x()) * d->mGridSpacingX : gpos.x() * d= ->mGridSpacingX); + int x =3D int(QApplication::isRightToLeft() + ? (d->mColumns - gpos.x()) * d->mGridSpacingX : gpos.x() *= d->mGridSpacingX); int y =3D int(gpos.y() * d->mGridSpacingY); return QPoint(x, y); } @@ -1645,7 +1682,6 @@ QPoint Agenda::gridToContents(const QPoint &gpos) con= st */ int Agenda::timeToY(const QTime &time) const { - int minutesPerCell =3D 24 * 60 / d->mRows; int timeMinutes =3D time.hour() * 60 + time.minute(); int Y =3D (timeMinutes + (minutesPerCell / 2)) / minutesPerCell; @@ -1712,20 +1748,19 @@ QVector Agenda::maxContentsY() const = void Agenda::setStartTime(const QTime &startHour) { - const double startPos =3D - (startHour.hour() / 24. + startHour.minute() / 1440. + startHour.s= econd() / 86400.) * - d->mRows * gridSpacingY(); + const double startPos + =3D (startHour.hour() / 24. + startHour.minute() / 1440. + startHo= ur.second() / 86400.) + *d->mRows * gridSpacingY(); = verticalScrollBar()->setValue(startPos); - } = /* Insert AgendaItem into agenda. */ -AgendaItem::QPtr Agenda::insertItem(const KCalCore::Incidence::Ptr &incide= nce, const QDateTime &recurrenceId, - int X, int YTop, int YBottom, int item= Pos, int itemCount, - bool isSelected) +AgendaItem::QPtr Agenda::insertItem(const KCalCore::Incidence::Ptr &incide= nce, + const QDateTime &recurrenceId, int X, = int YTop, int YBottom, + int itemPos, int itemCount, bool isSel= ected) { if (d->mAllDayMode) { qCDebug(CALENDARVIEW_LOG) << "using this in all-day mode is illega= l."; @@ -1734,7 +1769,8 @@ AgendaItem::QPtr Agenda::insertItem(const KCalCore::I= ncidence::Ptr &incidence, c = d->mActionType =3D NOP; = - AgendaItem::QPtr agendaItem =3D createAgendaItem(incidence, itemPos, i= temCount, recurrenceId, isSelected); + AgendaItem::QPtr agendaItem =3D createAgendaItem(incidence, itemPos, i= temCount, recurrenceId, + isSelected); if (!agendaItem) { return AgendaItem::QPtr(); } @@ -1744,10 +1780,10 @@ AgendaItem::QPtr Agenda::insertItem(const KCalCore:= :Incidence::Ptr &incidence, c YBottom =3D YTop; } = - agendaItem->resize(int((X + 1) * d->mGridSpacingX) - - int(X * d->mGridSpacingX), - int(YTop * d->mGridSpacingY) - - int((YBottom + 1) * d->mGridSpacingY)); + agendaItem->resize(int((X + 1) * d->mGridSpacingX) + -int(X * d->mGridSpacingX), + int(YTop * d->mGridSpacingY) + -int((YBottom + 1) * d->mGridSpacingY)); agendaItem->setCellXY(X, YTop, YBottom); agendaItem->setCellXRight(X); agendaItem->setResourceColor(d->mCalendar->resourceColor(incidence)); @@ -1769,8 +1805,9 @@ AgendaItem::QPtr Agenda::insertItem(const KCalCore::I= ncidence::Ptr &incidence, c /* Insert all-day AgendaItem into agenda. */ -AgendaItem::QPtr Agenda::insertAllDayItem(const KCalCore::Incidence::Ptr &= incidence, const QDateTime &recurrenceId, - int XBegin, int XEnd, bool isSelected) +AgendaItem::QPtr Agenda::insertAllDayItem(const KCalCore::Incidence::Ptr &= incidence, + const QDateTime &recurrenceId, i= nt XBegin, int XEnd, + bool isSelected) { if (!d->mAllDayMode) { qCCritical(CALENDARVIEW_LOG) << "using this in non all-day mode is= illegal."; @@ -1788,8 +1825,8 @@ AgendaItem::QPtr Agenda::insertAllDayItem(const KCalC= ore::Incidence::Ptr &incide agendaItem->setCellXRight(XEnd); = const double startIt =3D d->mGridSpacingX * (agendaItem->cellXLeft()); - const double endIt =3D d->mGridSpacingX * (agendaItem->cellWidth() + - agendaItem->cellXLeft()); + const double endIt =3D d->mGridSpacingX * (agendaItem->cellWidth() + +agendaItem->cellXLeft()); = agendaItem->resize(int(endIt) - int(startIt), int(d->mGridSpacingY)); = @@ -1806,7 +1843,8 @@ AgendaItem::QPtr Agenda::insertAllDayItem(const KCalC= ore::Incidence::Ptr &incide } = AgendaItem::QPtr Agenda::createAgendaItem(const KCalCore::Incidence::Ptr &= incidence, int itemPos, - int itemCount, const QDateTime &recurrenceId, bool isSelected) + int itemCount, const QDateTime &= recurrenceId, + bool isSelected) { if (!incidence) { qCWarning(CALENDARVIEW_LOG) << "Agenda::createAgendaItem() item is= invalid."; @@ -1814,7 +1852,8 @@ AgendaItem::QPtr Agenda::createAgendaItem(const KCalC= ore::Incidence::Ptr &incide } = AgendaItem::QPtr agendaItem =3D new AgendaItem(d->mAgendaView, d->mCal= endar, incidence, - itemPos, itemCount, recurrenceId, isSelected, this); + itemPos, itemCount, recur= renceId, isSelected, + this); = connect(agendaItem.data(), &AgendaItem::removeAgendaItem, this, &Agend= a::removeAgendaItem); connect(agendaItem.data(), &AgendaItem::showAgendaItem, this, &Agenda:= :showAgendaItem); @@ -1824,8 +1863,8 @@ AgendaItem::QPtr Agenda::createAgendaItem(const KCalC= ore::Incidence::Ptr &incide return agendaItem; } = -void Agenda::insertMultiItem(const KCalCore::Incidence::Ptr &event, const = QDateTime &recurrenceId, int XBegin, - int XEnd, int YTop, int YBottom, bool isSelec= ted) +void Agenda::insertMultiItem(const KCalCore::Incidence::Ptr &event, const = QDateTime &recurrenceId, + int XBegin, int XEnd, int YTop, int YBottom, = bool isSelected) { KCalCore::Event::Ptr ev =3D CalendarSupport::event(event); Q_ASSERT(ev); @@ -1859,7 +1898,8 @@ void Agenda::insertMultiItem(const KCalCore::Incidenc= e::Ptr &event, const QDateT newtext =3D QStringLiteral("(%1/%2): ").arg(count).arg(width); newtext.append(ev->summary()); = - current =3D insertItem(event, recurrenceId, cellX, cellYTop, c= ellYBottom, count, width, isSelected); + current =3D insertItem(event, recurrenceId, cellX, cellYTop, c= ellYBottom, count, width, + isSelected); Q_ASSERT(current); current->setText(newtext); multiItems.append(current); @@ -1893,7 +1933,8 @@ void Agenda::insertMultiItem(const KCalCore::Incidenc= e::Ptr &event, const QDateT void Agenda::removeIncidence(const KCalCore::Incidence::Ptr &incidence) { if (!incidence) { - qCWarning(CALENDARVIEW_LOG) << "Agenda::removeIncidence() incidenc= e is invalid" << incidence->uid(); + qCWarning(CALENDARVIEW_LOG) << "Agenda::removeIncidence() incidenc= e is invalid" + << incidence->uid(); return; } = @@ -1913,7 +1954,8 @@ void Agenda::removeIncidence(const KCalCore::Incidenc= e::Ptr &incidence) continue; } if (removeAgendaItem(agendaItem)) { - qCWarning(CALENDARVIEW_LOG) << "Agenda::removeIncidence() = Failed to remove " << incidence->uid(); + qCWarning(CALENDARVIEW_LOG) << "Agenda::removeIncidence() = Failed to remove " + << incidence->uid(); } } } @@ -2231,13 +2273,13 @@ void Agenda::calculateWorkingHours() d->mWorkingHoursEnable =3D !d->mAllDayMode; = QTime tmp =3D d->preferences()->workingHoursStart().time(); - d->mWorkingHoursYTop =3D int(4 * d->mGridSpacingY * - (tmp.hour() + tmp.minute() / 60. + - tmp.second() / 3600.)); + d->mWorkingHoursYTop =3D int(4 * d->mGridSpacingY + *(tmp.hour() + tmp.minute() / 60. + +tmp.second() / 3600.)); tmp =3D d->preferences()->workingHoursEnd().time(); - d->mWorkingHoursYBottom =3D int(4 * d->mGridSpacingY * - (tmp.hour() + tmp.minute() / 60. + - tmp.second() / 3600.) - 1); + d->mWorkingHoursYBottom =3D int(4 * d->mGridSpacingY + *(tmp.hour() + tmp.minute() / 60. + +tmp.second() / 3600.) - 1); } = void Agenda::setDateList(const KCalCore::DateList &selectedDates) @@ -2295,8 +2337,8 @@ AgendaItem::List Agenda::agendaItems(const QString &u= id) const return d->mAgendaItemsById.values(uid); } = -AgendaScrollArea::AgendaScrollArea(bool isAllDay, AgendaView *agendaView, - bool isInteractive, QWidget *parent) +AgendaScrollArea::AgendaScrollArea(bool isAllDay, AgendaView *agendaView, = bool isInteractive, + QWidget *parent) : QScrollArea(parent) { if (isAllDay) { @@ -2322,4 +2364,3 @@ Agenda *AgendaScrollArea::agenda() const { return mAgenda; } - diff --git a/src/agenda/agenda.h b/src/agenda/agenda.h index 54ff2d4..dc64608 100644 --- a/src/agenda/agenda.h +++ b/src/agenda/agenda.h @@ -36,14 +36,11 @@ #include #include = -namespace Akonadi -{ +namespace Akonadi { class IncidenceChanger; } = -namespace EventViews -{ - +namespace EventViews { class Agenda; class AgendaItem; class AgendaView; @@ -68,8 +65,8 @@ class EVENTVIEWS_EXPORT Agenda : public QWidget { Q_OBJECT public: - Agenda(AgendaView *agendaView, QScrollArea *scrollArea, - int columns, int rows, int rowSize, bool isInteractive); + Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int columns, i= nt rows, int rowSize, + bool isInteractive); = Agenda(AgendaView *agendaView, QScrollArea *scrollArea, int columns, b= ool isInteractive); = @@ -123,14 +120,16 @@ public: = void setStartTime(const QTime &startHour); = - AgendaItem::QPtr insertItem(const KCalCore::Incidence::Ptr &incidence,= const QDateTime &recurrenceId, int X, int YTop, - int YBottom, int itemPos, int itemCount, b= ool isSelected); + AgendaItem::QPtr insertItem(const KCalCore::Incidence::Ptr &incidence, + const QDateTime &recurrenceId, int X, int = YTop, int YBottom, + int itemPos, int itemCount, bool isSelecte= d); = - AgendaItem::QPtr insertAllDayItem(const KCalCore::Incidence::Ptr &even= t, const QDateTime &recurrenceId, int XBegin, - int XEnd, bool isSelected); + AgendaItem::QPtr insertAllDayItem(const KCalCore::Incidence::Ptr &even= t, + const QDateTime &recurrenceId, int X= Begin, int XEnd, + bool isSelected); = - void insertMultiItem(const KCalCore::Incidence::Ptr &event, const QDat= eTime &recurrenceId, int XBegin, int XEnd, - int YTop, int YBottom, bool isSelected); + void insertMultiItem(const KCalCore::Incidence::Ptr &event, const QDat= eTime &recurrenceId, + int XBegin, int XEnd, int YTop, int YBottom, bool= isSelected); = /** Removes an event and all its multi-items from the agenda. This funct= ion @@ -271,7 +270,8 @@ protected: @param pos The current mouse position @param item The affected item */ - MouseActionType isInResizeArea(bool horizontal, const QPoint &pos, con= st AgendaItem::QPtr &item); + MouseActionType isInResizeArea(bool horizontal, const QPoint &pos, + const AgendaItem::QPtr &item); /** Return whether the cell specified by the grid point belongs to the= current select */ bool ptInSelection(const QPoint &gpos) const; @@ -351,10 +351,7 @@ public: = private: Agenda *mAgenda =3D nullptr; - }; - } = #endif - diff --git a/src/agenda/agendaitem.cpp b/src/agenda/agendaitem.cpp index 9bd0877..0864090 100644 --- a/src/agenda/agendaitem.cpp +++ b/src/agenda/agendaitem.cpp @@ -68,11 +68,17 @@ QPixmap *AgendaItem::eventPxmp =3D nullptr; //------------------------------------------------------------------------= ----- = AgendaItem::AgendaItem(EventView *eventView, const MultiViewCalendar::Ptr = &calendar, - const KCalCore::Incidence::Ptr &item, - int itemPos, int itemCount, + const KCalCore::Incidence::Ptr &item, int itemPos, = int itemCount, const QDateTime &qd, bool isSelected, QWidget *pare= nt) - : QWidget(parent), mEventView(eventView), mCalendar(calendar), mIncide= nce(item), - mOccurrenceDateTime(qd), mValid(true), mCloned(false), mSelected(isS= elected), mSpecialEvent(false) + : QWidget(parent) + , mEventView(eventView) + , mCalendar(calendar) + , mIncidence(item) + , mOccurrenceDateTime(qd) + , mValid(true) + , mCloned(false) + , mSelected(isSelected) + , mSpecialEvent(false) { if (!mIncidence) { mValid =3D false; @@ -80,12 +86,14 @@ AgendaItem::AgendaItem(EventView *eventView, const Mult= iViewCalendar::Ptr &calen } = mIncidence =3D Incidence::Ptr(mIncidence->clone()); - if (mIncidence->customProperty("KABC", "BIRTHDAY") =3D=3D QLatin1Strin= g("YES") || - mIncidence->customProperty("KABC", "ANNIVERSARY") =3D=3D QLati= n1String("YES")) { - const int years =3D EventViews::yearDiff(mIncidence->dtStart().dat= e(), qd.toLocalTime().date()); + if (mIncidence->customProperty("KABC", "BIRTHDAY") =3D=3D QLatin1Strin= g("YES") + || mIncidence->customProperty("KABC", "ANNIVERSARY") =3D=3D QLatin= 1String("YES")) { + const int years + =3D EventViews::yearDiff(mIncidence->dtStart().date(), qd.toLo= calTime().date()); if (years > 0) { mIncidence->setReadOnly(false); - mIncidence->setSummary(i18np("%2 (1 year)", "%2 (%1 years)", y= ears, mIncidence->summary())); + mIncidence->setSummary(i18np("%2 (1 year)", "%2 (%1 years)", y= ears, + mIncidence->summary())); mIncidence->setReadOnly(true); mCloned =3D true; } @@ -137,8 +145,8 @@ void AgendaItem::updateIcons() mIconGroupTent =3D false; mIconOrganizer =3D true; } else { - KCalCore::Attendee::Ptr me =3D - mIncidence->attendeeByMails(mEventView->kcalPreferences()-= >allEmails()); + KCalCore::Attendee::Ptr me + =3D mIncidence->attendeeByMails(mEventView->kcalPreference= s()->allEmails()); = if (me) { if (me->status() =3D=3D KCalCore::Attendee::NeedsAction &&= me->RSVP()) { @@ -386,7 +394,7 @@ AgendaItem::QPtr AgendaItem::removeMoveItem(const Agend= aItem::QPtr &e) last->setMultiItem(last->firstMultiItem(), last->prevMultiItem= (), nullptr, nullptr); } = - AgendaItem::QPtr tmp =3D first; + AgendaItem::QPtr tmp =3D first; if (first =3D=3D last) { delete mMultiItemInfo; tmp =3D nullptr; @@ -502,7 +510,8 @@ void AgendaItem::resetMovePrivate() mMultiItemInfo->mNextMultiItem =3D nullptr; } = - if (mStartMoveInfo->mFirstMultiItem =3D=3D nullptr && mStartMo= veInfo->mLastMultiItem =3D=3D nullptr) { + if (mStartMoveInfo->mFirstMultiItem =3D=3D nullptr + && mStartMoveInfo->mLastMultiItem =3D=3D nullptr) { // it was a single-day event before we started the move. delete mMultiItemInfo; mMultiItemInfo =3D nullptr; @@ -685,7 +694,8 @@ QList &AgendaItem::conflictItems() void AgendaItem::setConflictItems(const QList &ci) { mConflictItems =3D ci; - for (QList::iterator it =3D mConflictItems.begin(), = end(mConflictItems.end()); it !=3D end; ++it) { + for (QList::iterator it =3D mConflictItems.begin(), = end(mConflictItems.end()); + it !=3D end; ++it) { (*it)->addConflictItem(this); } } @@ -715,8 +725,8 @@ bool AgendaItem::overlaps(CellItem *o) const return false; } = -static void conditionalPaint(QPainter *p, bool condition, int &x, int y, - int ft, const QPixmap &pxmp) +static void conditionalPaint(QPainter *p, bool condition, int &x, int y, i= nt ft, + const QPixmap &pxmp) { if (condition) { p->drawPixmap(x, y, pxmp); @@ -729,7 +739,7 @@ void AgendaItem::paintIcon(QPainter *p, int &x, int y, = int ft) QString iconName; if (mIncidence->customProperty("KABC", "ANNIVERSARY") =3D=3D QLatin1St= ring("YES")) { mSpecialEvent =3D true; - iconName =3D QStringLiteral("view-calendar-wedding-anniversary"); + iconName =3D QStringLiteral("view-calendar-wedding-anniversary"); } else if (mIncidence->customProperty("KABC", "BIRTHDAY") =3D=3D QLati= n1String("YES")) { mSpecialEvent =3D true; // We don't draw icon. The icon is drawn already, because it's the= Akonadi::Collection's icon @@ -750,7 +760,8 @@ void AgendaItem::paintIcons(QPainter *p, int &x, int y,= int ft) = if (icons.contains(EventViews::EventView::CalendarCustomIcon)) { const QString iconName =3D mCalendar->iconForIncidence(mIncidence); - if (!iconName.isEmpty() && iconName !=3D QLatin1String("view-calen= dar") && iconName !=3D QLatin1String("office-calendar")) { + if (!iconName.isEmpty() && iconName !=3D QLatin1String("view-calen= dar") + && iconName !=3D QLatin1String("office-calendar")) { conditionalPaint(p, true, x, y, ft, QIcon::fromTheme(iconName)= .pixmap(16, 16)); } } @@ -819,19 +830,26 @@ void AgendaItem::paintEvent(QPaintEvent *ev) // Also look at #17984 = if (!alarmPxmp) { - alarmPxmp =3D new QPixmap(QIcon::fromTheme(QStringLiteral("tas= k-reminder")).pixmap(16, 16)); - recurPxmp =3D new QPixmap(QIcon::fromTheme(QStringLiteral("app= ointment-recurring")).pixmap(16, 16)); - readonlyPxmp =3D new QPixmap(QIcon::fromTheme(QStringLiteral("obj= ect-locked")).pixmap(16, 16)); - replyPxmp =3D new QPixmap(QIcon::fromTheme(QStringLiteral("mai= l-reply-sender")).pixmap(16, 16)); - groupPxmp =3D new QPixmap(QIcon::fromTheme(QStringLiteral("mee= ting-attending")).pixmap(16, 16)); - groupPxmpTent =3D new QPixmap(QIcon::fromTheme(QStringLiteral("mee= ting-attending-tentative")).pixmap(16, 16)); - organizerPxmp =3D new QPixmap(QIcon::fromTheme(QStringLiteral("mee= ting-organizer")).pixmap(16, 16)); + alarmPxmp =3D new QPixmap(QIcon::fromTheme(QStringLiteral("task-re= minder")).pixmap(16, 16)); + recurPxmp + =3D new QPixmap(QIcon::fromTheme(QStringLiteral("appointment-r= ecurring")).pixmap(16, 16)); + readonlyPxmp + =3D new QPixmap(QIcon::fromTheme(QStringLiteral("object-locked= ")).pixmap(16, 16)); + replyPxmp + =3D new QPixmap(QIcon::fromTheme(QStringLiteral("mail-reply-se= nder")).pixmap(16, 16)); + groupPxmp + =3D new QPixmap(QIcon::fromTheme(QStringLiteral("meeting-atten= ding")).pixmap(16, 16)); + groupPxmpTent =3D new QPixmap(QIcon::fromTheme(QStringLiteral( + "meeting-attendin= g-tentative")).pixmap(16, + = 16)); + organizerPxmp + =3D new QPixmap(QIcon::fromTheme(QStringLiteral("meeting-organ= izer")).pixmap(16, 16)); } = QColor bgColor; = - if (CalendarSupport::hasTodo(mIncidence) && - !mEventView->preferences()->todosUseCategoryColors()) { + if (CalendarSupport::hasTodo(mIncidence) + && !mEventView->preferences()->todosUseCategoryColors()) { Todo::Ptr todo =3D CalendarSupport::todo(mIncidence); Q_ASSERT(todo); const QDate dueDate =3D todo->dtDue().toLocalTime().date(); @@ -851,8 +869,8 @@ void AgendaItem::paintEvent(QPaintEvent *ev) cat =3D categories.first(); } = - categoryColor =3D cat.isEmpty() ? CalendarSupport::KCalPrefs::instance= ()->unsetCategoryColor() : - CalendarSupport::KCalPrefs::instance()->categoryColor(= cat); + categoryColor =3D cat.isEmpty() ? CalendarSupport::KCalPrefs::instance= ()->unsetCategoryColor() + : CalendarSupport::KCalPrefs::instance()->categoryColo= r(cat); = QColor resourceColor =3D mResourceColor; if (!resourceColor.isValid()) { @@ -861,29 +879,33 @@ void AgendaItem::paintEvent(QPaintEvent *ev) = QColor frameColor; // TODO PrefsBase enums should probably be redefined in Prefs - if (mEventView->preferences()->agendaViewColors() =3D=3D PrefsBase::Re= sourceOnly || - mEventView->preferences()->agendaViewColors() =3D=3D PrefsBase= ::CategoryInsideResourceOutside) { + if (mEventView->preferences()->agendaViewColors() =3D=3D PrefsBase::Re= sourceOnly + || mEventView->preferences()->agendaViewColors() + =3D=3D PrefsBase::CategoryInsideResourceOutside) { frameColor =3D bgColor.isValid() ? bgColor : resourceColor; } else { frameColor =3D bgColor.isValid() ? bgColor : categoryColor; } = if (!bgColor.isValid()) { - if (mEventView->preferences()->agendaViewColors() =3D=3D PrefsBase= ::ResourceOnly || - mEventView->preferences()->agendaViewColors() =3D=3D Prefs= Base::ResourceInsideCategoryOutside) { + if (mEventView->preferences()->agendaViewColors() =3D=3D PrefsBase= ::ResourceOnly + || mEventView->preferences()->agendaViewColors() + =3D=3D PrefsBase::ResourceInsideCategoryOutside) { bgColor =3D resourceColor; } else { bgColor =3D categoryColor; } } = - if (cat.isEmpty() && - mEventView->preferences()->agendaViewColors() =3D=3D PrefsBase= ::ResourceInsideCategoryOutside) { + if (cat.isEmpty() + && mEventView->preferences()->agendaViewColors() + =3D=3D PrefsBase::ResourceInsideCategoryOutside) { frameColor =3D bgColor; } = - if (cat.isEmpty() && - mEventView->preferences()->agendaViewColors() =3D=3D PrefsBase= ::CategoryInsideResourceOutside) { + if (cat.isEmpty() + && mEventView->preferences()->agendaViewColors() + =3D=3D PrefsBase::CategoryInsideResourceOutside) { bgColor =3D frameColor; } = @@ -921,25 +943,31 @@ void AgendaItem::paintEvent(QPaintEvent *ev) QString shortH; QString longH; if (!isMultiItem()) { - shortH =3D QLocale().toString(mIncidence->dateTime(KCalCore::Incid= ence::RoleDisplayStart).toLocalTime().time(), QLocale::ShortFormat); + shortH =3D QLocale().toString(mIncidence->dateTime( + KCalCore::Incidence::RoleDisplaySt= art).toLocalTime().time(), + QLocale::ShortFormat); = if (CalendarSupport::hasEvent(mIncidence)) { longH =3D i18n("%1 - %2", shortH, - QLocale().toString(mIncidence->dateTime(KCalCore:= :Incidence::RoleEnd).toLocalTime().time(), QLocale::ShortFormat)); + QLocale().toString(mIncidence->dateTime(KCalCore:= :Incidence::RoleEnd). + toLocalTime().time(), QLocale:= :ShortFormat)); } else { longH =3D shortH; } } else if (!mMultiItemInfo->mFirstMultiItem) { - shortH =3D QLocale().toString(mIncidence->dtStart().toLocalTime().= time(), QLocale::ShortFormat); + shortH + =3D QLocale().toString(mIncidence->dtStart().toLocalTime().tim= e(), QLocale::ShortFormat); longH =3D shortH; } else { - shortH =3D QLocale().toString(mIncidence->dateTime(KCalCore::Incid= ence::RoleEnd).toLocalTime().time(), QLocale::ShortFormat); + shortH =3D QLocale().toString(mIncidence->dateTime( + KCalCore::Incidence::RoleEnd).toLo= calTime().time(), + QLocale::ShortFormat); longH =3D i18n("- %1", shortH); } = KWordWrap ww =3D KWordWrap::formatText( - fm, QRect(0, 0, width() - (2 * margin), -1), 0, mLa= belText); + fm, QRect(0, 0, width() - (2 * margin), -1), 0, mLabelText); int th =3D ww.boundingRect().height(); = int hlHeight =3D qMax(fm.boundingRect(longH).height(), @@ -948,7 +976,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev) qMax(readonlyPxmp->height(), qMax(replyPxmp->height(), qMax(groupPxmp->height(), - organizerPxmp->height(= ))))))); + organizerPxmp->height()))= )))); = const bool completelyRenderable =3D th < (height() - 2 * ft - 2 - hlHe= ight); = @@ -959,7 +987,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev) if ( //( singleLineHeight > height() - 4 ) || (width() < 16)) { int x =3D qRound((width() - 16) / 2.0); - paintIcon(&p, x/*by-ref*/, margin, ft); + paintIcon(&p, x /*by-ref*/, margin, ft); return; } = @@ -969,11 +997,11 @@ void AgendaItem::paintEvent(QPaintEvent *ev) = if (mIncidence->allDay()) { x +=3D visRect.left(); - const int y =3D qRound((height() - 16) / 2.0); + const int y =3D qRound((height() - 16) / 2.0); paintIcons(&p, x, y, ft); txtWidth =3D visRect.right() - margin - x; } else { - const int y =3D qRound((height() - 16) / 2.0); + const int y =3D qRound((height() - 16) / 2.0); paintIcons(&p, x, y, ft); txtWidth =3D width() - margin - x; } @@ -985,9 +1013,9 @@ void AgendaItem::paintEvent(QPaintEvent *ev) = // case 3: enough for 2-5 lines, but not for the header. // Also used for the middle days in multi-events - if (((!completelyRenderable) && - ((height() - (2 * margin)) <=3D (5 * singleLineHeight))) || - (isMultiItem() && mMultiItemInfo->mNextMultiItem && mMultiItem= Info->mFirstMultiItem)) { + if (((!completelyRenderable) + && ((height() - (2 * margin)) <=3D (5 * singleLineHeight))) + || (isMultiItem() && mMultiItemInfo->mNextMultiItem && mMultiItemI= nfo->mFirstMultiItem)) { int x =3D margin, txtWidth; = if (mIncidence->allDay()) { @@ -1000,7 +1028,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev) } = ww =3D KWordWrap::formatText( - fm, QRect(0, 0, txtWidth, (height() - (2 * margin))), 0, = mLabelText); + fm, QRect(0, 0, txtWidth, (height() - (2 * margin))), 0, mLabe= lText); = ww.drawText(&p, x, margin, Qt::AlignHCenter | KWordWrap::FadeOut); return; @@ -1022,16 +1050,18 @@ void AgendaItem::paintEvent(QPaintEvent *ev) if (const KCalCore::Event::Ptr event =3D CalendarSupport::event(mI= ncidence)) { if (event->isMultiDay(QTimeZone::systemTimeZone())) { // multi-day, all-day event - shortH =3D - i18n("%1 - %2", - QLocale().toString(mIncidence->dtStart().toLocalT= ime().date()), - QLocale().toString(mIncidence->dateTime(KCalCore:= :Incidence::RoleEnd).toLocalTime().date())); + shortH + =3D i18n("%1 - %2", + QLocale().toString(mIncidence->dtStart().toLoca= lTime().date()), + QLocale().toString(mIncidence->dateTime(KCalCor= e::Incidence::RoleEnd). + toLocalTime().date())); longH =3D shortH; = // paint headline drawRoundedRect( &p, - QRect(fmargin, fmargin, width() - fmargin * 2, - fmarg= in * 2 + margin + hlHeight), + QRect(fmargin, fmargin, + width() - fmargin * 2, -fmargin * 2 + margin + h= lHeight), mSelected, frameColor, false, ft, roundTop, false); } else { // single-day, all-day event @@ -1039,7 +1069,8 @@ void AgendaItem::paintEvent(QPaintEvent *ev) // paint headline drawRoundedRect( &p, - QRect(fmargin, fmargin, width() - fmargin * 2, - fmarg= in * 2 + margin + hlHeight), + QRect(fmargin, fmargin, + width() - fmargin * 2, -fmargin * 2 + margin + h= lHeight), mSelected, frameColor, false, ft, roundTop, false); } } else { @@ -1048,7 +1079,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev) // paint headline drawRoundedRect( &p, - QRect(fmargin, fmargin, width() - fmargin * 2, - fmargin *= 2 + margin + hlHeight), + QRect(fmargin, fmargin, width() - fmargin * 2, -fmargin * = 2 + margin + hlHeight), mSelected, frameColor, false, ft, roundTop, false); } = @@ -1061,7 +1092,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev) // paint headline drawRoundedRect( &p, - QRect(fmargin, fmargin, width() - fmargin * 2, - fmargin * 2 += margin + hlHeight), + QRect(fmargin, fmargin, width() - fmargin * 2, -fmargin * 2 + = margin + hlHeight), mSelected, frameColor, false, ft, roundTop, false); = txtWidth =3D width() - margin - x; @@ -1089,7 +1120,7 @@ void AgendaItem::paintEvent(QPaintEvent *ev) = // draw event text ww =3D KWordWrap::formatText( - fm, QRect(0, 0, txtWidth, height() - margin - y), 0, mLabelTe= xt); + fm, QRect(0, 0, txtWidth, height() - margin - y), 0, mLabelText); = p.setBackground(QBrush(bgColor)); p.setPen(textColor); @@ -1100,12 +1131,10 @@ void AgendaItem::paintEvent(QPaintEvent *ev) ww.drawText(&p, eventX + (txtWidth - ww.boundingRect().width() - 2= * margin) / 2, y, Qt::AlignHCenter | KWordWrap::FadeOut); } - } = -void AgendaItem::drawRoundedRect(QPainter *p, const QRect &rect, - bool selected, const QColor &bgColor, - bool frame, int ft, bool roundTop, +void AgendaItem::drawRoundedRect(QPainter *p, const QRect &rect, bool sele= cted, + const QColor &bgColor, bool frame, int ft= , bool roundTop, bool roundBottom) { Q_UNUSED(ft); @@ -1190,9 +1219,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const Q= Rect &rect, QLinearGradient gradient(QPointF(r.x(), r.y()), QPointF(r.x(), r.heigh= t())); = if (r.height() > 50) { - if (mIncidence->allDay() && - mIncidence->dtStart() =3D=3D mIncidence->dateTime(KCalCore= ::Incidence::RoleEnd) && - CalendarSupport::hasEvent(mIncidence)) { + if (mIncidence->allDay() + && mIncidence->dtStart() =3D=3D mIncidence->dateTime(KCalCore:= :Incidence::RoleEnd) + && CalendarSupport::hasEvent(mIncidence)) { gradient.setColorAt(0, bgColor.lighter(130)); qreal t =3D 1.0 - (r.height() - 18.0) / r.height(); gradient.setColorAt(t, bgColor.lighter(115)); @@ -1205,9 +1234,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const Q= Rect &rect, } gradient.setColorAt(1, bgColor.darker(110)); } else { - if (mIncidence->allDay() && - mIncidence->dtStart() =3D=3D mIncidence->dateTime(KCalCore= ::Incidence::RoleEnd) && - !CalendarSupport::hasTodo(mIncidence)) { + if (mIncidence->allDay() + && mIncidence->dtStart() =3D=3D mIncidence->dateTime(KCalCore:= :Incidence::RoleEnd) + && !CalendarSupport::hasTodo(mIncidence)) { gradient.setColorAt(0, bgColor.lighter(130)); gradient.setColorAt(0.35, bgColor.lighter(115)); gradient.setColorAt(0.65, bgColor); @@ -1244,11 +1273,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const = QRect &rect, p->setBrushOrigin(r.x() + 8, r.y() + r.height() - 6); p->fillRect(QRect(r.x() + 8, r.y() + r.height() - 6, r.width() - 1= 6, 6), QBrush(bottomLines)); - } = if (r.height() - 16 > 0) { - QPixmap leftLines; QString key(QStringLiteral("ko_l")); if (!QPixmapCache::find(key, leftLines)) { @@ -1285,7 +1312,9 @@ void AgendaItem::drawRoundedRect(QPainter *p, const Q= Rect &rect, QPixmap topLeft; QString key =3D roundTop ? QStringLiteral("ko_tl") : QStringLiteral("k= o_rtl"); if (!QPixmapCache::find(key, topLeft)) { - topLeft =3D roundTop ? QPixmap(QStringLiteral(":/roundTopLeft.png"= )) : QPixmap(QStringLiteral(":/rectangularTopLeft.png")); + topLeft + =3D roundTop ? QPixmap(QStringLiteral(":/roundTopLeft.png")) := QPixmap(QStringLiteral( + = ":/rectangularTopLeft.png")); QPixmapCache::insert(key, topLeft); } p->drawPixmap(r.x(), r.y(), topLeft, 0, 0, lw, th); @@ -1293,7 +1322,8 @@ void AgendaItem::drawRoundedRect(QPainter *p, const Q= Rect &rect, QPixmap topRight; key =3D roundTop ? QStringLiteral("ko_tr") : QStringLiteral("ko_rtr"); if (!QPixmapCache::find(key, topRight)) { - topRight =3D roundTop ? QPixmap(QStringLiteral(":/roundTopRight.pn= g")) : QPixmap(QStringLiteral(":/rectangularTopRight.png")); + topRight =3D roundTop ? QPixmap(QStringLiteral(":/roundTopRight.pn= g")) : QPixmap(QStringLiteral( + = ":/rectangularTopRight.png")); QPixmapCache::insert(key, topRight); } p->drawPixmap(r.x() + r.width() - rw, r.y(), topRight, 8 - rw, 0, rw, = th); @@ -1301,8 +1331,8 @@ void AgendaItem::drawRoundedRect(QPainter *p, const Q= Rect &rect, QPixmap bottomLeft; key =3D roundBottom ? QStringLiteral("ko_bl") : QStringLiteral("ko_rbl= "); if (!QPixmapCache::find(key, bottomLeft)) { - bottomLeft =3D roundBottom ? QPixmap(QStringLiteral(":/roundBottom= Left.png")) : - QPixmap(QStringLiteral(":/rectangularBottomLeft.png")= ); + bottomLeft =3D roundBottom ? QPixmap(QStringLiteral(":/roundBottom= Left.png")) + : QPixmap(QStringLiteral(":/rectangularBottomLeft.png= ")); QPixmapCache::insert(key, bottomLeft); } p->drawPixmap(r.x(), r.y() + r.height() - bh, bottomLeft, 0, 8 - bh, l= w, bh); @@ -1310,8 +1340,8 @@ void AgendaItem::drawRoundedRect(QPainter *p, const Q= Rect &rect, QPixmap bottomRight; key =3D roundBottom ? QStringLiteral("ko_br") : QStringLiteral("ko_rbr= "); if (!QPixmapCache::find(key, bottomRight)) { - bottomRight =3D roundBottom ? QPixmap(QStringLiteral(":/roundBotto= mRight.png")) : - QPixmap(QStringLiteral(":/rectangularBottomRight.png= ")); + bottomRight =3D roundBottom ? QPixmap(QStringLiteral(":/roundBotto= mRight.png")) + : QPixmap(QStringLiteral(":/rectangularBottomRight.p= ng")); QPixmapCache::insert(key, bottomRight); } p->drawPixmap(r.x() + r.width() - rw, r.y() + r.height() - bh, bottomR= ight, @@ -1347,4 +1377,3 @@ bool AgendaItem::event(QEvent *event) } return QWidget::event(event); } - diff --git a/src/agenda/agendaitem.h b/src/agenda/agendaitem.h index f52468d..08f0198 100644 --- a/src/agenda/agendaitem.h +++ b/src/agenda/agendaitem.h @@ -34,9 +34,7 @@ #include #include = -namespace EventViews -{ - +namespace EventViews { class AgendaItem; class EventView; = @@ -83,14 +81,9 @@ public: typedef QPointer QPtr; typedef QList List; = - AgendaItem(EventView *eventView, - const MultiViewCalendar::Ptr &calendar, - const KCalCore::Incidence::Ptr &incidence, - int itemPos, - int itemCount, - const QDateTime &qd, - bool isSelected, - QWidget *parent); + AgendaItem(EventView *eventView, const MultiViewCalendar::Ptr &calenda= r, + const KCalCore::Incidence::Ptr &incidence, int itemPos, int= itemCount, + const QDateTime &qd, bool isSelected, QWidget *parent); ~AgendaItem(); = int cellXLeft() const @@ -286,8 +279,7 @@ private: // paint all visible icons void paintIcons(QPainter *p, int &x, int y, int ft); = - void drawRoundedRect(QPainter *p, const QRect &rect, - bool selected, const QColor &bgcolor, + void drawRoundedRect(QPainter *p, const QRect &rect, bool selected, co= nst QColor &bgcolor, bool frame, int ft, bool roundTop, bool roundBott= om); = int mCellXLeft, mCellXRight; @@ -326,7 +318,6 @@ private: static QPixmap *todoPxmp; static QPixmap *completedPxmp; }; - } = #endif diff --git a/src/agenda/agendaview.cpp b/src/agenda/agendaview.cpp index 1497462..1f56e0c 100644 --- a/src/agenda/agendaview.cpp +++ b/src/agenda/agendaview.cpp @@ -77,7 +77,9 @@ class Q_DECL_HIDDEN EventIndicator::Private = public: Private(EventIndicator *parent, EventIndicator::Location loc) - : q(parent), mColumns(1), mLocation(loc) + : q(parent) + , mColumns(1) + , mLocation(loc) { mEnabled.resize(mColumns); = @@ -103,9 +105,9 @@ public: rect.setWidth(q->parentWidget()->width()); rect.setHeight(q->height()); rect.setLeft(0); - rect.setTop(mLocation =3D=3D EventIndicator::Top ? - 0 : - q->parentWidget()->height() - rect.height()); + rect.setTop(mLocation =3D=3D EventIndicator::Top + ? 0 + : q->parentWidget()->height() - rect.height()); q->setGeometry(rect); } = @@ -117,7 +119,8 @@ public: }; = EventIndicator::EventIndicator(Location loc, QWidget *parent) - : QFrame(parent), d(new Private(this, loc)) + : QFrame(parent) + , d(new Private(this, loc)) { setAttribute(Qt::WA_TransparentForMouseEvents); setFixedHeight(d->mPixmap.height()); @@ -177,26 +180,26 @@ class AgendaView::Private : public Akonadi::ETMCalend= ar::CalendarObserver = public: explicit Private(AgendaView *parent, bool isInteractive, bool isSideBy= Side) - : q(parent), - mTopDayLabels(nullptr), - mLayoutTopDayLabels(nullptr), - mTopDayLabelsFrame(nullptr), - mLayoutBottomDayLabels(nullptr), - mBottomDayLabels(nullptr), - mBottomDayLabelsFrame(nullptr), - mTimeBarHeaderFrame(nullptr), - mAllDayAgenda(nullptr), - mAgenda(nullptr), - mTimeLabelsZone(nullptr), - mAllowAgendaUpdate(true), - mUpdateItem(0), - mIsSideBySide(isSideBySide), - mDummyAllDayLeft(nullptr), - mUpdateAllDayAgenda(true), - mUpdateAgenda(true), - mIsInteractive(isInteractive), - mUpdateEventIndicatorsScheduled(false), - mViewCalendar(MultiViewCalendar::Ptr(new MultiViewCalendar())) + : q(parent) + , mTopDayLabels(nullptr) + , mLayoutTopDayLabels(nullptr) + , mTopDayLabelsFrame(nullptr) + , mLayoutBottomDayLabels(nullptr) + , mBottomDayLabels(nullptr) + , mBottomDayLabelsFrame(nullptr) + , mTimeBarHeaderFrame(nullptr) + , mAllDayAgenda(nullptr) + , mAgenda(nullptr) + , mTimeLabelsZone(nullptr) + , mAllowAgendaUpdate(true) + , mUpdateItem(0) + , mIsSideBySide(isSideBySide) + , mDummyAllDayLeft(nullptr) + , mUpdateAllDayAgenda(true) + , mUpdateAgenda(true) + , mIsInteractive(isInteractive) + , mUpdateEventIndicatorsScheduled(false) + , mViewCalendar(MultiViewCalendar::Ptr(new MultiViewCalendar())) { mViewCalendar->mAgendaView =3D q; mViewCalendar->setETMCalendar(q->calendar()); @@ -257,9 +260,8 @@ public: bool makesWholeDayBusy(const KCalCore::Incidence::Ptr &incidence) cons= t; CalendarDecoration::Decoration *loadCalendarDecoration(const QString &= name); void clearView(); - void setChanges(EventView::Changes changes, - const KCalCore::Incidence::Ptr &incidence =3D - KCalCore::Incidence::Ptr()); + void setChanges(EventView::Changes changes, const KCalCore::Incidence:= :Ptr &incidence + =3D KCalCore::Incidence::Ptr()); = /** Returns a list of consecutive dates, starting with @p start and en= ding @@ -292,18 +294,20 @@ protected: /* reimplemented from KCalCore::Calendar::CalendarObserver */ void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence)= override; void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &incidenc= e) override; - void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidenc= e, const KCalCore::Calendar *calendar) override; + void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidenc= e, + const KCalCore::Calendar *calendar) over= ride; private: //quiet --overloaded-virtual warning using KCalCore::Calendar::CalendarObserver::calendarIncidenceDeleted; }; = -bool AgendaView::Private::datesEqual(const KCalCore::Incidence::Ptr &one, = const KCalCore::Incidence::Ptr &two) const +bool AgendaView::Private::datesEqual(const KCalCore::Incidence::Ptr &one, + const KCalCore::Incidence::Ptr &two) = const { const auto start1 =3D one->dtStart(); const auto start2 =3D two->dtStart(); - const auto end1 =3D one->dateTime(KCalCore::Incidence::RoleDisplayEn= d); - const auto end2 =3D two->dateTime(KCalCore::Incidence::RoleDisplayEn= d); + const auto end1 =3D one->dateTime(KCalCore::Incidence::RoleDisplayEnd); + const auto end2 =3D two->dateTime(KCalCore::Incidence::RoleDisplayEnd); = if (start1.isValid() ^ start2.isValid()) { return false; @@ -347,7 +351,8 @@ bool AgendaView::Private::mightBeVisible(const KCalCore= ::Incidence::Ptr &inciden = if (!incidence->recurs()) { // If DTEND/DTDUE is before the 1st visible column - if (incidence->dateTime(KCalCore::Incidence::RoleEnd).date().daysT= o(mSelectedDates.first()) > 2) { + if (incidence->dateTime(KCalCore::Incidence::RoleEnd).date().daysT= o(mSelectedDates.first()) + > 2) { return false; } = @@ -381,8 +386,8 @@ QList AgendaView::Private::generateDateList(cons= t QDate &start, const QDa { QList list; = - if (start.isValid() && end.isValid() && end >=3D start && - start.daysTo(end) < AgendaView::MAX_DAY_COUNT) { + if (start.isValid() && end.isValid() && end >=3D start + && start.daysTo(end) < AgendaView::MAX_DAY_COUNT) { QDate date =3D start; list.reserve(start.daysTo(end) + 1); while (date <=3D end) { @@ -412,14 +417,17 @@ void AgendaView::Private::reevaluateIncidence(const K= CalCore::Incidence::Ptr &in void AgendaView::Private::calendarIncidenceAdded(const KCalCore::Incidence= ::Ptr &incidence) { if (!incidence || !mViewCalendar->isValid(incidence)) { - qCCritical(CALENDARVIEW_LOG) << "AgendaView::Private::calendarInci= denceAdded() Invalid incidence or item:" << incidence; + qCCritical(CALENDARVIEW_LOG) + << "AgendaView::Private::calendarIncidenceAdded() Invalid inci= dence or item:" + << incidence; Q_ASSERT(false); return; } = if (incidence->hasRecurrenceId() && mViewCalendar->isValid(incidence))= { // Reevaluate the main event instead, if it was inserted before th= is one - KCalCore::Incidence::Ptr mainIncidence =3D q->calendar2(incidence)= ->incidence(incidence->uid()); + KCalCore::Incidence::Ptr mainIncidence + =3D q->calendar2(incidence)->incidence(incidence->uid()); if (mainIncidence) { reevaluateIncidence(mainIncidence); } @@ -432,14 +440,18 @@ void AgendaView::Private::calendarIncidenceAdded(cons= t KCalCore::Incidence::Ptr void AgendaView::Private::calendarIncidenceChanged(const KCalCore::Inciden= ce::Ptr &incidence) { if (!incidence || incidence->uid().isEmpty()) { - qCCritical(CALENDARVIEW_LOG) << "AgendaView::calendarIncidenceChan= ged() Invalid incidence or empty UID. " << incidence; + qCCritical(CALENDARVIEW_LOG) + << "AgendaView::calendarIncidenceChanged() Invalid incidence o= r empty UID. " + << incidence; Q_ASSERT(false); return; } = AgendaItem::List agendaItems =3D this->agendaItems(incidence->uid()); if (agendaItems.isEmpty()) { - qCWarning(CALENDARVIEW_LOG) << "AgendaView::calendarIncidenceChang= ed() Invalid agendaItem for incidence " << incidence->uid(); + qCWarning(CALENDARVIEW_LOG) + << "AgendaView::calendarIncidenceChanged() Invalid agendaItem = for incidence " + << incidence->uid(); return; } = @@ -459,7 +471,8 @@ void AgendaView::Private::calendarIncidenceChanged(cons= t KCalCore::Incidence::Pt = if (incidence->hasRecurrenceId() && mViewCalendar->isValid(incidence))= { // Reevaluate the main event instead, if it exists - KCalCore::Incidence::Ptr mainIncidence =3D q->calendar2(incidence)= ->incidence(incidence->uid()); + KCalCore::Incidence::Ptr mainIncidence + =3D q->calendar2(incidence)->incidence(incidence->uid()); reevaluateIncidence(mainIncidence ? mainIncidence : incidence); } else { reevaluateIncidence(incidence); @@ -469,7 +482,8 @@ void AgendaView::Private::calendarIncidenceChanged(cons= t KCalCore::Incidence::Pt // setChanges(q->changes() | IncidencesEdited, incidence); } = -void AgendaView::Private::calendarIncidenceDeleted(const KCalCore::Inciden= ce::Ptr &incidence, const KCalCore::Calendar *calendar) +void AgendaView::Private::calendarIncidenceDeleted(const KCalCore::Inciden= ce::Ptr &incidence, + const KCalCore::Calenda= r *calendar) { Q_UNUSED(calendar); if (!incidence || incidence->uid().isEmpty()) { @@ -484,7 +498,8 @@ void AgendaView::Private::calendarIncidenceDeleted(cons= t KCalCore::Incidence::Pt // Reevaluate the main event, if it exists. The exception was remo= ved so the main recurrent series // will no be bigger. if (mViewCalendar->isValid(incidence->uid())) { - KCalCore::Incidence::Ptr mainIncidence =3D q->calendar2(incide= nce->uid())->incidence(incidence->uid()); + KCalCore::Incidence::Ptr mainIncidence =3D q->calendar2(incide= nce->uid())->incidence( + incidence->uid()); if (mainIncidence) { reevaluateIncidence(mainIncidence); } @@ -498,7 +513,7 @@ void AgendaView::Private::calendarIncidenceDeleted(cons= t KCalCore::Incidence::Pt } = void EventViews::AgendaView::Private::setChanges(EventView::Changes change= s, - const KCalCore::Incidence::Ptr &incidence) + const KCalCore::Incidence= ::Ptr &incidence) { // We could just call EventView::setChanges(...) but we're going to do= a little // optimization. If only an all day item was changed, only all day age= nda @@ -535,8 +550,8 @@ void AgendaView::Private::clearView() } = void AgendaView::Private::insertIncidence(const KCalCore::Incidence::Ptr &= incidence, - const QDateTime &recurrenceId, const QDateTime &insertAtDateTime, - bool createSelected) + const QDateTime &recurrenceId, + const QDateTime &insertAtDateTim= e, bool createSelected) { if (!q->filterByCollectionSelection(incidence)) { return; @@ -575,10 +590,10 @@ void AgendaView::Private::insertIncidence(const KCalC= ore::Incidence::Ptr &incide const int duration =3D event->dtStart().toLocalTime().daysTo(event= ->dtEnd()); if (insertAtDate < firstVisibleDate) { beginX =3D curCol + firstVisibleDate.daysTo(insertAtDate); - endX =3D beginX + duration; + endX =3D beginX + duration; } else { beginX =3D curCol; - endX =3D beginX + duration; + endX =3D beginX + duration; } } else if (todo) { if (!todo->hasDueDate()) { @@ -677,10 +692,10 @@ void AgendaView::Private::insertIncidence(const KCalC= ore::Incidence::Ptr &incide const int halfHour =3D 1800; if (t.addSecs(-halfHour) < t) { startY =3D mAgenda->timeToY(t.addSecs(-halfHour)); - endY =3D mAgenda->timeToY(t) - 1; + endY =3D mAgenda->timeToY(t) - 1; } else { startY =3D 0; - endY =3D mAgenda->timeToY(t.addSecs(halfHour)) - 1; + endY =3D mAgenda->timeToY(t.addSecs(halfHour)) - 1; } } if (endY < startY) { @@ -699,23 +714,18 @@ void AgendaView::Private::insertIncidence(const KCalC= ore::Incidence::Ptr &incide = //////////////////////////////////////////////////////////////////////////= // = -AgendaView::AgendaView(const QDate &start, - const QDate &end, - bool isInteractive, - bool isSideBySide, +AgendaView::AgendaView(const QDate &start, const QDate &end, bool isIntera= ctive, bool isSideBySide, QWidget *parent) - : EventView(parent), d(new Private(this, isInteractive, isSideBySide)) + : EventView(parent) + , d(new Private(this, isInteractive, isSideBySide)) { init(start, end); } = -AgendaView::AgendaView(const PrefsPtr &prefs, - const QDate &start, - const QDate &end, - bool isInteractive, - bool isSideBySide, - QWidget *parent) - : EventView(parent), d(new Private(this, isInteractive, isSideBySide)) +AgendaView::AgendaView(const PrefsPtr &prefs, const QDate &start, const QD= ate &end, + bool isInteractive, bool isSideBySide, QWidget *par= ent) + : EventView(parent) + , d(new Private(this, isInteractive, isSideBySide)) { setPreferences(prefs); init(start, end); @@ -756,7 +766,8 @@ void AgendaView::init(const QDate &start, const QDate &= end) } = // The widget itself - AgendaScrollArea *allDayScrollArea =3D new AgendaScrollArea(true, this= , d->mIsInteractive, d->mAllDayFrame); + AgendaScrollArea *allDayScrollArea =3D new AgendaScrollArea(true, this= , d->mIsInteractive, + d->mAllDayFr= ame); allDayFrameLayout->addWidget(allDayScrollArea); d->mAllDayAgenda =3D allDayScrollArea->agenda(); = @@ -768,7 +779,7 @@ void AgendaView::init(const QDate &start, const QDate &= end) = // Create agenda AgendaScrollArea *scrollArea =3D new AgendaScrollArea(false, this, d->= mIsInteractive, - agendaFrame); + agendaFrame); d->mAgenda =3D scrollArea->agenda(); = // Create event indicator bars @@ -829,7 +840,8 @@ void AgendaView::init(const QDate &start, const QDate &= end) = /* Connect the agendas */ = - connect(d->mAllDayAgenda, &Agenda::newTimeSpanSignal, this, &AgendaVie= w::newTimeSpanSelectedAllDay); + connect(d->mAllDayAgenda, &Agenda::newTimeSpanSignal, this, + &AgendaView::newTimeSpanSelectedAllDay); = connect(d->mAgenda, &Agenda::newTimeSpanSignal, this, &AgendaView::new= TimeSpanSelected); = @@ -916,7 +928,6 @@ void AgendaView::connectAgenda(Agenda *agenda, Agenda *= otherAgenda) SLOT(slotIncidencesDropped(KCalCore::Incidence::List,QPoint,bo= ol))); connect(agenda, SIGNAL(droppedIncidences(QList,QPoint,bool)), SLOT(slotIncidencesDropped(QList,QPoint,bool))); - } = void AgendaView::slotIncidenceSelected(const KCalCore::Incidence::Ptr &inc= idence, const QDate &date) @@ -927,7 +938,8 @@ void AgendaView::slotIncidenceSelected(const KCalCore::= Incidence::Ptr &incidence } } = -void AgendaView::slotShowIncidencePopup(const KCalCore::Incidence::Ptr &in= cidence, const QDate &date) +void AgendaView::slotShowIncidencePopup(const KCalCore::Incidence::Ptr &in= cidence, + const QDate &date) { Akonadi::Item item =3D d->mViewCalendar->item(incidence); //qDebug() << "wanna see the popup for " << incidence->uid() << item.i= d(); @@ -971,12 +983,10 @@ void AgendaView::zoomInVertically() d->mTimeLabelsZone->updateAll(); setChanges(changes() | ZoomChanged); updateView(); - } = void AgendaView::zoomOutVertically() { - if (preferences()->hourSize() > 4 || d->mIsSideBySide) { if (!d->mIsSideBySide) { preferences()->setHourSize(preferences()->hourSize() - 1); @@ -1001,7 +1011,7 @@ void AgendaView::zoomInHorizontally(const QDate &date) ndays =3D begin.daysTo(d->mSelectedDates.last()); = // zoom with Action and are there a selected Incidence?, Yes, I zoom i= n to it. - if (! dateToZoom.isValid()) { + if (!dateToZoom.isValid()) { dateToZoom =3D d->mAgenda->selectedIncidenceDate(); } = @@ -1034,7 +1044,7 @@ void AgendaView::zoomOutHorizontally(const QDate &dat= e) ndays =3D begin.daysTo(d->mSelectedDates.last()); = // zoom with Action and are there a selected Incidence?, Yes, I zoom o= ut to it. - if (! dateToZoom.isValid()) { + if (!dateToZoom.isValid()) { dateToZoom =3D d->mAgenda->selectedIncidenceDate(); } = @@ -1093,8 +1103,7 @@ void AgendaView::zoomView(const int delta, const QPoi= nt &pos, const Qt::Orientat = #ifndef EVENTVIEWS_NODECOS = -bool AgendaView::loadDecorations(const QStringList &decorations, - DecorationList &decoList) +bool AgendaView::loadDecorations(const QStringList &decorations, Decoratio= nList &decoList) { for (const QString &decoName : decorations) { if (preferences()->selectedPlugins().contains(decoName)) { @@ -1107,7 +1116,6 @@ bool AgendaView::loadDecorations(const QStringList &d= ecorations, void AgendaView::placeDecorationsFrame(QFrame *frame, bool decorationsFoun= d, bool isTop) { if (decorationsFound) { - if (isTop) { // inserts in the first position d->mSplitterAgenda->insertWidget(0, frame); @@ -1121,8 +1129,8 @@ void AgendaView::placeDecorationsFrame(QFrame *frame,= bool decorationsFound, boo } } = -void AgendaView::placeDecorations(DecorationList &decoList, const QDate &d= ate, - QWidget *labelBox, bool forWeek) +void AgendaView::placeDecorations(DecorationList &decoList, const QDate &d= ate, QWidget *labelBox, + bool forWeek) { foreach (CalendarDecoration::Decoration *deco, decoList) { CalendarDecoration::Element::List elements; @@ -1165,17 +1173,18 @@ void AgendaView::createDayLabels(bool force) = d->mTopDayLabels =3D new QFrame(d->mTopDayLabelsFrame); d->mTopDayLabelsFrame->layout()->addWidget(d->mTopDayLabels); - static_cast(d->mTopDayLabelsFrame->layout())->setStretchF= actor(d->mTopDayLabels, 1); + static_cast(d->mTopDayLabelsFrame->layout())->setStretch= Factor(d->mTopDayLabels, + = 1); d->mLayoutTopDayLabels =3D new QHBoxLayout(d->mTopDayLabels); d->mLayoutTopDayLabels->setMargin(0); d->mLayoutTopDayLabels->setSpacing(1); = // this spacer moves the day labels over to line up with the day colum= ns - QSpacerItem *spacer =3D - new QSpacerItem((!d->mIsSideBySide ? d->mTimeLabelsZone->width() := 0) + - SPACING + - d->mAllDayAgenda->scrollArea()->frameWidth(), - 1, QSizePolicy::Fixed); + QSpacerItem *spacer + =3D new QSpacerItem((!d->mIsSideBySide ? d->mTimeLabelsZone->width= () : 0) + +SPACING + +d->mAllDayAgenda->scrollArea()->frameWidth(), + 1, QSizePolicy::Fixed); = d->mLayoutTopDayLabels->addSpacerItem(spacer); auto topWeekLabelBox =3D new QFrame(d->mTopDayLabels); @@ -1189,7 +1198,8 @@ void AgendaView::createDayLabels(bool force) = d->mBottomDayLabels =3D new QFrame(d->mBottomDayLabelsFrame); d->mBottomDayLabelsFrame->layout()->addWidget(d->mBottomDayLabels); - static_cast(d->mBottomDayLabelsFrame->layout())->setStret= chFactor(d->mBottomDayLabels, 1); + static_cast(d->mBottomDayLabelsFrame->layout())->setStre= tchFactor( + d->mBottomDayLabels, 1); d->mLayoutBottomDayLabels =3D new QHBoxLayout(d->mBottomDayLabels); d->mLayoutBottomDayLabels->setMargin(0); auto bottomWeekLabelBox =3D new QFrame(d->mBottomDayLabels); @@ -1229,7 +1239,8 @@ void AgendaView::createDayLabels(bool force) date.day()); QString shortstr =3D QString::number(date.day()); = - AlternateLabel *dayLabel =3D new AlternateLabel(shortstr, longstr,= veryLongStr, topDayLabelBox); + AlternateLabel *dayLabel + =3D new AlternateLabel(shortstr, longstr, veryLongStr, topDayL= abelBox); topDayLabelBoxLayout->addWidget(dayLabel); dayLabel->useShortText(); // will be recalculated in updateDayLabe= lSizes() anyway dayLabel->setAlignment(Qt::AlignHCenter); @@ -1244,7 +1255,8 @@ void AgendaView::createDayLabels(bool force) for (const QString &text : texts) { // Compute a small version of the holiday string for Alternate= Label const KWordWrap ww =3D KWordWrap::formatText(fm, topDayLabelBo= x->rect(), 0, text, -1); - AlternateLabel *label =3D new AlternateLabel(ww.truncatedStrin= g(), text, text, topDayLabelBox); + AlternateLabel *label =3D new AlternateLabel( + ww.truncatedString(), text, text, topDayLabelBox); topDayLabelBoxLayout->addWidget(label); label->setAlignment(Qt::AlignCenter); } @@ -1257,7 +1269,7 @@ void AgendaView::createDayLabels(bool force) } = QSpacerItem *rightSpacer =3D new QSpacerItem(d->mAllDayAgenda->scrollA= rea()->frameWidth(), - 1, QSizePolicy::Fixed); + 1, QSizePolicy::Fixed); d->mLayoutTopDayLabels->addSpacerItem(rightSpacer); = #ifndef EVENTVIEWS_NODECOS @@ -1377,10 +1389,10 @@ bool AgendaView::selectedIsSingleCell() const = if (selectedIsAllDay()) { int days =3D selectionStart().daysTo(selectionEnd()); - return (days < 1); + return days < 1; } else { int secs =3D selectionStart().secsTo(selectionEnd()); - return (secs <=3D 24 * 60 * 60 / d->mAgenda->rows()); + return secs <=3D 24 * 60 * 60 / d->mAgenda->rows(); } } = @@ -1421,8 +1433,9 @@ void AgendaView::createTimeBarHeaders() = foreach (QScrollArea *area, d->mTimeLabelsZone->timeLabels()) { TimeLabels *timeLabel =3D static_cast(area->widget()= ); - QLabel *label =3D new QLabel(timeLabel->header().replace(QLatin1Ch= ar('/'), QStringLiteral("/ ")), - d->mTimeBarHeaderFrame); + QLabel *label + =3D new QLabel(timeLabel->header().replace(QLatin1Char('/'), Q= StringLiteral("/ ")), + d->mTimeBarHeaderFrame); d->mTimeBarHeaderFrame->layout()->addWidget(label); label->setFont(labelFont); label->setAlignment(Qt::AlignBottom | Qt::AlignRight); @@ -1502,7 +1515,8 @@ void AgendaView::updateEventDates(AgendaItem *item, b= ool addIncidence, KCalCore::Incidence::Ptr incidence =3D item->incidence(); Akonadi::Item aitem =3D d->mViewCalendar->item(incidence); if ((!aitem.isValid() && !addIncidence) || !incidence || !changer()) { - qCWarning(CALENDARVIEW_LOG) << "changer is " << changer() << " and= incidence is " << incidence.data(); + qCWarning(CALENDARVIEW_LOG) << "changer is " << changer() << " and= incidence is " + << incidence.data(); return; } = @@ -1533,7 +1547,7 @@ void AgendaView::updateEventDates(AgendaItem *item, b= ool addIncidence, endTime =3D incidence->dateTime(KCalCore::Incidence::RoleEnd).= time(); daysLength =3D item->itemCount() - 1; } else { - endTime =3D d-> mAgenda->gyToTime(item->cellYBottom() + 1); + endTime =3D d->mAgenda->gyToTime(item->cellYBottom() + 1); } } = @@ -1656,15 +1670,16 @@ QDate AgendaView::endDate() const void AgendaView::showDates(const QDate &start, const QDate &end, const QDa= te &preferredMonth) { Q_UNUSED(preferredMonth); - if (!d->mSelectedDates.isEmpty() && - d->mSelectedDates.first() =3D=3D start && - d->mSelectedDates.last() =3D=3D end) { + if (!d->mSelectedDates.isEmpty() + && d->mSelectedDates.first() =3D=3D start + && d->mSelectedDates.last() =3D=3D end) { return; } = - if (!start.isValid() || !end.isValid() || start > end || - start.daysTo(end) > MAX_DAY_COUNT) { - qCWarning(CALENDARVIEW_LOG) << "got bizare parameters: " << start = << end << " - aborting here"; + if (!start.isValid() || !end.isValid() || start > end + || start.daysTo(end) > MAX_DAY_COUNT) { + qCWarning(CALENDARVIEW_LOG) << "got bizare parameters: " << start = << end + << " - aborting here"; return; } = @@ -1701,7 +1716,8 @@ void AgendaView::showIncidences(const Akonadi::Item::= List &incidences, const QDa } = QDateTime start =3D CalendarSupport::incidence(incidences.first())->dt= Start().toLocalTime(); - QDateTime end =3D CalendarSupport::incidence(incidences.first())->date= Time(KCalCore::Incidence::RoleEnd).toLocalTime(); + QDateTime end =3D CalendarSupport::incidence(incidences.first())->date= Time( + KCalCore::Incidence::RoleEnd).toLocalTime(); Akonadi::Item first =3D incidences.first(); Q_FOREACH (const Akonadi::Item &aitem, incidences) { if (CalendarSupport::incidence(aitem)->dtStart().toLocalTime() < s= tart) { @@ -1766,11 +1782,11 @@ void AgendaView::fillAgenda() = foreach (const KCalCore::Incidence::Ptr &incidence, incidences) { Q_ASSERT(incidence); - const bool wasSelected =3D incidence->uid() =3D=3D selectedAgendaI= d || - incidence->uid() =3D=3D selectedAllDayAge= ndaId; + const bool wasSelected =3D incidence->uid() =3D=3D selectedAgendaId + || incidence->uid() =3D=3D selectedAllDay= AgendaId; = - if ((incidence->allDay() && d->mUpdateAllDayAgenda) || - (!incidence->allDay() && d->mUpdateAgenda)) { + if ((incidence->allDay() && d->mUpdateAllDayAgenda) + || (!incidence->allDay() && d->mUpdateAgenda)) { displayIncidence(incidence, wasSelected); } = @@ -1796,7 +1812,7 @@ void AgendaView::fillAgenda() } } = -bool AgendaView::displayIncidence(const KCalCore::Incidence::Ptr &inciden= ce, bool createSelected) +bool AgendaView::displayIncidence(const KCalCore::Incidence::Ptr &incidenc= e, bool createSelected) { if (!incidence || incidence->hasRecurrenceId()) { return false; @@ -1844,8 +1860,8 @@ bool AgendaView::displayIncidence(const KCalCore::In= cidence::Ptr &incidence, bo while (rIt.hasNext()) { rIt.next(); const auto occurrenceDate =3D rIt.occurrenceStartDate().toLoca= lTime(); - const bool makesDayBusy =3D - preferences()->colorAgendaBusyDays() && makesWholeDayBusy(= rIt.incidence()); + const bool makesDayBusy + =3D preferences()->colorAgendaBusyDays() && makesWholeDayB= usy(rIt.incidence()); if (makesDayBusy) { KCalCore::Event::List &busyEvents =3D d->mBusyDays[occurre= nceDate.date()]; busyEvents.append(event); @@ -1856,7 +1872,6 @@ bool AgendaView::displayIncidence(const KCalCore::In= cidence::Ptr &incidence, bo } d->insertIncidence(rIt.incidence(), rIt.recurrenceId(), occurr= enceDate, createSelected); } - } else { QDateTime dateToAdd; // date to add to our date list QDateTime incidenceStart; @@ -1891,10 +1906,10 @@ bool AgendaView::displayIncidence(const KCalCore::= Incidence::Ptr &incidence, bo = // ToDo items shall be displayed today if they are overdue const QDateTime dateTimeToday =3D QDateTime(today, QTime(0, 0), Qt::Lo= calTime); - if (todo && - todo->isOverdue() && - dateTimeToday >=3D firstVisibleDateTime && - dateTimeToday <=3D lastVisibleDateTime) { + if (todo + && todo->isOverdue() + && dateTimeToday >=3D firstVisibleDateTime + && dateTimeToday <=3D lastVisibleDateTime) { /* If there's a recurring instance showing up today don't add "tod= ay" again * we don't want the event to appear duplicated */ if (!alreadyAddedToday) { @@ -1916,8 +1931,8 @@ bool AgendaView::displayIncidence(const KCalCore::In= cidence::Ptr &incidence, bo if (event && makesDayBusy && event->isMultiDay()) { const QDate lastVisibleDate =3D d->mSelectedDates.last(); for (QDate date =3D event->dtStart().date(); - date <=3D event->dtEnd().date() && date <=3D lastVisibleDa= te; - date =3D date.addDays(1)) { + date <=3D event->dtEnd().date() && date <=3D lastVisibleDate; + date =3D date.addDays(1)) { KCalCore::Event::List &busyEvents =3D d->mBusyDays[date]; busyEvents.append(event); } @@ -1959,9 +1974,9 @@ void AgendaView::slotIncidencesDropped(const QList &items, const QPoint &g newTime.setDateOnly(allDay); = Todo::Ptr todo =3D CalendarSupport::todo(todoItem); - if (todo && dynamic_cast(calendar())) { - const Akonadi::Item existingTodoItem =3D - calendar()->itemForIncidence(calendar()->todo(todo->uid())); + if (todo && dynamic_cast(calendar())) { + const Akonadi::Item existingTodoItem + =3D calendar()->itemForIncidence(calendar()->todo(todo->uid())= ); = if (Todo::Ptr existingTodo =3D CalendarSupport::todo(existingTodoI= tem)) { qCDebug(CALENDARVIEW_LOG) << "Drop existing Todo"; @@ -1999,14 +2014,16 @@ void AgendaView::slotIncidencesDropped(const KCalCo= re::Incidence::List &incidenc = const QDate day =3D d->mSelectedDates[gpos.x()]; QDateTime newTime(day, {}, Qt::LocalTime); - = + Q_FOREACH (const KCalCore::Incidence::Ptr &incidence, incidences) { const Akonadi::Item existingItem =3D calendar()->item(incidence); - const bool existsInSameCollection =3D existingItem.isValid() && - (existingItem.storageCollectio= nId() =3D=3D collectionId() || collectionId() =3D=3D -1); + const bool existsInSameCollection =3D existingItem.isValid() + && (existingItem.storageCollec= tionId() + =3D=3D collectionId() || c= ollectionId() =3D=3D -1); = if (existingItem.isValid() && existsInSameCollection) { - KCalCore::Incidence::Ptr newIncidence =3D existingItem.payload= (); + KCalCore::Incidence::Ptr newIncidence + =3D existingItem.payload(); KCalCore::Incidence::Ptr oldIncidence(newIncidence->clone()); = if (newIncidence->dtStart() =3D=3D newTime && newIncidence->al= lDay() =3D=3D allDay) { @@ -2113,7 +2130,7 @@ void AgendaView::setHolidayMasks() d->mHolidayMask.resize(d->mSelectedDates.count() + 1); = const QList workDays =3D CalendarSupport::workDays(d->mSelected= Dates.first().addDays(-1), - d->mSelectedDates.last()); + d->mSelectedDa= tes.last()); for (int i =3D 0; i < d->mSelectedDates.count(); ++i) { d->mHolidayMask[i] =3D !workDays.contains(d->mSelectedDates[ i ]); } @@ -2147,10 +2164,10 @@ void AgendaView::newTimeSpanSelected(const QPoint &= start, const QPoint &end) = d->mTimeSpanInAllDay =3D false; = - const QDate dayStart =3D - d-> mSelectedDates[ qBound(0, start.x(), (int)d->mSelectedDates.si= ze() - 1) ]; - const QDate dayEnd =3D - d->mSelectedDates[ qBound(0, end.x(), (int)d->mSelectedDates.size(= ) - 1) ]; + const QDate dayStart + =3D d->mSelectedDates[ qBound(0, start.x(), (int)d->mSelectedDates= .size() - 1) ]; + const QDate dayEnd + =3D d->mSelectedDates[ qBound(0, end.x(), (int)d->mSelectedDates.s= ize() - 1) ]; = const QTime timeStart =3D d->mAgenda->gyToTime(start.y()); const QTime timeEnd =3D d->mAgenda->gyToTime(end.y() + 1); @@ -2265,8 +2282,8 @@ void AgendaView::alignAgendas() { // resize dummy widget so the allday agenda lines up with the hourly a= genda. if (d->mDummyAllDayLeft) { - d->mDummyAllDayLeft->setFixedWidth(-SPACING + d->mTimeLabelsZone->= width() - - d->mTimeBarHeaderFrame->width()= ); + d->mDummyAllDayLeft->setFixedWidth(-SPACING + d->mTimeLabelsZone->= width() + -d->mTimeBarHeaderFrame->width(= )); } = // Must be async, so they are centered @@ -2280,8 +2297,8 @@ CalendarDecoration::Decoration *AgendaView::Private::= loadCalendarDecoration(cons = QString constraint; if (version >=3D 0) { - constraint =3D - QStringLiteral("[X-KDE-PluginInterfaceVersion] =3D=3D %1").arg= (QString::number(version)); + constraint + =3D QStringLiteral("[X-KDE-PluginInterfaceVersion] =3D=3D %1")= .arg(QString::number(version)); } = KService::List list =3D KServiceTypeTrader::self()->query(type, constr= aint); diff --git a/src/agenda/agendaview.h b/src/agenda/agendaview.h index 26560a5..dbf2c2e 100644 --- a/src/agenda/agendaview.h +++ b/src/agenda/agendaview.h @@ -38,12 +38,9 @@ class KConfig; = class QSplitter; = -namespace EventViews -{ - +namespace EventViews { #ifndef EVENTVIEWS_NODECOS -namespace CalendarDecoration -{ +namespace CalendarDecoration { class Decoration; } #endif @@ -87,18 +84,11 @@ class EVENTVIEWS_EXPORT AgendaView : public EventView { Q_OBJECT public: - explicit AgendaView(const PrefsPtr &preferences, - const QDate &start, - const QDate &end, - bool isInteractive, - bool isSideBySide =3D false, - QWidget *parent =3D nullptr); - - explicit AgendaView(const QDate &start, - const QDate &end, - bool isInteractive, - bool isSideBySide =3D false, - QWidget *parent =3D nullptr); + explicit AgendaView(const PrefsPtr &preferences, const QDate &start, c= onst QDate &end, + bool isInteractive, bool isSideBySide =3D false, Q= Widget *parent =3D nullptr); + + explicit AgendaView(const QDate &start, const QDate &end, bool isInter= active, + bool isSideBySide =3D false, QWidget *parent =3D n= ullptr); = virtual ~AgendaView(); = @@ -116,8 +106,7 @@ public: KCalCore::DateList selectedIncidenceDates() const override; = /** return the default start/end date/time for new events */ - virtual bool eventDurationHint(QDateTime &startDt, - QDateTime &endDt, + virtual bool eventDurationHint(QDateTime &startDt, QDateTime &endDt, bool &allDay) const override; = /** start-datetime of selection */ @@ -227,8 +216,7 @@ public Q_SLOTS: void updateConfig() override; /** reschedule the todo to the given x- and y- coordinates. Third parameter determines all-day (no time specified) */ - void slotIncidencesDropped(const KCalCore::Incidence::List &incidences, - const QPoint &, bool); + void slotIncidencesDropped(const KCalCore::Incidence::List &incidences= , const QPoint &, bool); void slotIncidencesDropped(const QList &incidences, const QPoint= &, bool); void startDrag(const KCalCore::Incidence::Ptr &); = @@ -259,7 +247,7 @@ private Q_SLOTS: = private: void init(const QDate &start, const QDate &end); - bool filterByCollectionSelection(const KCalCore::Incidence::Ptr &inci= dence); + bool filterByCollectionSelection(const KCalCore::Incidence::Ptr &incid= ence); void setupTimeLabel(TimeLabels *timeLabel); bool displayIncidence(const KCalCore::Incidence::Ptr &incidence, bool = createSelected); = @@ -267,7 +255,8 @@ private: typedef QList Decoration= List; bool loadDecorations(const QStringList &decorations, DecorationList &d= ecoList); void placeDecorationsFrame(QFrame *frame, bool decorationsFound, bool = isTop); - void placeDecorations(EventViews::AgendaView::DecorationList &decoList= , const QDate &date, QWidget *labelBox, bool forWeek); + void placeDecorations(EventViews::AgendaView::DecorationList &decoList= , const QDate &date, + QWidget *labelBox, bool forWeek); #endif = friend class TimeLabelsZone; @@ -278,7 +267,6 @@ private: class Private; Private *const d; }; - } = #endif diff --git a/src/agenda/alternatelabel.cpp b/src/agenda/alternatelabel.cpp index d328d52..a58deab 100644 --- a/src/agenda/alternatelabel.cpp +++ b/src/agenda/alternatelabel.cpp @@ -26,8 +26,11 @@ using namespace EventViews; = AlternateLabel::AlternateLabel(const QString &shortlabel, const QString &l= onglabel, const QString &extensivelabel, QWidget *par= ent) - : QLabel(parent), mTextTypeFixed(false), mShortText(shortlabel), - mLongText(longlabel), mExtensiveText(extensivelabel) + : QLabel(parent) + , mTextTypeFixed(false) + , mShortText(shortlabel) + , mLongText(longlabel) + , mExtensiveText(extensivelabel) { setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); if (mExtensiveText.isEmpty()) { diff --git a/src/agenda/alternatelabel.h b/src/agenda/alternatelabel.h index 89f0473..ac4ae02 100644 --- a/src/agenda/alternatelabel.h +++ b/src/agenda/alternatelabel.h @@ -25,9 +25,7 @@ = #include = -namespace EventViews -{ - +namespace EventViews { class AlternateLabel : public QLabel { Q_OBJECT @@ -60,7 +58,6 @@ protected: private: int getIndent() const; }; - } = #endif diff --git a/src/agenda/calendardecoration.cpp b/src/agenda/calendardecorat= ion.cpp index 19e7376..464b195 100644 --- a/src/agenda/calendardecoration.cpp +++ b/src/agenda/calendardecoration.cpp @@ -73,26 +73,30 @@ StoredElement::StoredElement(const QString &id) : Eleme= nt(id) } = StoredElement::StoredElement(const QString &id, const QString &shortText) - : Element(id), mShortText(shortText) + : Element(id) + , mShortText(shortText) { } = -StoredElement::StoredElement(const QString &id, const QString &shortText, - const QString &longText) - : Element(id), mShortText(shortText), mLongText(longText) +StoredElement::StoredElement(const QString &id, const QString &shortText, = const QString &longText) + : Element(id) + , mShortText(shortText) + , mLongText(longText) { } = -StoredElement::StoredElement(const QString &id, const QString &shortText, - const QString &longText, +StoredElement::StoredElement(const QString &id, const QString &shortText, = const QString &longText, const QString &extensiveText) - : Element(id), mShortText(shortText), mLongText(longText), - mExtensiveText(extensiveText) + : Element(id) + , mShortText(shortText) + , mLongText(longText) + , mExtensiveText(extensiveText) { } = StoredElement::StoredElement(const QString &id, const QPixmap &pixmap) - : Element(id), mPixmap(pixmap) + : Element(id) + , mPixmap(pixmap) { } = @@ -282,4 +286,3 @@ QDate Decoration::yearDate(const QDate &date) { return QDate(date.year(), 1, 1); } - diff --git a/src/agenda/calendardecoration.h b/src/agenda/calendardecoratio= n.h index a93ae11..07285c7 100644 --- a/src/agenda/calendardecoration.h +++ b/src/agenda/calendardecoration.h @@ -28,12 +28,8 @@ #include #include = -namespace EventViews -{ - -namespace CalendarDecoration -{ - +namespace EventViews { +namespace CalendarDecoration { /** @class Element = @@ -118,10 +114,9 @@ class EVENTVIEWS_EXPORT StoredElement : public Element public: explicit StoredElement(const QString &id); StoredElement(const QString &id, const QString &shortText); - StoredElement(const QString &id, const QString &shortText, - const QString &longText); - StoredElement(const QString &id, const QString &shortText, - const QString &longText, const QString &extensiveText); + StoredElement(const QString &id, const QString &shortText, const QStri= ng &longText); + StoredElement(const QString &id, const QString &shortText, const QStri= ng &longText, + const QString &extensiveText); StoredElement(const QString &id, const QPixmap &pixmap); = virtual void setShortText(const QString &t); @@ -162,6 +157,7 @@ public: { return 2; } + static QString serviceType() { return QStringLiteral("Calendar/Decoration"); @@ -265,9 +261,7 @@ class EVENTVIEWS_EXPORT DecorationFactory : public Cale= ndarSupport::PluginFactor public: Decoration *createPluginFactory() override =3D 0; }; - } - } = #endif diff --git a/src/agenda/decorationlabel.cpp b/src/agenda/decorationlabel.cpp index faa8715..7e97ee1 100644 --- a/src/agenda/decorationlabel.cpp +++ b/src/agenda/decorationlabel.cpp @@ -30,11 +30,13 @@ = using namespace EventViews; = -DecorationLabel::DecorationLabel(CalendarDecoration::Element *e, - QWidget *parent) - : QLabel(parent), mAutomaticSqueeze(true), mDecorationElement(e), - mShortText(e->shortText()), mLongText(e->longText()), - mExtensiveText(e->extensiveText()) +DecorationLabel::DecorationLabel(CalendarDecoration::Element *e, QWidget *= parent) + : QLabel(parent) + , mAutomaticSqueeze(true) + , mDecorationElement(e) + , mShortText(e->shortText()) + , mLongText(e->longText()) + , mExtensiveText(e->extensiveText()) { mPixmap =3D e->newPixmap(size()); mUrl =3D e->url(); @@ -53,15 +55,15 @@ DecorationLabel::DecorationLabel(CalendarDecoration::El= ement *e, squeezeContentsToLabel(); } = -DecorationLabel::DecorationLabel(const QString &shortText, - const QString &longText, - const QString &extensiveText, - const QPixmap &pixmap, - const QUrl &url, - QWidget *parent) - : QLabel(parent), mAutomaticSqueeze(true), mShortText(shortText), - mLongText(longText), mExtensiveText(extensiveText), - mPixmap(pixmap) +DecorationLabel::DecorationLabel(const QString &shortText, const QString &= longText, + const QString &extensiveText, const QPixm= ap &pixmap, + const QUrl &url, QWidget *parent) + : QLabel(parent) + , mAutomaticSqueeze(true) + , mShortText(shortText) + , mLongText(longText) + , mExtensiveText(extensiveText) + , mPixmap(pixmap) { setUrl(url); = @@ -78,7 +80,7 @@ void DecorationLabel::mouseReleaseEvent(QMouseEvent *even= t) = switch (event->button()) { case Qt::LeftButton: - if (! mUrl.isEmpty()) { + if (!mUrl.isEmpty()) { QDesktopServices::openUrl(mUrl); setForegroundRole(QPalette::LinkVisited); } @@ -158,7 +160,7 @@ void DecorationLabel::squeezeContentsToLabel() int longTextWidth =3D fm.width(mLongText); int extensiveTextWidth =3D fm.width(mExtensiveText); = - if (! mPixmap.isNull()) { + if (!mPixmap.isNull()) { usePixmap(true); } else if ((!mExtensiveText.isEmpty()) && (extensiveTextWidth <=3D lab= elWidth)) { useExtensiveText(true); @@ -211,4 +213,3 @@ void DecorationLabel::useShortText(bool allowAutomaticS= queeze) QLabel::setText(mShortText); setToolTip(mExtensiveText.isEmpty() ? mLongText : mExtensiveText); } - diff --git a/src/agenda/decorationlabel.h b/src/agenda/decorationlabel.h index cc3485e..4e3580b 100644 --- a/src/agenda/decorationlabel.h +++ b/src/agenda/decorationlabel.h @@ -28,22 +28,18 @@ = #include = -namespace EventViews -{ - +namespace EventViews { class DecorationLabel : public QLabel { Q_OBJECT public: - explicit DecorationLabel(EventViews::CalendarDecoration::Element *e, - QWidget *parent =3D nullptr); + explicit DecorationLabel(EventViews::CalendarDecoration::Element *e, Q= Widget *parent =3D nullptr); = explicit DecorationLabel(const QString &shortText, const QString &longText =3D QString(), const QString &extensiveText =3D QString(), const QPixmap &pixmap =3D QPixmap(), - const QUrl &url =3D QUrl(), - QWidget *parent =3D nullptr); + const QUrl &url =3D QUrl(), QWidget *parent = =3D nullptr); ~DecorationLabel(); = public Q_SLOTS: @@ -69,7 +65,6 @@ protected: QPixmap mPixmap; QUrl mUrl; }; - } = #endif diff --git a/src/agenda/timelabels.cpp b/src/agenda/timelabels.cpp index e815edd..2bbe9f5 100644 --- a/src/agenda/timelabels.cpp +++ b/src/agenda/timelabels.cpp @@ -37,9 +37,9 @@ = using namespace EventViews; = -TimeLabels::TimeLabels(const QTimeZone &zone, int rows, TimeLabelsZone *pa= rent, Qt::WindowFlags f) : - QFrame(parent, f), - mTimezone(zone) +TimeLabels::TimeLabels(const QTimeZone &zone, int rows, TimeLabelsZone *pa= rent, Qt::WindowFlags f) + : QFrame(parent, f) + , mTimezone(zone) { mTimeLabelsZone =3D parent; mRows =3D rows; @@ -184,12 +184,13 @@ void TimeLabels::paintEvent(QPaintEvent *) // We won't paint parts that aren't visible const int cy =3D -y();// y() returns a negative value. = - const auto firstDay =3D QDateTime(mAgenda->dateList().first(), QTime(0= ,0,0), Qt::LocalTime).toUTC(); - const int beginning =3D - !mTimezone.isValid() ? - 0 : - (mTimezone.offsetFromUtc(firstDay) - - mTimeLabelsZone->preferences()->timeZone().offsetFromUtc(firstDay= )) / (60 * 60); + const auto firstDay + =3D QDateTime(mAgenda->dateList().first(), QTime(0, 0, 0), Qt::Loc= alTime).toUTC(); + const int beginning + =3D !mTimezone.isValid() + ? 0 + : (mTimezone.offsetFromUtc(firstDay) + -mTimeLabelsZone->preferences()->timeZone().offsetFromUtc(fir= stDay)) / (60 * 60); = // bug: the parameters cx and cw are the areas that need to be // redrawn, not the area of the widget. unfortunately, this @@ -301,21 +302,22 @@ void TimeLabels::contextMenuEvent(QContextMenuEvent *= event) Q_UNUSED(event); = QMenu popup(this); - QAction *editTimeZones =3D - popup.addAction(QIcon::fromTheme(QStringLiteral("document-properti= es")), i18n("&Add Timezones...")); - QAction *removeTimeZone =3D - popup.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), - i18n("&Remove Timezone %1", i18n(mTimezone.id().co= nstData()))); - if (!mTimezone.isValid() || - !mTimeLabelsZone->preferences()->timeScaleTimezones().count() = || - mTimezone =3D=3D mTimeLabelsZone->preferences()->timeZone()) { + QAction *editTimeZones + =3D popup.addAction(QIcon::fromTheme(QStringLiteral("document-prop= erties")), + i18n("&Add Timezones...")); + QAction *removeTimeZone + =3D popup.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")= ), + i18n("&Remove Timezone %1", i18n(mTimezone.id().= constData()))); + if (!mTimezone.isValid() + || !mTimeLabelsZone->preferences()->timeScaleTimezones().count() + || mTimezone =3D=3D mTimeLabelsZone->preferences()->timeZone()) { removeTimeZone->setEnabled(false); } = QAction *activatedAction =3D popup.exec(QCursor::pos()); if (activatedAction =3D=3D editTimeZones) { - QPointer dialog =3D - new TimeScaleConfigDialog(mTimeLabelsZone->preferences(), this= ); + QPointer dialog + =3D new TimeScaleConfigDialog(mTimeLabelsZone->preferences(), = this); if (dialog->exec() =3D=3D QDialog::Accepted) { mTimeLabelsZone->reset(); } @@ -354,7 +356,9 @@ QString TimeLabels::headerToolTip() const } = auto abbreviations =3D QStringLiteral(" "); - foreach (const auto &transition, mTimezone.transitions(QDateTime::curr= entDateTime(), QDateTime::currentDateTime().addYears(1))) { + foreach (const auto &transition, + mTimezone.transitions(QDateTime::currentDateTime(), + QDateTime::currentDateTime().addYears(1= ))) { abbreviations +=3D transition.abbreviation; abbreviations +=3D QLatin1String(", "); } @@ -372,4 +376,3 @@ QString TimeLabels::headerToolTip() const = return toolTip; } - diff --git a/src/agenda/timelabels.h b/src/agenda/timelabels.h index 549b4ef..bba8fc6 100644 --- a/src/agenda/timelabels.h +++ b/src/agenda/timelabels.h @@ -28,9 +28,7 @@ = #include = -namespace EventViews -{ - +namespace EventViews { class Agenda; class TimeLabelsZone; = @@ -43,7 +41,8 @@ class TimeLabels : public QFrame public: typedef QList List; = - TimeLabels(const QTimeZone &zone, int rows, TimeLabelsZone *parent =3D= nullptr, Qt::WindowFlags f =3D nullptr); + TimeLabels(const QTimeZone &zone, int rows, TimeLabelsZone *parent =3D= nullptr, + Qt::WindowFlags f =3D nullptr); = /** updates widget's internal state */ void updateConfig(); @@ -92,7 +91,6 @@ private: = QFrame *mMousePos =3D nullptr; // shows a marker for the current mous= e position in y direction }; - } = #endif diff --git a/src/agenda/timelabelszone.cpp b/src/agenda/timelabelszone.cpp index f57cc8c..0ad65f4 100644 --- a/src/agenda/timelabelszone.cpp +++ b/src/agenda/timelabelszone.cpp @@ -25,7 +25,6 @@ #include "prefs.h" #include "timelabels.h" = - #include #include #include @@ -33,8 +32,10 @@ using namespace EventViews; = TimeLabelsZone::TimeLabelsZone(QWidget *parent, const PrefsPtr &preference= s, Agenda *agenda) - : QWidget(parent), mAgenda(agenda), mPrefs(preferences), - mParent(qobject_cast(parent)) + : QWidget(parent) + , mAgenda(agenda) + , mPrefs(preferences) + , mParent(qobject_cast(parent)) { mTimeLabelsLayout =3D new QHBoxLayout(this); mTimeLabelsLayout->setMargin(0); @@ -106,7 +107,6 @@ void TimeLabelsZone::setupTimeLabel(QScrollArea *area) mAgenda->verticalScrollBar(), &QAbstractSlider::setValue); = area->verticalScrollBar()->setValue(mAgenda->verticalScrollBar()->= value()); - } = TimeLabels *timeLabels =3D static_cast(area->widget()); @@ -177,4 +177,3 @@ void TimeLabelsZone::setPreferences(const PrefsPtr &pre= fs) mPrefs =3D prefs; } } - diff --git a/src/agenda/timelabelszone.h b/src/agenda/timelabelszone.h index df571bd..a79aab0 100644 --- a/src/agenda/timelabelszone.h +++ b/src/agenda/timelabelszone.h @@ -22,16 +22,13 @@ #ifndef EVENTVIEWS_TIMELABELSZONE_H #define EVENTVIEWS_TIMELABELSZONE_H = - #include = class QHBoxLayout; class QScrollArea; class QTimeZone; = -namespace EventViews -{ - +namespace EventViews { class Agenda; class AgendaView; = @@ -78,7 +75,6 @@ private: QHBoxLayout *mTimeLabelsLayout =3D nullptr; QList mTimeLabelsList; }; - } = #endif diff --git a/src/agenda/timescaleconfigdialog.cpp b/src/agenda/timescalecon= figdialog.cpp index c148bbe..a984e35 100644 --- a/src/agenda/timescaleconfigdialog.cpp +++ b/src/agenda/timescaleconfigdialog.cpp @@ -22,7 +22,6 @@ #include "timescaleconfigdialog.h" #include "prefs.h" = - #include #include #include @@ -36,7 +35,8 @@ class Q_DECL_HIDDEN TimeScaleConfigDialog::Private { public: Private(TimeScaleConfigDialog *parent, const PrefsPtr &preferences) - : q(parent), mPreferences(preferences) + : q(parent) + , mPreferences(preferences) { } = @@ -59,14 +59,13 @@ static QString tzUTCOffsetStr(const QTimeZone &tz) int utcOffsetMins =3D (currentOffset % 3600) / 60; // in minutes QString utcStr; if (utcOffsetMins > 0) { - utcStr =3D utcOffsetHrs >=3D 0 ? - QStringLiteral("+%1:%2").arg(utcOffsetHrs).arg(utcOffsetM= ins) : - QStringLiteral("%1:%2").arg(utcOffsetHrs).arg(utcOffsetMi= ns); - + utcStr =3D utcOffsetHrs >=3D 0 + ? QStringLiteral("+%1:%2").arg(utcOffsetHrs).arg(utcOffse= tMins) + : QStringLiteral("%1:%2").arg(utcOffsetHrs).arg(utcOffset= Mins); } else { - utcStr =3D utcOffsetHrs >=3D 0 ? - QStringLiteral("+%1").arg(utcOffsetHrs) : - QStringLiteral("%1").arg(utcOffsetHrs); + utcStr =3D utcOffsetHrs >=3D 0 + ? QStringLiteral("+%1").arg(utcOffsetHrs) + : QStringLiteral("%1").arg(utcOffsetHrs); } return utcStr; } @@ -81,7 +80,8 @@ static QString tzWithUTC(const QByteArray &zoneId) } = TimeScaleConfigDialog::TimeScaleConfigDialog(const PrefsPtr &preferences, = QWidget *parent) - : QDialog(parent), d(new Private(this, preferences)) + : QDialog(parent) + , d(new Private(this, preferences)) { setWindowTitle(i18n("Timezone")); QVBoxLayout *mainLayout =3D new QVBoxLayout(this); @@ -92,7 +92,8 @@ TimeScaleConfigDialog::TimeScaleConfigDialog(const PrefsP= tr &preferences, QWidge = mainLayout->addWidget(mainwidget); = - QDialogButtonBox *buttonBox =3D new QDialogButtonBox(QDialogButtonBox:= :Ok | QDialogButtonBox::Cancel, this); + QDialogButtonBox *buttonBox =3D new QDialogButtonBox( + QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); QPushButton *okButton =3D buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); @@ -132,8 +133,11 @@ TimeScaleConfigDialog::TimeScaleConfigDialog(const Pre= fsPtr &preferences, QWidge connect(downButton, &QPushButton::clicked, this, &TimeScaleConfigDialo= g::down); = connect(okButton, &QPushButton::clicked, this, &TimeScaleConfigDialog:= :okClicked); - connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::cli= cked, this, &TimeScaleConfigDialog::reject); - connect(listWidget, &QListWidget::currentItemChanged, this, &TimeScale= ConfigDialog::slotUpdateButton); + connect(buttonBox->button( + QDialogButtonBox::Cancel), &QPushButton::clicked, this, + &TimeScaleConfigDialog::reject); + connect(listWidget, &QListWidget::currentItemChanged, this, + &TimeScaleConfigDialog::slotUpdateButton); for (const TimeZoneNamePair &item : qAsConst(selList)) { QListWidgetItem *widgetItem =3D new QListWidgetItem(item.first); widgetItem->setData(TimeZoneNameRole, item.second); @@ -152,7 +156,8 @@ void TimeScaleConfigDialog::slotUpdateButton() removeButton->setEnabled(listWidget->currentItem()); const bool numberElementMoreThanOneElement =3D (listWidget->count() > = 1); upButton->setEnabled(numberElementMoreThanOneElement && (listWidget->c= urrentRow() >=3D 1)); - downButton->setEnabled(numberElementMoreThanOneElement && (listWidget-= >currentRow() < listWidget->count() - 1)); + downButton->setEnabled(numberElementMoreThanOneElement + && (listWidget->currentRow() < listWidget->coun= t() - 1)); } = void TimeScaleConfigDialog::okClicked() @@ -168,13 +173,15 @@ void TimeScaleConfigDialog::add() if (zoneCombo->currentIndex() >=3D 0) { const int numberItem(listWidget->count()); for (int i =3D 0; i < numberItem; ++i) { - if (listWidget->item(i)->data(TimeZoneNameRole).toString() =3D= =3D zoneCombo->itemData(zoneCombo->currentIndex(), TimeZoneNameRole).toStri= ng()) { + if (listWidget->item(i)->data(TimeZoneNameRole).toString() + =3D=3D zoneCombo->itemData(zoneCombo->currentIndex(), Time= ZoneNameRole).toString()) { return; } } = QListWidgetItem *item =3D new QListWidgetItem(zoneCombo->currentTe= xt()); - item->setData(TimeZoneNameRole, zoneCombo->itemData(zoneCombo->cur= rentIndex(), TimeZoneNameRole).toString()); + item->setData(TimeZoneNameRole, + zoneCombo->itemData(zoneCombo->currentIndex(), TimeZ= oneNameRole).toString()); listWidget->addItem(item); zoneCombo->removeItem(zoneCombo->currentIndex()); } @@ -183,7 +190,9 @@ void TimeScaleConfigDialog::add() = void TimeScaleConfigDialog::remove() { - zoneCombo->insertItem(0, listWidget->currentItem()->text(), zoneCombo-= >itemData(zoneCombo->currentIndex(), TimeZoneNameRole).toString()); + zoneCombo->insertItem(0, listWidget->currentItem()->text(), + zoneCombo->itemData(zoneCombo->currentIndex(), + TimeZoneNameRole).toString()= ); delete listWidget->takeItem(listWidget->currentRow()); slotUpdateButton(); } @@ -214,4 +223,3 @@ QStringList TimeScaleConfigDialog::zones() const } return list; } - diff --git a/src/agenda/timescaleconfigdialog.h b/src/agenda/timescaleconfi= gdialog.h index c872a7b..6557e49 100644 --- a/src/agenda/timescaleconfigdialog.h +++ b/src/agenda/timescaleconfigdialog.h @@ -26,9 +26,7 @@ = #include = -namespace EventViews -{ - +namespace EventViews { class Prefs; typedef QSharedPointer PrefsPtr; = @@ -54,7 +52,6 @@ private: class Private; Private *const d; }; - } = #endif diff --git a/src/agenda/viewcalendar.cpp b/src/agenda/viewcalendar.cpp index b02fa66..8c1e8d1 100644 --- a/src/agenda/viewcalendar.cpp +++ b/src/agenda/viewcalendar.cpp @@ -181,7 +181,8 @@ Akonadi::Item AkonadiViewCalendar::item(const KCalCore:= :Incidence::Ptr &incidenc = if (id =3D=3D -1) { // Ok, we really don't know the ID, give up. - qCWarning(CALENDARVIEW_LOG) << "Item is invalid. uid =3D " << = incidence->instanceIdentifier(); + qCWarning(CALENDARVIEW_LOG) << "Item is invalid. uid =3D " + << incidence->instanceIdentifier(); return Akonadi::Item(); } return mCalendar->item(incidence->instanceIdentifier()); diff --git a/src/agenda/viewcalendar.h b/src/agenda/viewcalendar.h index 6fb8008..05908f9 100644 --- a/src/agenda/viewcalendar.h +++ b/src/agenda/viewcalendar.h @@ -32,14 +32,11 @@ #include #include = -namespace EventViews -{ - +namespace EventViews { class AgendaView; = class EVENTVIEWS_EXPORT ViewCalendar { - public: typedef QSharedPointer Ptr; = @@ -54,7 +51,7 @@ public: virtual KCalCore::Calendar::Ptr getCalendar() const =3D 0; }; = -class AkonadiViewCalendar: public ViewCalendar +class AkonadiViewCalendar : public ViewCalendar { public: typedef QSharedPointer Ptr; @@ -102,7 +99,6 @@ public: AkonadiViewCalendar::Ptr mETMCalendar; QList mSubCalendars; }; - } = #endif diff --git a/src/eventview.cpp b/src/eventview.cpp index 2e95e9f..a3707c2 100644 --- a/src/eventview.cpp +++ b/src/eventview.cpp @@ -66,8 +66,8 @@ void EventView::setGlobalCollectionSelection(CalendarSupp= ort::CollectionSelectio } = EventView::EventView(QWidget *parent) - : QWidget(parent), - d_ptr(new EventViewPrivate()) + : QWidget(parent) + , d_ptr(new EventViewPrivate()) { QByteArray cname =3D metaObject()->className(); cname.replace(':', '_'); @@ -131,7 +131,7 @@ int EventView::showMoveRecurDialog(const Incidence::Ptr= &inc, const QDate &date) case KCalUtils::RecurrenceActions::SelectedOccurrence: return KCalUtils::RecurrenceActions::SelectedOccurrence; = - case KCalUtils::RecurrenceActions::AllOccurrences: { + case KCalUtils::RecurrenceActions::AllOccurrences: Q_ASSERT(availableOccurrences & KCalUtils::RecurrenceActions::Sele= ctedOccurrence); = // if there are all kinds of ooccurrences (i.e. past present and f= uture) the user might @@ -142,9 +142,8 @@ int EventView::showMoveRecurDialog(const Incidence::Ptr= &inc, const QDate &date) "Should the changes be applied on= ly to this single occurrence, " "also to future items, or to all = items in the recurrence?"); return KCalUtils::RecurrenceActions::questionSelectedFutureAll= Cancel( - message, caption, itemSelected, itemFuture, itemAll= , this); + message, caption, itemSelected, itemFuture, itemAll, this); } - } = default: Q_ASSERT(availableOccurrences & KCalUtils::RecurrenceActions::Sele= ctedOccurrence); @@ -153,7 +152,7 @@ int EventView::showMoveRecurDialog(const Incidence::Ptr= &inc, const QDate &date) "Should the changes be applied only t= o this single occurrence " "or to all items in the recurrence?"); return KCalUtils::RecurrenceActions::questionSelectedAllCancel( - message, caption, itemSelected, itemAll, this); + message, caption, itemSelected, itemAll, this); break; } = @@ -462,9 +461,8 @@ void EventView::doSaveConfig(KConfigGroup &) { } = -QPair EventView::actualDateRange(const QDateTime &st= art, - const QDateTime &end, - const QDate &preferredMonth) const +QPair EventView::actualDateRange(const QDateTime &st= art, const QDateTime &end, + const QDate &prefer= redMonth) const { Q_UNUSED(preferredMonth); return qMakePair(start, end); @@ -536,7 +534,6 @@ void EventView::restoreConfig(const KConfigGroup &confi= gGroup) d->collectionSelectionModel =3D nullptr; d->setUpModels(); } else if (useCustom) { - if (!d->collectionSelectionModel) { // Sort the calendar model on calendar name QSortFilterProxyModel *sortProxy =3D new QSortFilterProxyModel= (this); @@ -549,7 +546,8 @@ void EventView::restoreConfig(const KConfigGroup &confi= gGroup) = // Only show the first column. KRearrangeColumnsProxyModel *columnFilterProxy =3D new KRearra= ngeColumnsProxyModel(this); - columnFilterProxy->setSourceColumns(QVector() << Akonadi:= :ETMCalendar::CollectionTitle); + columnFilterProxy->setSourceColumns( + QVector() << Akonadi::ETMCalendar::CollectionTitle); columnFilterProxy->setSourceModel(sortProxy); = // Make the calendar model checkable. @@ -558,8 +556,8 @@ void EventView::restoreConfig(const KConfigGroup &confi= gGroup) = d->setUpModels(); } - const KConfigGroup selectionGroup =3D - configGroup.config()->group(configGroup.name() + QLatin1String= ("_selectionSetup")); + const KConfigGroup selectionGroup + =3D configGroup.config()->group(configGroup.name() + QLatin1St= ring("_selectionSetup")); = KViewStateMaintainer maintainer(selectionGroup); maintainer.setSelectionModel(d->collectionSelectionModel->selectio= nModel()); @@ -575,8 +573,8 @@ void EventView::saveConfig(KConfigGroup &configGroup) configGroup.writeEntry("UseCustomCollectionSelection", d->collectionSe= lectionModel !=3D nullptr); = if (d->collectionSelectionModel) { - KConfigGroup selectionGroup =3D - configGroup.config()->group(configGroup.name() + QLatin1String= ("_selectionSetup")); + KConfigGroup selectionGroup + =3D configGroup.config()->group(configGroup.name() + QLatin1St= ring("_selectionSetup")); = KViewStateMaintainer maintainer(selectionGroup); maintainer.setSelectionModel(d->collectionSelectionModel->selectio= nModel()); @@ -650,8 +648,8 @@ QString EventView::iconForItem(const Akonadi::Item &ite= m) { QString iconName; Akonadi::Collection collection =3D item.parentCollection(); - while (collection.parentCollection().isValid() && - collection.parentCollection() !=3D Akonadi::Collection::root()= ) { + while (collection.parentCollection().isValid() + && collection.parentCollection() !=3D Akonadi::Collection::root= ()) { collection =3D calendar()->collection(collection.parentCollection(= ).id()); } = @@ -671,4 +669,3 @@ void EventView::onCollectionChanged(const Akonadi::Coll= ection &collection, updateView(); } } - diff --git a/src/eventview.h b/src/eventview.h index 8734d7a..e5182c5 100644 --- a/src/eventview.h +++ b/src/eventview.h @@ -40,35 +40,29 @@ #include #include = -namespace KCalCore -{ -template class SortableList; +namespace KCalCore { +template class SortableList; typedef SortableList DateList; } = -namespace KHolidays -{ +namespace KHolidays { class HolidayRegion; typedef QSharedPointer HolidayRegionPtr; } = -namespace CalendarSupport -{ +namespace CalendarSupport { class CollectionSelection; class KCalPrefs; } = -namespace Akonadi -{ +namespace Akonadi { class IncidenceChanger; } = class KCheckableProxyModel; class KConfigGroup; = -namespace EventViews -{ - +namespace EventViews { enum { BUSY_BACKGROUND_ALPHA =3D 70 }; @@ -322,8 +316,7 @@ public Q_SLOTS: @param incidenceList a list of incidences to show. @param date is the QDate on which the incidences are being shown. */ - virtual void showIncidences(const Akonadi::Item::List &incidenceList, - const QDate &date) =3D 0; + virtual void showIncidences(const Akonadi::Item::List &incidenceList, = const QDate &date) =3D 0; = /** Updates the current display to reflect changes that may have happened @@ -529,7 +522,6 @@ private: EventViewPrivate *const d_ptr; Q_DECLARE_PRIVATE(EventView) }; - } = #endif diff --git a/src/eventview_p.cpp b/src/eventview_p.cpp index 63edfcc..209561b 100644 --- a/src/eventview_p.cpp +++ b/src/eventview_p.cpp @@ -37,19 +37,20 @@ using namespace EventViews; = EventViewPrivate::EventViewPrivate() - : calendar(nullptr), - customCollectionSelection(nullptr), - collectionSelectionModel(nullptr), - mReturnPressed(false), - mDateRangeSelectionEnabled(true), - mTypeAhead(false), - mTypeAheadReceiver(nullptr), - mPrefs(new Prefs()), - mKCalPrefs(new CalendarSupport::KCalPrefs()), - mChanger(nullptr), - mChanges(EventView::DatesChanged), - mCollectionId(-1) -{ } + : calendar(nullptr) + , customCollectionSelection(nullptr) + , collectionSelectionModel(nullptr) + , mReturnPressed(false) + , mDateRangeSelectionEnabled(true) + , mTypeAhead(false) + , mTypeAheadReceiver(nullptr) + , mPrefs(new Prefs()) + , mKCalPrefs(new CalendarSupport::KCalPrefs()) + , mChanger(nullptr) + , mChanges(EventView::DatesChanged) + , mCollectionId(-1) +{ +} = EventViewPrivate::~EventViewPrivate() { @@ -73,6 +74,7 @@ void EventViewPrivate::setUpModels() delete customCollectionSelection; customCollectionSelection =3D nullptr; if (collectionSelectionModel) { - customCollectionSelection =3D new CalendarSupport::CollectionSelec= tion(collectionSelectionModel->selectionModel()); + customCollectionSelection =3D new CalendarSupport::CollectionSelec= tion( + collectionSelectionModel->selectionModel()); } } diff --git a/src/eventview_p.h b/src/eventview_p.h index 5e13ce8..3ff92f3 100644 --- a/src/eventview_p.h +++ b/src/eventview_p.h @@ -32,9 +32,7 @@ = class KCheckableProxyModel; = -namespace EventViews -{ - +namespace EventViews { class EventViewPrivate { public: /// Methods @@ -80,7 +78,6 @@ public: /// Members EventView::Changes mChanges; Akonadi::Collection::Id mCollectionId; }; - } // EventViews = #endif diff --git a/src/helper.cpp b/src/helper.cpp index f9520ac..f4ab17f 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -37,7 +37,8 @@ QColor EventViews::getTextColor(const QColor &c) return (luminance > 128.0) ? QColor(0, 0, 0) : QColor(255, 255, 255); } = -void EventViews::setResourceColor(const Akonadi::Collection &coll, const Q= Color &color, const PrefsPtr &preferences) +void EventViews::setResourceColor(const Akonadi::Collection &coll, const Q= Color &color, + const PrefsPtr &preferences) { if (!coll.isValid()) { return; @@ -45,7 +46,8 @@ void EventViews::setResourceColor(const Akonadi::Collecti= on &coll, const QColor = const QString id =3D QString::number(coll.id()); if (coll.hasAttribute()) { - Akonadi::CollectionColorAttribute *colorAttr =3D coll.attribute(); + Akonadi::CollectionColorAttribute *colorAttr + =3D coll.attribute(); if (colorAttr && colorAttr->color().isValid() && (colorAttr->color= () =3D=3D color)) { // It's the same color: we save an invalid color preferences->setResourceColor(id, QColor()); @@ -55,7 +57,6 @@ void EventViews::setResourceColor(const Akonadi::Collecti= on &coll, const QColor preferences->setResourceColor(id, color); } = - QColor EventViews::resourceColor(const Akonadi::Collection &coll, const Pr= efsPtr &preferences) { if (!coll.isValid()) { @@ -64,7 +65,8 @@ QColor EventViews::resourceColor(const Akonadi::Collectio= n &coll, const PrefsPtr const QString id =3D QString::number(coll.id()); QColor color =3D preferences->resourceColorKnown(id); if (!color.isValid() && coll.hasAttribute()) { - Akonadi::CollectionColorAttribute *colorAttr =3D coll.attribute(); + Akonadi::CollectionColorAttribute *colorAttr + =3D coll.attribute(); if (colorAttr && colorAttr->color().isValid()) { color =3D colorAttr->color(); } else { @@ -82,8 +84,10 @@ QColor EventViews::resourceColor(const Akonadi::Item &it= em, const PrefsPtr &pref const QString id =3D QString::number(item.parentCollection().id()); = QColor color =3D preferences->resourceColorKnown(id); - if (!color.isValid() && item.parentCollection().hasAttribute()) { - Akonadi::CollectionColorAttribute *colorAttr =3D item.parentCollec= tion().attribute(); + if (!color.isValid() + && item.parentCollection().hasAttribute()) { + Akonadi::CollectionColorAttribute *colorAttr + =3D item.parentCollection().attribute(); if (colorAttr && colorAttr->color().isValid()) { color =3D colorAttr->color(); } else { diff --git a/src/helper.h b/src/helper.h index 333d981..a8b6886 100644 --- a/src/helper.h +++ b/src/helper.h @@ -27,8 +27,7 @@ #include #include = -namespace Akonadi -{ +namespace Akonadi { class Collection; class Item; } @@ -38,9 +37,7 @@ class QDate; = // Provides static methods that are useful to all views. = -namespace EventViews -{ - +namespace EventViews { class Prefs; typedef QSharedPointer PrefsPtr; = @@ -62,11 +59,10 @@ QColor getTextColor(const QColor &c); @param incidence the incidence for which the color is needed (to determine which subresource needs to be used) */ -EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Item &incidence, - const PrefsPtr &preferences); +EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Item &incidence, con= st PrefsPtr &preferences); = EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Collection &collecti= on, - const PrefsPtr &preferences); + const PrefsPtr &preferences); = /** This method sets the resource color in the preferences, only if it is @@ -76,8 +72,8 @@ EVENTVIEWS_EXPORT QColor resourceColor(const Akonadi::Col= lection &collection, @param color the color to stored @param preferences a pointer to the EventViews::Prefs to use */ -EVENTVIEWS_EXPORT void setResourceColor(const Akonadi::Collection &collect= ion, - const QColor &color, const PrefsPt= r &preferences); +EVENTVIEWS_EXPORT void setResourceColor(const Akonadi::Collection &collect= ion, const QColor &color, + const PrefsPtr &preferences); = /** Returns the number of years between the @p start QDate and the @p end QD= ate diff --git a/src/journal/journalframe.cpp b/src/journal/journalframe.cpp index 5656d9c..e70a5f1 100644 --- a/src/journal/journalframe.cpp +++ b/src/journal/journalframe.cpp @@ -28,7 +28,6 @@ = #include "journalframe.h" = - #include = #include @@ -48,7 +47,9 @@ using namespace EventViews; = JournalDateView::JournalDateView(const Akonadi::ETMCalendar::Ptr &calendar= , QWidget *parent) - : QFrame(parent), mCalendar(calendar), mChanger(nullptr) + : QFrame(parent) + , mCalendar(calendar) + , mChanger(nullptr) { auto layout =3D new QVBoxLayout(this); layout->setMargin(0); @@ -84,7 +85,7 @@ void JournalDateView::addJournal(const Akonadi::Item &j) QHBoxLayout *layout =3D new QHBoxLayout(container); layout->addStretch(1); JournalFrame *entry =3D new JournalFrame(j, mCalendar, this); - layout->addWidget(entry, 3/*stretch*/); + layout->addWidget(entry, 3 /*stretch*/); layout->addStretch(1); = entry->show(); @@ -148,10 +149,11 @@ void JournalDateView::journalDeleted(const Akonadi::I= tem &journal) mEntries.remove(journal.id()); } = -JournalFrame::JournalFrame(const Akonadi::Item &j, - const Akonadi::ETMCalendar::Ptr &calendar, +JournalFrame::JournalFrame(const Akonadi::Item &j, const Akonadi::ETMCalen= dar::Ptr &calendar, QWidget *parent) - : QFrame(parent), mJournal(j), mCalendar(calendar) + : QFrame(parent) + , mJournal(j) + , mCalendar(calendar) { mDirty =3D false; mWriteInProgress =3D false; @@ -205,7 +207,8 @@ JournalFrame::JournalFrame(const Akonadi::Item &j, mPrintPreviewButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fi= xed); mPrintPreviewButton->setToolTip(i18n("Print preview this journal entry= ")); buttonsLayout->addWidget(mPrintPreviewButton); - connect(mPrintPreviewButton, &QAbstractButton::clicked, this, &Journal= Frame::printPreviewJournal); + connect(mPrintPreviewButton, &QAbstractButton::clicked, this, + &JournalFrame::printPreviewJournal); = readJournal(mJournal); mDirty =3D false; @@ -333,6 +336,4 @@ void JournalFrame::readJournal(const Akonadi::Item &j) mEditButton->setEnabled(mCalendar->hasRight(j, Akonadi::Collection= ::CanChangeItem)); mDeleteButton->setEnabled(mCalendar->hasRight(j, Akonadi::Collecti= on::CanDeleteItem)); } - } - diff --git a/src/journal/journalframe.h b/src/journal/journalframe.h index e9b9080..4dc62dd 100644 --- a/src/journal/journalframe.h +++ b/src/journal/journalframe.h @@ -37,17 +37,14 @@ class QTextBrowser; class QPushButton; = -namespace EventViews -{ - +namespace EventViews { class JournalFrame : public QFrame { Q_OBJECT public: typedef QList List; = - JournalFrame(const Akonadi::Item &journal, - const Akonadi::ETMCalendar::Ptr &calendar, + JournalFrame(const Akonadi::Item &journal, const Akonadi::ETMCalendar:= :Ptr &calendar, QWidget *parent); = ~JournalFrame(); @@ -80,6 +77,7 @@ public Q_SLOTS: { mChanger =3D changer; } + void setDate(const QDate &date); = Q_SIGNALS: @@ -150,7 +148,6 @@ private: = Akonadi::IncidenceChanger *mChanger =3D nullptr; }; - } = #endif diff --git a/src/journal/journalview.cpp b/src/journal/journalview.cpp index 118ff76..e2eef7a 100644 --- a/src/journal/journalview.cpp +++ b/src/journal/journalview.cpp @@ -37,7 +37,8 @@ = using namespace EventViews; = -JournalView::JournalView(QWidget *parent) : EventView(parent), mChanger(nu= llptr) +JournalView::JournalView(QWidget *parent) : EventView(parent) + , mChanger(nullptr) { QVBoxLayout *topLayout =3D new QVBoxLayout(this); topLayout->setMargin(0); @@ -116,6 +117,7 @@ void JournalView::clearEntries() } mEntries.clear(); } + void JournalView::updateView() { QMap::Iterator it =3D mEntries.end(); @@ -140,7 +142,8 @@ void JournalView::showDates(const QDate &start, const Q= Date &end, const QDate &) { clearEntries(); if (end < start) { - qCWarning(CALENDARVIEW_LOG) << "End is smaller than start. end=3D"= << end << "; start=3D" << start; + qCWarning(CALENDARVIEW_LOG) << "End is smaller than start. end=3D"= << end << "; start=3D" + << start; return; } = @@ -172,7 +175,7 @@ void JournalView::showIncidences(const Akonadi::Item::L= ist &incidences, const QD } = void JournalView::changeIncidenceDisplay(const Akonadi::Item &incidence, - Akonadi::IncidenceChanger::ChangeType changeType) + Akonadi::IncidenceChanger::Change= Type changeType) { if (KCalCore::Journal::Ptr journal =3D CalendarSupport::journal(incide= nce)) { switch (changeType) { @@ -213,4 +216,3 @@ bool JournalView::eventFilter(QObject *object, QEvent *= event) return false; } } - diff --git a/src/journal/journalview.h b/src/journal/journalview.h index 67e0d6c..6b8229e 100644 --- a/src/journal/journalview.h +++ b/src/journal/journalview.h @@ -38,9 +38,7 @@ class QScrollArea; * @author Cornelius Schumacher , Reinhold Kainhofer <= reinhold@kainhofer.com> * @see KOBaseView */ -namespace EventViews -{ - +namespace EventViews { class JournalDateView; = class EVENTVIEWS_EXPORT JournalView : public EventView @@ -60,19 +58,21 @@ public: void appendJournal(const Akonadi::Item &journal, const QDate &dt); = /** documentation in baseview.h */ - void getHighlightMode(bool &highlightEvents, - bool &highlightTodos, - bool &highlightJournals); + void getHighlightMode(bool &highlightEvents, bool &highlightTodos, boo= l &highlightJournals); = bool eventFilter(QObject *, QEvent *) override; = public Q_SLOTS: // Don't update the view when midnight passed, otherwise we'll have da= ta loss (bug 79145) - void dayPassed(const QDate &) override {} + void dayPassed(const QDate &) override + { + } + void updateView() override; void flushView() override; = - void showDates(const QDate &start, const QDate &end, const QDate &pref= erredMonth =3D QDate()) override; + void showDates(const QDate &start, const QDate &end, + const QDate &preferredMonth =3D QDate()) override; void showIncidences(const Akonadi::Item::List &incidences, const QDate= &date) override; = void changeIncidenceDisplay(const Akonadi::Item &incidence, @@ -96,7 +96,6 @@ private: Akonadi::IncidenceChanger *mChanger =3D nullptr; // DateList mSelectedDates; // List of dates to be displayed }; - } = #endif diff --git a/src/list/listview.cpp b/src/list/listview.cpp index 24c2779..3a30e38 100644 --- a/src/list/listview.cpp +++ b/src/list/listview.cpp @@ -76,7 +76,9 @@ class ListViewItem : public QTreeWidgetItem { public: ListViewItem(const Akonadi::Item &incidence, QTreeWidget *parent) - : QTreeWidgetItem(parent), mTreeWidget(parent), mIncidence(inciden= ce) + : QTreeWidgetItem(parent) + , mTreeWidget(parent) + , mIncidence(incidence) { } = @@ -93,11 +95,10 @@ bool ListViewItem::operator<(const QTreeWidgetItem &oth= er) const const ListViewItem *otheritem =3D static_cast(&o= ther); = switch (treeWidget()->sortColumn()) { - - case StartDateTime_Column: { + case StartDateTime_Column: return otheritem->start < start; - } - case EndDateTime_Column: { + case EndDateTime_Column: + { Incidence::Ptr thisInc =3D CalendarSupport::incidence(mIncidence); const auto thisEnd =3D thisInc->dateTime(Incidence::RoleEnd).toLoc= alTime(); = @@ -107,7 +108,7 @@ bool ListViewItem::operator<(const QTreeWidgetItem &oth= er) const return otherEnd < thisEnd; } default: - return QTreeWidgetItem::operator < (other); + return QTreeWidgetItem::operator <(other); } } = @@ -124,10 +125,10 @@ public: = void addIncidences(const Akonadi::ETMCalendar::Ptr &calendar, const KCalCore::Incidence::List &incidenceList, con= st QDate &date); - void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar, - const KCalCore::Incidence::Ptr &, const QDate &date); - void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar, - const Akonadi::Item &, const QDate &date); + void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar, const KCa= lCore::Incidence::Ptr &, + const QDate &date); + void addIncidence(const Akonadi::ETMCalendar::Ptr &calendar, const Ako= nadi::Item &, + const QDate &date); ListViewItem *getItemForIncidence(const Akonadi::Item &); = QTreeWidget *mTreeWidget =3D nullptr; @@ -150,9 +151,11 @@ public: class ListView::Private::ListItemVisitor : public KCalCore::Visitor { public: - ListItemVisitor(ListViewItem *item, QDate dt) : mItem(item), mStartDat= e(dt) + ListItemVisitor(ListViewItem *item, QDate dt) : mItem(item) + , mStartDate(dt) { } + ~ListItemVisitor() { } @@ -160,7 +163,8 @@ public: bool visit(const Event::Ptr &) override; bool visit(const Todo::Ptr &) override; bool visit(const Journal::Ptr &) override; - bool visit(const FreeBusy::Ptr &) override { + bool visit(const FreeBusy::Ptr &) override + { // to inhibit hidden virtual compile warning return true; } @@ -187,7 +191,7 @@ bool ListView::Private::ListItemVisitor::visit(const Ev= ent::Ptr &e) mItem->end =3D e->dtEnd().toLocalTime(); if (e->recurs()) { const int duration =3D e->dtStart().secsTo(e->dtEnd()); - QDateTime kdt(mStartDate, QTime(0,0,0)); + QDateTime kdt(mStartDate, QTime(0, 0, 0)); kdt =3D kdt.addSecs(-1); mItem->start =3D e->recurrence()->getNextDateTime(kdt).toLocalTime= (); mItem->end =3D mItem->start.addSecs(duration); @@ -197,10 +201,13 @@ bool ListView::Private::ListItemVisitor::visit(const = Event::Ptr &e) mItem->setText(Summary_Column, cleanSummary(e->summary(), next)); = if (e->allDay()) { - mItem->setText(StartDateTime_Column, QLocale().toString(mItem->sta= rt.date(), QLocale::ShortFormat)); - mItem->setText(EndDateTime_Column, QLocale().toString(mItem->end.d= ate(), QLocale::ShortFormat)); + mItem->setText(StartDateTime_Column, + QLocale().toString(mItem->start.date(), QLocale::Sh= ortFormat)); + mItem->setText(EndDateTime_Column, + QLocale().toString(mItem->end.date(), QLocale::Shor= tFormat)); } else { - mItem->setText(StartDateTime_Column, QLocale().toString(mItem->sta= rt, QLocale::ShortFormat)); + mItem->setText(StartDateTime_Column, + QLocale().toString(mItem->start, QLocale::ShortForm= at)); mItem->setText(EndDateTime_Column, QLocale().toString(mItem->end, = QLocale::ShortFormat)); } = @@ -216,19 +223,27 @@ bool ListView::Private::ListItemVisitor::visit(const = Todo::Ptr &t) mItem->setText(Summary_Column, cleanSummary(t->summary(), QDateTime())= ); = if (t->hasStartDate()) { - if (t->allDay()) - mItem->setText(StartDateTime_Column, QLocale().toString(t->dtS= tart().toLocalTime().date(), QLocale::ShortFormat)); - else - mItem->setText(StartDateTime_Column, QLocale().toString(t->dtS= tart().toLocalTime(), QLocale::ShortFormat)); + if (t->allDay()) { + mItem->setText(StartDateTime_Column, + QLocale().toString(t->dtStart().toLocalTime().d= ate(), + QLocale::ShortFormat)); + } else { + mItem->setText(StartDateTime_Column, + QLocale().toString(t->dtStart().toLocalTime(), = QLocale::ShortFormat)); + } } else { mItem->setText(StartDateTime_Column, QStringLiteral("---")); } = if (t->hasDueDate()) { - if (t->allDay()) - mItem->setText(EndDateTime_Column, QLocale().toString(t->dtDue= ().toLocalTime().date(), QLocale::ShortFormat)); - else - mItem->setText(EndDateTime_Column, QLocale().toString(t->dtDue= ().toLocalTime(), QLocale::ShortFormat)); + if (t->allDay()) { + mItem->setText(EndDateTime_Column, + QLocale().toString(t->dtDue().toLocalTime().dat= e(), + QLocale::ShortFormat)); + } else { + mItem->setText(EndDateTime_Column, + QLocale().toString(t->dtDue().toLocalTime(), QL= ocale::ShortFormat)); + } } else { mItem->setText(EndDateTime_Column, QStringLiteral("---")); } @@ -248,17 +263,20 @@ bool ListView::Private::ListItemVisitor::visit(const = Journal::Ptr &j) } else { mItem->setText(Summary_Column, cleanSummary(j->summary(), QDateTim= e())); } - if (j->allDay()) - mItem->setText(StartDateTime_Column, QLocale().toString(j->dtStart= ().toLocalTime().date(), QLocale::ShortFormat)); - else - mItem->setText(StartDateTime_Column, QLocale().toString(j->dtStart= ().toLocalTime(), QLocale::ShortFormat)); + if (j->allDay()) { + mItem->setText(StartDateTime_Column, + QLocale().toString(j->dtStart().toLocalTime().date(= ), QLocale::ShortFormat)); + } else { + mItem->setText(StartDateTime_Column, + QLocale().toString(j->dtStart().toLocalTime(), QLoc= ale::ShortFormat)); + } = return true; } = -ListView::ListView(const Akonadi::ETMCalendar::Ptr &calendar, - QWidget *parent, bool nonInteractive) - : EventView(parent), d(new Private()) +ListView::ListView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *par= ent, bool nonInteractive) + : EventView(parent) + , d(new Private()) { setCalendar(calendar); d->mActiveItem =3D nullptr; @@ -309,8 +327,8 @@ int ListView::currentDateCount() const Akonadi::Item::List ListView::selectedIncidences() const { Akonadi::Item::List eventList; - QTreeWidgetItem *item =3D d->mTreeWidget->selectedItems().isEmpty() ? = nullptr : - d->mTreeWidget->selectedItems().first(); + QTreeWidgetItem *item =3D d->mTreeWidget->selectedItems().isEmpty() ? = nullptr + : d->mTreeWidget->selectedItems().first(); if (item) { ListViewItem *i =3D static_cast(item); eventList.append(i->mIncidence); @@ -379,8 +397,7 @@ void ListView::Private::addIncidences(const Akonadi::ET= MCalendar::Ptr &calendar, } = void ListView::Private::addIncidence(const Akonadi::ETMCalendar::Ptr &cale= ndar, - const Akonadi::Item &item, - const QDate &date) + const Akonadi::Item &item, const QDat= e &date) { Q_ASSERT(calendar); if (item.isValid() && item.hasPayload()) { @@ -389,8 +406,7 @@ void ListView::Private::addIncidence(const Akonadi::ETM= Calendar::Ptr &calendar, } = void ListView::Private::addIncidence(const Akonadi::ETMCalendar::Ptr &cale= ndar, - const KCalCore::Incidence::Ptr &incid= ence, - const QDate &date) + const KCalCore::Incidence::Ptr &incid= ence, const QDate &date) { if (!incidence) { return; @@ -406,8 +422,8 @@ void ListView::Private::addIncidence(const Akonadi::ETM= Calendar::Ptr &calendar, mItems.insert(aitem.id(), aitem); Incidence::Ptr tinc =3D incidence; = - if (tinc->customProperty("KABC", "BIRTHDAY") =3D=3D QLatin1String("YES= ") || - tinc->customProperty("KABC", "ANNIVERSARY") =3D=3D QLatin1Stri= ng("YES")) { + if (tinc->customProperty("KABC", "BIRTHDAY") =3D=3D QLatin1String("YES= ") + || tinc->customProperty("KABC", "ANNIVERSARY") =3D=3D QLatin1Strin= g("YES")) { const int years =3D EventViews::yearDiff(tinc->dtStart().date(), m= EndDate); if (years > 0) { tinc =3D Incidence::Ptr(incidence->clone()); @@ -423,7 +439,8 @@ void ListView::Private::addIncidence(const Akonadi::ETM= Calendar::Ptr &calendar, for (int col =3D 0; col < Dummy_EOF_Column; ++col) { item->setToolTip(col, IncidenceFormatter::toolTipStr( - CalendarSupport::displayName(calendar.data(),= aitem.parentCollection()), + CalendarSupport::displayName(calendar.data(), + aitem.parentColl= ection()), incidence)); } = @@ -461,13 +478,12 @@ void ListView::changeIncidenceDisplay(const Akonadi::= Item &aitem, int action) } = switch (action) { - case Akonadi::IncidenceChanger::ChangeTypeCreate: { + case Akonadi::IncidenceChanger::ChangeTypeCreate: if (date >=3D f && date <=3D l) { d->addIncidence(calendar(), aitem, date); } break; - } - case Akonadi::IncidenceChanger::ChangeTypeModify: { + case Akonadi::IncidenceChanger::ChangeTypeModify: item =3D d->getItemForIncidence(aitem); if (item) { delete item; @@ -478,12 +494,10 @@ void ListView::changeIncidenceDisplay(const Akonadi::= Item &aitem, int action) d->addIncidence(calendar(), aitem, date); } break; - } - case Akonadi::IncidenceChanger::ChangeTypeDelete: { + case Akonadi::IncidenceChanger::ChangeTypeDelete: item =3D d->getItemForIncidence(aitem); delete item; break; - } default: qCDebug(CALENDARVIEW_LOG) << "Illegal action" << action; } @@ -588,4 +602,3 @@ QSize ListView::sizeHint() const return QSize(s.width() + style()->pixelMetric(QStyle::PM_ScrollBarExte= nt) + 1, s.height()); } - diff --git a/src/list/listview.h b/src/list/listview.h index 93fc6f4..21790b6 100644 --- a/src/list/listview.h +++ b/src/list/listview.h @@ -41,15 +41,13 @@ class QModelIndex; @see KOBaseView, KODayListView */ = -namespace EventViews -{ - +namespace EventViews { class EVENTVIEWS_EXPORT ListView : public EventView { Q_OBJECT public: - explicit ListView(const Akonadi::ETMCalendar::Ptr &calendar, - QWidget *parent =3D nullptr, bool nonInteractive =3D= false); + explicit ListView(const Akonadi::ETMCalendar::Ptr &calendar, QWidget *= parent =3D nullptr, + bool nonInteractive =3D false); ~ListView(); = int currentDateCount() const override; @@ -93,7 +91,6 @@ private: class Private; Private *const d; }; - } = #endif diff --git a/src/month/monthgraphicsitems.cpp b/src/month/monthgraphicsitem= s.cpp index 9212c5f..c76e558 100644 --- a/src/month/monthgraphicsitems.cpp +++ b/src/month/monthgraphicsitems.cpp @@ -43,7 +43,7 @@ ScrollIndicator::ScrollIndicator(ScrollIndicator::ArrowDi= rection dir) = QRectF ScrollIndicator::boundingRect() const { - return QRectF(- mWidth / 2, - mHeight / 2, mWidth, mHeight); + return QRectF(-mWidth / 2, -mHeight / 2, mWidth, mHeight); } = void ScrollIndicator::paint(QPainter *painter, const QStyleOptionGraphicsI= tem *option, @@ -56,12 +56,12 @@ void ScrollIndicator::paint(QPainter *painter, const QS= tyleOptionGraphicsItem *o = QPolygon arrow(3); if (mDirection =3D=3D ScrollIndicator::UpArrow) { - arrow.setPoint(0, 0, - mHeight / 2); + arrow.setPoint(0, 0, -mHeight / 2); arrow.setPoint(1, mWidth / 2, mHeight / 2); - arrow.setPoint(2, - mWidth / 2, mHeight / 2); + arrow.setPoint(2, -mWidth / 2, mHeight / 2); } else if (mDirection =3D=3D ScrollIndicator::DownArrow) { // down - arrow.setPoint(1, mWidth / 2, - mHeight / 2); - arrow.setPoint(2, - mWidth / 2, - mHeight / 2); + arrow.setPoint(1, mWidth / 2, -mHeight / 2); + arrow.setPoint(2, -mWidth / 2, -mHeight / 2); arrow.setPoint(0, 0, mHeight / 2); } QColor color(Qt::black); @@ -73,7 +73,9 @@ void ScrollIndicator::paint(QPainter *painter, const QSty= leOptionGraphicsItem *o = //------------------------------------------------------------- MonthCell::MonthCell(int id, const QDate &date, QGraphicsScene *scene) - : mId(id), mDate(date), mScene(scene) + : mId(id) + , mDate(date) + , mScene(scene) { mUpArrow =3D new ScrollIndicator(ScrollIndicator::UpArrow); mDownArrow =3D new ScrollIndicator(ScrollIndicator::DownArrow); @@ -132,8 +134,8 @@ int MonthCell::firstFreeSpace() static const int ft =3D 2; // frame thickness = MonthGraphicsItem::MonthGraphicsItem(MonthItem *manager) - : QGraphicsItem(nullptr), - mMonthItem(manager) + : QGraphicsItem(nullptr) + , mMonthItem(manager) { manager->monthScene()->addItem(this); QTransform transform; @@ -216,7 +218,7 @@ QPainterPath MonthGraphicsItem::widgetPath(bool border)= const QRectF MonthGraphicsItem::boundingRect() const { // width - 2 because of the cell-dividing line with width =3D=3D 1 at = beginning and end - return QRectF(0, 0, (daySpan() + 1) * mMonthItem->monthScene()->colum= nWidth() - 2, + return QRectF(0, 0, (daySpan() + 1) * mMonthItem->monthScene()->column= Width() - 2, mMonthItem->monthScene()->itemHeight()); } = @@ -233,11 +235,11 @@ void MonthGraphicsItem::paint(QPainter *p, const QSty= leOptionGraphicsItem *, QWi int textMargin =3D 7; = QColor bgColor =3D mMonthItem->bgColor(); - bgColor =3D mMonthItem->selected() ? - bgColor.lighter(EventView::BRIGHTNESS_FACTOR) : bgColor; + bgColor =3D mMonthItem->selected() + ? bgColor.lighter(EventView::BRIGHTNESS_FACTOR) : bgColor; QColor frameColor =3D mMonthItem->frameColor(); - frameColor =3D mMonthItem->selected() ? - frameColor.lighter(EventView::BRIGHTNESS_FACTOR) : frameC= olor; + frameColor =3D mMonthItem->selected() + ? frameColor.lighter(EventView::BRIGHTNESS_FACTOR) : fram= eColor; QColor textColor =3D EventViews::getTextColor(bgColor); = // make moving or resizing items translucent @@ -327,7 +329,6 @@ void MonthGraphicsItem::paint(QPainter *p, const QStyle= OptionGraphicsItem *, QWi text =3D p->fontMetrics().elidedText(text, Qt::ElideRight, textRec= t.width()); p->drawText(textRect, alignFlag, text); } - } = void MonthGraphicsItem::setStartDate(const QDate &date) @@ -357,7 +358,7 @@ int MonthGraphicsItem::daySpan() const = void MonthGraphicsItem::updateGeometry() { - MonthCell *cell =3D mMonthItem->monthScene()->mMonthCellMap.value(sta= rtDate()); + MonthCell *cell =3D mMonthItem->monthScene()->mMonthCellMap.value(star= tDate()); = // If the item is moving and this one is moved outside the view, // cell will be null @@ -373,16 +374,16 @@ void MonthGraphicsItem::updateGeometry() int beginX =3D 1 + mMonthItem->monthScene()->cellHorizontalPos(cell); int beginY =3D 1 + cell->topMargin() + mMonthItem->monthScene()->cellV= erticalPos(cell); = - beginY +=3D mMonthItem->position() * - mMonthItem->monthScene()->itemHeightIncludingSpacing() - - mMonthItem->monthScene()->startHeight() * - mMonthItem->monthScene()->itemHeightIncludingSpacing(); // s= crolling + beginY +=3D mMonthItem->position() + *mMonthItem->monthScene()->itemHeightIncludingSpacing() + -mMonthItem->monthScene()->startHeight() + *mMonthItem->monthScene()->itemHeightIncludingSpacing(); // = scrolling = setPos(beginX, beginY); = - if (mMonthItem->position() < mMonthItem->monthScene()->startHeight() || - mMonthItem->position() - mMonthItem->monthScene()->startHeight= () >=3D - mMonthItem->monthScene()->maxRowCount()) { + if (mMonthItem->position() < mMonthItem->monthScene()->startHeight() + || mMonthItem->position() - mMonthItem->monthScene()->startHeight() + >=3D mMonthItem->monthScene()->maxRowCount()) { hide(); } else { show(); @@ -394,4 +395,3 @@ QString MonthGraphicsItem::getToolTip() const { return mMonthItem->toolTipText(mStartDate); } - diff --git a/src/month/monthgraphicsitems.h b/src/month/monthgraphicsitems.h index 88a2991..4d6e9e2 100644 --- a/src/month/monthgraphicsitems.h +++ b/src/month/monthgraphicsitems.h @@ -27,9 +27,7 @@ #include #include = -namespace EventViews -{ - +namespace EventViews { class MonthItem; = /** @@ -85,6 +83,7 @@ public: { return mId; } + QDate date() const { return mDate; @@ -109,6 +108,7 @@ public: { return mUpArrow; } + ScrollIndicator *downArrow() const { return mDownArrow; @@ -218,7 +218,6 @@ private: // The current item is part of a MonthItem MonthItem *mMonthItem =3D nullptr; }; - } = #endif diff --git a/src/month/monthitem.cpp b/src/month/monthitem.cpp index 3f160ab..7a17e7b 100644 --- a/src/month/monthitem.cpp +++ b/src/month/monthitem.cpp @@ -42,10 +42,10 @@ using namespace EventViews; using namespace KCalCore; = MonthItem::MonthItem(MonthScene *monthScene) - : mMonthScene(monthScene), - mSelected(false), - mMoving(false), - mResizing(false) + : mMonthScene(monthScene) + , mSelected(false) + , mMoving(false) + , mResizing(false) { } = @@ -77,7 +77,7 @@ void MonthItem::updateMonthGraphicsItems() // For each row of the month view, create an item to build the whole // MonthItem's MonthGraphicsItems. for (QDate d =3D mMonthScene->mMonthView->actualStartDateTime().date(); - d < mMonthScene->mMonthView->actualEndDateTime().date(); d =3D= d.addDays(7)) { + d < mMonthScene->mMonthView->actualEndDateTime().date(); d =3D d.= addDays(7)) { QDate end =3D d.addDays(6); = int span; @@ -245,7 +245,7 @@ bool MonthItem::greaterThan(const MonthItem *e1, const = MonthItem *e2) } return e1->greaterThanFallback(e2); } else { - return leftDaySpan > rightDaySpan; + return leftDaySpan > rightDaySpan; } } = @@ -301,17 +301,18 @@ IncidenceMonthItem::IncidenceMonthItem(MonthScene *mo= nthScene, const Akonadi::Item &aitem, const KCalCore::Incidence::Ptr &inc= idence, const QDate &recurStartDate) - : MonthItem(monthScene), mCalendar(calendar), - mIncidence(incidence), - mAkonadiItemId(aitem.id()) + : MonthItem(monthScene) + , mCalendar(calendar) + , mIncidence(incidence) + , mAkonadiItemId(aitem.id()) { mIsEvent =3D CalendarSupport::hasEvent(aitem); mIsJournal =3D CalendarSupport::hasJournal(aitem); mIsTodo =3D CalendarSupport::hasTodo(aitem); = KCalCore::Incidence::Ptr inc =3D mIncidence; - if (inc->customProperty("KABC", "BIRTHDAY") =3D=3D QLatin1String("YES"= ) || - inc->customProperty("KABC", "ANNIVERSARY") =3D=3D QLatin1Strin= g("YES")) { + if (inc->customProperty("KABC", "BIRTHDAY") =3D=3D QLatin1String("YES") + || inc->customProperty("KABC", "ANNIVERSARY") =3D=3D QLatin1String= ("YES")) { const int years =3D EventViews::yearDiff(inc->dtStart().date(), re= curStartDate); if (years > 0) { inc =3D KCalCore::Incidence::Ptr(inc->clone()); @@ -327,8 +328,8 @@ IncidenceMonthItem::IncidenceMonthItem(MonthScene *mont= hScene, = // first set to 0, because it's used in startDate() mRecurDayOffset =3D 0; - if ((mIncidence->recurs() || mIncidence->recurrenceId().isValid()) && - startDate().isValid() && recurStartDate.isValid()) { + if ((mIncidence->recurs() || mIncidence->recurrenceId().isValid()) + && startDate().isValid() && recurStartDate.isValid()) { mRecurDayOffset =3D startDate().daysTo(recurStartDate); } } @@ -339,7 +340,6 @@ IncidenceMonthItem::~IncidenceMonthItem() = bool IncidenceMonthItem::greaterThanFallback(const MonthItem *other) const { - const IncidenceMonthItem *o =3D qobject_cast(other); if (!o) { return MonthItem::greaterThanFallback(other); @@ -369,6 +369,7 @@ QDate IncidenceMonthItem::realStartDate() const = return start.addDays(mRecurDayOffset); } + QDate IncidenceMonthItem::realEndDate() const { if (!mIncidence) { @@ -380,6 +381,7 @@ QDate IncidenceMonthItem::realEndDate() const = return end.addDays(mRecurDayOffset); } + bool IncidenceMonthItem::allDay() const { return mIncidence->allDay(); @@ -388,12 +390,14 @@ bool IncidenceMonthItem::allDay() const bool IncidenceMonthItem::isMoveable() const { return monthScene()->mMonthView->calendar()->hasRight(akonadiItem(), - Akonadi::Collection::CanChangeItem); + Akonadi::Collect= ion::CanChangeItem); } + bool IncidenceMonthItem::isResizable() const { - return mIsEvent && monthScene()->mMonthView->calendar()->hasRight(akon= adiItem(), - Akonadi::Collection::CanChangeItem); + return mIsEvent && monthScene()->mMonthView->calendar()->hasRight( + akonadiItem(), + Akonadi::Collection::CanChangeItem); } = void IncidenceMonthItem::finalizeMove(const QDate &newStartDate) @@ -405,13 +409,13 @@ void IncidenceMonthItem::finalizeMove(const QDate &ne= wStartDate) startDate().daysTo(newStartDate)); } } -void IncidenceMonthItem::finalizeResize(const QDate &newStartDate, - const QDate &newEndDate) + +void IncidenceMonthItem::finalizeResize(const QDate &newStartDate, const Q= Date &newEndDate) { Q_ASSERT(isResizable()); = - if (startDate().isValid() && endDate().isValid() && - newStartDate.isValid() && newEndDate.isValid()) { + if (startDate().isValid() && endDate().isValid() + && newStartDate.isValid() && newEndDate.isValid()) { updateDates(startDate().daysTo(newStartDate), endDate().daysTo(newEndDate)); } @@ -430,7 +434,8 @@ void IncidenceMonthItem::updateDates(int startOffset, i= nt endOffset) if (mIncidence->recurs()) { const int res =3D monthScene()->mMonthView->showMoveRecurDialog(mI= ncidence, startDate()); switch (res) { - case KCalUtils::RecurrenceActions::AllOccurrences: { + case KCalUtils::RecurrenceActions::AllOccurrences: + { // All occurrences KCalCore::Incidence::Ptr oldIncidence(mIncidence->clone()); setNewDates(mIncidence, startOffset, endOffset); @@ -438,12 +443,13 @@ void IncidenceMonthItem::updateDates(int startOffset,= int endOffset) break; } case KCalUtils::RecurrenceActions::SelectedOccurrence: // Just thi= s occurrence - case KCalUtils::RecurrenceActions::FutureOccurrences: { // All fut= ure occurrences + case KCalUtils::RecurrenceActions::FutureOccurrences: + { // All fut= ure occurrences const bool thisAndFuture =3D (res =3D=3D KCalUtils::Recurrence= Actions::FutureOccurrences); QDateTime occurrenceDate(mIncidence->dtStart()); occurrenceDate.setDate(startDate()); KCalCore::Incidence::Ptr newIncidence(KCalCore::Calendar::crea= teException( - mIncidence, occurrenceDate, thisAndFuture)); + mIncidence, occurren= ceDate, thisAndFuture)); if (newIncidence) { changer->startAtomicOperation(i18n("Move occurrence(s)")); setNewDates(newIncidence, startOffset, endOffset); @@ -475,7 +481,8 @@ void IncidenceMonthItem::updateSelection(const Akonadi:= :Item &incidence, const Q QString IncidenceMonthItem::text(bool end) const { QString ret =3D mIncidence->summary(); - if (!allDay() && !mIsJournal && monthScene()->monthView()->preferences= ()->showTimeInMonthView()) { + if (!allDay() && !mIsJournal + && monthScene()->monthView()->preferences()->showTimeInMonthView()= ) { // Prepend the time str to the text QString timeStr; if (mIsTodo) { @@ -486,14 +493,15 @@ QString IncidenceMonthItem::text(bool end) const QTime time; if (mIncidence->recurs()) { const auto start =3D mIncidence->dtStart().addDays(mRe= curDayOffset).addSecs(-1); - time =3D mIncidence->recurrence()->getNextDateTime(st= art).toLocalTime().time(); + time =3D mIncidence->recurrence()->getNextDateTime(sta= rt).toLocalTime().time(); } else { time =3D mIncidence->dtStart().toLocalTime().time(); } timeStr =3D QLocale().toString(time, QLocale::ShortFormat); } else { KCalCore::Event::Ptr event =3D mIncidence.staticCast(); - timeStr =3D QLocale().toString(event->dtEnd().toLocalTime(= ).time(), QLocale::ShortFormat); + timeStr =3D QLocale().toString( + event->dtEnd().toLocalTime().time(), QLocale::ShortFor= mat); } } if (!timeStr.isEmpty()) { @@ -511,8 +519,8 @@ QString IncidenceMonthItem::text(bool end) const QString IncidenceMonthItem::toolTipText(const QDate &date) const { return KCalUtils::IncidenceFormatter::toolTipStr( - CalendarSupport::displayName(mCalendar.data(), akonadiItem(= ).parentCollection()), - mIncidence, date, true); + CalendarSupport::displayName(mCalendar.data(), akonadiItem().paren= tCollection()), + mIncidence, date, true); } = QVector IncidenceMonthItem::icons() const @@ -526,13 +534,14 @@ QVector IncidenceMonthItem::icons() const bool specialEvent =3D false; Akonadi::Item item =3D akonadiItem(); = - const QSet icons =3D - monthScene()->monthView()->preferences()->monthViewIcons(); + const QSet icons + =3D monthScene()->monthView()->preferences()->monthViewIcons(); = QString customIconName; if (icons.contains(EventViews::EventView::CalendarCustomIcon)) { const QString iconName =3D monthScene()->monthView()->iconForItem(= item); - if (!iconName.isEmpty() && iconName !=3D QLatin1String("view-calen= dar") && iconName !=3D QLatin1String("office-calendar")) { + if (!iconName.isEmpty() && iconName !=3D QLatin1String("view-calen= dar") + && iconName !=3D QLatin1String("office-calendar")) { customIconName =3D iconName; ret << QPixmap(cachedSmallIcon(iconName)); } @@ -557,10 +566,9 @@ QVector IncidenceMonthItem::icons() const // from event's much easier. = // ret << monthScene()->eventPixmap(); - - } else if ((mIsTodo || mIsJournal) && icons.contains(mIsTodo ? - EventView::TaskIcon : - EventView::JournalIcon)) { + } else if ((mIsTodo || mIsJournal) && icons.contains(mIsTodo + ? EventView::Task= Icon + : EventView::Jour= nalIcon)) { QDateTime occurrenceDateTime =3D mIncidence->dateTime(Incidence::R= oleRecurrenceStart); occurrenceDateTime.setDate(realStartDate()); = @@ -570,20 +578,20 @@ QVector IncidenceMonthItem::icons() const } } = - if (icons.contains(EventView::ReadOnlyIcon) && - !monthScene()->mMonthView->calendar()->hasRight(item, Akonadi:= :Collection::CanChangeItem) && - !specialEvent) { + if (icons.contains(EventView::ReadOnlyIcon) + && !monthScene()->mMonthView->calendar()->hasRight(item, Akonadi::= Collection::CanChangeItem) + && !specialEvent) { ret << monthScene()->readonlyPixmap(); } = /* sorry, this looks too cluttered. disable until we can make something prettier; no idea at this time -- allen */ - if (icons.contains(EventView::ReminderIcon) && - mIncidence->hasEnabledAlarms() && !specialEvent) { + if (icons.contains(EventView::ReminderIcon) + && mIncidence->hasEnabledAlarms() && !specialEvent) { ret << monthScene()->alarmPixmap(); } - if (icons.contains(EventView::RecurringIcon) && - mIncidence->recurs() && !specialEvent) { + if (icons.contains(EventView::RecurringIcon) + && mIncidence->recurs() && !specialEvent) { ret << monthScene()->recurPixmap(); } //TODO: check what to do with Reply @@ -600,8 +608,8 @@ QColor IncidenceMonthItem::catColor() const cat =3D categories.at(0); } = - return cat.isEmpty() ? CalendarSupport::KCalPrefs::instance()->unsetCa= tegoryColor() : - CalendarSupport::KCalPrefs::instance()->categoryColor(cat); + return cat.isEmpty() ? CalendarSupport::KCalPrefs::instance()->unsetCa= tegoryColor() + : CalendarSupport::KCalPrefs::instance()->categoryColor(cat); } = QColor IncidenceMonthItem::bgColor() const @@ -613,20 +621,21 @@ QColor IncidenceMonthItem::bgColor() const Todo::Ptr todo =3D CalendarSupport::todo(akonadiItem()); Q_ASSERT(todo); if (todo) { - const QDate dtRecurrence =3D // this is dtDue if there's no dt= Recurrence - todo->dtRecurrence().toLocalTime().date(); + const QDate dtRecurrence // this is dtDue if there's no dtRe= currence + =3D todo->dtRecurrence().toLocalTime().date(); const QDate today =3D QDate::currentDate(); if (todo->isOverdue() && today > startDate() && startDate() >= =3D dtRecurrence) { bgColor =3D prefs->todoOverdueColor(); - } else if (today =3D=3D startDate() && !todo->isCompleted() &&= startDate() >=3D dtRecurrence) { + } else if (today =3D=3D startDate() && !todo->isCompleted() + && startDate() >=3D dtRecurrence) { bgColor =3D prefs->todoDueTodayColor(); } } } = if (!bgColor.isValid()) { - if (prefs->monthViewColors() =3D=3D PrefsBase::MonthItemResourceOn= ly || - prefs->monthViewColors() =3D=3D PrefsBase::MonthItemResour= ceInsideCategoryOutside) { + if (prefs->monthViewColors() =3D=3D PrefsBase::MonthItemResourceOn= ly + || prefs->monthViewColors() =3D=3D PrefsBase::MonthItemResourc= eInsideCategoryOutside) { bgColor =3D EventViews::resourceColor(akonadiItem(), prefs); } else { bgColor =3D catColor(); @@ -645,10 +654,10 @@ QColor IncidenceMonthItem::frameColor() const QColor frameColor; = PrefsPtr prefs =3D monthScene()->monthView()->preferences(); - if (prefs->monthViewColors() =3D=3D PrefsBase::MonthItemResourceOnly || - prefs->monthViewColors() =3D=3D PrefsBase::MonthItemCategoryIn= sideResourceOutside || - (mIncidence->categories().isEmpty() && prefs->monthViewColors(= ) =3D=3D - PrefsBase::MonthItemResourceInsideCategoryOutside)) { + if (prefs->monthViewColors() =3D=3D PrefsBase::MonthItemResourceOnly + || prefs->monthViewColors() =3D=3D PrefsBase::MonthItemCategoryIns= ideResourceOutside + || (mIncidence->categories().isEmpty() && prefs->monthViewColors() + =3D=3D PrefsBase::MonthItemResourceInsideCategoryOutside)) { Q_ASSERT(mIncidence); frameColor =3D EventViews::resourceColor(akonadiItem(), prefs); } else { @@ -677,18 +686,17 @@ Akonadi::Item::Id IncidenceMonthItem::akonadiItemId()= const return mAkonadiItemId; } = -void IncidenceMonthItem::setNewDates(const KCalCore::Incidence::Ptr &incid= ence, - int startOffset, int endOffset) +void IncidenceMonthItem::setNewDates(const KCalCore::Incidence::Ptr &incid= ence, int startOffset, + int endOffset) { if (mIsTodo) { - // For to-dos endOffset is ignored because it will always be =3D= =3D to startOffset because we only // support moving to-dos, not resizing them. There are no multi-da= y to-dos. // Lets just call it offset to reduce confusion. const int offset =3D startOffset; = KCalCore::Todo::Ptr todo =3D incidence.staticCast(); - QDateTime due =3D todo->dtDue(); + QDateTime due =3D todo->dtDue(); QDateTime start =3D todo->dtStart(); if (due.isValid()) { // Due has priority over start. // We will only move the due date, unlike events where we move= both. @@ -705,7 +713,8 @@ void IncidenceMonthItem::setNewDates(const KCalCore::In= cidence::Ptr &incidence, todo->setDtStart(start); } else { // This never happens - qCWarning(CALENDARVIEW_LOG) << "Move what? uid:" << todo->uid(= ) << "; summary=3D" << todo->summary(); + qCWarning(CALENDARVIEW_LOG) << "Move what? uid:" << todo->uid(= ) << "; summary=3D" + << todo->summary(); } } else { incidence->setDtStart(incidence->dtStart().addDays(startOffset)); @@ -718,9 +727,10 @@ void IncidenceMonthItem::setNewDates(const KCalCore::I= ncidence::Ptr &incidence, = //----------------------------------------------------------------- // HOLIDAYMONTHITEM -HolidayMonthItem::HolidayMonthItem(MonthScene *monthScene, const QDate &da= te, - const QString &name) - : MonthItem(monthScene), mDate(date), mName(name) +HolidayMonthItem::HolidayMonthItem(MonthScene *monthScene, const QDate &da= te, const QString &name) + : MonthItem(monthScene) + , mDate(date) + , mName(name) { } = @@ -744,8 +754,8 @@ void HolidayMonthItem::finalizeMove(const QDate &newSta= rtDate) Q_UNUSED(newStartDate); Q_ASSERT(false); } -void HolidayMonthItem::finalizeResize(const QDate &newStartDate, - const QDate &newEndDate) + +void HolidayMonthItem::finalizeResize(const QDate &newStartDate, const QDa= te &newEndDate) { Q_UNUSED(newStartDate); Q_UNUSED(newEndDate); @@ -772,4 +782,3 @@ QColor HolidayMonthItem::frameColor() const { return Qt::black; } - diff --git a/src/month/monthitem.h b/src/month/monthitem.h index f670652..d676626 100644 --- a/src/month/monthitem.h +++ b/src/month/monthitem.h @@ -32,9 +32,7 @@ #include #include = -namespace EventViews -{ - +namespace EventViews { class MonthGraphicsItem; class MonthScene; = @@ -262,8 +260,7 @@ protected: /** Called after a resize operation. */ - virtual void finalizeResize(const QDate &newStartDate, - const QDate &newEndDate) =3D 0; + virtual void finalizeResize(const QDate &newStartDate, const QDate &ne= wEndDate) =3D 0; = private: /** @@ -289,10 +286,8 @@ class EVENTVIEWS_EXPORT IncidenceMonthItem : public Mo= nthItem Q_OBJECT = public: - IncidenceMonthItem(MonthScene *monthScene, - const Akonadi::ETMCalendar::Ptr &calendar, - const Akonadi::Item &item, - const KCalCore::Incidence::Ptr &incidence, + IncidenceMonthItem(MonthScene *monthScene, const Akonadi::ETMCalendar:= :Ptr &calendar, + const Akonadi::Item &item, const KCalCore::Incidenc= e::Ptr &incidence, const QDate &recurStartDate =3D QDate()); = virtual ~IncidenceMonthItem(); @@ -320,8 +315,7 @@ public: = protected: void finalizeMove(const QDate &newStartDate) override; - virtual void finalizeResize(const QDate &newStartDate, - const QDate &newEndDate) override; + virtual void finalizeResize(const QDate &newStartDate, const QDate &ne= wEndDate) override; = protected Q_SLOTS: /** @@ -334,8 +328,7 @@ protected Q_SLOTS: private: void updateDates(int startOffset, int endOffset); = - void setNewDates(const KCalCore::Incidence::Ptr &incidence, - int startOffset, int endOffset); + void setNewDates(const KCalCore::Incidence::Ptr &incidence, int startO= ffset, int endOffset); = /** Returns the category color for this incidence. @@ -363,10 +356,12 @@ public: { return mDate; } + QDate realEndDate() const override { return mDate; } + bool allDay() const override { return true; @@ -376,6 +371,7 @@ public: { return false; } + bool isResizable() const override { return false; @@ -386,6 +382,7 @@ public: Q_UNUSED(end); return mName; } + QString toolTipText(const QDate &) const override { return mName; @@ -398,14 +395,12 @@ public: = protected: void finalizeMove(const QDate &newStartDate) override; - virtual void finalizeResize(const QDate &newStartDate, - const QDate &newEndDate) override; + virtual void finalizeResize(const QDate &newStartDate, const QDate &ne= wEndDate) override; = private: QDate mDate; QString mName; }; - } = #endif diff --git a/src/month/monthscene.cpp b/src/month/monthscene.cpp index 295ba9b..fb59484 100644 --- a/src/month/monthscene.cpp +++ b/src/month/monthscene.cpp @@ -26,7 +26,6 @@ #include "monthview.h" #include "prefs.h" = - #include = #include @@ -40,26 +39,27 @@ static const int AUTO_REPEAT_DELAY =3D 600; using namespace EventViews; = MonthScene::MonthScene(MonthView *parent) - : QGraphicsScene(parent), - mMonthView(parent), - mInitialized(false), - mClickedItem(nullptr), - mActionItem(nullptr), - mActionInitiated(false), - mSelectedItem(nullptr), - mStartCell(nullptr), - mPreviousCell(nullptr), - mActionType(None), - mStartHeight(0), - mCurrentIndicator(nullptr) -{ - mBirthdayPixmap =3D QIcon::fromTheme(QStringLiteral("view-calendar-bi= rthday")).pixmap(16, 16); - mAnniversaryPixmap =3D QIcon::fromTheme(QStringLiteral("view-calendar-= wedding-anniversary")).pixmap(16, 16); - mAlarmPixmap =3D QIcon::fromTheme(QStringLiteral("appointment-remi= nder")).pixmap(16, 16); - mRecurPixmap =3D QIcon::fromTheme(QStringLiteral("appointment-recu= rring")).pixmap(16, 16); - mReadonlyPixmap =3D QIcon::fromTheme(QStringLiteral("object-locked"))= .pixmap(16, 16); - mReplyPixmap =3D QIcon::fromTheme(QStringLiteral("mail-reply-sende= r")).pixmap(16, 16); - mHolidayPixmap =3D QIcon::fromTheme(QStringLiteral("view-calendar-ho= liday")).pixmap(16, 16); + : QGraphicsScene(parent) + , mMonthView(parent) + , mInitialized(false) + , mClickedItem(nullptr) + , mActionItem(nullptr) + , mActionInitiated(false) + , mSelectedItem(nullptr) + , mStartCell(nullptr) + , mPreviousCell(nullptr) + , mActionType(None) + , mStartHeight(0) + , mCurrentIndicator(nullptr) +{ + mBirthdayPixmap =3D QIcon::fromTheme(QStringLiteral("view-calendar-bir= thday")).pixmap(16, 16); + mAnniversaryPixmap + =3D QIcon::fromTheme(QStringLiteral("view-calendar-wedding-anniver= sary")).pixmap(16, 16); + mAlarmPixmap =3D QIcon::fromTheme(QStringLiteral("appointment-reminder= ")).pixmap(16, 16); + mRecurPixmap =3D QIcon::fromTheme(QStringLiteral("appointment-recurrin= g")).pixmap(16, 16); + mReadonlyPixmap =3D QIcon::fromTheme(QStringLiteral("object-locked")).= pixmap(16, 16); + mReplyPixmap =3D QIcon::fromTheme(QStringLiteral("mail-reply-sender"))= .pixmap(16, 16); + mHolidayPixmap =3D QIcon::fromTheme(QStringLiteral("view-calendar-holi= day")).pixmap(16, 16); = setSceneRect(0, 0, parent->width(), parent->height()); } @@ -194,7 +194,7 @@ void MonthGraphicsView::drawBackground(QPainter *p, con= st QRectF &rect) font.setPointSize(15); p->setFont(font); const int dayLabelsHeight =3D 20; - p->drawText(QRect(0, 0, // top right + p->drawText(QRect(0, 0, // top right static_cast(mScene->sceneRect().width()), static_cast(mScene->headerHeight() - dayLabelsH= eight)), Qt::AlignCenter, @@ -209,7 +209,7 @@ void MonthGraphicsView::drawBackground(QPainter *p, con= st QRectF &rect) const QDate end =3D mMonthView->actualEndDateTime().date(); = for (QDate d =3D start; - d <=3D start.addDays(6); d =3D d.addDays(1)) { + d <=3D start.addDays(6); d =3D d.addDays(1)) { MonthCell *cell =3D mScene->mMonthCellMap.value(d); = if (!cell) { @@ -232,8 +232,9 @@ void MonthGraphicsView::drawBackground(QPainter *p, con= st QRectF &rect) int columnWidth =3D mScene->columnWidth(); int rowHeight =3D mScene->rowHeight(); = - const QList workDays =3D CalendarSupport::workDays(mMonthView->= actualStartDateTime().date(), - mMonthView->actualEndDateTime().date()); + const QList workDays =3D CalendarSupport::workDays( + mMonthView->actualStartDateTime().date(), + mMonthView->actualEndDateTime().date()); = for (QDate d =3D start; d <=3D end; d =3D d.addDays(1)) { if (!mScene->mMonthCellMap.contains(d)) { @@ -294,11 +295,11 @@ void MonthGraphicsView::drawBackground(QPainter *p, c= onst QRectF &rect) = p->setFont(font); = - QPen oldPen =3D mMonthView->preferences()->monthGridBackgroundColor()= .darker(150); + QPen oldPen =3D mMonthView->preferences()->monthGridBackgroundColor().= darker(150); = // Draw dates for (QDate d =3D mMonthView->actualStartDateTime().date(); - d <=3D mMonthView->actualEndDateTime().date(); d =3D d.addDays= (1)) { + d <=3D mMonthView->actualEndDateTime().date(); d =3D d.addDays(1)= ) { MonthCell *cell =3D mScene->mMonthCellMap.value(d); = QFont font =3D p->font(); @@ -333,8 +334,8 @@ void MonthGraphicsView::drawBackground(QPainter *p, con= st QRectF &rect) if (!mScene->lastItemFit(cell)) { cell->downArrow()->setPos( mScene->cellHorizontalPos(cell) + columnWidth / 2, - mScene->cellVerticalPos(cell) + rowHeight - - cell->downArrow()->boundingRect().height() / 2 - 2); + mScene->cellVerticalPos(cell) + rowHeight + -cell->downArrow()->boundingRect().height() / 2 - 2); cell->downArrow()->show(); } else { cell->downArrow()->hide(); @@ -342,8 +343,8 @@ void MonthGraphicsView::drawBackground(QPainter *p, con= st QRectF &rect) = QString dayText; // Prepend month name if d is the first or last day of month - if (d.day() =3D=3D 1 || // d is the first day of= month - d.addDays(1).day() =3D=3D 1) { // d is the last day = of month + if (d.day() =3D=3D 1 // d is the first day of= month + || d.addDays(1).day() =3D=3D 1) { // d is the last day = of month dayText =3D i18nc("'Month day' for month view cells", "%1 %2", QLocale::system().monthName(d.month(), QLocale= ::ShortFormat), d.day()); @@ -398,7 +399,7 @@ int MonthScene::totalHeight() { int max =3D 0; for (QDate d =3D mMonthView->actualStartDateTime().date(); - d <=3D mMonthView->actualEndDateTime().date(); d =3D d.addDays= (1)) { + d <=3D mMonthView->actualEndDateTime().date(); d =3D d.addDays(1)= ) { int c =3D mMonthCellMap[ d ]->firstFreeSpace(); if (c > max) { max =3D c; @@ -518,12 +519,12 @@ void MonthScene::mouseMoveEvent(QGraphicsSceneMouseEv= ent *mouseEvent) if (mActionType =3D=3D None) { MonthGraphicsItem *iItem =3D dynamic_cast(ite= mAt(pos, {})); if (iItem) { - if (iItem->monthItem()->isResizable() && - iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= =3D 10) { + if (iItem->monthItem()->isResizable() + && iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= =3D 10) { view->setActionCursor(Resize); - } else if (iItem->monthItem()->isResizable() && - iItem->isEndItem() && - iItem->mapFromScene(pos).x() >=3D iItem->boundingRe= ct().width() - 10) { + } else if (iItem->monthItem()->isResizable() + && iItem->isEndItem() + && iItem->mapFromScene(pos).x() >=3D iItem->boundin= gRect().width() - 10) { view->setActionCursor(Resize); } else { view->setActionCursor(None); @@ -552,7 +553,6 @@ void MonthScene::mouseMoveEvent(QGraphicsSceneMouseEven= t *mouseEvent) = // Move or resize action if (currentCell && currentCell !=3D mPreviousCell) { - bool ok =3D true; if (mActionType =3D=3D Move) { mActionItem->moveBy(mPreviousCell->date().daysTo(currentCe= ll->date())); @@ -597,13 +597,13 @@ void MonthScene::mousePressEvent(QGraphicsSceneMouseE= vent *mouseEvent) mActionInitiated =3D false; = // Move or resize ? - if (iItem->monthItem()->isResizable() && - iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= =3D 10) { + if (iItem->monthItem()->isResizable() + && iItem->isBeginItem() && iItem->mapFromScene(pos).x() <= =3D 10) { mActionType =3D Resize; mResizeType =3D ResizeLeft; - } else if (iItem->monthItem()->isResizable() && - iItem->isEndItem() && - iItem->mapFromScene(pos).x() >=3D iItem->boundingRe= ct().width() - 10) { + } else if (iItem->monthItem()->isResizable() + && iItem->isEndItem() + && iItem->mapFromScene(pos).x() >=3D iItem->boundin= gRect().width() - 10) { mActionType =3D Resize; mResizeType =3D ResizeRight; } else if (iItem->monthItem()->isMoveable()) { @@ -765,7 +765,8 @@ void MonthScene::removeIncidence(const QString &uid) = //---------------------------------------------------------- MonthGraphicsView::MonthGraphicsView(MonthView *parent) - : QGraphicsView(parent), mMonthView(parent) + : QGraphicsView(parent) + , mMonthView(parent) { setMouseTracking(true); } @@ -801,4 +802,3 @@ void MonthGraphicsView::resizeEvent(QResizeEvent *event) mScene->setSceneRect(0, 0, event->size().width(), event->size().height= ()); mScene->updateGeometry(); } - diff --git a/src/month/monthscene.h b/src/month/monthscene.h index d69f600..9aefb76 100644 --- a/src/month/monthscene.h +++ b/src/month/monthscene.h @@ -32,14 +32,11 @@ #include #include = -namespace Akonadi -{ +namespace Akonadi { class IncidenceChanger; } = -namespace EventViews -{ - +namespace EventViews { class MonthCell; class MonthItem; class MonthView; @@ -78,16 +75,19 @@ public: { return mMonthView; } + QMap mMonthCellMap; = bool initialized() { return mInitialized; } + void setInitialized(bool i) { mInitialized =3D i; } + void resetAll(); Akonadi::IncidenceChanger *incidenceChanger() const; = @@ -175,26 +175,32 @@ public: { return mBirthdayPixmap; } + QPixmap anniversaryPixmap() const { return mAnniversaryPixmap; } + QPixmap alarmPixmap() const { return mAlarmPixmap; } + QPixmap recurPixmap() const { return mRecurPixmap; } + QPixmap readonlyPixmap() const { return mReadonlyPixmap; } + QPixmap replyPixmap() const { - return mReplyPixmap; + return mReplyPixmap; } + QPixmap holidayPixmap() const { return mHolidayPixmap; @@ -345,7 +351,6 @@ private: MonthScene *mScene =3D nullptr; MonthView *mMonthView =3D nullptr; }; - } = #endif diff --git a/src/month/monthview.cpp b/src/month/monthview.cpp index 70dc391..86e2e1e 100644 --- a/src/month/monthview.cpp +++ b/src/month/monthview.cpp @@ -47,9 +47,7 @@ = using namespace EventViews; = -namespace EventViews -{ - +namespace EventViews { class MonthViewPrivate : public Akonadi::ETMCalendar::CalendarObserver { MonthView *q; @@ -63,12 +61,12 @@ public: /// Methods void triggerDelayedReload(EventView::Change reason); = public: /// Members - QTimer reloadTimer; - MonthScene *scene =3D nullptr; - QDate selectedItemDate; - Akonadi::Item::Id selectedItemId; - MonthGraphicsView *view =3D nullptr; - QToolButton *fullView =3D nullptr; + QTimer reloadTimer; + MonthScene *scene =3D nullptr; + QDate selectedItemDate; + Akonadi::Item::Id selectedItemId; + MonthGraphicsView *view =3D nullptr; + QToolButton *fullView =3D nullptr; = // List of uids for QDate QMap mBusyDays; @@ -77,20 +75,20 @@ protected: /* reimplemented from KCalCore::Calendar::CalendarObserver */ void calendarIncidenceAdded(const KCalCore::Incidence::Ptr &incidence)= override; void calendarIncidenceChanged(const KCalCore::Incidence::Ptr &incidenc= e) override; - void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidenc= e, const KCalCore::Calendar *calendar) override; + void calendarIncidenceDeleted(const KCalCore::Incidence::Ptr &incidenc= e, + const KCalCore::Calendar *calendar) over= ride; private: //quiet --overloaded-virtual warning using KCalCore::Calendar::CalendarObserver::calendarIncidenceDeleted; }; - } = MonthViewPrivate::MonthViewPrivate(MonthView *qq) - : q(qq), - scene(new MonthScene(qq)), - selectedItemId(-1), - view(new MonthGraphicsView(qq)), - fullView(nullptr) + : q(qq) + , scene(new MonthScene(qq)) + , selectedItemId(-1) + , view(new MonthGraphicsView(qq)) + , fullView(nullptr) { reloadTimer.setSingleShot(true); view->setScene(scene); @@ -150,7 +148,8 @@ void MonthViewPrivate::calendarIncidenceChanged(const K= CalCore::Incidence::Ptr & triggerDelayedReload(MonthView::IncidencesEdited); } = -void MonthViewPrivate::calendarIncidenceDeleted(const KCalCore::Incidence:= :Ptr &incidence, const KCalCore::Calendar *calendar) +void MonthViewPrivate::calendarIncidenceDeleted(const KCalCore::Incidence:= :Ptr &incidence, + const KCalCore::Calendar *= calendar) { Q_UNUSED(calendar); Q_ASSERT(!incidence->uid().isEmpty()); @@ -160,7 +159,8 @@ void MonthViewPrivate::calendarIncidenceDeleted(const K= CalCore::Incidence::Ptr & /// MonthView = MonthView::MonthView(NavButtonsVisibility visibility, QWidget *parent) - : EventView(parent), d(new MonthViewPrivate(this)) + : EventView(parent) + , d(new MonthViewPrivate(this)) { QHBoxLayout *topLayout =3D new QHBoxLayout(this); topLayout->addWidget(d->view); @@ -179,11 +179,11 @@ MonthView::MonthView(NavButtonsVisibility visibility,= QWidget *parent) d->fullView->setAutoRaise(true); d->fullView->setCheckable(true); d->fullView->setChecked(preferences()->fullViewMonth()); - d->fullView->isChecked() ? - d->fullView->setToolTip(i18nc("@info:tooltip", - "Display calendar in a normal size")= ) : - d->fullView->setToolTip(i18nc("@info:tooltip", - "Display calendar in a full window")= ); + d->fullView->isChecked() + ? d->fullView->setToolTip(i18nc("@info:tooltip", + "Display calendar in a normal size= ")) + : d->fullView->setToolTip(i18nc("@info:tooltip", + "Display calendar in a full window= ")); d->fullView->setWhatsThis( i18nc("@info:whatsthis", "Click this button and the month view will be enlarged t= o fill the " @@ -374,6 +374,7 @@ void MonthView::wheelEvent(QWheelEvent *event) // call accept in every case, we do not want anybody else to react event->accept(); } + #endif = void MonthView::keyPressEvent(QKeyEvent *event) @@ -447,9 +448,8 @@ void MonthView::showDates(const QDate &start, const QDa= te &end, const QDate &pre d->triggerDelayedReload(DatesChanged); } = -QPair MonthView::actualDateRange(const QDateTime &st= art, - const QDateTime &, - const QDate &preferredMonth) const +QPair MonthView::actualDateRange(const QDateTime &st= art, const QDateTime &, + const QDate &prefer= redMonth) const { QDateTime dayOne =3D preferredMonth.isValid() ? QDateTime(preferredMon= th) : start; dayOne.setDate(QDate(dayOne.date().year(), dayOne.date().month(), 1)); @@ -499,9 +499,9 @@ void MonthView::reloadIncidences() // build monthcells hash int i =3D 0; for (QDate date =3D actualStartDateTime().date(); - date <=3D actualEndDateTime().date(); date =3D date.addDays(1)= ) { + date <=3D actualEndDateTime().date(); date =3D date.addDays(1)) { d->scene->mMonthCellMap[ date ] =3D new MonthCell(i, date, d->scen= e); - i ++; + i++; } = // build global event list @@ -512,12 +512,12 @@ void MonthView::reloadIncidences() occurIter.next(); = // Remove the two checks when filtering is done through a proxyMod= el, when using calendar search - if (!preferences()->showTodosMonthView() && - occurIter.incidence()->type() =3D=3D KCalCore::Incidence::= TypeTodo) { + if (!preferences()->showTodosMonthView() + && occurIter.incidence()->type() =3D=3D KCalCore::Incidence::T= ypeTodo) { continue; } - if (!preferences()->showJournalsMonthView() && - occurIter.incidence()->type() =3D=3D KCalCore::Incidence::= TypeJournal) { + if (!preferences()->showJournalsMonthView() + && occurIter.incidence()->type() =3D=3D KCalCore::Incidence::T= ypeJournal) { continue; } = @@ -534,13 +534,13 @@ void MonthView::reloadIncidences() Q_ASSERT(item.isValid()); Q_ASSERT(item.hasPayload()); MonthItem *manager =3D new IncidenceMonthItem(d->scene, - calendar(), - item, - occurIter.incidence(), - occurIter.occurrenceStartDate().toLocalTime().date()); + calendar(), + item, + occurIter.incidence(), + occurIter.occurrenceSt= artDate().toLocalTime().date()); d->scene->mManagerList << manager; - if (d->selectedItemId =3D=3D item.id() && - manager->realStartDate() =3D=3D d->selectedItemDate) { + if (d->selectedItemId =3D=3D item.id() + && manager->realStartDate() =3D=3D d->selectedItemDate) { // only select it outside the loop because we are still creati= ng items itemToReselect =3D manager; } @@ -552,16 +552,16 @@ void MonthView::reloadIncidences() = // add holidays const QList workDays =3D CalendarSupport::workDays(actualStartD= ateTime().date(), - actualEndDateTime().date()); + actualEndDateT= ime().date()); = for (QDate date =3D actualStartDateTime().date(); - date <=3D actualEndDateTime().date(); date =3D date.addDays(1)= ) { + date <=3D actualEndDateTime().date(); date =3D date.addDays(1)) { // Only call CalendarSupport::holiday() if it's not a workDay, sav= es come cpu cicles. if (!workDays.contains(date)) { QStringList holidays(CalendarSupport::holiday(date)); if (!holidays.isEmpty()) { - MonthItem *holidayItem =3D - new HolidayMonthItem( + MonthItem *holidayItem + =3D new HolidayMonthItem( d->scene, date, holidays.join(i18nc("@item:intext delimiter for joinin= g holiday names", ","))); d->scene->mManagerList << holidayItem; @@ -571,13 +571,13 @@ void MonthView::reloadIncidences() = // sort it std::sort(d->scene->mManagerList.begin(), - d->scene->mManagerList.end(), - MonthItem::greaterThan); + d->scene->mManagerList.end(), + MonthItem::greaterThan); = // build each month's cell event list foreach (MonthItem *manager, d->scene->mManagerList) { for (QDate date =3D manager->startDate(); - date <=3D manager->endDate(); date =3D date.addDays(1)) { + date <=3D manager->endDate(); date =3D date.addDays(1)) { MonthCell *cell =3D d->scene->mMonthCellMap.value(date); if (cell) { cell->mMonthItemList << manager; @@ -608,7 +608,7 @@ void MonthView::calendarReset() QDate MonthView::averageDate() const { return actualStartDateTime().date().addDays( - actualStartDateTime().date().daysTo(actualEndDateTime().dat= e()) / 2); + actualStartDateTime().date().daysTo(actualEndDateTime().date()) / = 2); } = int MonthView::currentMonth() const diff --git a/src/month/monthview.h b/src/month/monthview.h index c2a7470..3172482 100644 --- a/src/month/monthview.h +++ b/src/month/monthview.h @@ -29,9 +29,7 @@ = class QModelIndex; = -namespace EventViews -{ - +namespace EventViews { class MonthViewPrivate; = /** @@ -115,7 +113,8 @@ protected: void keyReleaseEvent(QKeyEvent *event) override; = QPair actualDateRange( - const QDateTime &start, const QDateTime &end, const QDate &preferr= edMonth =3D QDate()) const override; + const QDateTime &start, const QDateTime &end, + const QDate &preferredMonth =3D QDate()) const override; = // Compute and update the whole view void reloadIncidences(); @@ -124,14 +123,14 @@ protected: /** * @deprecated */ - void showDates(const QDate &start, const QDate &end, const QDate &pref= eredMonth =3D QDate()) override; + void showDates(const QDate &start, const QDate &end, + const QDate &preferedMonth =3D QDate()) override; = private: MonthViewPrivate *const d; friend class MonthViewPrivate; friend class MonthScene; }; - } = #endif diff --git a/src/multiagenda/configdialoginterface.h b/src/multiagenda/conf= igdialoginterface.h index e722686..da9ce4e 100644 --- a/src/multiagenda/configdialoginterface.h +++ b/src/multiagenda/configdialoginterface.h @@ -22,13 +22,13 @@ = class KCheckableProxyModel; = -namespace EventViews -{ - +namespace EventViews { class ConfigDialogInterface { public: - virtual ~ConfigDialogInterface() { }; + virtual ~ConfigDialogInterface() + { + } = virtual int numberOfColumns() const =3D 0; virtual bool useCustomColumns() const =3D 0; @@ -36,7 +36,6 @@ public: = virtual KCheckableProxyModel *takeSelectionModel(int column) =3D 0; }; - } = #endif diff --git a/src/multiagenda/multiagendaview.cpp b/src/multiagenda/multiage= ndaview.cpp index 23589ab..9d9faa2 100644 --- a/src/multiagenda/multiagendaview.cpp +++ b/src/multiagenda/multiagendaview.cpp @@ -97,10 +97,12 @@ static QString generateColumnLabel(int c) class Q_DECL_HIDDEN MultiAgendaView::Private { private: - class ElidedLabel: public QFrame + class ElidedLabel : public QFrame { public: - ElidedLabel(const QString &text): mText(text) {} + ElidedLabel(const QString &text) : mText(text) + { + } = QSize minimumSizeHint() const override; = @@ -112,12 +114,12 @@ private: }; = public: - Private(MultiAgendaView *qq) : - q(qq), - mUpdateOnShow(true), - mPendingChanges(true), - mCustomColumnSetupUsed(false), - mCustomNumberOfColumns(2) + Private(MultiAgendaView *qq) + : q(qq) + , mUpdateOnShow(true) + , mPendingChanges(true) + , mCustomColumnSetupUsed(false) + , mCustomNumberOfColumns(2) { } = @@ -153,12 +155,12 @@ public: int mCustomNumberOfColumns; QLabel *mLabel =3D nullptr; QWidget *mRightDummyWidget =3D nullptr; - QHash* > mSelectionSa= vers; + QHash * > mSelectionS= avers; }; = MultiAgendaView::MultiAgendaView(QWidget *parent) - : EventView(parent), d(new Private(this)) - + : EventView(parent) + , d(new Private(this)) { QHBoxLayout *topLevelLayout =3D new QHBoxLayout(this); topLevelLayout->setSpacing(0); @@ -248,7 +250,8 @@ void MultiAgendaView::setCalendar(const Akonadi::ETMCal= endar::Ptr &calendar) proxy->setSourceModel(calendar->entityTreeModel()); } = - disconnect(nullptr, SIGNAL(selectionChanged(Akonadi::Collection::List,= Akonadi::Collection::List)), + disconnect(nullptr, SIGNAL(selectionChanged(Akonadi::Collection::List, + Akonadi::Collection::List)= ), this, SLOT(forceRecreateViews())); = connect(collectionSelection(), &CalendarSupport::CollectionSelection::= selectionChanged, @@ -459,8 +462,7 @@ void MultiAgendaView::slotSelectionChanged() } } = -bool MultiAgendaView::eventDurationHint(QDateTime &startDt, QDateTime &end= Dt, - bool &allDay) const +bool MultiAgendaView::eventDurationHint(QDateTime &startDt, QDateTime &end= Dt, bool &allDay) const { foreach (AgendaView *agenda, d->mAgendaViews) { bool valid =3D agenda->eventDurationHint(startDt, endDt, allDay); @@ -544,8 +546,8 @@ void MultiAgendaView::resizeEvent(QResizeEvent *ev) = void MultiAgendaView::Private::resizeScrollView(const QSize &size) { - const int widgetWidth =3D size.width() - mTimeLabelsZone->width() - - mScrollBar->width(); + const int widgetWidth =3D size.width() - mTimeLabelsZone->width() + -mScrollBar->width(); = int height =3D size.height(); if (mScrollArea->horizontalScrollBar()->isVisible()) { @@ -675,7 +677,6 @@ void MultiAgendaView::collectionSelectionChanged() = bool MultiAgendaView::hasConfigurationDialog() const { - /** The wrapper in korg has the dialog. Too complicated to move to Cal= endarViews. Depends on korg/AkonadiCollectionView, and will be refactored some= day to get rid of CollectionSelectionProxyModel/EntityStateSaver */ @@ -692,7 +693,7 @@ void MultiAgendaView::doRestoreConfig(const KConfigGrou= p &configGroup) = d->mCustomColumnSetupUsed =3D configGroup.readEntry("UseCustomColumnSe= tup", false); d->mCustomNumberOfColumns =3D configGroup.readEntry("CustomNumberOfCol= umns", 2); - d->mCustomColumnTitles =3D configGroup.readEntry("ColumnTitles", QStr= ingList()); + d->mCustomColumnTitles =3D configGroup.readEntry("ColumnTitles", QStri= ngList()); if (d->mCustomColumnTitles.size() !=3D d->mCustomNumberOfColumns) { const int orig =3D d->mCustomColumnTitles.size(); d->mCustomColumnTitles.reserve(d->mCustomNumberOfColumns); @@ -715,7 +716,8 @@ void MultiAgendaView::doRestoreConfig(const KConfigGrou= p &configGroup) = // Only show the first column KRearrangeColumnsProxyModel *columnFilterProxy =3D new KRearra= ngeColumnsProxyModel(this); - columnFilterProxy->setSourceColumns(QVector() << Akonadi:= :ETMCalendar::CollectionTitle); + columnFilterProxy->setSourceColumns( + QVector() << Akonadi::ETMCalendar::CollectionTitle); columnFilterProxy->setSourceModel(sortProxy); = // Keep track of selection. @@ -725,11 +727,13 @@ void MultiAgendaView::doRestoreConfig(const KConfigGr= oup &configGroup) KCheckableProxyModel *checkableProxy =3D new KCheckableProxyMo= del(this); checkableProxy->setSourceModel(columnFilterProxy); checkableProxy->setSelectionModel(qsm); - const QString groupName =3D configGroup.name() + QLatin1String= ("_subView_") + QString::number(i); + const QString groupName =3D configGroup.name() + QLatin1String= ("_subView_") + + QString::number(i); const KConfigGroup group =3D configGroup.config()->group(group= Name); = if (!d->mSelectionSavers.contains(groupName)) { - d->mSelectionSavers.insert(groupName, new KViewStateMainta= iner(group)); + d->mSelectionSavers.insert(groupName, + new KViewStateMaintainer(group)); d->mSelectionSavers[groupName]->setSelectionModel(checkabl= eProxy->selectionModel()); } = @@ -750,13 +754,15 @@ void MultiAgendaView::doSaveConfig(KConfigGroup &conf= igGroup) configGroup.writeEntry("ColumnTitles", d->mCustomColumnTitles); int idx =3D 0; foreach (KCheckableProxyModel *checkableProxyModel, d->mCollectionSele= ctionModels) { - const QString groupName =3D configGroup.name() + QLatin1String("_s= ubView_") + QString::number(idx); + const QString groupName =3D configGroup.name() + QLatin1String("_s= ubView_") + QString::number( + idx); KConfigGroup group =3D configGroup.config()->group(groupName); ++idx; //TODO never used ? KViewStateMaintainer saver(group); if (!d->mSelectionSavers.contains(groupName)) { - d->mSelectionSavers.insert(groupName, new KViewStateMaintainer= (group)); + d->mSelectionSavers.insert(groupName, + new KViewStateMaintainer(group)); d->mSelectionSavers[groupName]->setSelectionModel(checkablePro= xyModel->selectionModel()); } d->mSelectionSavers[groupName]->saveState(); diff --git a/src/multiagenda/multiagendaview.h b/src/multiagenda/multiagend= aview.h index c76d3e2..f920118 100644 --- a/src/multiagenda/multiagendaview.h +++ b/src/multiagenda/multiagendaview.h @@ -25,9 +25,7 @@ = #include = -namespace EventViews -{ - +namespace EventViews { class ConfigDialogInterface; = /** @@ -56,7 +54,7 @@ public: bool customColumnSetupUsed() const; int customNumberOfColumns() const; QStringList customColumnTitles() const; - QVectorcollectionSelectionModels() const; + QVector collectionSelectionModels() const; = void setPreferences(const PrefsPtr &prefs) override; = @@ -68,7 +66,8 @@ public Q_SLOTS: = void customCollectionsChanged(ConfigDialogInterface *dlg); = - void showDates(const QDate &start, const QDate &end, const QDate &pref= erredMonth =3D QDate()) override; + void showDates(const QDate &start, const QDate &end, + const QDate &preferredMonth =3D QDate()) override; void showIncidences(const Akonadi::Item::List &incidenceList, const QD= ate &date) override; void updateView() override; void updateConfig() override; @@ -102,7 +101,6 @@ private: class Private; Private *const d; }; - } = #endif diff --git a/src/prefs.cpp b/src/prefs.cpp index 7cded2a..8d94241 100644 --- a/src/prefs.cpp +++ b/src/prefs.cpp @@ -65,12 +65,12 @@ QByteArray agendaViewIconDefaults() QByteArray iconDefaults; = iconDefaults[EventViews::EventView::CalendarCustomIcon] =3D 1; - iconDefaults[EventViews::EventView::TaskIcon] =3D 1; - iconDefaults[EventViews::EventView::JournalIcon] =3D 1; - iconDefaults[EventViews::EventView::RecurringIcon] =3D 1; - iconDefaults[EventViews::EventView::ReminderIcon] =3D 1; - iconDefaults[EventViews::EventView::ReadOnlyIcon] =3D 1; - iconDefaults[EventViews::EventView::ReplyIcon] =3D 0; + iconDefaults[EventViews::EventView::TaskIcon] =3D 1; + iconDefaults[EventViews::EventView::JournalIcon] =3D 1; + iconDefaults[EventViews::EventView::RecurringIcon] =3D 1; + iconDefaults[EventViews::EventView::ReminderIcon] =3D 1; + iconDefaults[EventViews::EventView::ReadOnlyIcon] =3D 1; + iconDefaults[EventViews::EventView::ReplyIcon] =3D 0; = return iconDefaults; } @@ -80,12 +80,12 @@ QByteArray monthViewIconDefaults() QByteArray iconDefaults; = iconDefaults[EventViews::EventView::CalendarCustomIcon] =3D 1; - iconDefaults[EventViews::EventView::TaskIcon] =3D 1; - iconDefaults[EventViews::EventView::JournalIcon] =3D 1; - iconDefaults[EventViews::EventView::RecurringIcon] =3D 0; - iconDefaults[EventViews::EventView::ReminderIcon] =3D 0; - iconDefaults[EventViews::EventView::ReadOnlyIcon] =3D 1; - iconDefaults[EventViews::EventView::ReplyIcon] =3D 0; + iconDefaults[EventViews::EventView::TaskIcon] =3D 1; + iconDefaults[EventViews::EventView::JournalIcon] =3D 1; + iconDefaults[EventViews::EventView::RecurringIcon] =3D 0; + iconDefaults[EventViews::EventView::ReminderIcon] =3D 0; + iconDefaults[EventViews::EventView::ReadOnlyIcon] =3D 1; + iconDefaults[EventViews::EventView::ReplyIcon] =3D 0; = return iconDefaults; } @@ -180,8 +180,8 @@ void BaseConfig::usrRead() #if 0 config()->setGroup("FreeBusy"); if (mRememberRetrievePw) { - mRetrievePassword =3D - KStringHandler::obscure(config()->readEntry("Retrieve Server P= assword")); + mRetrievePassword + =3D KStringHandler::obscure(config()->readEntry("Retrieve Serv= er Password")); } #endif = @@ -190,10 +190,10 @@ void BaseConfig::usrRead() = KConfigGroup monthViewConfig(config(), "Month View"); KConfigGroup agendaViewConfig(config(), "Agenda View"); - const QByteArray agendaIconArray =3D - agendaViewConfig.readEntry("agendaViewItemIcons", agen= daViewIconDefaults()); - const QByteArray monthIconArray =3D - monthViewConfig.readEntry("monthViewItemIcons", monthV= iewIconDefaults()); + const QByteArray agendaIconArray + =3D agendaViewConfig.readEntry("agendaViewItemIcons", = agendaViewIconDefaults()); + const QByteArray monthIconArray + =3D monthViewConfig.readEntry("monthViewItemIcons", mo= nthViewIconDefaults()); = mAgendaViewIcons =3D iconArrayToSet(agendaIconArray); mMonthViewIcons =3D iconArrayToSet(monthIconArray); @@ -238,9 +238,16 @@ bool BaseConfig::usrSave() class Q_DECL_HIDDEN Prefs::Private { public: - Private(Prefs *parent) : mAppConfig(nullptr), q(parent) {} + Private(Prefs *parent) : mAppConfig(nullptr) + , q(parent) + { + } + Private(Prefs *parent, KCoreConfigSkeleton *appConfig) - : mAppConfig(appConfig), q(parent) {} + : mAppConfig(appConfig) + , q(parent) + { + } = KConfigSkeletonItem *appConfigItem(const KConfigSkeletonItem *baseConf= igItem) const; = @@ -290,11 +297,13 @@ void Prefs::Private::setBool(KCoreConfigSkeleton::Ite= mBool *baseConfigItem, bool { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemBool *item =3D dynamic_cast(appItem); + KCoreConfigSkeleton::ItemBool *item + =3D dynamic_cast(appItem); if (item) { item->setValue(value); } else { - qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() << "is not of type Bool"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() + << "is not of type Bool"; } } else { baseConfigItem->setValue(value); @@ -305,11 +314,13 @@ bool Prefs::Private::getBool(const KCoreConfigSkeleto= n::ItemBool *baseConfigItem { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemBool *item =3D dynamic_cast(appItem); + KCoreConfigSkeleton::ItemBool *item + =3D dynamic_cast(appItem); if (item) { return item->value(); } - qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() << "is not of type Bool"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() + << "is not of type Bool"; } return baseConfigItem->value(); } @@ -322,7 +333,8 @@ void Prefs::Private::setInt(KCoreConfigSkeleton::ItemIn= t *baseConfigItem, int va if (item) { item->setValue(value); } else { - qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() << "is not of type Int"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() + << "is not of type Int"; } } else { baseConfigItem->setValue(value); @@ -337,7 +349,8 @@ int Prefs::Private::getInt(const KCoreConfigSkeleton::I= temInt *baseConfigItem) c if (item) { return item->value(); } - qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() << "is not of type Int"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() + << "is not of type Int"; } return baseConfigItem->value(); } @@ -347,13 +360,14 @@ void Prefs::Private::setString(KCoreConfigSkeleton::I= temString *baseConfigItem, { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemString *item =3D - dynamic_cast(appItem); + KCoreConfigSkeleton::ItemString *item + =3D dynamic_cast(appItem); = if (item) { item->setValue(value); } else { - qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() << "is not of type String"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() + << "is not of type String"; } } else { baseConfigItem->setValue(value); @@ -364,13 +378,14 @@ QString Prefs::Private::getString(const KCoreConfigSk= eleton::ItemString *baseCon { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemString *item =3D - dynamic_cast(appItem); + KCoreConfigSkeleton::ItemString *item + =3D dynamic_cast(appItem); = if (item) { return item->value(); } - qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() << "is not of type String"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() + << "is not of type String"; } return baseConfigItem->value(); } @@ -380,13 +395,14 @@ void Prefs::Private::setDateTime(KCoreConfigSkeleton:= :ItemDateTime *baseConfigIt { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemDateTime *item =3D - dynamic_cast(appItem); + KCoreConfigSkeleton::ItemDateTime *item + =3D dynamic_cast(appItem); = if (item) { item->setValue(value); } else { - qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() << "is not of type DateTime"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() + << "is not of type DateTime"; } } else { baseConfigItem->setValue(value); @@ -398,13 +414,14 @@ QDateTime Prefs::Private::getDateTime( { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemDateTime *item =3D - dynamic_cast(appItem); + KCoreConfigSkeleton::ItemDateTime *item + =3D dynamic_cast(appItem); = if (item) { return item->value(); } - qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() << "is not of type DateTime"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() + << "is not of type DateTime"; } return baseConfigItem->value(); } @@ -414,13 +431,14 @@ void Prefs::Private::setStringList(KCoreConfigSkeleto= n::ItemStringList *baseConf { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemStringList *item =3D - dynamic_cast(appItem); + KCoreConfigSkeleton::ItemStringList *item + =3D dynamic_cast(appIte= m); = if (item) { item->setValue(value); } else { - qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() << "is not of type StringList"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() + << "is not of type StringList"; } } else { baseConfigItem->setValue(value); @@ -432,13 +450,14 @@ QStringList Prefs::Private::getStringList( { KConfigSkeletonItem *appItem =3D appConfigItem(baseConfigItem); if (appItem) { - KCoreConfigSkeleton::ItemStringList *item =3D - dynamic_cast(appItem); + KCoreConfigSkeleton::ItemStringList *item + =3D dynamic_cast(appIte= m); = if (item) { return item->value(); } - qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() << "is not of type StringList"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() + << "is not of type StringList"; } return baseConfigItem->value(); } @@ -451,7 +470,8 @@ void Prefs::Private::setColor(KConfigSkeleton::ItemColo= r *baseConfigItem, const if (item) { item->setValue(value); } else { - qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() << "is not of type Color"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() + << "is not of type Color"; } } else { baseConfigItem->setValue(value); @@ -466,7 +486,8 @@ QColor Prefs::Private::getColor(const KConfigSkeleton::= ItemColor *baseConfigItem if (item) { return item->value(); } - qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() << "is not of type Color"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() + << "is not of type Color"; } return baseConfigItem->value(); } @@ -479,7 +500,8 @@ void Prefs::Private::setFont(KConfigSkeleton::ItemFont = *baseConfigItem, const QF if (item) { item->setValue(value); } else { - qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() << "is not of type Font"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << a= ppItem->name() + << "is not of type Font"; } } else { baseConfigItem->setValue(value); @@ -494,7 +516,8 @@ QFont Prefs::Private::getFont(const KConfigSkeleton::It= emFont *baseConfigItem) c if (item) { return item->value(); } - qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() << "is not of type Font"; + qCCritical(CALENDARVIEW_LOG) << "Application config item" << appIt= em->name() + << "is not of type Font"; } return baseConfigItem->value(); } @@ -921,6 +944,7 @@ void Prefs::setResourceColor(const QString &cal, const = QColor &color) { d->mBaseConfig.setResourceColor(cal, color); } + #define USE_RANDOM void Prefs::createNewColor(QColor &defColor, int seed) { @@ -940,8 +964,8 @@ void Prefs::createNewColor(QColor &defColor, int seed) QColor Prefs::resourceColorKnown(const QString &cal) const { QColor color; - if (!cal.isEmpty() && - d->mBaseConfig.mResourceColors.contains(cal)) { + if (!cal.isEmpty() + && d->mBaseConfig.mResourceColors.contains(cal)) { color =3D d->mBaseConfig.mResourceColors.value(cal); } return color; @@ -956,8 +980,8 @@ QColor Prefs::resourceColor(const QString &cal) QColor color =3D resourceColorKnown(cal); = // assign default color if enabled - if (!color.isValid() && - d->getBool(d->mBaseConfig.assignDefaultResourceColorsItem())) { + if (!color.isValid() + && d->getBool(d->mBaseConfig.assignDefaultResourceColorsItem())) { QColor defColor(0x37, 0x7A, 0xBC); const int seed =3D d->getInt(d->mBaseConfig.defaultResourceColorSe= edItem()); const QStringList colors =3D d->getStringList(d->mBaseConfig.defau= ltResourceColorsItem()); diff --git a/src/prefs.h b/src/prefs.h index cf01f90..903eab2 100644 --- a/src/prefs.h +++ b/src/prefs.h @@ -31,9 +31,7 @@ #include #include = -namespace EventViews -{ - +namespace EventViews { class EVENTVIEWS_EXPORT Prefs { public: @@ -221,8 +219,6 @@ private: }; = typedef QSharedPointer PrefsPtr; - } = #endif - diff --git a/src/timeline/timelineitem.cpp b/src/timeline/timelineitem.cpp index e9ef5b4..4224c20 100644 --- a/src/timeline/timelineitem.cpp +++ b/src/timeline/timelineitem.cpp @@ -33,7 +33,10 @@ using namespace EventViews; = TimelineItem::TimelineItem(const Akonadi::ETMCalendar::Ptr &calendar, uint= index, QStandardItemModel *model, QObject *parent) - : QObject(parent), mCalendar(calendar), mModel(model), mIndex(index) + : QObject(parent) + , mCalendar(calendar) + , mModel(model) + , mIndex(index) { mModel->removeRow(mIndex); QStandardItem *dummyItem =3D new QStandardItem; @@ -41,8 +44,8 @@ TimelineItem::TimelineItem(const Akonadi::ETMCalendar::Pt= r &calendar, uint index mModel->insertRow(mIndex, dummyItem); } = -void TimelineItem::insertIncidence(const Akonadi::Item &aitem, - const QDateTime &_start, const QDateTim= e &_end) +void TimelineItem::insertIncidence(const Akonadi::Item &aitem, const QDate= Time &_start, + const QDateTime &_end) { const Incidence::Ptr incidence =3D CalendarSupport::incidence(aitem); QDateTime start(_start); @@ -60,8 +63,8 @@ void TimelineItem::insertIncidence(const Akonadi::Item &a= item, typedef QList ItemList; ItemList list =3D mItemMap.value(aitem.id()); for (ItemList::ConstIterator it =3D list.constBegin(); it !=3D list.co= nstEnd(); ++it) { - if (static_cast(*it)->startTime() =3D=3D start = && - static_cast(*it)->endTime() =3D=3D end)= { + if (static_cast(*it)->startTime() =3D=3D start + && static_cast(*it)->endTime() =3D=3D end) { return; } } @@ -109,8 +112,11 @@ void TimelineItem::setColor(const QColor &color) = TimelineSubItem::TimelineSubItem(const Akonadi::ETMCalendar::Ptr &calendar, const Akonadi::Item &incidence, TimelineI= tem *parent) - : QStandardItem(), mCalendar(calendar), mIncidence(incidence), - mParent(parent), mToolTipNeedsUpdate(true) + : QStandardItem() + , mCalendar(calendar) + , mIncidence(incidence) + , mParent(parent) + , mToolTipNeedsUpdate(true) { setData(KGantt::TypeTask, KGantt::ItemTypeRole); if (!CalendarSupport::incidence(incidence)->isReadOnly()) { @@ -152,5 +158,6 @@ void TimelineSubItem::updateToolTip() = setData(IncidenceFormatter::toolTipStr( CalendarSupport::displayName(mCalendar.data(), mIncidence.= parentCollection()), - CalendarSupport::incidence(mIncidence), originalStart().da= te(), true), Qt::ToolTipRole); + CalendarSupport::incidence(mIncidence), + originalStart().date(), true), Qt::ToolTipRole); } diff --git a/src/timeline/timelineitem.h b/src/timeline/timelineitem.h index 05ed1d5..cf1623c 100644 --- a/src/timeline/timelineitem.h +++ b/src/timeline/timelineitem.h @@ -31,9 +31,7 @@ #include #include = -namespace EventViews -{ - +namespace EventViews { class TimelineSubItem; = class TimelineItem : public QObject @@ -44,8 +42,7 @@ public: QObject *parent); = void insertIncidence(const Akonadi::Item &incidence, - const QDateTime &start =3D QDateTime(), - const QDateTime &end =3D QDateTime()); + const QDateTime &start =3D QDateTime(), const QDa= teTime &end =3D QDateTime()); void removeIncidence(const Akonadi::Item &incidence); = void moveItems(const Akonadi::Item &incidence, int delta, int duration= ); @@ -63,8 +60,8 @@ private: class TimelineSubItem : public QStandardItem { public: - TimelineSubItem(const Akonadi::ETMCalendar::Ptr &calendar, - const Akonadi::Item &incidence, TimelineItem *parent); + TimelineSubItem(const Akonadi::ETMCalendar::Ptr &calendar, const Akona= di::Item &incidence, + TimelineItem *parent); ~TimelineSubItem(); = Akonadi::Item incidence() const @@ -102,7 +99,6 @@ private: TimelineItem *mParent =3D nullptr; bool mToolTipNeedsUpdate; }; - } = #endif diff --git a/src/timeline/timelineview.cpp b/src/timeline/timelineview.cpp index 7378276..9d98b43 100644 --- a/src/timeline/timelineview.cpp +++ b/src/timeline/timelineview.cpp @@ -55,8 +55,7 @@ using namespace KCalCore; using namespace EventViews; = -namespace EventViews -{ +namespace EventViews { class RowController : public KGantt::AbstractRowController { private: @@ -150,12 +149,11 @@ public: }; class GanttItemDelegate : public KGantt::ItemDelegate { - void paintGanttItem(QPainter *painter, - const KGantt::StyleOptionGanttItem &opt, - const QModelIndex &idx) override { + void paintGanttItem(QPainter *painter, const KGantt::StyleOptionGanttI= tem &opt, + const QModelIndex &idx) override + { painter->setRenderHints(QPainter::Antialiasing); - if (!idx.isValid()) - { + if (!idx.isValid()) { return; } KGantt::ItemType type =3D static_cast( @@ -168,10 +166,9 @@ class GanttItemDelegate : public KGantt::ItemDelegate boundingRect.setHeight(itemRect.height()); = QBrush brush =3D defaultBrush(type); - if (opt.state & QStyle::State_Selected) - { + if (opt.state & QStyle::State_Selected) { QLinearGradient selectedGrad(0., 0., 0., - QApplication::fontMetrics().height()); + QApplication::fontMetrics().heigh= t()); selectedGrad.setColorAt(0., Qt::red); selectedGrad.setColorAt(1., Qt::darkRed); = @@ -184,8 +181,7 @@ class GanttItemDelegate : public KGantt::ItemDelegate painter->setPen(defaultPen(type)); painter->setBrushOrigin(itemRect.topLeft()); = - switch (type) - { + switch (type) { case KGantt::TypeTask: if (itemRect.isValid()) { QRectF r =3D itemRect; @@ -217,11 +213,11 @@ class GanttItemDelegate : public KGantt::ItemDelegate } } }; - } = TimelineView::TimelineView(QWidget *parent) - : EventView(parent), d(new Private(this)) + : EventView(parent) + , d(new Private(this)) { QVBoxLayout *vbox =3D new QVBoxLayout(this); QSplitter *splitter =3D new QSplitter(Qt::Horizontal, this); @@ -243,7 +239,8 @@ TimelineView::TimelineView(QWidget *parent) = QStyleOptionViewItem opt; opt.initFrom(d->mLeftView); - const auto h =3D d->mLeftView->style()->sizeFromContents(QStyle::CT_It= emViewItem, &opt, QSize(), d->mLeftView).height(); + const auto h =3D d->mLeftView->style()->sizeFromContents(QStyle::CT_It= emViewItem, &opt, + QSize(), d->mLe= ftView).height(); d->mRowController->setRowHeight(h); = d->mRowController->setModel(model); @@ -319,7 +316,6 @@ void TimelineView::showDates(const QDate &start, const = QDate &end, const QDate & d->mGantt); d->mLeftView->addTopLevelItem(new QTreeWidgetItem(QStringList() <<= i18n("Calendar"))); d->mCalendarItemMap.insert(-1, item); - } else { const CalendarSupport::CollectionSelection *colSel =3D collectionS= election(); const Akonadi::Collection::List collections =3D colSel->selectedCo= llections(); @@ -332,14 +328,17 @@ void TimelineView::showDates(const QDate &start, cons= t QDate &end, const QDate & d->mGantt); d->mLeftView->addTopLevelItem( new QTreeWidgetItem( - QStringList() << CalendarSupport::displayName(cale= ndar().data(), collection))); + QStringList() << CalendarSupport::displayName( + calendar().data(), collection))); const QColor resourceColor =3D EventViews::resourceColor(c= ollection, preferences()); if (resourceColor.isValid()) { item->setColor(resourceColor); } qCDebug(CALENDARVIEW_LOG) << "Created item " << item - << " (" << CalendarSupport::dis= playName(calendar().data(), collection) << ") " - << "with index " << index - 1 <= < " from collection " << collection.id(); + << " (" << CalendarSupport::dis= playName( + calendar().data(), collection) << ") " + << "with index " << index - 1 <= < " from collection " + << collection.id(); d->mCalendarItemMap.insert(collection.id(), item); } } @@ -403,8 +402,7 @@ void TimelineView::changeIncidenceDisplay(const Akonadi= ::Item &incidence, int mo } } = -bool TimelineView::eventDurationHint(QDateTime &startDt, QDateTime &endDt, - bool &allDay) const +bool TimelineView::eventDurationHint(QDateTime &startDt, QDateTime &endDt,= bool &allDay) const { startDt =3D QDateTime(d->mHintDate); endDt =3D QDateTime(d->mHintDate.addSecs(2 * 60 * 60)); @@ -432,11 +430,12 @@ bool TimelineView::eventFilter(QObject *object, QEven= t *event) KGantt::GraphicsItem *graphicsItem =3D static_cast(item); const QModelIndex itemIndex =3D graphicsItem->index(); = - QStandardItemModel *itemModel =3D - qobject_cast(d->mGantt->model()); + QStandardItemModel *itemModel + =3D qobject_cast(d->mGantt->mode= l()); = - TimelineSubItem *timelineItem =3D - dynamic_cast(itemModel->item(itemIn= dex.row(), itemIndex.column())); + TimelineSubItem *timelineItem + =3D dynamic_cast(itemModel->item(it= emIndex.row(), + item= Index.column())); = if (timelineItem) { timelineItem->updateToolTip(); @@ -447,4 +446,3 @@ bool TimelineView::eventFilter(QObject *object, QEvent = *event) = return EventView::eventFilter(object, event); } - diff --git a/src/timeline/timelineview.h b/src/timeline/timelineview.h index 7f8612e..54864b2 100644 --- a/src/timeline/timelineview.h +++ b/src/timeline/timelineview.h @@ -30,9 +30,7 @@ = #include = -namespace EventViews -{ - +namespace EventViews { /** This class provides a view .... */ @@ -70,9 +68,7 @@ protected: private: class Private; Private *const d; - }; - } // namespace EventViews = #endif diff --git a/src/timeline/timelineview_p.cpp b/src/timeline/timelineview_p.= cpp index 1034074..e0b708b 100644 --- a/src/timeline/timelineview_p.cpp +++ b/src/timeline/timelineview_p.cpp @@ -41,8 +41,8 @@ using namespace KCalCore; using namespace EventViews; = -TimelineView::Private::Private(TimelineView *parent) : - q(parent) +TimelineView::Private::Private(TimelineView *parent) + : q(parent) { } = @@ -57,9 +57,9 @@ void TimelineView::Private::splitterMoved() = void TimelineView::Private::itemSelected(const QModelIndex &index) { - TimelineSubItem *tlitem =3D - dynamic_cast(static_cast( - mGantt->model())->item(index.r= ow(), index.column())); + TimelineSubItem *tlitem + =3D dynamic_cast(static_cast( + mGantt->model())->item(index= .row(), index.column())); if (tlitem) { Q_EMIT q->incidenceSelected(tlitem->incidence(), tlitem->originalS= tart().date()); } @@ -67,9 +67,9 @@ void TimelineView::Private::itemSelected(const QModelInde= x &index) = void TimelineView::Private::itemDoubleClicked(const QModelIndex &index) { - TimelineSubItem *tlitem =3D - dynamic_cast(static_cast( - mGantt->model())->item(index.r= ow(), index.column())); + TimelineSubItem *tlitem + =3D dynamic_cast(static_cast( + mGantt->model())->item(index= .row(), index.column())); if (tlitem) { Q_EMIT q->editIncidenceSignal(tlitem->incidence()); } @@ -79,9 +79,9 @@ void TimelineView::Private::contextMenuRequested(const QP= oint &point) { QPersistentModelIndex index =3D mGantt->indexAt(point); // mHintDate =3D QDateTime( mGantt->getDateTimeForCoordX( QCursor::pos= ().x(), true ) ); - TimelineSubItem *tlitem =3D - dynamic_cast(static_cast( - mGantt->model())->item(index.r= ow(), index.column())); + TimelineSubItem *tlitem + =3D dynamic_cast(static_cast( + mGantt->model())->item(index= .row(), index.column())); if (!tlitem) { Q_EMIT q->showNewEventPopupSignal(); mSelectedItemList =3D Akonadi::Item::List(); @@ -124,17 +124,22 @@ void TimelineView::Private::insertIncidence(const Ako= nadi::Item &aitem, const QD } = if (incidence->recurs()) { - KCalCore::OccurrenceIterator occurIter(*(q->calendar()), incidence= , QDateTime(day, QTime(0, 0, 0)), QDateTime(day, QTime(23, 59, 59))); + KCalCore::OccurrenceIterator occurIter(*(q->calendar()), incidence= , QDateTime(day, QTime(0, + = 0, + = 0)), QDateTime( + day, QTime(23, 59, 59))= ); while (occurIter.hasNext()) { occurIter.next(); const Akonadi::Item akonadiItem =3D q->calendar()->item(occurI= ter.incidence()); const QDateTime startOfOccurrence =3D occurIter.occurrenceStar= tDate(); - const QDateTime endOfOccurrence =3D occurIter.incidence()->end= DateForStart(startOfOccurrence); - item->insertIncidence(akonadiItem, startOfOccurrence.toLocalTi= me(), endOfOccurrence.toLocalTime()); + const QDateTime endOfOccurrence =3D occurIter.incidence()->end= DateForStart( + startOfOccurrence); + item->insertIncidence(akonadiItem, + startOfOccurrence.toLocalTime(), endOfOc= currence.toLocalTime()); } } else { - if (incidence->dtStart().date() =3D=3D day || - incidence->dtStart().date() < mStartDate) { + if (incidence->dtStart().date() =3D=3D day + || incidence->dtStart().date() < mStartDate) { item->insertIncidence(aitem); } } @@ -153,9 +158,9 @@ void TimelineView::Private::insertIncidence(const Akona= di::Item &incidence) = for (QDate day =3D mStartDate; day <=3D mEndDate; day =3D day.addDays(= 1)) { KCalCore::Event::List events =3D q->calendar()->events(day, - QTimeZone::systemTimeZone(), - KCalCore::EventSortStartDate, - KCalCore::SortDirectionAscending); + QTimeZone::sy= stemTimeZone(), + KCalCore::Eve= ntSortStartDate, + KCalCore::Sor= tDirectionAscending); if (events.contains(event)) { //PENDING(AKONADI_PORT) check if correct. also check the origi= nal if, //was inside the for loop (unnecessarily) @@ -174,13 +179,13 @@ void TimelineView::Private::removeIncidence(const Ako= nadi::Item &incidence) item->removeIncidence(incidence); } else { #if 0 //AKONADI_PORT_DISABLED - // try harder, the incidence might already be removed from the res= ource + // try harder, the incidence might already be removed from the resou= rce typedef QMap M2_t; typedef QMap M1_t; for (M1_t::ConstIterator it1 =3D d->mCalendarItemMap.constBegin(); - it1 !=3D mCalendarItemMap.constEnd(); ++it1) { + it1 !=3D mCalendarItemMap.constEnd(); ++it1) { for (M2_t::ConstIterator it2 =3D it1.value().constBegin(); - it2 !=3D it1.value().constEnd(); ++it2) { + it2 !=3D it1.value().constEnd(); ++it2) { if (it2.value()) { it2.value()->removeIncidence(incidence); } @@ -223,4 +228,3 @@ void TimelineView::Private::itemChanged(QStandardItem *= item) TimelineItem *parent =3D tlit->parent(); parent->moveItems(i, tlit->originalStart().secsTo(newStart), duration = + allDayOffset); } - diff --git a/src/timeline/timelineview_p.h b/src/timeline/timelineview_p.h index 8279b84..23057c8 100644 --- a/src/timeline/timelineview_p.h +++ b/src/timeline/timelineview_p.h @@ -35,15 +35,11 @@ class QStandardItem; class QTreeWidget; = -namespace KGantt -{ +namespace KGantt { class GraphicsView; } = - -namespace EventViews -{ - +namespace EventViews { class TimelineItem; class RowController; = @@ -80,7 +76,6 @@ public: private: TimelineView *const q; }; - } // namespace EventViews = #endif diff --git a/src/todo/incidencetreemodel.cpp b/src/todo/incidencetreemodel.= cpp index 8fd67ef..c7ad57c 100644 --- a/src/todo/incidencetreemodel.cpp +++ b/src/todo/incidencetreemodel.cpp @@ -89,7 +89,6 @@ IncidenceTreeModel::Private::Private(IncidenceTreeModel *= qq, const QStringList &mimeTypes) : QObje= ct() , m_mimeTypes(mimeTypes) , q(qq) - { } = @@ -144,8 +143,10 @@ void IncidenceTreeModel::Private::reset(bool silent) const int sourceCount =3D q->sourceModel()->rowCount(); for (int i =3D 0; i < sourceCount; ++i) { PreNode::Ptr prenode =3D prenodeFromSourceRow(i); - if (prenode && (m_mimeTypes.isEmpty() || m_mimeTypes.contains(= prenode->incidence->mimeType()))) { - insertNode(prenode, /**silent=3D*/true); + if (prenode + && (m_mimeTypes.isEmpty() + || m_mimeTypes.contains(prenode->incidence->mimeType()= ))) { + insertNode(prenode, /**silent=3D*/ true); } } } @@ -154,7 +155,8 @@ void IncidenceTreeModel::Private::reset(bool silent) } } = -void IncidenceTreeModel::Private::onHeaderDataChanged(Qt::Orientation orie= ntation, int first, int last) +void IncidenceTreeModel::Private::onHeaderDataChanged(Qt::Orientation orie= ntation, int first, + int last) { Q_EMIT q->headerDataChanged(orientation, first, last); } @@ -184,12 +186,15 @@ void IncidenceTreeModel::Private::onDataChanged(const= QModelIndex &begin, const Node::Ptr node =3D m_uidMap.value(rawNode->uid); // Looks ha= ckish but it's safe Q_ASSERT(node); Node::Ptr oldParentNode =3D node->parentNode; - Akonadi::Item item =3D q->data(index, Akonadi::EntityTreeModel= ::ItemRole).value(); + Akonadi::Item item =3D q->data(index, + Akonadi::EntityTreeModel::ItemRol= e).value(); Q_ASSERT(item.isValid()); - KCalCore::Incidence::Ptr incidence =3D !item.hasPayload() ? KCalCore::Incidence::Ptr() : - item.payload(); + KCalCore::Incidence::Ptr incidence + =3D !item.hasPayload() ? KCalCor= e::Incidence::Ptr() + : item.payload(); if (!incidence) { - qCCritical(CALENDARVIEW_LOG) << "Incidence shouldn't be in= valid." << item.hasPayload() << item.id(); + qCCritical(CALENDARVIEW_LOG) << "Incidence shouldn't be in= valid." + << item.hasPayload() << item.= id(); Q_ASSERT(false); return; } @@ -221,8 +226,8 @@ void IncidenceTreeModel::Private::onDataChanged(const Q= ModelIndex &begin, const toRow =3D m_toplevelNodeList.count(); } = - const bool res =3D q->beginMoveRows(/**fromParent*/index.p= arent(), fromRow, - fromRow, newParentIndex, toRow); + const bool res =3D q->beginMoveRows(/**fromParent*/ index.= parent(), fromRow, + fromRow,= newParentIndex, toRow); Q_ASSERT(res); Q_UNUSED(res); = @@ -277,7 +282,8 @@ PreNode::Ptr IncidenceTreeModel::Private::prenodeFromSo= urceRow(int row) const node->sourceIndex =3D q->sourceModel()->index(row, 0, QModelIndex()); Q_ASSERT(node->sourceIndex.isValid()); Q_ASSERT(node->sourceIndex.model() =3D=3D q->sourceModel()); - const Akonadi::Item item =3D node->sourceIndex.data(EntityTreeModel::I= temRole).value(); + const Akonadi::Item item + =3D node->sourceIndex.data(EntityTreeModel::ItemRole).value(); = if (!item.isValid()) { // It's a Collection, ignore that, we only want items. @@ -302,7 +308,8 @@ void IncidenceTreeModel::Private::onRowsInserted(const = QModelIndex &parent, int for (int i =3D begin; i <=3D end; ++i) { PreNode::Ptr node =3D prenodeFromSourceRow(i); // if m_mimeTypes is empty, we ignore this feature - if (!node || (!m_mimeTypes.isEmpty() && !m_mimeTypes.contains(node= ->incidence->mimeType()))) { + if (!node + || (!m_mimeTypes.isEmpty() && !m_mimeTypes.contains(node->inci= dence->mimeType()))) { continue; } nodes << node; @@ -333,12 +340,16 @@ void IncidenceTreeModel::Private::insertNode(const Pr= eNode::Ptr &prenode, bool s //qCDebug(CALENDARVIEW_LOG) << "New node " << node.data() << node->uid= << node->id; node->parentUid =3D incidence->relatedTo(); if (node->uid =3D=3D node->parentUid) { - qCWarning(CALENDARVIEW_LOG) << "Incidence with itself as parent!" = << node->uid << "Akonadi item" << item.id() << "remoteId=3D" << item.remote= Id(); + qCWarning(CALENDARVIEW_LOG) << "Incidence with itself as parent!" = << node->uid + << "Akonadi item" << item.id() << "rem= oteId=3D" + << item.remoteId(); node->parentUid.clear(); } = if (m_uidMap.contains(node->uid)) { - qCWarning(CALENDARVIEW_LOG) << "Duplicate incidence detected. File= a bug against the resource. collection=3D" << item.storageCollectionId(); + qCWarning(CALENDARVIEW_LOG) + << "Duplicate incidence detected. File a bug against the resou= rce. collection=3D" + << item.storageCollectionId(); return; } = @@ -440,7 +451,8 @@ Node::List IncidenceTreeModel::Private::sorted(const No= de::List &nodes) const return sorted; } = -void IncidenceTreeModel::Private::onRowsAboutToBeRemoved(const QModelIndex= &parent, int begin, int end) +void IncidenceTreeModel::Private::onRowsAboutToBeRemoved(const QModelIndex= &parent, int begin, + int end) { //QElapsedTimer timer; //timer.start(); @@ -552,7 +564,7 @@ void IncidenceTreeModel::Private::onModelAboutToBeReset= () = void IncidenceTreeModel::Private::onModelReset() { - reset(/**silent=3D*/false); + reset(/**silent=3D*/ false); q->endResetModel(); } = @@ -564,12 +576,13 @@ void IncidenceTreeModel::Private::onLayoutAboutToBeCh= anged() = void IncidenceTreeModel::Private::onLayoutChanged() { - reset(/**silent=3D*/true); + reset(/**silent=3D*/ true); Q_ASSERT(q->persistentIndexList().isEmpty()); Q_EMIT q->layoutChanged(); } = -void IncidenceTreeModel::Private::onRowsMoved(const QModelIndex &, int, in= t, const QModelIndex &, int) +void IncidenceTreeModel::Private::onRowsMoved(const QModelIndex &, int, in= t, const QModelIndex &, + int) { // Not implemented yet Q_ASSERT(false); @@ -613,7 +626,8 @@ int IncidenceTreeModel::rowCount(const QModelIndex &par= ent) const Node *parentNode =3D reinterpret_cast(parent.internalPoint= er()); Q_ASSERT(parentNode); d->assert_and_dump(!d->m_removedNodes.contains(parentNode), - QString::number((quintptr)parentNode, 16) + QLa= tin1String(" was already deleted")); + QString::number((quintptr)parentNode, + 16) + QLatin1String(" was alrea= dy deleted")); = const int count =3D parentNode->directChilds.count(); return count; @@ -710,14 +724,15 @@ void IncidenceTreeModel::setSourceModel(QAbstractItem= Model *model) d, SLOT(onLayoutChanged())); } = - d->reset(/**silent=3D*/true); + d->reset(/**silent=3D*/ true); endResetModel(); } = QModelIndex IncidenceTreeModel::mapFromSource(const QModelIndex &sourceInd= ex) const { if (!sourceIndex.isValid()) { - qCWarning(CALENDARVIEW_LOG) << "IncidenceTreeModel::mapFromSource(= ) source index is invalid"; + qCWarning(CALENDARVIEW_LOG) + << "IncidenceTreeModel::mapFromSource() source index is invali= d"; // Q_ASSERT( false ); return QModelIndex(); } @@ -727,7 +742,8 @@ QModelIndex IncidenceTreeModel::mapFromSource(const QMo= delIndex &sourceIndex) co } Q_ASSERT(sourceIndex.column() < sourceModel()->columnCount()); Q_ASSERT(sourceModel() =3D=3D sourceIndex.model()); - const Akonadi::Item::Id id =3D sourceIndex.data(Akonadi::EntityTreeMod= el::ItemIdRole).toLongLong(); + const Akonadi::Item::Id id + =3D sourceIndex.data(Akonadi::EntityTreeModel::ItemIdRole).toLongL= ong(); = if (id =3D=3D -1 || !d->m_nodeMap.contains(id)) { return QModelIndex(); @@ -765,7 +781,8 @@ QModelIndex IncidenceTreeModel::mapToSource(const QMode= lIndex &proxyIndex) const QModelIndex index =3D indexes.first();*/ QModelIndex index =3D node->sourceIndex; if (!index.isValid()) { - qCWarning(CALENDARVIEW_LOG) << "IncidenceTreeModel::mapToSource():= sourceModelIndex is invalid"; + qCWarning(CALENDARVIEW_LOG) + << "IncidenceTreeModel::mapToSource(): sourceModelIndex is inv= alid"; Q_ASSERT(false); return QModelIndex(); } @@ -829,7 +846,8 @@ QModelIndex IncidenceTreeModel::index(int row, int colu= mn, const QModelIndex &pa Node *parentNode =3D reinterpret_cast(parent.internalPoint= er()); = if (row >=3D parentNode->directChilds.count()) { - qCCritical(CALENDARVIEW_LOG) << "IncidenceTreeModel::index() r= ow=3D" << row << "; column=3D" << column; + qCCritical(CALENDARVIEW_LOG) << "IncidenceTreeModel::index() r= ow=3D" << row + << "; column=3D" << column; Q_ASSERT(false); return QModelIndex(); } @@ -882,7 +900,9 @@ QDebug operator<<(QDebug s, const Node::Ptr &node) static int level =3D 0; ++level; QString padding =3D QString(level - 1, QLatin1Char(' ')); - s << padding + QLatin1String("node") << node.data() << QStringLiteral(= ";uid=3D") << node->uid << QStringLiteral(";id=3D") << node->id << QStringL= iteral(";parentUid=3D") << node->parentUid << QStringLiteral(";parentNode= =3D") << (void *)(node->parentNode.data()) << '\n'; + s << padding + QLatin1String("node") << node.data() << QStringLiteral(= ";uid=3D") << node->uid + << QStringLiteral(";id=3D") << node->id << QStringLiteral(";parentUi= d=3D") << node->parentUid + << QStringLiteral(";parentNode=3D") << (void *)(node->parentNode.dat= a()) << '\n'; = foreach (const Node::Ptr &child, node->directChilds) { s << child; diff --git a/src/todo/incidencetreemodel_p.h b/src/todo/incidencetreemodel_= p.h index 7d4a38f..c073e05 100644 --- a/src/todo/incidencetreemodel_p.h +++ b/src/todo/incidencetreemodel_p.h @@ -61,7 +61,9 @@ struct PreNode { QPersistentModelIndex sourceIndex; Akonadi::Item item; int depth; - PreNode() : depth(-1) {} + PreNode() : depth(-1) + { + } }; = class IncidenceTreeModel::Private : public QObject diff --git a/src/todo/tododelegates.cpp b/src/todo/tododelegates.cpp index 75ce357..4ca0680 100644 --- a/src/todo/tododelegates.cpp +++ b/src/todo/tododelegates.cpp @@ -56,8 +56,7 @@ TodoCompleteDelegate::~TodoCompleteDelegate() { } = -void TodoCompleteDelegate::paint(QPainter *painter, - const QStyleOptionViewItem &option, +void TodoCompleteDelegate::paint(QPainter *painter, const QStyleOptionView= Item &option, const QModelIndex &index) const { QStyleOptionViewItem opt =3D option; @@ -103,8 +102,7 @@ QSize TodoCompleteDelegate::sizeHint(const QStyleOption= ViewItem &option, } = void TodoCompleteDelegate::initStyleOptionProgressBar( - QStyleOptionProgressBar *option, - const QModelIndex &index) const + QStyleOptionProgressBar *option, const QModelIndex &index) const { option->rect.adjust(0, 1, 0, -1); option->maximum =3D 100; @@ -115,9 +113,8 @@ void TodoCompleteDelegate::initStyleOptionProgressBar( option->textVisible =3D true; } = -QWidget *TodoCompleteDelegate::createEditor(QWidget *parent, - const QStyleOptionViewItem &option, - const QModelIndex &index) const +QWidget *TodoCompleteDelegate::createEditor(QWidget *parent, const QStyleO= ptionViewItem &option, + const QModelIndex &index) const { Q_UNUSED(option); Q_UNUSED(index); @@ -130,16 +127,14 @@ QWidget *TodoCompleteDelegate::createEditor(QWidget *= parent, return slider; } = -void TodoCompleteDelegate::setEditorData(QWidget *editor, - const QModelIndex &index) const +void TodoCompleteDelegate::setEditorData(QWidget *editor, const QModelInde= x &index) const { QSlider *slider =3D static_cast(editor); = slider->setValue(index.data(Qt::EditRole).toInt()); } = -void TodoCompleteDelegate::setModelData(QWidget *editor, - QAbstractItemModel *model, +void TodoCompleteDelegate::setModelData(QWidget *editor, QAbstractItemMode= l *model, const QModelIndex &index) const { QSlider *slider =3D static_cast(editor); @@ -147,9 +142,8 @@ void TodoCompleteDelegate::setModelData(QWidget *editor, model->setData(index, slider->value()); } = -void TodoCompleteDelegate::updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, - const QModelIndex &index) const +void TodoCompleteDelegate::updateEditorGeometry(QWidget *editor, const QSt= yleOptionViewItem &option, + const QModelIndex &index) = const { Q_UNUSED(index); = @@ -185,9 +179,8 @@ TodoPriorityDelegate::~TodoPriorityDelegate() { } = -QWidget *TodoPriorityDelegate::createEditor(QWidget *parent, - const QStyleOptionViewItem &option, - const QModelIndex &index) const +QWidget *TodoPriorityDelegate::createEditor(QWidget *parent, const QStyleO= ptionViewItem &option, + const QModelIndex &index) const { Q_UNUSED(option); Q_UNUSED(index); @@ -208,16 +201,14 @@ QWidget *TodoPriorityDelegate::createEditor(QWidget *= parent, return combo; } = -void TodoPriorityDelegate::setEditorData(QWidget *editor, - const QModelIndex &index) const +void TodoPriorityDelegate::setEditorData(QWidget *editor, const QModelInde= x &index) const { KComboBox *combo =3D static_cast(editor); = combo->setCurrentIndex(index.data(Qt::EditRole).toInt()); } = -void TodoPriorityDelegate::setModelData(QWidget *editor, - QAbstractItemModel *model, +void TodoPriorityDelegate::setModelData(QWidget *editor, QAbstractItemMode= l *model, const QModelIndex &index) const { KComboBox *combo =3D static_cast(editor); @@ -225,9 +216,8 @@ void TodoPriorityDelegate::setModelData(QWidget *editor, model->setData(index, combo->currentIndex()); } = -void TodoPriorityDelegate::updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, - const QModelIndex &index) const +void TodoPriorityDelegate::updateEditorGeometry(QWidget *editor, const QSt= yleOptionViewItem &option, + const QModelIndex &index) = const { Q_UNUSED(index); = @@ -246,9 +236,8 @@ TodoDueDateDelegate::~TodoDueDateDelegate() { } = -QWidget *TodoDueDateDelegate::createEditor(QWidget *parent, - const QStyleOptionViewItem &option, - const QModelIndex &index) const +QWidget *TodoDueDateDelegate::createEditor(QWidget *parent, const QStyleOp= tionViewItem &option, + const QModelIndex &index) const { Q_UNUSED(option); Q_UNUSED(index); @@ -258,16 +247,14 @@ QWidget *TodoDueDateDelegate::createEditor(QWidget *p= arent, return dateEdit; } = -void TodoDueDateDelegate::setEditorData(QWidget *editor, - const QModelIndex &index) const +void TodoDueDateDelegate::setEditorData(QWidget *editor, const QModelIndex= &index) const { KDateComboBox *dateEdit =3D static_cast(editor); = dateEdit->setDate(index.data(Qt::EditRole).toDate()); } = -void TodoDueDateDelegate::setModelData(QWidget *editor, - QAbstractItemModel *model, +void TodoDueDateDelegate::setModelData(QWidget *editor, QAbstractItemModel= *model, const QModelIndex &index) const { KDateComboBox *dateEdit =3D static_cast(editor); @@ -275,9 +262,8 @@ void TodoDueDateDelegate::setModelData(QWidget *editor, model->setData(index, dateEdit->date()); } = -void TodoDueDateDelegate::updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, - const QModelIndex &index) const +void TodoDueDateDelegate::updateEditorGeometry(QWidget *editor, const QSty= leOptionViewItem &option, + const QModelIndex &index) c= onst { Q_UNUSED(index); editor->setGeometry(QStyle::alignedRect(QApplication::layoutDirection(= ), Qt::AlignCenter, @@ -288,7 +274,8 @@ void TodoDueDateDelegate::updateEditorGeometry(QWidget = *editor, // --------------------------------------------------------------- = TodoCategoriesDelegate::TodoCategoriesDelegate(QObject *parent) - : QStyledItemDelegate(parent), mCalendar(nullptr) + : QStyledItemDelegate(parent) + , mCalendar(nullptr) { } = @@ -296,9 +283,8 @@ TodoCategoriesDelegate::~TodoCategoriesDelegate() { } = -QWidget *TodoCategoriesDelegate::createEditor(QWidget *parent, - const QStyleOptionViewItem &option, - const QModelIndex &index) const +QWidget *TodoCategoriesDelegate::createEditor(QWidget *parent, const QStyl= eOptionViewItem &option, + const QModelIndex &index) co= nst { Q_UNUSED(option); Q_UNUSED(index); @@ -306,17 +292,15 @@ QWidget *TodoCategoriesDelegate::createEditor(QWidget= *parent, return new KPIM::TagSelectionCombo(parent); } = -void TodoCategoriesDelegate::setEditorData(QWidget *editor, - const QModelIndex &index) const +void TodoCategoriesDelegate::setEditorData(QWidget *editor, const QModelIn= dex &index) const { KPIM::KCheckComboBox *combo =3D static_cast(ed= itor); = combo->setCheckedItems(index.data(Qt::EditRole).toStringList(), Qt::Us= erRole); } = -void TodoCategoriesDelegate::setModelData(QWidget *editor, - QAbstractItemModel *model, - const QModelIndex &index) const +void TodoCategoriesDelegate::setModelData(QWidget *editor, QAbstractItemMo= del *model, + const QModelIndex &index) const { KPIM::KCheckComboBox *combo =3D static_cast(ed= itor); = @@ -324,8 +308,8 @@ void TodoCategoriesDelegate::setModelData(QWidget *edit= or, } = void TodoCategoriesDelegate::updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, - const QModelIndex &index) const + const QStyleOptionViewIt= em &option, + const QModelIndex &index= ) const { Q_UNUSED(index); = @@ -350,8 +334,7 @@ TodoRichTextDelegate::~TodoRichTextDelegate() { } = -void TodoRichTextDelegate::paint(QPainter *painter, - const QStyleOptionViewItem &option, +void TodoRichTextDelegate::paint(QPainter *painter, const QStyleOptionView= Item &option, const QModelIndex &index) const { if (index.data(TodoModel::IsRichTextRole).toBool()) { @@ -369,8 +352,8 @@ void TodoRichTextDelegate::paint(QPainter *painter, style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget); = // draw the text (rich text) - QPalette::ColorGroup cg =3D (opt.state & QStyle::State_Enabled) ? - QPalette::Normal : QPalette::Disabled; + QPalette::ColorGroup cg =3D (opt.state & QStyle::State_Enabled) + ? QPalette::Normal : QPalette::Disabled; if (cg =3D=3D QPalette::Normal && !(opt.state & QStyle::State_Acti= ve)) { cg =3D QPalette::Inactive; } @@ -422,7 +405,7 @@ QSize TodoRichTextDelegate::sizeHint(const QStyleOption= ViewItem &option, } = // This row might not have a checkbox, so give it more height so it ap= pears the same size as other rows. - const int checkboxHeight =3D QApplication::style()->sizeFromContents(Q= Style::CT_CheckBox, &option, QSize()).height(); + const int checkboxHeight =3D QApplication::style()->sizeFromContents(Q= Style::CT_CheckBox, &option, + QSi= ze()).height(); return QSize(ret.width(), qMax(ret.height(), checkboxHeight)); } - diff --git a/src/todo/tododelegates.h b/src/todo/tododelegates.h index 5d5547d..74a32a6 100644 --- a/src/todo/tododelegates.h +++ b/src/todo/tododelegates.h @@ -50,16 +50,14 @@ public: = void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; - QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const override; = QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &opt= ion, const QModelIndex &index) const override; void setEditorData(QWidget *editor, const QModelIndex &index) const ov= erride; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; - void updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem = &option, const QModelIndex &index) const override; = private: @@ -98,8 +96,7 @@ public: void setEditorData(QWidget *editor, const QModelIndex &index) const ov= erride; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; - void updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem = &option, const QModelIndex &index) const override; }; = @@ -123,8 +120,7 @@ public: void setEditorData(QWidget *editor, const QModelIndex &index) const ov= erride; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; - void updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem = &option, const QModelIndex &index) const override; }; = @@ -148,8 +144,7 @@ public: void setEditorData(QWidget *editor, const QModelIndex &index) const ov= erride; void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; - void updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem = &option, const QModelIndex &index) const override; = void setCalendar(const Akonadi::ETMCalendar::Ptr &cal); @@ -173,8 +168,7 @@ public: = void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; - QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &= index) const override; private: QTextDocument *m_textDoc =3D nullptr; }; diff --git a/src/todo/todomodel.cpp b/src/todo/todomodel.cpp index 03f7f28..40d5c89 100644 --- a/src/todo/todomodel.cpp +++ b/src/todo/todomodel.cpp @@ -47,7 +47,10 @@ = struct SourceModelIndex { SourceModelIndex(int _r, int _c, void *_p, QAbstractItemModel *_m) - : r(_r), c(_c), p(_p), m(_m) + : r(_r) + , c(_c) + , p(_p) + , m(_m) { } = @@ -66,15 +69,14 @@ static bool isDueToday(const KCalCore::Todo::Ptr &todo) return !todo->isCompleted() && todo->dtDue().date() =3D=3D QDate::curr= entDate(); } = -TodoModel::Private::Private(const EventViews::PrefsPtr &preferences, - TodoModel *qq) : QObject(), m_changer(nullptr) +TodoModel::Private::Private(const EventViews::PrefsPtr &preferences, TodoM= odel *qq) : QObject() + , m_changer(nullptr) , m_preferences(preferences) , q(qq) { } = -Akonadi::Item TodoModel::Private::findItemByUid(const QString &uid, - const QModelIndex &parent) const +Akonadi::Item TodoModel::Private::findItemByUid(const QString &uid, const = QModelIndex &parent) const { Q_ASSERT(!uid.isEmpty()); IncidenceTreeModel *treeModel =3D qobject_cast(q= ->sourceModel()); @@ -144,11 +146,9 @@ void TodoModel::Private::onRowsRemoved(const QModelInd= ex &, int, int) q->endRemoveRows(); } = -void TodoModel::Private::onRowsAboutToBeMoved(const QModelIndex &sourcePar= ent, - int sourceStart, - int sourceEnd, - const QModelIndex &destinationParent, - int destinationRow) +void TodoModel::Private::onRowsAboutToBeMoved(const QModelIndex &sourcePar= ent, int sourceStart, + int sourceEnd, const QModelI= ndex &destinationParent, + int destinationRow) { Q_UNUSED(sourceParent); Q_UNUSED(sourceStart); @@ -201,10 +201,10 @@ void TodoModel::Private::onLayoutChanged() QModelIndex newIndex_col0 =3D q->mapFromSource(m_layoutChangePersi= stentIndexes.at(i)); Q_ASSERT(newIndex_col0.isValid()); const int column =3D m_columns.at(i); - QModelIndex newIndex =3D - column =3D=3D 0 ? - newIndex_col0 : - q->createIndex(newIndex_col0.row(), column, newIndex_col0.inte= rnalPointer()); + QModelIndex newIndex + =3D column =3D=3D 0 + ? newIndex_col0 + : q->createIndex(newIndex_col0.row(), column, newIndex_col0.= internalPointer()); q->changePersistentIndex(m_persistentIndexes.at(i), newIndex); } = @@ -215,7 +215,8 @@ void TodoModel::Private::onLayoutChanged() } = TodoModel::TodoModel(const EventViews::PrefsPtr &preferences, QObject *par= ent) - : QAbstractProxyModel(parent), d(new Private(preferences, this)) + : QAbstractProxyModel(parent) + , d(new Private(preferences, this)) { setObjectName(QStringLiteral("TodoModel")); } @@ -237,8 +238,8 @@ QVariant TodoModel::data(const QModelIndex &index, int = role) const return QVariant(); } Q_ASSERT(sourceIndex.isValid()); - const Akonadi::Item item =3D - sourceIndex.data(Akonadi::EntityTreeModel::ItemRole).value(); + const Akonadi::Item item + =3D sourceIndex.data(Akonadi::EntityTreeModel::ItemRole).value(); if (!item.isValid()) { qCWarning(CALENDARVIEW_LOG) << "Invalid index: " << sourceIndex; //Q_ASSERT( false ); @@ -280,20 +281,24 @@ QVariant TodoModel::data(const QModelIndex &index, in= t role) const case PercentColumn: return QVariant(todo->percentComplete()); case StartDateColumn: - return todo->hasStartDate() ? QLocale().toString(todo->dtStart= ().toLocalTime().date(), QLocale::ShortFormat) + return todo->hasStartDate() ? QLocale().toString( + todo->dtStart().toLocalTime().date(), QLocale::ShortFormat) : QVariant(QString()); case DueDateColumn: - return todo->hasDueDate() ? QLocale().toString(todo->dtDue().t= oLocalTime().date(), QLocale::ShortFormat) + return todo->hasDueDate() ? QLocale().toString( + todo->dtDue().toLocalTime().date(), QLocale::ShortFormat) : QVariant(QString()); - case CategoriesColumn: { + case CategoriesColumn: + { QString categories =3D todo->categories().join( - i18nc("delimiter for joining category= names", ",")); + i18nc("delimiter for joining category names", ",")); return QVariant(categories); } case DescriptionColumn: return QVariant(todo->description()); case CalendarColumn: - return QVariant(CalendarSupport::displayName(d->m_calendar.dat= a(), item.parentCollection())); + return QVariant(CalendarSupport::displayName(d->m_calendar.dat= a(), + item.parentCollec= tion())); } return QVariant(); } @@ -317,7 +322,8 @@ QVariant TodoModel::data(const QModelIndex &index, int = role) const case DescriptionColumn: return QVariant(todo->description()); case CalendarColumn: - return QVariant(CalendarSupport::displayName(d->m_calendar.dat= a(), item.parentCollection())); + return QVariant(CalendarSupport::displayName(d->m_calendar.dat= a(), + item.parentCollec= tion())); } return QVariant(); } @@ -326,7 +332,8 @@ QVariant TodoModel::data(const QModelIndex &index, int = role) const if (role =3D=3D Qt::ToolTipRole) { if (d->m_preferences->enableToolTips()) { return QVariant(KCalUtils::IncidenceFormatter::toolTipStr( - CalendarSupport::displayName(d->m_calendar= .data(), item.parentCollection()), + CalendarSupport::displayName(d->m_calendar= .data(), + item.parentCo= llection()), todo, QDate(), true)); } else { return QVariant(); @@ -337,16 +344,15 @@ QVariant TodoModel::data(const QModelIndex &index, in= t role) const if (role =3D=3D Qt::BackgroundRole) { if (todo->isOverdue()) { return QVariant( - QBrush(d->m_preferences->todoOverdueColor())); + QBrush(d->m_preferences->todoOverdueColor())); } else if (isDueToday(todo)) { return QVariant( - QBrush(d->m_preferences->todoDueTodayColor())); + QBrush(d->m_preferences->todoDueTodayColor())); } } = // indicate if a row is checked (=3Dcompleted) only in the first column if (role =3D=3D Qt::CheckStateRole && index.column() =3D=3D 0) { - if (hasChildren(index) && !index.parent().isValid()) { return QVariant(); } @@ -370,9 +376,9 @@ QVariant TodoModel::data(const QModelIndex &index, int = role) const // category colour if (role =3D=3D Qt::DecorationRole && index.column() =3D=3D SummaryCol= umn) { QStringList categories =3D todo->categories(); - return categories.isEmpty() ? - QVariant() : - QVariant(CalendarSupport::KCalPrefs::instance()->categoryCo= lor(categories.first())); + return categories.isEmpty() + ? QVariant() + : QVariant(CalendarSupport::KCalPrefs::instance()->category= Color(categories.first())); } else if (role =3D=3D Qt::DecorationRole) { return QVariant(); } @@ -427,12 +433,13 @@ bool TodoModel::setData(const QModelIndex &index, con= st QVariant &value, int rol return true; } = - const Akonadi::Item item =3D - data(index, Akonadi::EntityTreeModel::ItemRole).value(); + const Akonadi::Item item + =3D data(index, Akonadi::EntityTreeModel::ItemRole).value(); const KCalCore::Todo::Ptr todo =3D CalendarSupport::todo(item); = if (!item.isValid() || !todo) { - qCWarning(CALENDARVIEW_LOG) << "TodoModel::setData() called, bug i= tem is invalid or doesn't have payload"; + qCWarning(CALENDARVIEW_LOG) + << "TodoModel::setData() called, bug item is invalid or doesn'= t have payload"; Q_ASSERT(false); return false; } @@ -461,18 +468,20 @@ bool TodoModel::setData(const QModelIndex &index, con= st QVariant &value, int rol case PercentColumn: todo->setPercentComplete(value.toInt()); break; - case StartDateColumn: { + case StartDateColumn: + { QDateTime tmp =3D todo->dtStart(); tmp.setDate(value.toDate()); todo->setDtStart(tmp); + break; } - break; - case DueDateColumn: { + case DueDateColumn: + { QDateTime tmp =3D todo->dtDue(); tmp.setDate(value.toDate()); todo->setDtDue(tmp); + break; } - break; case CategoriesColumn: todo->setCategories(value.toStringList()); break; @@ -679,8 +688,8 @@ QMimeData *TodoModel::mimeData(const QModelIndexList &i= ndexes) const { Akonadi::Item::List items; for (const QModelIndex &index : indexes) { - const Akonadi::Item item =3D - this->data(index, Akonadi::EntityTreeModel::ItemRole).value(); + const Akonadi::Item item + =3D this->data(index, Akonadi::EntityTreeModel::ItemRole).valu= e(); if (item.isValid() && !items.contains(item)) { items.push_back(item); } @@ -688,8 +697,8 @@ QMimeData *TodoModel::mimeData(const QModelIndexList &i= ndexes) const return CalendarSupport::createMimeData(items); } = -bool TodoModel::dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &paren= t) +bool TodoModel::dropMimeData(const QMimeData *data, Qt::DropAction action,= int row, int column, + const QModelIndex &parent) { Q_UNUSED(row); Q_UNUSED(column); @@ -699,8 +708,8 @@ bool TodoModel::dropMimeData(const QMimeData *data, Qt:= :DropAction action, return false; } = - if (d->m_calendar && d->m_changer && - (KCalUtils::ICalDrag::canDecode(data) || KCalUtils::VCalDrag::= canDecode(data))) { + if (d->m_calendar && d->m_changer + && (KCalUtils::ICalDrag::canDecode(data) || KCalUtils::VCalDrag::c= anDecode(data))) { KCalUtils::DndFactory dndFactory(d->m_calendar); KCalCore::Todo::Ptr t =3D dndFactory.createDropTodo(data); KCalCore::Event::Ptr e =3D dndFactory.createDropEvent(data); @@ -712,8 +721,8 @@ bool TodoModel::dropMimeData(const QMimeData *data, Qt:= :DropAction action, KCalCore::Todo::Ptr todo =3D CalendarSupport::todo(item); KCalCore::Todo::Ptr destTodo; if (parent.isValid()) { - const Akonadi::Item parentItem =3D - this->data(parent, Akonadi::EntityTreeModel::ItemRole)= .value(); + const Akonadi::Item parentItem + =3D this->data(parent, Akonadi::EntityTreeModel::ItemR= ole).value(); if (parentItem.isValid()) { destTodo =3D CalendarSupport::todo(parentItem); } @@ -744,7 +753,6 @@ bool TodoModel::dropMimeData(const QMimeData *data, Qt:= :DropAction action, qCDebug(CALENDARVIEW_LOG) << "Todo's with recurring id can= 't have child todos yet."; return false; } - } else if (e) { // TODO: Implement dropping an event onto a to-do: Generate a = relationship to the event! } else { @@ -754,8 +762,8 @@ bool TodoModel::dropMimeData(const QMimeData *data, Qt:= :DropAction action, return false; } = - const Akonadi::Item parentItem =3D - this->data(parent, Akonadi::EntityTreeModel::ItemRole).val= ue(); + const Akonadi::Item parentItem + =3D this->data(parent, Akonadi::EntityTreeModel::ItemRole)= .value(); KCalCore::Todo::Ptr destTodo =3D CalendarSupport::todo(parentI= tem); = if (data->hasText()) { @@ -764,14 +772,15 @@ bool TodoModel::dropMimeData(const QMimeData *data, Q= t::DropAction action, KCalCore::Todo::Ptr oldTodo =3D KCalCore::Todo::Ptr(destTo= do->clone()); = if (text.startsWith(QStringLiteral("file:"))) { - destTodo->addAttachment(KCalCore::Attachment::Ptr(new = KCalCore::Attachment(text))); + destTodo->addAttachment(KCalCore::Attachment::Ptr(new = KCalCore::Attachment( + = text))); } else { QStringList emails =3D KEmailAddress::splitAddressList= (text); for (QStringList::ConstIterator it =3D emails.constBeg= in(); - it !=3D emails.constEnd(); ++it) { + it !=3D emails.constEnd(); ++it) { QString name, email, comment; - if (KEmailAddress::splitAddress(*it, name, email, = comment) =3D=3D - KEmailAddress::AddressOk) { + if (KEmailAddress::splitAddress(*it, name, email, = comment) + =3D=3D KEmailAddress::AddressOk) { destTodo->addAttendee( KCalCore::Attendee::Ptr(new KCalCore::Atte= ndee(name, email))); } @@ -794,8 +803,8 @@ Qt::ItemFlags TodoModel::flags(const QModelIndex &index= ) const = Qt::ItemFlags ret =3D QAbstractItemModel::flags(index); = - const Akonadi::Item item =3D - data(index, Akonadi::EntityTreeModel::ItemRole).value(); + const Akonadi::Item item + =3D data(index, Akonadi::EntityTreeModel::ItemRole).value(); = if (!item.isValid()) { Q_ASSERT(mapToSource(index).isValid()); @@ -831,8 +840,8 @@ Qt::ItemFlags TodoModel::flags(const QModelIndex &index= ) const // whole rows should have checkboxes, so append the flag for the // first item of every row only. Also, only the first item of every // row should be used as a target for a drag and drop operation. - ret |=3D Qt::ItemIsUserCheckable | - Qt::ItemIsDropEnabled; + ret |=3D Qt::ItemIsUserCheckable + |Qt::ItemIsDropEnabled; } return ret; } @@ -855,7 +864,8 @@ QModelIndex TodoModel::mapToSource(const QModelIndex &p= roxyIndex) const } = if (proxyIndex.column() !=3D 0) { - qCCritical(CALENDARVIEW_LOG) << "Map to source called with column>= 0, but source model only has 1 column"; + qCCritical(CALENDARVIEW_LOG) + << "Map to source called with column>0, but source model only = has 1 column"; Q_ASSERT(false); } = @@ -863,7 +873,7 @@ QModelIndex TodoModel::mapToSource(const QModelIndex &p= roxyIndex) const = // we convert to column 0 const QModelIndex sourceIndex =3D SourceModelIndex(proxyIndex.row(), 0, - proxyIndex.internalPointer(), sourceMo= del()); + proxyIndex.internalPo= inter(), sourceModel()); = return sourceIndex; } @@ -875,14 +885,14 @@ QModelIndex TodoModel::index(int row, int column, con= st QModelIndex &parent) con } = Q_ASSERT(!parent.isValid() || parent.internalPointer()); - QModelIndex parent_col0 =3D - parent.isValid() ? - createIndex(parent.row(), 0, parent.internalPointer()) : - QModelIndex(); + QModelIndex parent_col0 + =3D parent.isValid() + ? createIndex(parent.row(), 0, parent.internalPointer()) + : QModelIndex(); = // Lets preserve the original internalPointer - const QModelIndex index =3D - mapFromSource(sourceModel()->index(row, 0, mapToSource(parent_col0= ))); + const QModelIndex index + =3D mapFromSource(sourceModel()->index(row, 0, mapToSource(parent_= col0))); = Q_ASSERT(!index.isValid() || index.internalPointer()); = diff --git a/src/todo/todomodel.h b/src/todo/todomodel.h index 9ccceb7..1238f15 100644 --- a/src/todo/todomodel.h +++ b/src/todo/todomodel.h @@ -84,8 +84,8 @@ public: = QMimeData *mimeData(const QModelIndexList &indexes) const override; = - bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) over= ride; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int ro= w, int column, + const QModelIndex &parent) override; = QStringList mimeTypes() const override; = diff --git a/src/todo/todomodel_p.h b/src/todo/todomodel_p.h index 0520305..7cc21f7 100644 --- a/src/todo/todomodel_p.h +++ b/src/todo/todomodel_p.h @@ -32,8 +32,7 @@ #include #include = -namespace Akonadi -{ +namespace Akonadi { class IncidenceChanger; } = diff --git a/src/todo/todoview.cpp b/src/todo/todoview.cpp index de624a4..a01e8ab 100644 --- a/src/todo/todoview.cpp +++ b/src/todo/todoview.cpp @@ -68,19 +68,18 @@ Q_DECLARE_METATYPE(QPointer) using namespace EventViews; using namespace KCalCore; = -namespace EventViews -{ +namespace EventViews { // We share this struct between all views, for performance and memory purp= oses class ModelStack { public: ModelStack(const EventViews::PrefsPtr &preferences, QObject *parent_) - : todoModel(new TodoModel(preferences)), - parent(parent_), - calendar(nullptr), - todoTreeModel(nullptr), - todoFlatModel(nullptr), - prefs(preferences) + : todoModel(new TodoModel(preferences)) + , parent(parent_) + , calendar(nullptr) + , todoTreeModel(nullptr) + , todoFlatModel(nullptr) + , prefs(preferences) { } = @@ -108,7 +107,7 @@ public: foreach (TodoView *view, views) { // In flatview dropping confuses users and it's very easy = to drop into a child item view->mView->setDragDropMode(QAbstractItemView::DragOnly); - view->setFlatView(flat, /**propagate=3D*/false); // So o= ther views update their toggle icon + view->setFlatView(flat, /**propagate=3D*/ false); // So = other views update their toggle icon = if (todoTreeModel) { view->saveViewState(); // Save the tree state before i= t's gone @@ -127,10 +126,12 @@ public: delete todoTreeModel; todoTreeModel =3D new IncidenceTreeModel(QStringList() << todo= MimeType, parent); foreach (TodoView *view, views) { - QObject::connect(todoTreeModel, &IncidenceTreeModel::index= ChangedParent, view, &TodoView::expandIndex); - QObject::connect(todoTreeModel, &IncidenceTreeModel::batch= InsertionFinished, view, &TodoView::restoreViewState); + QObject::connect(todoTreeModel, &IncidenceTreeModel::index= ChangedParent, view, + &TodoView::expandIndex); + QObject::connect(todoTreeModel, &IncidenceTreeModel::batch= InsertionFinished, view, + &TodoView::restoreViewState); view->mView->setDragDropMode(QAbstractItemView::DragDrop); - view->setFlatView(flat, /**propagate=3D*/false); // So o= ther views update their toggle icon + view->setFlatView(flat, /**propagate=3D*/ false); // So = other views update their toggle icon } todoTreeModel->setSourceModel(calendar ? calendar->model() : n= ullptr); todoModel->setSourceModel(todoTreeModel); @@ -179,8 +180,7 @@ public: // Don't use K_GLOBAL_STATIC, see QTBUG-22667 static ModelStack *sModels =3D nullptr; = -TodoView::TodoView(const EventViews::PrefsPtr &prefs, - bool sidebarView, QWidget *parent) +TodoView::TodoView(const EventViews::PrefsPtr &prefs, bool sidebarView, QW= idget *parent) : EventView(parent) , mQuickSearch(nullptr) , mQuickAdd(nullptr) @@ -205,18 +205,24 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, mProxyModel->setFilterKeyColumn(TodoModel::SummaryColumn); mProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); mProxyModel->setSortRole(Qt::EditRole); - connect(mProxyModel, &TodoViewSortFilterProxyModel::rowsInserted, this= , &TodoView::onRowsInserted); + connect(mProxyModel, &TodoViewSortFilterProxyModel::rowsInserted, this, + &TodoView::onRowsInserted); = if (!mSidebarView) { mQuickSearch =3D new TodoViewQuickSearch(calendar(), this); mQuickSearch->setVisible(prefs->enableTodoQuickSearch()); connect(mQuickSearch, SIGNAL(searchTextChanged(QString)), mProxyModel, SLOT(setFilterRegExp(QString))); - connect(mQuickSearch, &TodoViewQuickSearch::searchTextChanged, thi= s, &TodoView::restoreViewState); - connect(mQuickSearch, &TodoViewQuickSearch::filterCategoryChanged,= mProxyModel, &TodoViewSortFilterProxyModel::setCategoryFilter); - connect(mQuickSearch, &TodoViewQuickSearch::filterCategoryChanged,= this, &TodoView::restoreViewState); - connect(mQuickSearch, &TodoViewQuickSearch::filterPriorityChanged,= mProxyModel, &TodoViewSortFilterProxyModel::setPriorityFilter); - connect(mQuickSearch, &TodoViewQuickSearch::filterPriorityChanged,= this, &TodoView::restoreViewState); + connect(mQuickSearch, &TodoViewQuickSearch::searchTextChanged, thi= s, + &TodoView::restoreViewState); + connect(mQuickSearch, &TodoViewQuickSearch::filterCategoryChanged,= mProxyModel, + &TodoViewSortFilterProxyModel::setCategoryFilter); + connect(mQuickSearch, &TodoViewQuickSearch::filterCategoryChanged,= this, + &TodoView::restoreViewState); + connect(mQuickSearch, &TodoViewQuickSearch::filterPriorityChanged,= mProxyModel, + &TodoViewSortFilterProxyModel::setPriorityFilter); + connect(mQuickSearch, &TodoViewQuickSearch::filterPriorityChanged,= this, + &TodoView::restoreViewState); } = mView =3D new TodoViewView(this); @@ -230,10 +236,11 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, mView->setDragDropMode(QAbstractItemView::DragDrop); = mView->setExpandsOnDoubleClick(false); - mView->setEditTriggers(QAbstractItemView::SelectedClicked | - QAbstractItemView::EditKeyPressed); + mView->setEditTriggers(QAbstractItemView::SelectedClicked + |QAbstractItemView::EditKeyPressed); = - connect(mView->header(), &QHeaderView::geometriesChanged, this, &TodoV= iew::scheduleResizeColumns); + connect(mView->header(), &QHeaderView::geometriesChanged, this, + &TodoView::scheduleResizeColumns); connect(mView, &TodoViewView::visibleColumnCountChanged, this, &TodoVi= ew::resizeColumns); = TodoRichTextDelegate *richTextDelegate =3D new TodoRichTextDelegate(mV= iew); @@ -258,7 +265,9 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, connect(mView, &TodoViewView::customContextMenuRequested, this, &TodoV= iew::contextMenu); connect(mView, &TodoViewView::doubleClicked, this, &TodoView::itemDoub= leClicked); = - connect(mView->selectionModel(), &QItemSelectionModel::selectionChange= d, this, &TodoView::selectionChanged); + connect( + mView->selectionModel(), &QItemSelectionModel::selectionChanged, t= his, + &TodoView::selectionChanged); = mQuickAdd =3D new TodoViewQuickAddLine(this); mQuickAdd->setClearButtonEnabled(true); @@ -308,7 +317,7 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, // Dummy layout just to add a few px of right margin so the checkbox i= s aligned // with the QAbstractItemView's viewport. QHBoxLayout *dummyLayout =3D new QHBoxLayout(); - dummyLayout->setContentsMargins(0, 0, mView->frameWidth()/*right*/, 0); + dummyLayout->setContentsMargins(0, 0, mView->frameWidth() /*right*/, 0= ); if (!mSidebarView) { QFrame *f =3D new QFrame(this); f->setFrameShape(QFrame::VLine); @@ -324,30 +333,31 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, mItemPopupMenu =3D new QMenu(this); = mItemPopupMenuItemOnlyEntries << mItemPopupMenu->addAction( - i18nc("@action:inmenu show the to-do= ", "&Show"), - this, SLOT(showTodo())); + i18nc("@action:inmenu show the to-do", "&Show"), + this, SLOT(showTodo())); = QAction *a =3D mItemPopupMenu->addAction( - i18nc("@action:inmenu edit the to-do", "&Edit..."), - this, SLOT(editTodo())); + i18nc("@action:inmenu edit the to-do", "&Edit..."), + this, SLOT(editTodo())); mItemPopupMenuReadWriteEntries << a; mItemPopupMenuItemOnlyEntries << a; = mItemPopupMenu->addSeparator(); mItemPopupMenuItemOnlyEntries << mItemPopupMenu->addAction( - QIcon::fromTheme(QStringLiteral("doc= ument-print")), - i18nc("@action:inmenu print the to-d= o", "&Print..."), - this, SIGNAL(printTodo())); + QIcon::fromTheme(QStringLiteral("document-print")), + i18nc("@action:inmenu print the to-do", "&Print..."), + this, SIGNAL(printTodo())); = mItemPopupMenuItemOnlyEntries << mItemPopupMenu->addAction( - QIcon::fromTheme(QStringLiteral("doc= ument-print-preview")), - i18nc("@action:inmenu print preview = the to-do", "Print Previe&w..."), - this, SIGNAL(printPreviewTodo())); + QIcon::fromTheme(QStringLiteral("document-print-preview")), + i18nc("@action:inmenu print preview the to-do", "Print Previe&w...= "), + this, SIGNAL(printPreviewTodo())); mItemPopupMenu->addSeparator(); a =3D mItemPopupMenu->addAction( - KIconLoader::global()->loadIcon(QStringLiteral("edit-delete"),= KIconLoader::NoGroup, KIconLoader::SizeSmall), - i18nc("@action:inmenu delete the to-do", "&Delete"), - this, SLOT(deleteTodo())); + KIconLoader::global()->loadIcon(QStringLiteral("edit-delete"), KIc= onLoader::NoGroup, + KIconLoader::SizeSmall), + i18nc("@action:inmenu delete the to-do", "&Delete"), + this, SLOT(deleteTodo())); mItemPopupMenuReadWriteEntries << a; mItemPopupMenuItemOnlyEntries << a; = @@ -360,19 +370,19 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, this, SLOT(newTodo())); = a =3D mItemPopupMenu->addAction( - i18nc("@action:inmenu create a new sub-to-do", "New Su&b-to-do= ..."), - this, SLOT(newSubTodo())); + i18nc("@action:inmenu create a new sub-to-do", "New Su&b-to-do..."= ), + this, SLOT(newSubTodo())); mItemPopupMenuReadWriteEntries << a; mItemPopupMenuItemOnlyEntries << a; = mMakeTodoIndependent =3D mItemPopupMenu->addAction( - i18nc("@action:inmenu", "&Make this To-do I= ndependent"), - this, SIGNAL(unSubTodoSignal())); + i18nc("@action:inmenu", "&Make this To-do Independent"), + this, SIGNAL(unSubTodoSignal())); = - mMakeSubtodosIndependent =3D - mItemPopupMenu->addAction( - i18nc("@action:inmenu", "Make all Sub-to-dos &Independent"), - this, SIGNAL(unAllSubTodoSignal())); + mMakeSubtodosIndependent + =3D mItemPopupMenu->addAction( + i18nc("@action:inmenu", "Make all Sub-to-dos &Independent"), + this, SIGNAL(unAllSubTodoSignal())); = mItemPopupMenuItemOnlyEntries << mMakeTodoIndependent; mItemPopupMenuItemOnlyEntries << mMakeSubtodosIndependent; @@ -382,38 +392,44 @@ TodoView::TodoView(const EventViews::PrefsPtr &prefs, = mItemPopupMenu->addSeparator(); = - a =3D mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStrin= gLiteral("appointment-new"), KIconLoader::NoGroup, KIconLoader::SizeSmall), - i18n("Create Event"), - this, SLOT(createEvent())); + a + =3D mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStr= ingLiteral("appointment-new"), + KIconL= oader::NoGroup, + KIconL= oader::SizeSmall), + i18n("Create Event"), + this, SLOT(createEvent())); a->setObjectName(QStringLiteral("createevent")); mItemPopupMenuReadWriteEntries << a; mItemPopupMenuItemOnlyEntries << a; = - a =3D mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStrin= gLiteral("view-pim-notes"), KIconLoader::NoGroup, KIconLoader::SizeSmall), - i18n("Create Note"), - this, SLOT(createNote())); + a + =3D mItemPopupMenu->addAction(KIconLoader::global()->loadIcon(QStr= ingLiteral("view-pim-notes"), + KIconL= oader::NoGroup, + KIconL= oader::SizeSmall), + i18n("Create Note"), + this, SLOT(createNote())); a->setObjectName(QStringLiteral("createnote")); mItemPopupMenuReadWriteEntries << a; mItemPopupMenuItemOnlyEntries << a; = mItemPopupMenu->addSeparator(); = - mCopyPopupMenu =3D - new KPIM::KDatePickerPopup(KPIM::KDatePickerPopup::NoDate | - KPIM::KDatePickerPopup::DatePicker | - KPIM::KDatePickerPopup::Words, - QDate::currentDate(), this); + mCopyPopupMenu + =3D new KPIM::KDatePickerPopup(KPIM::KDatePickerPopup::NoDate + |KPIM::KDatePickerPopup::DatePicker + |KPIM::KDatePickerPopup::Words, + QDate::currentDate(), this); mCopyPopupMenu->setTitle(i18nc("@title:menu", "&Copy To")); = connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, &T= odoView::copyTodoToDate); = connect(mCopyPopupMenu, &KPIM::KDatePickerPopup::dateChanged, mItemPop= upMenu, &QMenu::hide); = - mMovePopupMenu =3D - new KPIM:: KDatePickerPopup(KPIM::KDatePickerPopup::NoDate | - KPIM::KDatePickerPopup::DatePicker | - KPIM::KDatePickerPopup::Words, - QDate::currentDate(), this); + mMovePopupMenu + =3D new KPIM:: KDatePickerPopup(KPIM::KDatePickerPopup::NoDate + |KPIM::KDatePickerPopup::DatePicker + |KPIM::KDatePickerPopup::Words, + QDate::currentDate(), this); mMovePopupMenu->setTitle(i18nc("@title:menu", "&Move To")); = connect(mMovePopupMenu, &KPIM::KDatePickerPopup::dateChanged, this, &T= odoView::setNewDate); @@ -580,14 +596,13 @@ void TodoView::restoreLayout(KConfig *config, const Q= String &group, bool minimal = // We don't have any incidences (content) yet, so we delay resizing QTimer::singleShot(0, this, &TodoView::resizeColumns); - } else { for (int i =3D 0; - i < header->count() && - i < columnOrder.size() && - i < columnWidths.size() && - i < columnVisibility.size(); - i++) { + i < header->count() + && i < columnOrder.size() + && i < columnWidths.size() + && i < columnVisibility.size(); + i++) { bool visible =3D columnVisibility[i].toBool(); int width =3D columnWidths[i].toInt(); int order =3D columnOrder[i].toInt(); @@ -657,8 +672,7 @@ void TodoView::clearSelection() mView->selectionModel()->clearSelection(); } = -void TodoView::addTodo(const QString &summary, - const Akonadi::Item &parentItem, +void TodoView::addTodo(const QString &summary, const Akonadi::Item &parent= Item, const QStringList &categories) { const QString summaryTrimmed =3D summary.trimmed(); @@ -694,9 +708,9 @@ void TodoView::addTodo(const QString &summary, void TodoView::addQuickTodo(Qt::KeyboardModifiers modifiers) { if (modifiers =3D=3D Qt::NoModifier) { - /*const QModelIndex index =3D */ addTodo(mQuickAdd->text(), Akonad= i::Item(), - mProxyModel->categories()); - + /*const QModelIndex index =3D */ + addTodo(mQuickAdd->text(), Akonadi::Item(), + mProxyModel->categories()); } else if (modifiers =3D=3D Qt::ControlModifier) { QModelIndexList selection =3D mView->selectionModel()->selectedRow= s(); if (selection.count() !=3D 1) { @@ -706,7 +720,8 @@ void TodoView::addQuickTodo(Qt::KeyboardModifiers modif= iers) const QModelIndex idx =3D mProxyModel->mapToSource(selection[0]); mView->expand(selection[0]); const Akonadi::Item parent =3D sModels->todoModel->data(idx, - Akonadi::EntityTreeModel::ItemRole).v= alue(); + Akonadi::Ent= ityTreeModel::ItemRole). + value(); addTodo(mQuickAdd->text(), parent, mProxyModel->categories()); } else { return; @@ -734,11 +749,11 @@ void TodoView::contextMenu(const QPoint &pos) // Action isn't RO, it can change the incidence, "Edit" fo= r example. const bool actionIsRw =3D mItemPopupMenuReadWriteEntries.c= ontains(entry); = - const bool incidenceIsRO =3D !calendar()->hasRight(item, A= konadi::Collection::CanChangeItem); - - enable =3D hasItem && (!actionIsRw || - !incidenceIsRO); + const bool incidenceIsRO =3D !calendar()->hasRight(item, + Akonadi::= Collection::CanChangeItem); = + enable =3D hasItem && (!actionIsRw + || !incidenceIsRO); } } else { enable =3D false; @@ -753,7 +768,9 @@ void TodoView::contextMenu(const QPoint &pos) if (incidencePtr) { const bool hasRecId =3D incidencePtr->hasRecurrenceId(); if (calendar()) { - mMakeSubtodosIndependent->setEnabled(!hasRecId && !calenda= r()->childItems(incidencePtr->uid()).isEmpty()); + mMakeSubtodosIndependent->setEnabled(!hasRecId + && !calendar()->child= Items( + incidencePtr->uid= ()).isEmpty()); } mMakeTodoIndependent->setEnabled(!hasRecId && !incidencePtr->r= elatedTo().isEmpty()); } @@ -781,8 +798,7 @@ void TodoView::contextMenu(const QPoint &pos) } } = -void TodoView::selectionChanged(const QItemSelection &selected, - const QItemSelection &deselected) +void TodoView::selectionChanged(const QItemSelection &selected, const QIte= mSelection &deselected) { Q_UNUSED(deselected); QModelIndexList selection =3D selected.indexes(); @@ -827,8 +843,8 @@ void TodoView::deleteTodo() { QModelIndexList selection =3D mView->selectionModel()->selectedRows(); if (selection.size() =3D=3D 1) { - const Akonadi::Item todoItem =3D - selection[0].data(TodoModel::TodoRole).value(); + const Akonadi::Item todoItem + =3D selection[0].data(TodoModel::TodoRole).value(); = if (!changer()->deletedRecently(todoItem.id())) { Q_EMIT deleteIncidenceSignal(todoItem); @@ -845,8 +861,8 @@ void TodoView::newSubTodo() { QModelIndexList selection =3D mView->selectionModel()->selectedRows(); if (selection.size() =3D=3D 1) { - const Akonadi::Item todoItem =3D - selection[0].data(TodoModel::TodoRole).value(); + const Akonadi::Item todoItem + =3D selection[0].data(TodoModel::TodoRole).value(); = Q_EMIT newSubTodoSignal(todoItem); } else { @@ -869,9 +885,9 @@ void TodoView::copyTodoToDate(const QDate &date) const QModelIndex origIndex =3D mProxyModel->mapToSource(selection[0]); Q_ASSERT(origIndex.isValid()); = - const Akonadi::Item origItem =3D - sModels->todoModel->data(origIndex, - Akonadi::EntityTreeModel::ItemRole).value= (); + const Akonadi::Item origItem + =3D sModels->todoModel->data(origIndex, + Akonadi::EntityTreeModel::ItemRole).val= ue(); = const KCalCore::Todo::Ptr orig =3D CalendarSupport::todo(origItem); if (!orig) { @@ -1114,7 +1130,8 @@ void TodoView::onRowsInserted(const QModelIndex &pare= nt, int start, int end) return; } = - const bool isPopulated =3D calendar()->entityTreeModel()->isCollection= Populated(item.storageCollectionId()); + const bool isPopulated =3D calendar()->entityTreeModel()->isCollection= Populated( + item.storageCollectionId()); if (!isPopulated) { return; } @@ -1126,9 +1143,11 @@ void TodoView::onRowsInserted(const QModelIndex &par= ent, int start, int end) // don't destroy complex selections, not applicable now (only = single // selection allowed), but for the future... int colCount =3D static_cast(TodoModel::ColumnCount); - mView->selectionModel()->select(QItemSelection(idx, mView->mod= el()->index(start, colCount - 1)), - QItemSelectionModel::ClearAndS= elect | - QItemSelectionModel::Rows); + mView->selectionModel()->select(QItemSelection(idx, + mView->model()-= >index(start, + = colCount - 1)), + QItemSelectionModel::ClearAndS= elect + |QItemSelectionModel::Rows); } return; } @@ -1146,12 +1165,11 @@ void TodoView::onRowsInserted(const QModelIndex &pa= rent, int start, int end) } } = -void TodoView::getHighlightMode(bool &highlightEvents, - bool &highlightTodos, +void TodoView::getHighlightMode(bool &highlightEvents, bool &highlightTodo= s, bool &highlightJournals) { - highlightTodos =3D preferences()->highlightTodos(); - highlightEvents =3D !highlightTodos; + highlightTodos =3D preferences()->highlightTodos(); + highlightEvents =3D !highlightTodos; highlightJournals =3D false; } = @@ -1174,12 +1192,13 @@ void TodoView::resizeColumns() // We have 3 columns that should stretch: summary, description and cat= egories. // Summary is always visible. const bool descriptionVisible =3D !mView->isColumnHidden(TodoModel::De= scriptionColumn); - const bool categoriesVisible =3D !mView->isColumnHidden(TodoModel::Ca= tegoriesColumn); + const bool categoriesVisible =3D !mView->isColumnHidden(TodoModel::Cat= egoriesColumn); = // Calculate size of non-stretchable columns: int size =3D 0; for (int i =3D 0; i < TodoModel::ColumnCount; ++i) { - if (!mView->isColumnHidden(i) && i !=3D TodoModel::SummaryColumn &= & i !=3D TodoModel::DescriptionColumn && i !=3D TodoModel::CategoriesColumn= ) { + if (!mView->isColumnHidden(i) && i !=3D TodoModel::SummaryColumn + && i !=3D TodoModel::DescriptionColumn && i !=3D TodoModel::Ca= tegoriesColumn) { size +=3D mView->columnWidth(i); } } diff --git a/src/todo/todoview.h b/src/todo/todoview.h index 5084bb9..cc9ebd3 100644 --- a/src/todo/todoview.h +++ b/src/todo/todoview.h @@ -41,13 +41,11 @@ class TodoViewQuickSearch; class TodoViewSortFilterProxyModel; class TodoViewView; = -namespace KPIM -{ +namespace KPIM { class KDatePickerPopup; } = -namespace Akonadi -{ +namespace Akonadi { class ETMViewStateSaver; } = @@ -57,9 +55,7 @@ class QModelIndex; class QToolButton; class QTimer; = -namespace EventViews -{ - +namespace EventViews { class EVENTVIEWS_EXPORT TodoView : public EventViews::EventView { Q_OBJECT @@ -78,16 +74,16 @@ public: return 0; } = - void setDocumentId(const QString &) {} + void setDocumentId(const QString &) + { + } = void saveLayout(KConfig *config, const QString &group) const; = void restoreLayout(KConfig *config, const QString &group, bool minimal= Defaults); = /** documentation in baseview.h */ - void getHighlightMode(bool &highlightEvents, - bool &highlightTodos, - bool &highlightJournals); + void getHighlightMode(bool &highlightEvents, bool &highlightTodos, boo= l &highlightJournals); = bool usesFullWindow(); = @@ -102,7 +98,8 @@ public Q_SLOTS: const QDate &preferredMonth =3D QDate()) override; void showIncidences(const Akonadi::Item::List &incidenceList, const QD= ate &date) override; void updateView() override; - virtual void changeIncidenceDisplay(const Akonadi::Item &incidence, Ak= onadi::IncidenceChanger::ChangeType changeType); + virtual void changeIncidenceDisplay(const Akonadi::Item &incidence, + Akonadi::IncidenceChanger::ChangeT= ype changeType); void updateConfig() override; void clearSelection() override; void expandIndex(const QModelIndex &index); @@ -118,8 +115,7 @@ protected Q_SLOTS: = void contextMenu(const QPoint &pos); = - void selectionChanged(const QItemSelection &selected, - const QItemSelection &deselected); + void selectionChanged(const QItemSelection &selected, const QItemSelec= tion &deselected); = // slots used by popup-menus void showTodo(); @@ -161,8 +157,7 @@ private: QString stateSaverGroup() const; = /** Creates a new todo with the given text as summary under the given = parent */ - void addTodo(const QString &summary, - const Akonadi::Item &parentItem, + void addTodo(const QString &summary, const Akonadi::Item &parentItem, const QStringList &categories =3D QStringList()); = TodoViewView *mView =3D nullptr; @@ -193,7 +188,6 @@ private: bool mResizeColumnsScheduled; QTimer *mResizeColumnsTimer =3D nullptr; }; - } = #endif diff --git a/src/todo/todoviewquickaddline.cpp b/src/todo/todoviewquickaddl= ine.cpp index ff7866a..699622c 100644 --- a/src/todo/todoviewquickaddline.cpp +++ b/src/todo/todoviewquickaddline.cpp @@ -65,4 +65,3 @@ void TodoViewQuickAddLine::resizeEvent(QResizeEvent *even= t) Qt::ElideRight, width() - clearButtonUsedSize().width())); } - diff --git a/src/todo/todoviewquickaddline.h b/src/todo/todoviewquickaddlin= e.h index 7ae6afd..39cbce2 100644 --- a/src/todo/todoviewquickaddline.h +++ b/src/todo/todoviewquickaddline.h @@ -33,7 +33,9 @@ class TodoViewQuickAddLine : public KLineEdit = public: explicit TodoViewQuickAddLine(QWidget *parent); - ~TodoViewQuickAddLine() {} + ~TodoViewQuickAddLine() + { + } = protected: void keyPressEvent(QKeyEvent *event) override; diff --git a/src/todo/todoviewquicksearch.cpp b/src/todo/todoviewquicksearc= h.cpp index 745604f..3fe7815 100644 --- a/src/todo/todoviewquicksearch.cpp +++ b/src/todo/todoviewquicksearch.cpp @@ -43,9 +43,9 @@ = #include = -TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &= calendar, - QWidget *parent) - : QWidget(parent), mCalendar(calendar) +TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &= calendar, QWidget *parent) + : QWidget(parent) + , mCalendar(calendar) { QHBoxLayout *layout =3D new QHBoxLayout(this); // no special margin because it is added by the view @@ -74,7 +74,8 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::E= TMCalendar::Ptr &calend mCategoryCombo->setDefaultText(defaultText); mCategoryCombo->setSeparator(i18nc("@item:intext delimiter for joining= category names", ",")); = - connect(mCategoryCombo, &KPIM::TagSelectionCombo::checkedItemsChanged,= this, &TodoViewQuickSearch::emitFilterCategoryChanged); + connect(mCategoryCombo, &KPIM::TagSelectionCombo::checkedItemsChanged,= this, + &TodoViewQuickSearch::emitFilterCategoryChanged); = layout->addWidget(mCategoryCombo, 1); = @@ -86,9 +87,9 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::E= TMCalendar::Ptr &calend const int currentPreferedWidth =3D mCategoryCombo->lineEdit()->siz= eHint().width(); = // Calculate a nice size for "Select Categories" - const int newPreferedWidth =3D currentPreferedWidth - - fm.width(QLatin1Char('x')) * 17 + - fm.width(defaultText); + const int newPreferedWidth =3D currentPreferedWidth + -fm.width(QLatin1Char('x')) * 17 + +fm.width(defaultText); = const int pixelsToAdd =3D newPreferedWidth - mCategoryCombo->lineE= dit()->width(); mCategoryCombo->setMinimumWidth(mCategoryCombo->width() + pixelsTo= Add); @@ -102,7 +103,8 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi:= :ETMCalendar::Ptr &calend "Use this combobox to filter the to-dos that are shown by " "a list of selected priorities.")); mPriorityCombo->setDefaultText(i18nc("@item:inlistbox", "Select Priori= ty")); - connect(mPriorityCombo, &KPIM::KCheckComboBox::checkedItemsChanged, th= is, &TodoViewQuickSearch::emitFilterPriorityChanged); + connect(mPriorityCombo, &KPIM::KCheckComboBox::checkedItemsChanged, th= is, + &TodoViewQuickSearch::emitFilterPriorityChanged); = layout->addWidget(mPriorityCombo, 1); fillPriorities(); @@ -149,4 +151,3 @@ void TodoViewQuickSearch::emitFilterPriorityChanged() { Q_EMIT filterPriorityChanged(mPriorityCombo->checkedItems(Qt::UserRole= )); } - diff --git a/src/todo/todoviewquicksearch.h b/src/todo/todoviewquicksearch.h index 6c3c6b9..0597590 100644 --- a/src/todo/todoviewquicksearch.h +++ b/src/todo/todoviewquicksearch.h @@ -30,8 +30,7 @@ #include #include = -namespace KPIM -{ +namespace KPIM { class KCheckComboBox; class TagSelectionCombo; } @@ -42,9 +41,10 @@ class TodoViewQuickSearch : public QWidget { Q_OBJECT public: - TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calendar, - QWidget *parent); - ~TodoViewQuickSearch() {} + TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calendar, QWidget= *parent); + ~TodoViewQuickSearch() + { + } = void setCalendar(const Akonadi::ETMCalendar::Ptr &calendar); = diff --git a/src/todo/todoviewsortfilterproxymodel.cpp b/src/todo/todoviews= ortfilterproxymodel.cpp index d9ad503..6ac93ea 100644 --- a/src/todo/todoviewsortfilterproxymodel.cpp +++ b/src/todo/todoviewsortfilterproxymodel.cpp @@ -31,7 +31,7 @@ #include = TodoViewSortFilterProxyModel::TodoViewSortFilterProxyModel(const EventView= s::PrefsPtr &prefs, - QObject *parent) + QObject *parent) : QSortFilterProxyModel(parent) , mSortOrder(Qt::AscendingOrder) , mPreferences(prefs) @@ -45,21 +45,21 @@ void TodoViewSortFilterProxyModel::sort(int column, Qt:= :SortOrder order) } = bool TodoViewSortFilterProxyModel::filterAcceptsRow(int source_row, - const QModelIndex &source_parent) const + const QModelIndex &sou= rce_parent) const { bool ret =3D QSortFilterProxyModel::filterAcceptsRow(source_row, sourc= e_parent); = bool returnValue =3D true; if (ret && !mPriorities.isEmpty()) { - QString priorityValue =3D - sourceModel()->index(source_row, TodoModel::PriorityColumn, so= urce_parent). - data(Qt::EditRole).toString(); + QString priorityValue + =3D sourceModel()->index(source_row, TodoModel::PriorityColumn= , source_parent). + data(Qt::EditRole).toString(); returnValue =3D mPriorities.contains(priorityValue); } if (ret && !mCategories.isEmpty()) { - const QStringList categories =3D - sourceModel()->index(source_row, TodoModel::CategoriesColumn, = source_parent). - data(Qt::EditRole).toStringList(); + const QStringList categories + =3D sourceModel()->index(source_row, TodoModel::CategoriesColu= mn, source_parent). + data(Qt::EditRole).toStringList(); = for (const QString &category : categories) { if (mCategories.contains(category)) { @@ -82,19 +82,18 @@ bool TodoViewSortFilterProxyModel::filterAcceptsRow(int= source_row, return ret && returnValue; } = -bool TodoViewSortFilterProxyModel::lessThan(const QModelIndex &left, - const QModelIndex &right) const +bool TodoViewSortFilterProxyModel::lessThan(const QModelIndex &left, const= QModelIndex &right) const { - if (mPreferences->sortCompletedTodosSeparately() && - left.column() !=3D TodoModel::PercentColumn) { + if (mPreferences->sortCompletedTodosSeparately() + && left.column() !=3D TodoModel::PercentColumn) { QModelIndex cLeft =3D left.sibling(left.row(), TodoModel::PercentC= olumn); QModelIndex cRight =3D right.sibling(right.row(), TodoModel::Perce= ntColumn); = - if (cRight.data(Qt::EditRole).toInt() =3D=3D 100 && - cLeft.data(Qt::EditRole).toInt() !=3D 100) { + if (cRight.data(Qt::EditRole).toInt() =3D=3D 100 + && cLeft.data(Qt::EditRole).toInt() !=3D 100) { return mSortOrder =3D=3D Qt::AscendingOrder ? true : false; - } else if (cRight.data(Qt::EditRole).toInt() !=3D 100 && - cLeft.data(Qt::EditRole).toInt() =3D=3D 100) { + } else if (cRight.data(Qt::EditRole).toInt() !=3D 100 + && cLeft.data(Qt::EditRole).toInt() =3D=3D 100) { return mSortOrder =3D=3D Qt::AscendingOrder ? false : true; } } @@ -117,7 +116,6 @@ bool TodoViewSortFilterProxyModel::lessThan(const QMode= lIndex &left, return fallbackComparison =3D=3D 1; } } - } else if (right.column() =3D=3D TodoModel::StartDateColumn) { return compareStartDates(left, right) =3D=3D -1; } else if (right.column() =3D=3D TodoModel::PriorityColumn) { @@ -154,9 +152,9 @@ bool TodoViewSortFilterProxyModel::lessThan(const QMode= lIndex &left, // This patch is not about fallingback to the SummaryColumn for so= rting. // It's about avoiding jumping due to random reasons. // That's why we ignore the sort direction... - return mSortOrder =3D=3D Qt::AscendingOrder ? - QSortFilterProxyModel::lessThan(leftSummaryIndex, rightSumm= aryIndex) : - QSortFilterProxyModel::lessThan(rightSummaryIndex, leftSumm= aryIndex); + return mSortOrder =3D=3D Qt::AscendingOrder + ? QSortFilterProxyModel::lessThan(leftSummaryIndex, rightSu= mmaryIndex) + : QSortFilterProxyModel::lessThan(rightSummaryIndex, leftSu= mmaryIndex); = // ...so, if you have 4 to-dos, all with CompletionColumn =3D "55%= ", // and click the header multiple times, nothing will happen because @@ -187,23 +185,23 @@ void TodoViewSortFilterProxyModel::setPriorityFilter(= const QStringList &prioriti } = int TodoViewSortFilterProxyModel::compareStartDates(const QModelIndex &lef= t, - const QModelIndex &right) const + const QModelIndex &rig= ht) const { Q_ASSERT(left.column() =3D=3D TodoModel::StartDateColumn); Q_ASSERT(right.column() =3D=3D TodoModel::StartDateColumn); = // The due date column is a QString so fetch the akonadi item // We can't compare QStrings because it won't work if the format is MM= /DD/YYYY - const KCalCore::Todo::Ptr leftTodo =3D - CalendarSupport::todo(left.data(TodoModel::TodoRole).value()); - const KCalCore::Todo::Ptr rightTodo =3D - CalendarSupport::todo(right.data(TodoModel::TodoRole). value()); + const KCalCore::Todo::Ptr leftTodo + =3D CalendarSupport::todo(left.data(TodoModel::TodoRole).value()); + const KCalCore::Todo::Ptr rightTodo + =3D CalendarSupport::todo(right.data(TodoModel::TodoRole).value()); = if (!leftTodo || !rightTodo) { return 0; } = - const bool leftIsEmpty =3D !leftTodo->hasStartDate(); + const bool leftIsEmpty =3D !leftTodo->hasStartDate(); const bool rightIsEmpty =3D !rightTodo->hasStartDate(); = if (leftIsEmpty !=3D rightIsEmpty) { // One of them doesn't have a s= tart date @@ -234,23 +232,23 @@ void TodoViewSortFilterProxyModel::setCategoryFilter(= const QStringList &categori * 1 - bigger than */ int TodoViewSortFilterProxyModel::compareDueDates(const QModelIndex &left, - const QModelIndex &right) const + const QModelIndex &right= ) const { Q_ASSERT(left.column() =3D=3D TodoModel::DueDateColumn); Q_ASSERT(right.column() =3D=3D TodoModel::DueDateColumn); = // The due date column is a QString so fetch the akonadi item // We can't compare QStrings because it won't work if the format is MM= /DD/YYYY - const KCalCore::Todo::Ptr leftTodo =3D - CalendarSupport::todo(left.data(TodoModel::TodoRole).value()); - const KCalCore::Todo::Ptr rightTodo =3D - CalendarSupport::todo(right.data(TodoModel::TodoRole). value()); + const KCalCore::Todo::Ptr leftTodo + =3D CalendarSupport::todo(left.data(TodoModel::TodoRole).value()); + const KCalCore::Todo::Ptr rightTodo + =3D CalendarSupport::todo(right.data(TodoModel::TodoRole).value()); = if (!leftTodo || !rightTodo) { return 0; } = - const bool leftIsEmpty =3D !leftTodo->hasDueDate(); + const bool leftIsEmpty =3D !leftTodo->hasDueDate(); const bool rightIsEmpty =3D !rightTodo->hasDueDate(); = if (leftIsEmpty !=3D rightIsEmpty) { // One of them doesn't have a d= ue date @@ -275,7 +273,7 @@ int TodoViewSortFilterProxyModel::compareDueDates(const= QModelIndex &left, * 1 - bigger than */ int TodoViewSortFilterProxyModel::compareCompletion(const QModelIndex &lef= t, - const QModelIndex &right) const + const QModelIndex &rig= ht) const { Q_ASSERT(left.column() =3D=3D TodoModel::PercentColumn); Q_ASSERT(right.column() =3D=3D TodoModel::PercentColumn); @@ -285,10 +283,10 @@ int TodoViewSortFilterProxyModel::compareCompletion(c= onst QModelIndex &left, = if (leftValue =3D=3D 100 && rightValue =3D=3D 100) { // Untie with the completion date - const KCalCore::Todo::Ptr leftTodo =3D - CalendarSupport::todo(left.data(TodoModel::TodoRole).value()); - const KCalCore::Todo::Ptr rightTodo =3D - CalendarSupport::todo(right.data(TodoModel::TodoRole). value()); + const KCalCore::Todo::Ptr leftTodo + =3D CalendarSupport::todo(left.data(TodoModel::TodoRole).value= ()); + const KCalCore::Todo::Ptr rightTodo + =3D CalendarSupport::todo(right.data(TodoModel::TodoRole).valu= e()); = if (!leftTodo || !rightTodo) { return 0; @@ -305,7 +303,7 @@ int TodoViewSortFilterProxyModel::compareCompletion(con= st QModelIndex &left, * 1 - bigger than */ int TodoViewSortFilterProxyModel::comparePriorities(const QModelIndex &lef= t, - const QModelIndex &right) const + const QModelIndex &rig= ht) const { Q_ASSERT(left.column() =3D=3D TodoModel::PriorityColumn); Q_ASSERT(right.column() =3D=3D TodoModel::PriorityColumn); @@ -313,7 +311,7 @@ int TodoViewSortFilterProxyModel::comparePriorities(con= st QModelIndex &left, const QVariant leftValue =3D sourceModel()->data(left); const QVariant rightValue =3D sourceModel()->data(right); = - const bool leftIsString =3D sourceModel()->data(left).type() =3D=3D Q= Variant::String; + const bool leftIsString =3D sourceModel()->data(left).type() =3D=3D QV= ariant::String; const bool rightIsString =3D sourceModel()->data(right).type() =3D=3D = QVariant::String; = // unspecified priority is a low priority, so, if we don't have two QV= ariant:Ints diff --git a/src/todo/todoviewview.cpp b/src/todo/todoviewview.cpp index 6a99cc5..b2e2f9d 100644 --- a/src/todo/todoviewview.cpp +++ b/src/todo/todoviewview.cpp @@ -35,7 +35,9 @@ #include = TodoViewView::TodoViewView(QWidget *parent) - : QTreeView(parent), mHeaderPopup(nullptr), mIgnoreNextMouseRelease(fa= lse) + : QTreeView(parent) + , mHeaderPopup(nullptr) + , mIgnoreNextMouseRelease(false) { header()->installEventFilter(this); setAlternatingRowColors(true); @@ -46,8 +48,8 @@ TodoViewView::TodoViewView(QWidget *parent) = bool TodoViewView::isEditing(const QModelIndex &index) const { - return state() & QAbstractItemView::EditingState && - currentIndex() =3D=3D index; + return state() & QAbstractItemView::EditingState + && currentIndex() =3D=3D index; } = bool TodoViewView::eventFilter(QObject *watched, QEvent *event) @@ -61,8 +63,8 @@ bool TodoViewView::eventFilter(QObject *watched, QEvent *= event) mHeaderPopup->setTitle(i18n("View Columns")); // First entry can't be disabled for (int i =3D 1; i < model()->columnCount(); ++i) { - QAction *tmp =3D - mHeaderPopup->addAction(model()->headerData(i, Qt::Hor= izontal).toString()); + QAction *tmp + =3D mHeaderPopup->addAction(model()->headerData(i, Qt:= :Horizontal).toString()); tmp->setData(QVariant(i)); tmp->setCheckable(true); mColumnActions << tmp; @@ -94,8 +96,7 @@ void TodoViewView::toggleColumnHidden(QAction *action) Q_EMIT visibleColumnCountChanged(); } = -QModelIndex TodoViewView::moveCursor(CursorAction cursorAction, - Qt::KeyboardModifiers modifiers) +QModelIndex TodoViewView::moveCursor(CursorAction cursorAction, Qt::Keyboa= rdModifiers modifiers) { QModelIndex current =3D currentIndex(); if (!current.isValid()) { @@ -103,10 +104,11 @@ QModelIndex TodoViewView::moveCursor(CursorAction cur= sorAction, } = switch (cursorAction) { - case MoveNext: { + case MoveNext: + { // try to find an editable item right of the current one QModelIndex tmp =3D getNextEditableIndex( - current.sibling(current.row(), current.colum= n() + 1), 1); + current.sibling(current.row(), current.column() + 1), 1); if (tmp.isValid()) { return tmp; } @@ -137,10 +139,11 @@ QModelIndex TodoViewView::moveCursor(CursorAction cur= sorAction, } return QModelIndex(); } - case MovePrevious: { + case MovePrevious: + { // try to find an editable item left of the current one QModelIndex tmp =3D getNextEditableIndex( - current.sibling(current.row(), current.colum= n() - 1), -1); + current.sibling(current.row(), current.column() - 1), -1); if (tmp.isValid()) { return tmp; } @@ -232,4 +235,3 @@ void TodoViewView::expandParent() QTreeView::keyPressEvent(&keyEvent); } } - diff --git a/src/viewerapp/main.cpp b/src/viewerapp/main.cpp index 17950e4..4c399e3 100644 --- a/src/viewerapp/main.cpp +++ b/src/viewerapp/main.cpp @@ -29,9 +29,11 @@ static const char description[] =3D I18N_NOOP("A test ap= p for embedding calendarvi = int main(int argc, char **argv) { - KAboutData about(QStringLiteral("viewerapp"), i18n("ViewerApp"), QStri= ngLiteral("0.1"), i18n(description), + KAboutData about(QStringLiteral("viewerapp"), i18n("ViewerApp"), QStri= ngLiteral("0.1"), i18n( + description), KAboutLicense::GPL, - i18n("Copyright (C) 2010 Klar=C3=A4lvdalens Datakonsu= lt AB, a KDAB Group company, info@kdab.net")); + i18n( + "Copyright (C) 2010 Klar=C3=A4lvdalens Datakonsul= t AB, a KDAB Group company, info@kdab.net")); about.addAuthor(i18n("Kevin Krammer"), QString(), QStringLiteral("krak= e@kdab.com")); = QCommandLineParser parser; @@ -41,7 +43,8 @@ int main(int argc, char **argv) about.setupCommandLine(&parser); parser.process(app); about.processCommandLine(&parser); - parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("+= [viewname]"), i18n("Optional list of view names to instantiate"))); + parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("+= [viewname]"), + i18n("Optional list of view names to instantiate"))); = QStringList viewNames; for (int i =3D 0; i < parser.positionalArguments().count(); ++i) { @@ -54,4 +57,3 @@ int main(int argc, char **argv) = return app.exec(); } - diff --git a/src/viewerapp/mainwindow.cpp b/src/viewerapp/mainwindow.cpp index 8a45898..25f7228 100644 --- a/src/viewerapp/mainwindow.cpp +++ b/src/viewerapp/mainwindow.cpp @@ -43,11 +43,11 @@ using namespace CalendarSupport; using namespace EventViews; = MainWindow::MainWindow(const QStringList &viewNames) - : QMainWindow(), - mViewNames(viewNames), - mIncidenceChanger(0), - mSettings(0), - mViewPreferences(0) + : QMainWindow() + , mViewNames(viewNames) + , mIncidenceChanger(0) + , mSettings(0) + , mViewPreferences(0) { mUi.setupUi(this); mUi.tabWidget->clear(); @@ -108,7 +108,8 @@ void MainWindow::delayedInit() KCheckableProxyModel *checkableProxy =3D mCalendar->checkableProxyMode= l(); QItemSelectionModel *selectionModel =3D checkableProxy->selectionModel= (); = - CalendarSupport::CollectionSelection *collectionSelection =3D new Cale= ndarSupport::CollectionSelection(selectionModel); + CalendarSupport::CollectionSelection *collectionSelection + =3D new CalendarSupport::CollectionSelection(selectionModel); EventViews::EventView::setGlobalCollectionSelection(collectionSelectio= n); = mIncidenceChanger =3D new IncidenceChanger(this); @@ -125,4 +126,3 @@ void MainWindow::addViewTriggered(QAction *action) viewName.remove(QLatin1Char('&')); addView(viewName); } - diff --git a/src/viewerapp/mainwindow.h b/src/viewerapp/mainwindow.h index cb5985c..07f8ad6 100644 --- a/src/viewerapp/mainwindow.h +++ b/src/viewerapp/mainwindow.h @@ -25,13 +25,11 @@ #include #include = -namespace Akonadi -{ +namespace Akonadi { class IncidenceChanger; } = -namespace EventViews -{ +namespace EventViews { class Prefs; typedef QSharedPointer PrefsPtr; } diff --git a/src/whatsnext/whatsnextview.cpp b/src/whatsnext/whatsnextview.= cpp index f1631dd..dce6b1c 100644 --- a/src/whatsnext/whatsnextview.cpp +++ b/src/whatsnext/whatsnextview.cpp @@ -101,9 +101,9 @@ void WhatsNextView::updateView() mText +=3D QLocale::system().toString(mStartDate); } else { mText +=3D i18nc( - "date from - to", "%1 - %2", - QLocale::system().toString(mStartDate), - QLocale::system().toString(mEndDate)); + "date from - to", "%1 - %2", + QLocale::system().toString(mStartDate), + QLocale::system().toString(mEndDate)); } mText +=3D QLatin1String("\n"); = @@ -127,7 +127,8 @@ void WhatsNextView::updateView() } else { KCalCore::Recurrence *recur =3D ev->recurrence(); int duration =3D ev->dtStart().secsTo(ev->dtEnd()); - QDateTime start =3D recur->getPreviousDateTime(QDateTime(m= StartDate, QTime(), Qt::LocalTime)); + QDateTime start + =3D recur->getPreviousDateTime(QDateTime(mStartDate, Q= Time(), Qt::LocalTime)); QDateTime end =3D start.addSecs(duration); QDateTime endDate(mEndDate, QTime(23, 59, 59), Qt::LocalTi= me); if (end.date() >=3D mStartDate) { @@ -143,7 +144,7 @@ void WhatsNextView::updateView() if (!times[count - 1].isValid()) { --count; // list overflow } - for (; i < count && times[i].date() <=3D mEndDate; += +i) { + for (; i < count && times[i].date() <=3D mEndDate; ++i= ) { appendEvent(ev, times[i].toLocalTime()); } } @@ -154,7 +155,7 @@ void WhatsNextView::updateView() = mTodos.clear(); KCalCore::Todo::List todos =3D calendar()->todos(KCalCore::TodoSortDue= Date, - KCalCore::SortDirectionAscending); + KCalCore::SortDirection= Ascending); if (!todos.isEmpty()) { bool taskHeaderWasCreated =3D false; Q_FOREACH (const KCalCore::Todo::Ptr &todo, todos) { @@ -188,7 +189,8 @@ void WhatsNextView::updateView() = QStringList myEmails(CalendarSupport::KCalPrefs::instance()->allEmails= ()); int replies =3D 0; - events =3D calendar()->events(QDate::currentDate(), QDate(2975, 12, 6)= , QTimeZone::systemTimeZone()); + events =3D calendar()->events(QDate::currentDate(), QDate(2975, 12, 6), + QTimeZone::systemTimeZone()); Q_FOREACH (const KCalCore::Event::Ptr &ev, events) { KCalCore::Attendee::Ptr me =3D ev->attendeeByMails(myEmails); if (me !=3D nullptr) { @@ -200,7 +202,8 @@ void WhatsNextView::updateView() mText +=3D QLatin1String("

"); - mText +=3D i18n("Events and to-dos that need a reply:"= ) + QLatin1String("

\n"); + mText +=3D i18n("Events and to-dos that need a reply:") + + QLatin1String("\n"); mText +=3D QLatin1String("\n"); } replies++; @@ -220,7 +223,8 @@ void WhatsNextView::updateView() mText +=3D QLatin1String("

"); - mText +=3D i18n("Events and to-dos that need a reply:"= ) + QLatin1String("

\n"); + mText +=3D i18n("Events and to-dos that need a reply:") + + QLatin1String("\n"); mText +=3D QLatin1String("
\n"); } replies++; @@ -235,7 +239,6 @@ void WhatsNextView::updateView() mText +=3D QLatin1String("\n
\n"); = mView->setText(mText); - } = void WhatsNextView::showDates(const QDate &start, const QDate &end, const = QDate &) @@ -252,7 +255,7 @@ void WhatsNextView::showIncidences(const Akonadi::Item:= :List &incidenceList, con } = void WhatsNextView::changeIncidenceDisplay(const Akonadi::Item &, - Akonadi::IncidenceChanger::ChangeType) + Akonadi::IncidenceChanger::Chan= geType) { updateView(); } @@ -272,20 +275,26 @@ void WhatsNextView::appendEvent(const KCalCore::Incid= ence::Ptr &incidence, const } = if (starttime.date().daysTo(endtime.date()) >=3D 1) { - if (event->allDay()) - mText +=3D i18nc("date from - to", "%1 - %2", QLocale().to= String(starttime.date(), QLocale::ShortFormat), - QLocale().toString(endtime.date(), QLocale:= :ShortFormat)); - else - mText +=3D i18nc("date from - to", "%1 - %2", QLocale().to= String(starttime, QLocale::ShortFormat), - QLocale().toString(endtime, QLocale::ShortF= ormat)); + if (event->allDay()) { + mText + +=3D i18nc("date from - to", "%1 - %2", + QLocale().toString(starttime.date(), QLocale:= :ShortFormat), + QLocale().toString(endtime.date(), QLocale::S= hortFormat)); + } else { + mText + +=3D i18nc("date from - to", "%1 - %2", QLocale().toSt= ring(starttime, + = QLocale::ShortFormat), + QLocale().toString(endtime, QLocale::ShortFor= mat)); + } } else { - if (event->allDay()) + if (event->allDay()) { mText +=3D QLocale().toString(starttime.date(), QLocale::S= hortFormat); - else + } else { mText +=3D i18nc("date, from - to", "%1, %2 - %3", - QLocale().toString(starttime.date(), QLocale::Sho= rtFormat), - QLocale().toString(starttime.time(), QLocale::Sho= rtFormat), - QLocale().toString(endtime.time(), QLocale::Short= Format)); + QLocale().toString(starttime.date(), QLocal= e::ShortFormat), + QLocale().toString(starttime.time(), QLocal= e::ShortFormat), + QLocale().toString(endtime.time(), QLocale:= :ShortFormat)); + } } } mText +=3D QLatin1String(" #include = -namespace EventViews -{ - +namespace EventViews { class WhatsNextTextBrowser : public QTextBrowser { Q_OBJECT public: - explicit WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) = {} + explicit WhatsNextTextBrowser(QWidget *parent) : QTextBrowser(parent) + { + } + /** Reimplemented from QTextBrowser to handle links. */ void setSource(const QUrl &name) override; = @@ -61,6 +62,7 @@ public: { return Akonadi::Item::List(); } + KCalCore::DateList selectedIncidenceDates() const override { return KCalCore::DateList(); @@ -80,8 +82,7 @@ public Q_SLOTS: = protected: void appendEvent(const KCalCore::Incidence::Ptr &, - const QDateTime &start =3D QDateTime(), - const QDateTime &end =3D QDateTime()); + const QDateTime &start =3D QDateTime(), const QDateTi= me &end =3D QDateTime()); void appendTodo(const KCalCore::Incidence::Ptr &); = private Q_SLOTS: @@ -96,7 +97,6 @@ private: = Akonadi::Item::List mTodos; }; - } = #endif diff --git a/tests/createcolorgui_test.cpp b/tests/createcolorgui_test.cpp index d5ca89a..0bb2ea4 100644 --- a/tests/createcolorgui_test.cpp +++ b/tests/createcolorgui_test.cpp @@ -37,7 +37,6 @@ CreateColorGui_test::CreateColorGui_test(QWidget *parent) = CreateColorGui_test::~CreateColorGui_test() { - } = void CreateColorGui_test::createListWidgetItem() @@ -56,7 +55,8 @@ void CreateColorGui_test::createListWidgetItem() int main(int argc, char **argv) { QApplication app(argc, argv); - KAboutData aboutData(QStringLiteral("CreateColorGui_test"), i18n("Crea= teColorGui_test"), QStringLiteral("1.0")); + KAboutData aboutData(QStringLiteral("CreateColorGui_test"), i18n( + "CreateColorGui_test"), QStringLiteral("1.0")= ); aboutData.setShortDescription(i18n("Test creating color")); QCommandLineParser parser; KAboutData::setApplicationData(aboutData);