Commit 26023413 authored by eekkelund's avatar eekkelund

[Scaling] Request to change fontSize to font.pixelSize

parent b2030497
...@@ -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.fontSizeLarge font.pixelSize: Theme.fontSizeSmall
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.fontSizeLarge font.pixelSize: Theme.fontSizeSmall
elide:Text.ElideRight elide:Text.ElideRight
horizontalAlignment:Text.AlignHCenter horizontalAlignment:Text.AlignHCenter
verticalAlignment:Text.AlignVCenter verticalAlignment:Text.AlignVCenter
......
...@@ -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.fontSizeExtraLarge font.pixelSize: Theme.fontSizeLarge
} }
} }
Flickable { Flickable {
......
...@@ -51,14 +51,14 @@ Item { ...@@ -51,14 +51,14 @@ Item {
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: Theme.itemSpacingLarge spacing: Theme.itemSpacingExtraSmall
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.fontSizeExtraLarge font.pixelSize: Theme.fontSizeMedium
} }
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 {
id: btnLabel
text: modelData text: modelData
font.pixelSize: Theme.fontSizeExtraLarge * 1.5
anchors {
centerIn: parent
}
}
onClicked: { onClicked: {
if (btnLabel.text !== "Ca" && btnLabel.text !== "OK") { if (button.text !== "Ca" && button.text !== "OK") {
lockCodeField.insert(lockCodeField.cursorPosition, btnLabel.text) lockCodeField.insert(lockCodeField.cursorPosition, button.text)
} else { } else {
if (btnLabel.text === "OK") { if (button.text === "OK") {
authenticator.enterLockCode(lockCodeField.text) authenticator.enterLockCode(lockCodeField.text)
lockCodeField.text = "" lockCodeField.text = ""
} else if (btnLabel.text === "Ca"){ } else if (button.text === "Ca"){
lockCodeField.text = "" lockCodeField.text = ""
} }
} }
......
...@@ -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.fontSizeExtraLarge 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.fontSizeExtraLarge font.pixelSize: Theme.fontSizeLarge
color: Theme.textColor color: Theme.textColor
font.weight: Font.Light font.weight: Font.Light
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
......
...@@ -51,7 +51,7 @@ Rectangle { ...@@ -51,7 +51,7 @@ Rectangle {
Label { Label {
id: weekdayDisplay id: weekdayDisplay
font.pixelSize: Theme.fontSizeLarge font.pixelSize: Theme.fontSizeMedium
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.fontSizeLarge font.pixelSize: Theme.fontSizeMedium
color: Theme.textColor color: Theme.textColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.weight: Font.Light font.weight: Font.Light
......
...@@ -108,7 +108,7 @@ Item { ...@@ -108,7 +108,7 @@ Item {
} }
font.capitalization: Font.AllUppercase font.capitalization: Font.AllUppercase
font.pixelSize: Theme.fontSizeMedium font.pixelSize: Theme.fontSizeSmall
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.fontSizeLarge font.pixelSize:Theme.fontSizeMedium
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.fontSizeSmall font.pixelSize:Theme.fontSizeTiny
color:Theme.textColor color:Theme.textColor
elide:Text.ElideRight elide:Text.ElideRight
verticalAlignment:Text.AlignVCenter verticalAlignment:Text.AlignVCenter
......
...@@ -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
......
...@@ -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.fontSizeLarge font.pixelSize: Theme.fontSizeSmall
//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.fontSizeMedium font.pixelSize: Theme.fontSizeSmall
anchors{ anchors{
left: appName.left left: appName.left
top: appSummary.bottom top: appSummary.bottom
......
...@@ -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.fontSizeLarge font.pixelSize: Theme.fontSizeMedium
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.fontSizeMedium pixelSize: Theme.fontSizeSmall
bold: true bold: true
} }
text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewBody : "" text: notificationPreviewPresenter.notification != null ? notificationPreviewPresenter.notification.previewBody : ""
......
...@@ -92,7 +92,7 @@ Rectangle { ...@@ -92,7 +92,7 @@ Rectangle {
leftMargin: Theme.itemSpacingLarge leftMargin: Theme.itemSpacingLarge
} }
wrapMode: Text.Wrap wrapMode: Text.Wrap
font.pointSize: 8 font.pixelSize: Theme.fontSizeMedium
font.bold: true font.bold: true
color: "#ffffff" color: "#ffffff"
} }
......
...@@ -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.fontSizeMedium font.pixelSize: Theme.fontSizeSmall
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
......
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