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
0793fe08
Commit
0793fe08
authored
Mar 30, 2014
by
Simonas Leleiva
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4 from locusf/notifications
[glacierui] Notifications modified as per some of the specs
parents
d6ce9ea7
3dc67f56
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
20 deletions
+21
-20
NotificationPreview.qml
src/qml/NotificationPreview.qml
+20
-20
resources-qml.qrc
src/resources-qml.qrc
+1
-0
No files found.
src/qml/NotificationPreview.qml
View file @
0793fe08
...
...
@@ -53,7 +53,7 @@ Item {
property
int
notificationHeight
:
102
property
int
notificationMargin
:
14
property
int
notificationIconSize
:
60
anchors.
top
:
parent
.
top
anchors.
bottom
:
parent
.
bottom
anchors.left
:
parent
.
left
width
:
isPortrait
?
notificationWindow
.
height
:
notificationWindow
.
width
height
:
notificationArea
.
notificationHeight
...
...
@@ -85,14 +85,9 @@ Item {
id
:
notificationPreview
anchors
{
fill
:
parent
margins
:
10
}
color
:
"
black
"
color
:
"
transparent
"
radius
:
5
border
{
color
:
"
gray
"
width
:
2
}
opacity
:
0
...
...
@@ -128,7 +123,20 @@ Item {
}
}
]
Rectangle
{
id
:
dimmer
height
:
15
anchors.top
:
parent
.
top
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
gradient
:
Gradient
{
GradientStop
{
position
:
0
;
color
:
"
black
"
}
GradientStop
{
position
:
1.0
;
color
:
"
transparent
"
}
}
}
transitions
:
[
Transition
{
to
:
"
show
"
...
...
@@ -158,21 +166,12 @@ Item {
anchors
{
top
:
parent
.
top
left
:
parent
.
left
topMargin
:
notificationArea
.
notificationMargin
-
3
topMargin
:
notificationArea
.
notificationMargin
leftMargin
:
notificationArea
.
notificationMargin
}
width
:
notificationArea
.
notificationIconSize
height
:
width
source
:
{
var
icon
=
""
if
(
notificationPreviewPresenter
.
notification
!=
null
)
{
icon
=
notificationPreviewPresenter
.
notification
.
previewIcon
?
notificationPreviewPresenter
.
notification
.
previewIcon
:
notificationPreviewPresenter
.
notification
.
icon
if
(
icon
)
{
icon
=
((
icon
.
indexOf
(
"
/
"
)
==
0
?
"
file://
"
:
"
image://theme/
"
)
+
icon
)
}
}
icon
}
source
:
"
images/notification-circle.png
"
}
Text
{
...
...
@@ -186,7 +185,7 @@ Item {
rightMargin
:
notificationArea
.
notificationMargin
}
font
{
pixelSize
:
22
pixelSize
:
36
}
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewSummary
:
""
color
:
"
white
"
...
...
@@ -202,7 +201,8 @@ Item {
right
:
summary
.
right
}
font
{
pixelSize
:
22
pixelSize
:
18
bold
:
true
}
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewBody
:
""
color
:
"
white
"
...
...
src/resources-qml.qrc
View file @
0793fe08
...
...
@@ -33,5 +33,6 @@
<file>qml/compositor/WindowWrapperMystic.qml</file>
<file>qml/theme/icon-m-framework-close-thumbnail.png</file>
<file>qml/NotificationPreview.qml</file>
<file>qml/images/notification-circle.png</file>
</qresource>
</RCC>
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