diff --git a/c/applets/digital-clock/package/contents/config/main.xml b/applets/digital-clock/package/contents/config/main.xml --- a/c/applets/digital-clock/package/contents/config/main.xml +++ b/applets/digital-clock/package/contents/config/main.xml @@ -26,6 +26,10 @@ + + + 19 + false diff --git a/applets/digital-clock/package/contents/ui/DigitalClock.qml b/applets/digital-clock/package/contents/ui/DigitalClock.qml --- a/applets/digital-clock/package/contents/ui/DigitalClock.qml +++ b/applets/digital-clock/package/contents/ui/DigitalClock.qml @@ -155,7 +155,10 @@ PropertyChanges { target: sizehelper - height: Math.min(main.showDate || timezoneLabel.visible ? 0.56 * main.height : main.height, 3 * theme.defaultFont.pixelSize) + // The two line mode (date or timezone visible) should be + // divided by 2 but it gets too small + height: Math.min(main.showDate || timezoneLabel.visible ? units.iconSizes.small / 1.25 : units.iconSizes.small, + 3 * theme.defaultFont.pixelSize) font.pixelSize: sizehelper.height } diff --git a/c/applets/digital-clock/package/contents/ui/configAppearance.qml b/applets/digital-clock/package/contents/ui/configAppearance.qml --- a/c/applets/digital-clock/package/contents/ui/configAppearance.qml +++ b/applets/digital-clock/package/contents/ui/configAppearance.qml @@ -24,6 +24,7 @@ import QtQuick.Controls 1.0 as QtControls import QtQuick.Layouts 1.0 as QtLayouts import org.kde.plasma.calendar 2.0 as PlasmaCalendar +import org.kde.plasma.core 2.0 as PlasmaCore Item { id: appearancePage @@ -33,6 +34,7 @@ signal configurationChanged property string cfg_fontFamily + property alias cfg_fontSize: fontSize.value property alias cfg_boldText: boldCheckBox.checked property string cfg_timeFormat: "" property alias cfg_italicText: italicCheckBox.checked @@ -80,7 +82,7 @@ flat: true QtLayouts.GridLayout { // there's no FormLayout :( - columns: 2 + columns: 3 QtLayouts.Layout.fillWidth: true QtControls.Label { @@ -107,14 +109,22 @@ } } + QtControls.SpinBox { + id: fontSize + minimumValue: 8 + enabled: plasmoid.formFactor != PlasmaCore.Types.Vertical + } + // spacer, cannot do Qt.AlignTop on the font style label + rowSpan 3, otherwise looks odd Item { QtLayouts.Layout.fillWidth: true - QtLayouts.Layout.rowSpan: 2 + QtLayouts.Layout.rowSpan: 1 + QtLayouts.Layout.columnSpan: 3 } QtControls.CheckBox { id: boldCheckBox + QtLayouts.Layout.columnSpan: 3 text: i18n("Bold text") }