diff options
Diffstat (limited to 'views')
-rw-r--r-- | views/calendar/qml/View.qml | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/views/calendar/qml/View.qml b/views/calendar/qml/View.qml index 704b46f7..0d86313d 100644 --- a/views/calendar/qml/View.qml +++ b/views/calendar/qml/View.qml | |||
@@ -36,11 +36,12 @@ FocusScope { | |||
36 | width: Kube.Units.gridUnit * 7 * 7 + Kube.Units.gridUnit * 2 | 36 | width: Kube.Units.gridUnit * 7 * 7 + Kube.Units.gridUnit * 2 |
37 | height: Kube.Units.gridUnit * 27 | 37 | height: Kube.Units.gridUnit * 27 |
38 | 38 | ||
39 | //BEGIN day labels | ||
39 | DayOfWeekRow { | 40 | DayOfWeekRow { |
40 | id: dayLabels | 41 | id: dayLabels |
41 | anchors.right: parent.right | 42 | anchors.right: parent.right |
42 | spacing: 0 | 43 | spacing: 0 |
43 | locale: Qt.locale("de") | 44 | locale: Qt.locale("en_GB") |
44 | 45 | ||
45 | delegate: Rectangle { | 46 | delegate: Rectangle { |
46 | width: Kube.Units.gridUnit * 7 | 47 | width: Kube.Units.gridUnit * 7 |
@@ -60,8 +61,9 @@ FocusScope { | |||
60 | } | 61 | } |
61 | } | 62 | } |
62 | } | 63 | } |
64 | //END day labels | ||
63 | 65 | ||
64 | 66 | //BEGIN daylong events | |
65 | Rectangle { | 67 | Rectangle { |
66 | id: daylong | 68 | id: daylong |
67 | 69 | ||
@@ -109,6 +111,7 @@ FocusScope { | |||
109 | } | 111 | } |
110 | } | 112 | } |
111 | } | 113 | } |
114 | //END daylong events | ||
112 | 115 | ||
113 | Flickable { | 116 | Flickable { |
114 | id: mainWeekViewer | 117 | id: mainWeekViewer |
@@ -135,10 +138,11 @@ FocusScope { | |||
135 | 138 | ||
136 | spacing: 0 | 139 | spacing: 0 |
137 | 140 | ||
141 | //BEGIN time labels | ||
138 | Column { | 142 | Column { |
139 | anchors.bottom: parent.bottom | 143 | anchors.bottom: parent.bottom |
140 | Repeater { | 144 | Repeater { |
141 | model: ["0:00","1:00","2:00","3:00","4:00","5:00","6:00","7:00","8:00","9:00","10:00","11:00","12:00","13:00","14:00","15:00","16:00","17:00","18:00","19:00","20:00","21:00","22:00","23:00"] | 145 | model: ["1:00","2:00","3:00","4:00","5:00","6:00","7:00","8:00","9:00","10:00","11:00","12:00","13:00","14:00","15:00","16:00","17:00","18:00","19:00","20:00","21:00","22:00","23:00","0:00"] |
142 | delegate: Item { | 146 | delegate: Item { |
143 | height: Kube.Units.gridUnit * 2 | 147 | height: Kube.Units.gridUnit * 2 |
144 | width: Kube.Units.gridUnit * 2 | 148 | width: Kube.Units.gridUnit * 2 |
@@ -147,12 +151,14 @@ FocusScope { | |||
147 | anchors { | 151 | anchors { |
148 | right: parent.right | 152 | right: parent.right |
149 | rightMargin: Kube.Units.smallSpacing | 153 | rightMargin: Kube.Units.smallSpacing |
154 | bottom: parent.bottom | ||
150 | } | 155 | } |
151 | text: model.modelData | 156 | text: model.modelData |
152 | } | 157 | } |
153 | } | 158 | } |
154 | } | 159 | } |
155 | } | 160 | } |
161 | //END time labels | ||
156 | 162 | ||
157 | Repeater { | 163 | Repeater { |
158 | model: WeekEvents{} | 164 | model: WeekEvents{} |
@@ -168,6 +174,20 @@ FocusScope { | |||
168 | border.color: "lightgrey" | 174 | border.color: "lightgrey" |
169 | color: Kube.Colors.viewBackgroundColor | 175 | color: Kube.Colors.viewBackgroundColor |
170 | 176 | ||
177 | Column { | ||
178 | anchors.fill: parent | ||
179 | Repeater { | ||
180 | model: 24 | ||
181 | delegate: Rectangle { | ||
182 | height: Kube.Units.gridUnit * 4 | ||
183 | width: parent.width | ||
184 | color: "transparent" | ||
185 | border.width:1 | ||
186 | border.color: "lightgrey" | ||
187 | } | ||
188 | } | ||
189 | } | ||
190 | |||
171 | Repeater { | 191 | Repeater { |
172 | model: parent.events | 192 | model: parent.events |
173 | 193 | ||
@@ -207,7 +227,6 @@ FocusScope { | |||
207 | eventDelegate.z = eventDelegate.z - 100 | 227 | eventDelegate.z = eventDelegate.z - 100 |
208 | 228 | ||
209 | } | 229 | } |
210 | |||
211 | } | 230 | } |
212 | } | 231 | } |
213 | } | 232 | } |