From 91c0ffffb29331ab77d9af1494b809f15c6eae7e Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 15 May 2018 11:35:57 +0200 Subject: Nitpicks --- framework/qml/Colors.qml | 1 + framework/src/domain/daylongeventmodel.cpp | 6 +++--- framework/src/domain/daylongeventmodel.h | 2 +- views/calendar/qml/WeekView.qml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/framework/qml/Colors.qml b/framework/qml/Colors.qml index f85436bc..271d3564 100644 --- a/framework/qml/Colors.qml +++ b/framework/qml/Colors.qml @@ -34,6 +34,7 @@ Item { property string bewareOrange: "#f67400" property string dangerRed: "#ed1515" property string darkCharcoalGrey: "#232629" + property string jazzberryJam: "#af1a6a" property string lightgrey: "lightgrey" //Colorusage: diff --git a/framework/src/domain/daylongeventmodel.cpp b/framework/src/domain/daylongeventmodel.cpp index c6d5776e..0ea73709 100644 --- a/framework/src/domain/daylongeventmodel.cpp +++ b/framework/src/domain/daylongeventmodel.cpp @@ -36,9 +36,9 @@ DayLongEventModel::DayLongEventModel(QObject *parent) : QSortFilterProxyModel(pa query.filter(true); - eventModel = Sink::Store::loadModel(query); + mModel = Sink::Store::loadModel(query); - setSourceModel(eventModel.data()); + setSourceModel(mModel.data()); } QHash DayLongEventModel::roleNames() const @@ -85,7 +85,7 @@ bool DayLongEventModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourc auto eventEnd = event->getEndTime().date(); if (!eventStart.isValid() || !eventEnd.isValid()) { - SinkWarning() << "Invalid date in the eventModel, ignoring..."; + SinkWarning() << "Invalid date in the event model, ignoring..."; return false; } diff --git a/framework/src/domain/daylongeventmodel.h b/framework/src/domain/daylongeventmodel.h index a4a291df..21bcbfba 100644 --- a/framework/src/domain/daylongeventmodel.h +++ b/framework/src/domain/daylongeventmodel.h @@ -62,7 +62,7 @@ public: void setPeriodLength(int); private: - QSharedPointer eventModel; + QSharedPointer mModel; QDate mPeriodStart; int mPeriodLength = 7; diff --git a/views/calendar/qml/WeekView.qml b/views/calendar/qml/WeekView.qml index 5272e6a4..bcf037fa 100644 --- a/views/calendar/qml/WeekView.qml +++ b/views/calendar/qml/WeekView.qml @@ -98,7 +98,7 @@ FocusScope { height: parent.height x: root.dayWidth * model.starts //color: model.color - color: "#af1a6a" + color: Kube.Colors.jazzberryJam border.width: 1 border.color: Kube.Colors.viewBackgroundColor -- cgit v1.2.3