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
26023413
Commit
26023413
authored
Aug 13, 2017
by
eekkelund
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Scaling] Request to change fontSize to font.pixelSize
parent
b2030497
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
27 additions
and
44 deletions
+27
-44
AppLauncher.qml
src/qml/AppLauncher.qml
+2
-2
AppSwitcher.qml
src/qml/AppSwitcher.qml
+1
-1
DeviceLockUI.qml
src/qml/DeviceLockUI.qml
+11
-19
FeedsPage.qml
src/qml/FeedsPage.qml
+2
-2
LockscreenClock.qml
src/qml/LockscreenClock.qml
+2
-2
SearchListView.qml
src/qml/SearchListView.qml
+3
-3
SwitcherItem.qml
src/qml/SwitcherItem.qml
+0
-9
NotificationItem.qml
src/qml/notifications/NotificationItem.qml
+2
-2
NotificationPreview.qml
src/qml/notifications/NotificationPreview.qml
+2
-2
CommonPanel.qml
src/qml/statusbar/CommonPanel.qml
+1
-1
WifiPanel.qml
src/qml/statusbar/WifiPanel.qml
+1
-1
No files found.
src/qml/AppLauncher.qml
View file @
26023413
...
@@ -219,7 +219,7 @@ GridView {
...
@@ -219,7 +219,7 @@ GridView {
width
:
parent
.
width
width
:
parent
.
width
anchors.centerIn
:
parent
anchors.centerIn
:
parent
text
:
qsTr
(
"
Remove
"
)
text
:
qsTr
(
"
Remove
"
)
font.pixelSize
:
Theme
.
fontSize
Large
font.pixelSize
:
Theme
.
fontSize
Small
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
...
@@ -246,7 +246,7 @@ GridView {
...
@@ -246,7 +246,7 @@ GridView {
width
:
parent
.
width
width
:
parent
.
width
anchors.centerIn
:
parent
anchors.centerIn
:
parent
text
:
qsTr
(
"
Uninstall
"
)
text
:
qsTr
(
"
Uninstall
"
)
font.pixelSize
:
Theme
.
fontSize
Large
font.pixelSize
:
Theme
.
fontSize
Small
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
...
...
src/qml/AppSwitcher.qml
View file @
26023413
...
@@ -67,7 +67,7 @@ Item {
...
@@ -67,7 +67,7 @@ Item {
left
:
parent
.
left
left
:
parent
.
left
}
}
font.weight
:
Font
.
Light
font.weight
:
Font
.
Light
font.pixelSize
:
Theme
.
fontSize
Extra
Large
font.pixelSize
:
Theme
.
fontSizeLarge
}
}
}
}
Flickable
{
Flickable
{
...
...
src/qml/DeviceLockUI.qml
View file @
26023413
...
@@ -51,14 +51,14 @@ Item {
...
@@ -51,14 +51,14 @@ Item {
ColumnLayout
{
ColumnLayout
{
anchors.fill
:
parent
anchors.fill
:
parent
spacing
:
Theme
.
itemSpacing
Large
spacing
:
Theme
.
itemSpacing
ExtraSmall
TextField
{
TextField
{
id
:
lockCodeField
id
:
lockCodeField
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
readOnly
:
true
readOnly
:
true
echoMode
:
TextInput
.
PasswordEchoOnEdit
echoMode
:
TextInput
.
PasswordEchoOnEdit
font.pixelSize
:
Theme
.
fontSize
ExtraLarge
font.pixelSize
:
Theme
.
fontSize
Medium
}
}
GridLayout
{
GridLayout
{
...
@@ -70,27 +70,19 @@ Item {
...
@@ -70,27 +70,19 @@ Item {
model
:
[
"
1
"
,
"
2
"
,
"
3
"
,
"
4
"
,
"
5
"
,
"
6
"
,
"
7
"
,
"
8
"
,
"
9
"
,
"
Ca
"
,
"
0
"
,
"
OK
"
]
model
:
[
"
1
"
,
"
2
"
,
"
3
"
,
"
4
"
,
"
5
"
,
"
6
"
,
"
7
"
,
"
8
"
,
"
9
"
,
"
Ca
"
,
"
0
"
,
"
OK
"
]
delegate
:
delegate
:
Button
{
Button
{
height
:
Theme
.
itemHeightHuge
id
:
button
width
:
Theme
.
itemHeightHuge
Layout.maximumWidth
:
Theme
.
itemWidthSmall
Layout.maximumWidth
:
Theme
.
itemHeightHuge
*
1.5
Layout.maximumHeight
:
Theme
.
itemHeightHuge
*
2
Layout.maximumHeight
:
Theme
.
itemHeightHuge
*
1.5
Layout.minimumHeight
:
Theme
.
itemHeightHuge
*
1.5
Label
{
text
:
modelData
id
:
btnLabel
text
:
modelData
font.pixelSize
:
Theme
.
fontSizeExtraLarge
*
1.5
anchors
{
centerIn
:
parent
}
}
onClicked
:
{
onClicked
:
{
if
(
b
tnLabel
.
text
!==
"
Ca
"
&&
btnLabel
.
text
!==
"
OK
"
)
{
if
(
b
utton
.
text
!==
"
Ca
"
&&
button
.
text
!==
"
OK
"
)
{
lockCodeField
.
insert
(
lockCodeField
.
cursorPosition
,
b
tnLabel
.
text
)
lockCodeField
.
insert
(
lockCodeField
.
cursorPosition
,
b
utton
.
text
)
}
else
{
}
else
{
if
(
b
tnLabel
.
text
===
"
OK
"
)
{
if
(
b
utton
.
text
===
"
OK
"
)
{
authenticator
.
enterLockCode
(
lockCodeField
.
text
)
authenticator
.
enterLockCode
(
lockCodeField
.
text
)
lockCodeField
.
text
=
""
lockCodeField
.
text
=
""
}
else
if
(
b
tnLabel
.
text
===
"
Ca
"
){
}
else
if
(
b
utton
.
text
===
"
Ca
"
){
lockCodeField
.
text
=
""
lockCodeField
.
text
=
""
}
}
}
}
...
...
src/qml/FeedsPage.qml
View file @
26023413
...
@@ -59,7 +59,7 @@ Flickable {
...
@@ -59,7 +59,7 @@ Flickable {
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
.
fontSize
Extra
Large
font.pixelSize
:
Theme
.
fontSizeLarge
font.weight
:
Font
.
Bold
font.weight
:
Font
.
Bold
anchors
{
anchors
{
top
:
parent
.
top
top
:
parent
.
top
...
@@ -71,7 +71,7 @@ Flickable {
...
@@ -71,7 +71,7 @@ Flickable {
Label
{
Label
{
id
:
displayCurrentDate
id
:
displayCurrentDate
text
:
Qt
.
formatDate
(
wallClock
.
time
,
"
d MMMM yyyy
"
)
text
:
Qt
.
formatDate
(
wallClock
.
time
,
"
d MMMM yyyy
"
)
font.pixelSize
:
Theme
.
fontSize
Extra
Large
font.pixelSize
:
Theme
.
fontSizeLarge
color
:
Theme
.
textColor
color
:
Theme
.
textColor
font.weight
:
Font
.
Light
font.weight
:
Font
.
Light
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
...
...
src/qml/LockscreenClock.qml
View file @
26023413
...
@@ -51,7 +51,7 @@ Rectangle {
...
@@ -51,7 +51,7 @@ Rectangle {
Label
{
Label
{
id
:
weekdayDisplay
id
:
weekdayDisplay
font.pixelSize
:
Theme
.
fontSize
Large
font.pixelSize
:
Theme
.
fontSize
Medium
color
:
Theme
.
textColor
color
:
Theme
.
textColor
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
font.weight
:
Font
.
Bold
font.weight
:
Font
.
Bold
...
@@ -65,7 +65,7 @@ Rectangle {
...
@@ -65,7 +65,7 @@ Rectangle {
Label
{
Label
{
id
:
dateDisplay
id
:
dateDisplay
font.pixelSize
:
Theme
.
fontSize
Large
font.pixelSize
:
Theme
.
fontSize
Medium
color
:
Theme
.
textColor
color
:
Theme
.
textColor
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
font.weight
:
Font
.
Light
font.weight
:
Font
.
Light
...
...
src/qml/SearchListView.qml
View file @
26023413
...
@@ -108,7 +108,7 @@ Item {
...
@@ -108,7 +108,7 @@ Item {
}
}
font
.
capitalization
:
Font
.
AllUppercase
font
.
capitalization
:
Font
.
AllUppercase
font
.
pixelSize
:
Theme
.
fontSize
Medium
font
.
pixelSize
:
Theme
.
fontSize
Small
color
:
Theme
.
textColor
color
:
Theme
.
textColor
anchors
{
anchors
{
left
:
parent
.
left
left
:
parent
.
left
...
@@ -296,7 +296,7 @@ Item {
...
@@ -296,7 +296,7 @@ Item {
left
:
parent
.
left
left
:
parent
.
left
right
:
parent
.
right
right
:
parent
.
right
}
}
font.pixelSize
:
Theme
.
fontSize
Large
font.pixelSize
:
Theme
.
fontSize
Medium
color
:
Theme
.
textColor
color
:
Theme
.
textColor
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
...
@@ -308,7 +308,7 @@ Item {
...
@@ -308,7 +308,7 @@ Item {
top
:
mainLabel
.
bottom
top
:
mainLabel
.
bottom
left
:
mainLabel
.
left
left
:
mainLabel
.
left
}
}
font.pixelSize
:
Theme
.
fontSize
Small
font.pixelSize
:
Theme
.
fontSize
Tiny
color
:
Theme
.
textColor
color
:
Theme
.
textColor
elide
:
Text
.
ElideRight
elide
:
Text
.
ElideRight
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
...
...
src/qml/SwitcherItem.qml
View file @
26023413
...
@@ -83,15 +83,6 @@ MouseArea {
...
@@ -83,15 +83,6 @@ MouseArea {
script
:
switcherItemRoot
.
close
()
script
:
switcherItemRoot
.
close
()
}
}
}
}
Label
{
anchors
{
top
:
parent
.
top
horizontalCenter
:
parent
.
horizontalCenter
topMargin
:
30
}
font.pointSize
:
8
text
:
Lipstick
.
compositor
.
windowForId
(
model
.
window
).
title
}
CloseButton
{
CloseButton
{
id
:
closeButton
id
:
closeButton
...
...
src/qml/notifications/NotificationItem.qml
View file @
26023413
...
@@ -95,7 +95,7 @@ MouseArea {
...
@@ -95,7 +95,7 @@ MouseArea {
text
:
modelData
.
summary
text
:
modelData
.
summary
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
Theme
.
itemSpacingHuge
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
Theme
.
itemSpacingHuge
color
:
Theme
.
textColor
color
:
Theme
.
textColor
font.pixelSize
:
Theme
.
fontSize
Large
font.pixelSize
:
Theme
.
fontSize
Small
//font.bold :true
//font.bold :true
//font.capitalization: Font.AllUppercase
//font.capitalization: Font.AllUppercase
...
@@ -112,7 +112,7 @@ MouseArea {
...
@@ -112,7 +112,7 @@ MouseArea {
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
Theme
.
itemSpacingHuge
width
:
(
rootitem
.
width
-
appIcon
.
width
)
-
Theme
.
itemSpacingHuge
text
:
modelData
.
body
text
:
modelData
.
body
color
:
Theme
.
textColor
color
:
Theme
.
textColor
font.pixelSize
:
Theme
.
fontSize
Medium
font.pixelSize
:
Theme
.
fontSize
Small
anchors
{
anchors
{
left
:
appName
.
left
left
:
appName
.
left
top
:
appSummary
.
bottom
top
:
appSummary
.
bottom
...
...
src/qml/notifications/NotificationPreview.qml
View file @
26023413
...
@@ -144,7 +144,7 @@ Item {
...
@@ -144,7 +144,7 @@ Item {
rightMargin
:
notificationArea
.
notificationMargin
rightMargin
:
notificationArea
.
notificationMargin
//bottomMargin: notificationArea.notificationMargin
//bottomMargin: notificationArea.notificationMargin
}
}
font.pixelSize
:
Theme
.
fontSize
Large
font.pixelSize
:
Theme
.
fontSize
Medium
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewSummary
:
""
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewSummary
:
""
color
:
Theme
.
textColor
color
:
Theme
.
textColor
clip
:
true
clip
:
true
...
@@ -159,7 +159,7 @@ Item {
...
@@ -159,7 +159,7 @@ Item {
right
:
summary
.
right
right
:
summary
.
right
}
}
font
{
font
{
pixelSize
:
Theme
.
fontSize
Medium
pixelSize
:
Theme
.
fontSize
Small
bold
:
true
bold
:
true
}
}
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewBody
:
""
text
:
notificationPreviewPresenter
.
notification
!=
null
?
notificationPreviewPresenter
.
notification
.
previewBody
:
""
...
...
src/qml/statusbar/CommonPanel.qml
View file @
26023413
...
@@ -92,7 +92,7 @@ Rectangle {
...
@@ -92,7 +92,7 @@ Rectangle {
leftMargin
:
Theme
.
itemSpacingLarge
leftMargin
:
Theme
.
itemSpacingLarge
}
}
wrapMode
:
Text
.
Wrap
wrapMode
:
Text
.
Wrap
font.p
ointSize
:
8
font.p
ixelSize
:
Theme
.
fontSizeMedium
font.bold
:
true
font.bold
:
true
color
:
"
#ffffff
"
color
:
"
#ffffff
"
}
}
...
...
src/qml/statusbar/WifiPanel.qml
View file @
26023413
...
@@ -84,7 +84,7 @@ Component {
...
@@ -84,7 +84,7 @@ Component {
verticalCenter
:
statusImage
.
verticalCenter
verticalCenter
:
statusImage
.
verticalCenter
}
}
width
:
root
.
width
width
:
root
.
width
font.pixelSize
:
Theme
.
fontSize
Medium
font.pixelSize
:
Theme
.
fontSize
Small
text
:
modelData
.
name
text
:
modelData
.
name
wrapMode
:
Text
.
Wrap
wrapMode
:
Text
.
Wrap
color
:
modelData
.
state
===
"
online
"
?
Theme
.
accentColor
:
Theme
.
textColor
color
:
modelData
.
state
===
"
online
"
?
Theme
.
accentColor
:
Theme
.
textColor
...
...
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