Commit 26023413 authored by eekkelund's avatar eekkelund

[Scaling] Request to change fontSize to font.pixelSize

parent b2030497
......@@ -219,7 +219,7 @@ GridView {
width: parent.width
anchors.centerIn: parent
text: qsTr("Remove")
font.pixelSize: Theme.fontSizeLarge
font.pixelSize: Theme.fontSizeSmall
elide:Text.ElideRight
horizontalAlignment:Text.AlignHCenter
verticalAlignment:Text.AlignVCenter
......@@ -246,7 +246,7 @@ GridView {
width: parent.width
anchors.centerIn: parent
text: qsTr("Uninstall")
font.pixelSize: Theme.fontSizeLarge
font.pixelSize: Theme.fontSizeSmall
elide:Text.ElideRight
horizontalAlignment:Text.AlignHCenter
verticalAlignment:Text.AlignVCenter
......
......@@ -67,7 +67,7 @@ Item {
left: parent.left
}
font.weight: Font.Light
font.pixelSize: Theme.fontSizeExtraLarge
font.pixelSize: Theme.fontSizeLarge
}
}
Flickable {
......
......@@ -51,14 +51,14 @@ Item {
ColumnLayout {
anchors.fill: parent
spacing: Theme.itemSpacingLarge
spacing: Theme.itemSpacingExtraSmall
TextField {
id: lockCodeField
anchors.horizontalCenter: parent.horizontalCenter
readOnly: true
echoMode: TextInput.PasswordEchoOnEdit
font.pixelSize: Theme.fontSizeExtraLarge
font.pixelSize: Theme.fontSizeMedium
}
GridLayout {
......@@ -70,27 +70,19 @@ Item {
model: ["1","2","3","4","5","6","7","8","9","Ca","0","OK"]
delegate:
Button {
height: Theme.itemHeightHuge
width: Theme.itemHeightHuge
Layout.maximumWidth: Theme.itemHeightHuge * 1.5
Layout.maximumHeight: Theme.itemHeightHuge * 1.5
Label {
id: btnLabel
id:button
Layout.maximumWidth: Theme.itemWidthSmall
Layout.maximumHeight: Theme.itemHeightHuge * 2
Layout.minimumHeight: Theme.itemHeightHuge * 1.5
text: modelData
font.pixelSize: Theme.fontSizeExtraLarge * 1.5
anchors {
centerIn: parent
}
}
onClicked: {
if (btnLabel.text !== "Ca" && btnLabel.text !== "OK") {
lockCodeField.insert(lockCodeField.cursorPosition, btnLabel.text)
if (button.text !== "Ca" && button.text !== "OK") {
lockCodeField.insert(lockCodeField.cursorPosition, button.text)
} else {
if (btnLabel.text === "OK") {
if (button.text === "OK") {
authenticator.enterLockCode(lockCodeField.text)
lockCodeField.text = ""
} else if (btnLabel.text === "Ca"){
} else if (button.text === "Ca"){
lockCodeField.text = ""
}
}
......
......@@ -59,7 +59,7 @@ Flickable {
id: displayDayOfWeek
text: Qt.formatDateTime(wallClock.time, "dddd")
color: Theme.textColor
font.pixelSize: Theme.fontSizeExtraLarge
font.pixelSize: Theme.fontSizeLarge
font.weight: Font.Bold
anchors {
top: parent.top
......@@ -71,7 +71,7 @@ Flickable {
Label {
id: displayCurrentDate
text: Qt.formatDate(wallClock.time, "d MMMM yyyy")
font.pixelSize: Theme.fontSizeExtraLarge
font.pixelSize: Theme.fontSizeLarge
color: Theme.textColor
font.weight: Font.Light
wrapMode: Text.WordWrap
......
......@@ -51,7 +51,7 @@ Rectangle {
Label {
id: weekdayDisplay
font.pixelSize: Theme.fontSizeLarge
font.pixelSize: Theme.fontSizeMedium
color: Theme.textColor
horizontalAlignment: Text.AlignHCenter
font.weight: Font.Bold
......@@ -65,7 +65,7 @@ Rectangle {
Label {
id: dateDisplay
font.pixelSize: Theme.fontSizeLarge
font.pixelSize: Theme.fontSizeMedium
color: Theme.textColor
horizontalAlignment: Text.AlignHCenter
font.weight: Font.Light
......
......@@ -108,7 +108,7 @@ Item {
}
font.capitalization: Font.AllUppercase
font.pixelSize: Theme.fontSizeMedium
font.pixelSize: Theme.fontSizeSmall
color: Theme.textColor
anchors{
left: parent.left
......@@ -296,7 +296,7 @@ Item {
left: parent.left
right: parent.right
}
font.pixelSize:Theme.fontSizeLarge
font.pixelSize:Theme.fontSizeMedium
color:Theme.textColor
elide:Text.ElideRight
verticalAlignment:Text.AlignVCenter
......@@ -308,7 +308,7 @@ Item {
top:mainLabel.bottom
left:mainLabel.left
}
font.pixelSize:Theme.fontSizeSmall
font.pixelSize:Theme.fontSizeTiny
color:Theme.textColor
elide:Text.ElideRight
verticalAlignment:Text.AlignVCenter
......
......@@ -83,15 +83,6 @@ MouseArea {
script: switcherItemRoot.close()
}
}
Label {
anchors {
top: parent.top
horizontalCenter: parent.horizontalCenter
topMargin: 30
}
font.pointSize: 8
text: Lipstick.compositor.windowForId(model.window).title
}
CloseButton {
id: closeButton
......
......@@ -95,7 +95,7 @@ MouseArea {
text: modelData.summary
width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge
color: Theme.textColor
font.pixelSize: Theme.fontSizeLarge
font.pixelSize: Theme.fontSizeSmall
//font.bold :true
//font.capitalization: Font.AllUppercase
......@@ -112,7 +112,7 @@ MouseArea {
width: (rootitem.width-appIcon.width)-Theme.itemSpacingHuge
text: modelData.body
color: Theme.textColor
font.pixelSize: Theme.fontSizeMedium
font.pixelSize: Theme.fontSizeSmall
anchors{
left: appName.left
top: appSummary.bottom
......
......@@ -144,7 +144,7 @@ Item {
rightMargin: notificationArea.notificationMargin
//bottomMargin: notificationArea.notificationMargin
}
font.pixelSize: Theme.fontSizeLarge
font.pixelSize: Theme.fontSizeMedium
text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewSummary : ""
color: Theme.textColor
clip: true
......@@ -159,7 +159,7 @@ Item {
right: summary.right
}
font {
pixelSize: Theme.fontSizeMedium
pixelSize: Theme.fontSizeSmall
bold: true
}
text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewBody : ""
......
......@@ -92,7 +92,7 @@ Rectangle {
leftMargin: Theme.itemSpacingLarge
}
wrapMode: Text.Wrap
font.pointSize: 8
font.pixelSize: Theme.fontSizeMedium
font.bold: true
color: "#ffffff"
}
......
......@@ -84,7 +84,7 @@ Component {
verticalCenter: statusImage.verticalCenter
}
width: root.width
font.pixelSize: Theme.fontSizeMedium
font.pixelSize: Theme.fontSizeSmall
text: modelData.name
wrapMode: Text.Wrap
color: modelData.state === "online" ? Theme.accentColor : Theme.textColor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment