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 @@ -79,7 +79,6 @@ PlasmaComponents.Label { id: label - font.pointSize: theme.defaultFont.pointSize + 1 anchors { top: icon.bottom topMargin: (softwareRendering ? 1.5 : 1) * units.smallSpacing 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 @@ -30,7 +30,6 @@ readonly property bool softwareRendering: GraphicsInfo.api === GraphicsInfo.Software property bool isCurrent: true - readonly property var m: model property string name property string userName @@ -159,7 +158,7 @@ PlasmaComponents.Label { id: usernameDelegate - font.pointSize: theme.defaultFont.pointSize + 2 + font.pointSize: config.UsernameSize || 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 @@ -248,6 +248,7 @@ actionItems: [ ActionButton { text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Switch User") + font.pointSize: theme.defaultFont.pointSize + 1 iconSource: "system-switch-user" onClicked: mainStack.push(switchSessionPage) // the current session isn't listed in the model, hence a check for greater than zero, not one @@ -417,6 +418,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() @@ -426,6 +428,7 @@ ActionButton { iconSource: "go-previous" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Back") + font.pointSize: theme.defaultFont.pointSize + 1 onClicked: mainStack.pop() } ] 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,16 +114,16 @@ PlasmaExtras.Heading { Layout.fillWidth: true - level: 4 + level: 3 wrapMode: Text.NoWrap elide: Text.ElideRight text: mpris2Source.track || i18n("No media playing") textFormat: Text.PlainText } PlasmaExtras.Heading { Layout.fillWidth: true - level: 5 + level: 4 wrapMode: Text.NoWrap elide: Text.ElideRight // if no artist is given, show player name instead 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 @@ -28,6 +28,7 @@ ActionButton { property var action onClicked: action() + font.pointSize: theme.defaultFont.pointSize + 1 Layout.alignment: Qt.AlignTop iconSize: units.iconSizes.huge circleVisiblity: activeFocus || containsMouse 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: 10 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 @@ -44,7 +44,7 @@ PlasmaComponents.TextField { id: userNameInput - font.pointSize: theme.defaultFont.pointSize + 1 + font.pointSize: 11 Layout.fillWidth: true text: lastUserName @@ -63,7 +63,7 @@ PlasmaComponents.TextField { id: passwordBox - font.pointSize: theme.defaultFont.pointSize + 1 + font.pointSize: 11 Layout.fillWidth: true placeholderText: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Password") diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml --- a/sddm-theme/Main.qml +++ b/sddm-theme/Main.qml @@ -201,27 +201,31 @@ ActionButton { iconSource: "system-suspend" text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel","Suspend to RAM","Sleep") + font.pointSize: 11 onClicked: sddm.suspend() enabled: sddm.canSuspend visible: !inputPanel.keyboardActive }, ActionButton { iconSource: "system-reboot" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Restart") + font.pointSize: 11 onClicked: sddm.reboot() enabled: sddm.canReboot visible: !inputPanel.keyboardActive }, ActionButton { iconSource: "system-shutdown" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Shut Down") + font.pointSize: 11 onClicked: sddm.powerOff() enabled: sddm.canPowerOff visible: !inputPanel.keyboardActive }, ActionButton { iconSource: "system-user-prompt" text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel", "For switching to a username and password prompt", "Other...") + font.pointSize: 11 onClicked: mainStack.push(userPromptComponent) enabled: true visible: !userListComponent.showUsernamePrompt && !inputPanel.keyboardActive @@ -374,27 +378,31 @@ ActionButton { iconSource: "system-suspend" text: i18ndc("plasma_lookandfeel_org.kde.lookandfeel","Suspend to RAM","Sleep") + font.pointSize: 11 onClicked: sddm.suspend() enabled: sddm.canSuspend visible: !inputPanel.keyboardActive }, ActionButton { iconSource: "system-reboot" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Restart") + font.pointSize: 11 onClicked: sddm.reboot() enabled: sddm.canReboot visible: !inputPanel.keyboardActive }, ActionButton { iconSource: "system-shutdown" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","Shut Down") + font.pointSize: 11 onClicked: sddm.powerOff() enabled: sddm.canPowerOff visible: !inputPanel.keyboardActive }, ActionButton { iconSource: "system-user-list" text: i18nd("plasma_lookandfeel_org.kde.lookandfeel","List Users") + font.pointSize: 11 onClicked: mainStack.pop() visible: !inputPanel.keyboardActive } 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: 10 + 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 +UsernameSize=12 background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png