diff --git a/applets/digital-clock/package/contents/config/main.xml b/applets/digital-clock/package/contents/config/main.xml --- a/applets/digital-clock/package/contents/config/main.xml +++ b/applets/digital-clock/package/contents/config/main.xml @@ -18,6 +18,10 @@ false + + + false + shortDate 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 @@ -33,6 +33,7 @@ property bool showSeconds: plasmoid.configuration.showSeconds property bool showLocalTimezone: plasmoid.configuration.showLocalTimezone property bool showDate: plasmoid.configuration.showDate + property bool showDateAndTimeSameLine: plasmoid.configuration.showDateAndTimeSameLine property int dateFormat: { if (plasmoid.configuration.dateFormat === "longDate") { return Qt.SystemLocaleLongDate; @@ -97,7 +98,7 @@ states: [ State { name: "horizontalPanel" - when: plasmoid.formFactor == PlasmaCore.Types.Horizontal && !main.oneLineMode + when: plasmoid.formFactor == PlasmaCore.Types.Horizontal && !main.oneLineMode && !main.showDateAndTimeSameLine PropertyChanges { target: main @@ -179,7 +180,9 @@ State { name: "horizontalPanelSmall" - when: plasmoid.formFactor == PlasmaCore.Types.Horizontal && main.oneLineMode + when: plasmoid.formFactor == PlasmaCore.Types.Horizontal && main.oneLineMode || + plasmoid.formFactor != PlasmaCore.Types.Vertical && plasmoid.formFactor != PlasmaCore.Types.Horizontal && main.showDateAndTimeSameLine || + plasmoid.formFactor == PlasmaCore.Types.Horizontal && main.showDateAndTimeSameLine PropertyChanges { target: main @@ -327,7 +330,7 @@ State { name: "other" - when: plasmoid.formFactor != PlasmaCore.Types.Vertical && plasmoid.formFactor != PlasmaCore.Types.Horizontal + when: plasmoid.formFactor != PlasmaCore.Types.Vertical && plasmoid.formFactor != PlasmaCore.Types.Horizontal && !main.showDateAndTimeSameLine PropertyChanges { target: main diff --git a/applets/digital-clock/package/contents/ui/configAppearance.qml b/applets/digital-clock/package/contents/ui/configAppearance.qml --- a/applets/digital-clock/package/contents/ui/configAppearance.qml +++ b/applets/digital-clock/package/contents/ui/configAppearance.qml @@ -42,6 +42,8 @@ property alias cfg_showSeconds: showSeconds.checked property alias cfg_showDate: showDate.checked + property alias cfg_showDateAndTimeSameLine: showDateAndTimeSameLine.checked + property string cfg_dateFormat: "shortDate" property alias cfg_use24hFormat: use24hFormat.checkedState @@ -86,6 +88,12 @@ text: i18n("Show date") } + QtControls.CheckBox { + id: showDateAndTimeSameLine + enabled: showDate.checked + text: i18n("Show date and time in the same line") + } + QtControls.CheckBox { id: showSeconds text: i18n("Show seconds")