Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Kalendar
Commits
0cbfd474
Commit
0cbfd474
authored
Nov 28, 2021
by
Claudio Cambra
Browse files
Consistent numbering in week view with month view for days. Fixes
#99
parent
9064a02b
Pipeline
#102194
passed with stage
in 4 minutes and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/contents/ui/CollectionPickerPage.qml
View file @
0cbfd474
...
...
@@ -70,7 +70,7 @@ Kirigami.ScrollablePage {
separatorVisible
:
false
Keys.onEnterPressed
:
clicked
();
Keys.onEnterPressed
:
clicked
();
// TODO: Remove this once upstream item handles this by itself
Keys.onReturnPressed
:
clicked
();
onClicked
:
collectionPickerSheet
.
collectionPicked
(
collectionId
);
...
...
src/contents/ui/WeekView.qml
View file @
0cbfd474
...
...
@@ -226,9 +226,9 @@ Kirigami.Page {
level
:
2
color
:
isToday
?
Kirigami
.
Theme
.
highlightColor
:
Kirigami
.
Theme
.
textColor
text
:
{
const
longText
=
headingDate
.
toLocaleDateString
(
Qt
.
locale
(),
"
dddd <b>d
d
</b>
"
);
const
mediumText
=
headingDate
.
toLocaleDateString
(
Qt
.
locale
(),
"
ddd <b>d
d
</b>
"
);
const
shortText
=
mediumText
.
slice
(
0
,
1
)
+
"
"
+
headingDate
.
toLocaleDateString
(
Qt
.
locale
(),
"
<b>d
d
</b>
"
);
const
longText
=
headingDate
.
toLocaleDateString
(
Qt
.
locale
(),
"
dddd <b>d</b>
"
);
const
mediumText
=
headingDate
.
toLocaleDateString
(
Qt
.
locale
(),
"
ddd <b>d</b>
"
);
const
shortText
=
mediumText
.
slice
(
0
,
1
)
+
"
"
+
headingDate
.
toLocaleDateString
(
Qt
.
locale
(),
"
<b>d</b>
"
);
if
(
fontMetrics
.
boundingRect
(
longText
).
width
<
width
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment