diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml --- a/lookandfeel/contents/components/ActionButton.qml +++ b/lookandfeel/contents/components/ActionButton.qml @@ -30,6 +30,7 @@ property alias labelRendering: label.renderType property alias circleOpacity: iconCircle.opacity property alias circleVisiblity: iconCircle.visible + property int fontSize: config.fontSize readonly property bool softwareRendering: GraphicsInfo.api === GraphicsInfo.Software signal clicked @@ -79,7 +80,7 @@ PlasmaComponents.Label { id: label - font.pointSize: theme.defaultFont.pointSize + 1 + font.pointSize: Math.max(fontSize + 1,theme.defaultFont.pointSize + 1) anchors { top: icon.bottom topMargin: (softwareRendering ? 1.5 : 1) * units.smallSpacing diff --git a/lookandfeel/contents/components/Battery.qml b/lookandfeel/contents/components/Battery.qml --- a/lookandfeel/contents/components/Battery.qml +++ b/lookandfeel/contents/components/Battery.qml @@ -45,6 +45,7 @@ PlasmaComponents.Label { id: batteryLabel + font.pointSize: config.fontSize height: undefined text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","%1%", battery.percent) Accessible.name: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Battery at %1%", battery.percent) diff --git a/lookandfeel/contents/components/KeyboardLayoutButton.qml b/lookandfeel/contents/components/KeyboardLayoutButton.qml --- a/lookandfeel/contents/components/KeyboardLayoutButton.qml +++ b/lookandfeel/contents/components/KeyboardLayoutButton.qml @@ -25,11 +25,15 @@ import org.kde.plasma.workspace.keyboardlayout 1.0 PlasmaComponents.ToolButton { + + property int fontSize: config.fontSize + id: kbLayoutButton iconName: "input-keyboard" implicitWidth: minimumWidth text: layout.currentLayoutDisplayName + font.pointSize: Math.max(fontSize,theme.defaultFont.pointSize) Accessible.name: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "Button to change keyboard layout", "Switch layout") diff --git a/lookandfeel/contents/components/SessionManagementScreen.qml b/lookandfeel/contents/components/SessionManagementScreen.qml --- a/lookandfeel/contents/components/SessionManagementScreen.qml +++ b/lookandfeel/contents/components/SessionManagementScreen.qml @@ -61,6 +61,8 @@ property alias userList: userListView + property int fontSize: config.fontSize + default property alias _children: innerLayout.children UserList { @@ -85,6 +87,7 @@ anchors.bottom: parent.bottom PlasmaComponents.Label { id: notificationsLabel + font.pointSize: Math.max(fontSize + 1,theme.defaultFont.pointSize + 1) Layout.maximumWidth: units.gridUnit * 16 Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml --- a/lookandfeel/contents/components/UserDelegate.qml +++ b/lookandfeel/contents/components/UserDelegate.qml @@ -37,6 +37,8 @@ property string avatarPath property string iconSource property bool constrainText: true + property alias nameFontSize: usernameDelegate.font.pointSize + property int fontSize: config.fontSize signal clicked() property real faceSize: Math.min(width, height - usernameDelegate.height - units.smallSpacing) @@ -159,7 +161,7 @@ PlasmaComponents.Label { id: usernameDelegate - font.pointSize: theme.defaultFont.pointSize + 2 + font.pointSize: Math.max(fontSize + 2,theme.defaultFont.pointSize + 2) anchors { bottom: parent.bottom horizontalCenter: parent.horizontalCenter diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml --- a/lookandfeel/contents/lockscreen/LockScreenUi.qml +++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml @@ -417,6 +417,7 @@ PlasmaComponents.Button { Layout.fillWidth: true + font.pointSize: theme.defaultFont.pointSize + 1 // the magic "-1" vtNumber indicates the "New Session" entry text: userListCurrentModelData.vtNumber === -1 ? i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Start New Session") : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Switch Session") onClicked: initSwitchSession() diff --git a/lookandfeel/contents/lockscreen/MediaControls.qml b/lookandfeel/contents/lockscreen/MediaControls.qml --- a/lookandfeel/contents/lockscreen/MediaControls.qml +++ b/lookandfeel/contents/lockscreen/MediaControls.qml @@ -114,11 +114,12 @@ PlasmaExtras.Heading { Layout.fillWidth: true - level: 4 + level: 5 wrapMode: Text.NoWrap elide: Text.ElideRight text: mpris2Source.track || i18n("No media playing") textFormat: Text.PlainText + font.weight: Font.Bold } PlasmaExtras.Heading { @@ -129,6 +130,7 @@ // if no artist is given, show player name instead text: mpris2Source.artist || mpris2Source.identity || "" textFormat: Text.PlainText + opacity: 0.75 } } diff --git a/lookandfeel/contents/logout/Logout.qml b/lookandfeel/contents/logout/Logout.qml --- a/lookandfeel/contents/logout/Logout.qml +++ b/lookandfeel/contents/logout/Logout.qml @@ -119,6 +119,7 @@ UserDelegate { width: units.iconSizes.enormous height: width + nameFontSize: theme.defaultFont.pointSize + 2 anchors { horizontalCenter: parent.horizontalCenter bottom: parent.verticalCenter diff --git a/lookandfeel/contents/logout/LogoutButton.qml b/lookandfeel/contents/logout/LogoutButton.qml --- a/lookandfeel/contents/logout/LogoutButton.qml +++ b/lookandfeel/contents/logout/LogoutButton.qml @@ -35,6 +35,7 @@ opacity: activeFocus || containsMouse ? 1 : 0.5 labelRendering: Text.QtRendering // Remove once we've solved Qt bug: https://bugreports.qt.io/browse/QTBUG-70138 (KDE bug: https://bugs.kde.org/show_bug.cgi?id=401644) font.underline: false + font.pointSize: theme.defaultFont.pointSize + 1 Behavior on opacity { OpacityAnimator { duration: units.longDuration diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml --- a/sddm-theme/KeyboardButton.qml +++ b/sddm-theme/KeyboardButton.qml @@ -12,6 +12,7 @@ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName) implicitWidth: minimumWidth + font.pointSize: config.fontSize visible: menu.items.length > 1 diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml --- a/sddm-theme/Login.qml +++ b/sddm-theme/Login.qml @@ -19,6 +19,8 @@ property int visibleBoundary: mapFromItem(loginButton, 0, 0).y onHeightChanged: visibleBoundary = mapFromItem(loginButton, 0, 0).y + loginButton.height + units.smallSpacing + property int fontSize: config.fontSize + signal loginRequest(string username, string password) onShowUsernamePromptChanged: { @@ -44,7 +46,7 @@ PlasmaComponents.TextField { id: userNameInput - font.pointSize: theme.defaultFont.pointSize + 1 + font.pointSize: fontSize + 1 Layout.fillWidth: true text: lastUserName @@ -63,7 +65,7 @@ PlasmaComponents.TextField { id: passwordBox - font.pointSize: theme.defaultFont.pointSize + 1 + font.pointSize: fontSize + 1 Layout.fillWidth: true placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password") diff --git a/sddm-theme/SessionButton.qml b/sddm-theme/SessionButton.qml --- a/sddm-theme/SessionButton.qml +++ b/sddm-theme/SessionButton.qml @@ -34,6 +34,8 @@ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).text || "") + font.pointSize: config.fontSize + Component.onCompleted: { currentIndex = sessionModel.lastIndex } diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake @@ -1,4 +1,5 @@ [General] type=image color=#1d99f3 +fontSize=10 background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png