Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
glacier-home
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
glacier-home
Commits
874f0d56
Commit
874f0d56
authored
Jul 21, 2017
by
eekkelund
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FeedsPage] Show default notification icon if no icon found. Fix date to fit to screen
parent
f7197141
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
10 deletions
+17
-10
FeedsPage.qml
src/qml/FeedsPage.qml
+4
-4
LockscreenClock.qml
src/qml/LockscreenClock.qml
+5
-5
NotificationItem.qml
src/qml/notifications/NotificationItem.qml
+8
-1
No files found.
src/qml/FeedsPage.qml
View file @
874f0d56
...
@@ -57,13 +57,13 @@ Flickable {
...
@@ -57,13 +57,13 @@ Flickable {
Label
{
Label
{
id
:
displayDayOfWeek
id
:
displayDayOfWeek
text
:
Qt
.
formatDateTime
(
wallClock
.
time
,
"
dddd
"
)
+
"
,
"
text
:
Qt
.
formatDateTime
(
wallClock
.
time
,
"
dddd
"
)
color
:
Theme
.
textColor
color
:
Theme
.
textColor
font.pixelSize
:
Theme
.
fontSizeExtraLarge
font.pixelSize
:
Theme
.
fontSizeExtraLarge
font.weight
:
Font
.
Bold
font.weight
:
Font
.
Bold
anchors
{
anchors
{
top
:
parent
.
top
top
:
parent
.
top
left
:
parent
.
left
horizontalCenter
:
parent
.
horizontalCenter
}
}
}
}
...
@@ -76,8 +76,8 @@ Flickable {
...
@@ -76,8 +76,8 @@ Flickable {
font.weight
:
Font
.
Light
font.weight
:
Font
.
Light
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
anchors
{
anchors
{
left
:
displayDayOfWeek
.
right
horizontalCenter
:
parent
.
horizontalCenter
top
:
parent
.
top
top
:
displayDayOfWeek
.
bottom
}
}
}
}
}
}
...
...
src/qml/LockscreenClock.qml
View file @
874f0d56
...
@@ -40,7 +40,7 @@ Rectangle {
...
@@ -40,7 +40,7 @@ Rectangle {
}
}
Rectangle
{
Rectangle
{
id
:
dateRow
id
:
dateRow
height
:
weekdayDisplay
.
height
height
:
childrenRect
.
height
width
:
weekdayDisplay
.
width
+
dateDisplay
.
width
width
:
weekdayDisplay
.
width
+
dateDisplay
.
width
anchors
{
anchors
{
horizontalCenter
:
parent
.
horizontalCenter
horizontalCenter
:
parent
.
horizontalCenter
...
@@ -56,10 +56,10 @@ Rectangle {
...
@@ -56,10 +56,10 @@ Rectangle {
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
font.weight
:
Font
.
Bold
font.weight
:
Font
.
Bold
anchors
{
anchors
{
left
:
parent
.
left
horizontalCenter
:
parent
.
horizontalCenter
}
}
text
:
Qt
.
formatDateTime
(
wallClock
.
time
,
"
dddd
"
)
+
"
,
"
text
:
Qt
.
formatDateTime
(
wallClock
.
time
,
"
dddd
"
)
}
}
Label
{
Label
{
...
@@ -70,8 +70,8 @@ Rectangle {
...
@@ -70,8 +70,8 @@ Rectangle {
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
font.weight
:
Font
.
Light
font.weight
:
Font
.
Light
anchors
{
anchors
{
left
:
weekdayDisplay
.
right
horizontalCenter
:
parent
.
horizontalCenter
top
:
parent
.
top
top
:
weekdayDisplay
.
bottom
}
}
text
:
Qt
.
formatDate
(
wallClock
.
time
,
"
d MMMM yyyy
"
)
text
:
Qt
.
formatDate
(
wallClock
.
time
,
"
d MMMM yyyy
"
)
...
...
src/qml/notifications/NotificationItem.qml
View file @
874f0d56
...
@@ -18,6 +18,7 @@ MouseArea {
...
@@ -18,6 +18,7 @@ MouseArea {
id
:
appIcon
id
:
appIcon
height
:
Theme
.
itemHeightExtraLarge
height
:
Theme
.
itemHeightExtraLarge
width
:
height
width
:
height
property
string
defaultIcon
:
"
/usr/share/lipstick-glacier-home-qt5/qml/images/glacier.svg
"
anchors
{
anchors
{
left
:
parent
.
left
left
:
parent
.
left
...
@@ -25,10 +26,16 @@ MouseArea {
...
@@ -25,10 +26,16 @@ MouseArea {
}
}
source
:
{
source
:
{
console
.
log
(
modelData
,
modelData
.
icon
)
if
(
modelData
.
icon
)
if
(
modelData
.
icon
)
return
"
image://theme/
"
+
modelData
.
icon
return
"
image://theme/
"
+
modelData
.
icon
else
else
return
"
/usr/share/lipstick-glacier-home-qt5/qml/images/glacier.svg
"
return
defaultIcon
}
onStatusChanged
:
{
if
(
appIcon
.
status
==
Image
.
Error
)
{
appIcon
.
source
=
defaultIcon
}
}
}
}
}
Label
{
Label
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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