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
66ebe6dc
Commit
66ebe6dc
authored
Mar 26, 2017
by
Aleksi Suomalainen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[home] Revert lipstick api changes and modify scaling
parent
599bc36e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
43 additions
and
36 deletions
+43
-36
AppLauncher.qml
src/qml/AppLauncher.qml
+2
-2
LauncherItemDelegate.qml
src/qml/LauncherItemDelegate.qml
+8
-2
LockscreenClock.qml
src/qml/LockscreenClock.qml
+2
-2
MainScreen.qml
src/qml/MainScreen.qml
+1
-0
Statusbar.qml
src/qml/Statusbar.qml
+1
-1
NotificationItem.qml
src/qml/notifications/NotificationItem.qml
+2
-3
NotificationPreview.qml
src/qml/notifications/NotificationPreview.qml
+27
-26
No files found.
src/qml/AppLauncher.qml
View file @
66ebe6dc
...
@@ -43,10 +43,10 @@ GridView {
...
@@ -43,10 +43,10 @@ GridView {
// just for margin purposes
// just for margin purposes
header
:
Item
{
header
:
Item
{
height
:
10
0
height
:
Math
.
min
(
parent
.
width
,
parent
.
height
)
/
1
0
}
}
footer
:
Item
{
footer
:
Item
{
height
:
10
0
height
:
Math
.
min
(
parent
.
width
,
parent
.
height
)
/
1
0
}
}
Item
{
Item
{
...
...
src/qml/LauncherItemDelegate.qml
View file @
66ebe6dc
...
@@ -235,7 +235,13 @@ Item {
...
@@ -235,7 +235,13 @@ Item {
Spinner
{
Spinner
{
id
:
spinner
id
:
spinner
anchors.centerIn
:
parent
anchors
{
horizontalCenter
:
parent
.
horizontalCenter
top
:
parent
.
top
topMargin
:
8
}
width
:
gridview
.
cellWidth
-
gridview
.
cellWidth
/
10
height
:
width
enabled
:
(
model
.
object
.
type
===
LauncherModel
.
Application
)
?
model
.
object
.
isLaunching
:
false
enabled
:
(
model
.
object
.
type
===
LauncherModel
.
Application
)
?
model
.
object
.
isLaunching
:
false
}
}
}
}
...
@@ -259,7 +265,7 @@ Item {
...
@@ -259,7 +265,7 @@ Item {
width
:
parent
.
width
width
:
parent
.
width
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
font.pixelSize
:
gridview
.
cellWidth
/
10
font.pixelSize
:
gridview
.
cellWidth
/
8
color
:
'
white
'
color
:
'
white
'
anchors
{
anchors
{
left
:
parent
.
left
left
:
parent
.
left
...
...
src/qml/LockscreenClock.qml
View file @
66ebe6dc
...
@@ -22,7 +22,7 @@ Rectangle {
...
@@ -22,7 +22,7 @@ Rectangle {
Text
{
Text
{
id
:
timeDisplay
id
:
timeDisplay
font.p
ixelSize
:
80
font.p
ointSize
:
16
font.weight
:
Font
.
Light
font.weight
:
Font
.
Light
lineHeight
:
0.85
lineHeight
:
0.85
color
:
"
white
"
color
:
"
white
"
...
@@ -39,7 +39,7 @@ Rectangle {
...
@@ -39,7 +39,7 @@ Rectangle {
Text
{
Text
{
id
:
dateDisplay
id
:
dateDisplay
font.p
ixelSize
:
20
font.p
ointSize
:
14
color
:
"
white
"
color
:
"
white
"
opacity
:
0.8
opacity
:
0.8
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
...
...
src/qml/MainScreen.qml
View file @
66ebe6dc
...
@@ -58,6 +58,7 @@ Page {
...
@@ -58,6 +58,7 @@ Page {
id
:
desktop
id
:
desktop
property
alias
lockscreen
:
lockScreen
property
alias
lockscreen
:
lockScreen
property
alias
switcher
:
switcher
property
alias
switcher
:
switcher
property
int
statusBarHeight
:
statusbar
.
height
// Implements back key navigation
// Implements back key navigation
Keys.onReleased
:
{
Keys.onReleased
:
{
...
...
src/qml/Statusbar.qml
View file @
66ebe6dc
...
@@ -42,7 +42,7 @@ import "statusbar"
...
@@ -42,7 +42,7 @@ import "statusbar"
Item
{
Item
{
id
:
root
id
:
root
z
:
201
z
:
201
height
:
Math
.
min
(
parent
.
width
,
parent
.
height
)
/
1
2
height
:
Math
.
min
(
parent
.
width
,
parent
.
height
)
/
1
0
width
:
parent
.
width
width
:
parent
.
width
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
...
...
src/qml/notifications/NotificationItem.qml
View file @
66ebe6dc
...
@@ -36,7 +36,7 @@ MouseArea {
...
@@ -36,7 +36,7 @@ MouseArea {
id
:
appSummary
id
:
appSummary
text
:
modelData
.
summary
text
:
modelData
.
summary
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
40
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
40
font.pointSize
:
1
0
font.pointSize
:
1
2
font.bold
:
true
font.bold
:
true
font.capitalization
:
Font
.
AllUppercase
font.capitalization
:
Font
.
AllUppercase
...
@@ -52,8 +52,7 @@ MouseArea {
...
@@ -52,8 +52,7 @@ MouseArea {
id
:
appBody
id
:
appBody
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
40
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
40
text
:
modelData
.
body
text
:
modelData
.
body
font.pointSize
:
8
font.pointSize
:
14
anchors
{
anchors
{
left
:
appSummary
.
left
left
:
appSummary
.
left
top
:
appSummary
.
bottom
top
:
appSummary
.
bottom
...
...
src/qml/notifications/NotificationPreview.qml
View file @
66ebe6dc
...
@@ -24,6 +24,9 @@
...
@@ -24,6 +24,9 @@
import
QtQuick
2.0
import
QtQuick
2.0
import
org
.
nemomobile
.
lipstick
0.1
import
org
.
nemomobile
.
lipstick
0.1
import
QtQuick
.
Controls
.
Nemo
1.0
import
QtQuick
.
Controls
.
Styles
.
Nemo
1.0
import
"
../scripts/desktop.js
"
as
Desktop
import
"
../scripts/desktop.js
"
as
Desktop
Item
{
Item
{
...
@@ -36,14 +39,28 @@ Item {
...
@@ -36,14 +39,28 @@ Item {
rotation
:
Desktop
.
instance
.
parent
.
rotation
rotation
:
Desktop
.
instance
.
parent
.
rotation
x
:
Desktop
.
instance
.
parent
.
x
x
:
Desktop
.
instance
.
parent
.
x
y
:
Desktop
.
instance
.
parent
.
y
y
:
Desktop
.
instance
.
parent
.
y
Rectangle
{
id
:
dimmer
height
:
Math
.
min
(
parent
.
width
,
parent
.
height
)
/
14
anchors.top
:
parent
.
top
anchors.topMargin
:
notificationArea
.
notificationHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
gradient
:
Gradient
{
GradientStop
{
position
:
1.0
;
color
:
"
black
"
}
GradientStop
{
position
:
0
;
color
:
"
transparent
"
}
}
}
MouseArea
{
MouseArea
{
id
:
notificationArea
id
:
notificationArea
property
int
notificationHeight
:
10
2
property
int
notificationHeight
:
Math
.
min
(
parent
.
width
,
parent
.
height
)
/
1
2
property
int
notificationMargin
:
14
property
int
notificationMargin
:
14
property
int
notificationIconSize
:
60
property
int
notificationIconSize
:
Math
.
min
(
parent
.
width
,
parent
.
height
)
/
12
anchors.bottom
:
parent
.
bottom
anchors.top
:
parent
.
top
anchors.bottomMargin
:
48
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
width
:
notificationWindow
.
width
width
:
notificationWindow
.
width
height
:
notificationArea
.
notificationHeight
height
:
notificationArea
.
notificationHeight
...
@@ -56,7 +73,7 @@ Item {
...
@@ -56,7 +73,7 @@ Item {
fill
:
parent
fill
:
parent
}
}
color
:
"
transparent
"
color
:
"
transparent
"
radius
:
5
radius
:
10
opacity
:
0
opacity
:
0
...
@@ -89,20 +106,6 @@ Item {
...
@@ -89,20 +106,6 @@ 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
:
[
transitions
:
[
Transition
{
Transition
{
to
:
"
show
"
to
:
"
show
"
...
@@ -140,26 +143,24 @@ Item {
...
@@ -140,26 +143,24 @@ Item {
source
:
"
/usr/share/lipstick-glacier-home-qt5/qml/images/notification-circle.png
"
source
:
"
/usr/share/lipstick-glacier-home-qt5/qml/images/notification-circle.png
"
}
}
Text
{
Label
{
id
:
summary
id
:
summary
anchors
{
anchors
{
top
:
parent
.
top
top
:
parent
.
top
left
:
icon
.
right
left
:
icon
.
right
right
:
parent
.
right
right
:
parent
.
right
topMargin
:
notificationArea
.
notificationMargin
leftMargin
:
notificationArea
.
notificationMargin
+
26
leftMargin
:
notificationArea
.
notificationMargin
+
26
rightMargin
:
notificationArea
.
notificationMargin
rightMargin
:
notificationArea
.
notificationMargin
bottomMargin
:
notificationArea
.
notificationMargin
}
}
font
{
font.pointSize
:
12
pixelSize
:
36
}
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewSummary
:
""
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewSummary
:
""
color
:
"
white
"
color
:
"
white
"
clip
:
true
clip
:
true
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
}
}
Text
{
Label
{
id
:
body
id
:
body
anchors
{
anchors
{
top
:
summary
.
bottom
top
:
summary
.
bottom
...
@@ -167,7 +168,7 @@ Item {
...
@@ -167,7 +168,7 @@ Item {
right
:
summary
.
right
right
:
summary
.
right
}
}
font
{
font
{
p
ixelSize
:
18
p
ointSize
:
10
bold
:
true
bold
:
true
}
}
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewBody
:
""
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewBody
:
""
...
...
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