diff options
Diffstat (limited to 'framework')
-rw-r--r-- | framework/qml/Colors.qml | 1 | ||||
-rw-r--r-- | framework/src/domain/daylongeventmodel.cpp | 6 | ||||
-rw-r--r-- | framework/src/domain/daylongeventmodel.h | 2 |
3 files changed, 5 insertions, 4 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 { | |||
34 | property string bewareOrange: "#f67400" | 34 | property string bewareOrange: "#f67400" |
35 | property string dangerRed: "#ed1515" | 35 | property string dangerRed: "#ed1515" |
36 | property string darkCharcoalGrey: "#232629" | 36 | property string darkCharcoalGrey: "#232629" |
37 | property string jazzberryJam: "#af1a6a" | ||
37 | property string lightgrey: "lightgrey" | 38 | property string lightgrey: "lightgrey" |
38 | 39 | ||
39 | //Colorusage: | 40 | //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 | |||
36 | 36 | ||
37 | query.filter<Event::AllDay>(true); | 37 | query.filter<Event::AllDay>(true); |
38 | 38 | ||
39 | eventModel = Sink::Store::loadModel<Event>(query); | 39 | mModel = Sink::Store::loadModel<Event>(query); |
40 | 40 | ||
41 | setSourceModel(eventModel.data()); | 41 | setSourceModel(mModel.data()); |
42 | } | 42 | } |
43 | 43 | ||
44 | QHash<int, QByteArray> DayLongEventModel::roleNames() const | 44 | QHash<int, QByteArray> DayLongEventModel::roleNames() const |
@@ -85,7 +85,7 @@ bool DayLongEventModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourc | |||
85 | auto eventEnd = event->getEndTime().date(); | 85 | auto eventEnd = event->getEndTime().date(); |
86 | 86 | ||
87 | if (!eventStart.isValid() || !eventEnd.isValid()) { | 87 | if (!eventStart.isValid() || !eventEnd.isValid()) { |
88 | SinkWarning() << "Invalid date in the eventModel, ignoring..."; | 88 | SinkWarning() << "Invalid date in the event model, ignoring..."; |
89 | return false; | 89 | return false; |
90 | } | 90 | } |
91 | 91 | ||
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: | |||
62 | void setPeriodLength(int); | 62 | void setPeriodLength(int); |
63 | 63 | ||
64 | private: | 64 | private: |
65 | QSharedPointer<QAbstractItemModel> eventModel; | 65 | QSharedPointer<QAbstractItemModel> mModel; |
66 | 66 | ||
67 | QDate mPeriodStart; | 67 | QDate mPeriodStart; |
68 | int mPeriodLength = 7; | 68 | int mPeriodLength = 7; |