Merge pull request #62 from eekkelund/fontScaling

[Scaling] Request to change fontSize to font.pixelSize

src/qml/AppLauncher.qml

@@ -222,7 +222,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
@@ -249,7 +249,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

src/qml/AppSwitcher.qml

@@ -67,7 +67,7 @@ Item {
                 left: parent.left
             }
             font.weight: Font.Light
-            font.pixelSize: Theme.fontSizeExtraLarge
+            font.pixelSize: Theme.fontSizeLarge
         }
     }
     Flickable {

src/qml/DeviceLockUI.qml

@@ -55,7 +55,7 @@ Item {
 
     ColumnLayout {
         anchors.fill: parent
-        spacing: Theme.itemSpacingLarge
+        spacing: Theme.itemSpacingExtraSmall
 
         SequentialAnimation  {
             id: animation;
@@ -77,7 +77,7 @@ Item {
             anchors.horizontalCenter: parent.horizontalCenter
             readOnly: true
             echoMode: TextInput.PasswordEchoOnEdit
-            font.pixelSize: Theme.fontSizeExtraLarge
+            font.pixelSize: Theme.fontSizeMedium
         }
 
         GridLayout {
@@ -90,27 +90,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
-                        text: modelData
-                        font.pixelSize: Theme.fontSizeExtraLarge * 1.5
-                        anchors {
-                            centerIn: parent
-                        }
-                    }
-
+                    id:button
+                    Layout.maximumWidth: Theme.itemWidthSmall
+                    Layout.maximumHeight: Theme.itemHeightHuge * 2
+                    Layout.minimumHeight: Theme.itemHeightHuge * 1.5
+                    text: modelData
                     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 = ""
                             }
                         }

src/qml/FeedsPage.qml

@@ -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

src/qml/LockscreenClock.qml

@@ -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

src/qml/SearchListView.qml

@@ -107,7 +107,7 @@ Item {
                     }
 
                     font.capitalization: Font.AllUppercase
-                    font.pixelSize: Theme.fontSizeMedium
+                    font.pixelSize: Theme.fontSizeSmall
                     color: Theme.textColor
                     anchors{
                         left: parent.left
@@ -294,7 +294,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
@@ -306,7 +306,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

src/qml/SwitcherItem.qml

@@ -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

src/qml/notifications/NotificationItem.qml

@@ -102,7 +102,7 @@ MouseArea {
         text: modelData.summary
         width: (parent.width-appIcon.width)-Theme.itemSpacingHuge
         color: Theme.textColor
-        font.pixelSize: Theme.fontSizeLarge
+        font.pixelSize: Theme.fontSizeSmall
         //font.bold :true
         //font.capitalization: Font.AllUppercase
 
@@ -119,7 +119,7 @@ MouseArea {
         width: (parent.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

src/qml/notifications/NotificationPreview.qml

@@ -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 : ""

src/qml/statusbar/CommonPanel.qml

@@ -92,7 +92,7 @@ Rectangle {
                 leftMargin: Theme.itemSpacingLarge
             }
             wrapMode: Text.Wrap
-            font.pointSize: 8
+            font.pixelSize: Theme.fontSizeMedium
             font.bold: true
             color: "#ffffff"
         }

src/qml/statusbar/WifiPanel.qml

@@ -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