mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-06-24 03:55:23 -04:00
fix: UI polishes, uptime formatting, and missing i18n strings (#2686)
* Update CompositorLayoutTab.qml * add missing i18n strings * fix context menu overflow and strip uptime prefix * fix settings index --------- Co-authored-by: bbedward <bbedward@gmail.com>
This commit is contained in:
@@ -512,7 +512,7 @@ FloatingWindow {
|
|||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
text: DgopService.shortUptime || "--"
|
text: DgopService.shortUptime ? DgopService.shortUptime.slice(2) : "--"
|
||||||
font.pixelSize: Theme.fontSizeSmall
|
font.pixelSize: Theme.fontSizeSmall
|
||||||
font.weight: Font.Bold
|
font.weight: Font.Bold
|
||||||
color: Theme.surfaceText
|
color: Theme.surfaceText
|
||||||
|
|||||||
@@ -281,6 +281,8 @@ Popup {
|
|||||||
Row {
|
Row {
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: Theme.spacingS
|
anchors.leftMargin: Theme.spacingS
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: Theme.spacingS
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
spacing: Theme.spacingS
|
spacing: Theme.spacingS
|
||||||
|
|
||||||
@@ -311,6 +313,8 @@ Popup {
|
|||||||
return Theme.surfaceText;
|
return Theme.surfaceText;
|
||||||
}
|
}
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
|
elide: Text.ElideRight
|
||||||
|
width: parent.width - 16 - Theme.spacingS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ Item {
|
|||||||
}
|
}
|
||||||
InfoRow {
|
InfoRow {
|
||||||
label: I18n.tr("Uptime")
|
label: I18n.tr("Uptime")
|
||||||
value: DgopService.uptime || "--"
|
value: DgopService.uptime ? DgopService.uptime.slice(3) : "--"
|
||||||
}
|
}
|
||||||
InfoRow {
|
InfoRow {
|
||||||
label: I18n.tr("Load Average", "system info label")
|
label: I18n.tr("Load Average", "system info label")
|
||||||
|
|||||||
@@ -14,8 +14,7 @@ Item {
|
|||||||
Column {
|
Column {
|
||||||
id: layoutColumn
|
id: layoutColumn
|
||||||
|
|
||||||
topPadding: Theme.spacingXL
|
topPadding: 4
|
||||||
bottomPadding: Theme.spacingXL
|
|
||||||
width: Math.min(550, parent.width - Theme.spacingL * 2)
|
width: Math.min(550, parent.width - Theme.spacingL * 2)
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
spacing: Theme.spacingXL
|
spacing: Theme.spacingXL
|
||||||
|
|||||||
@@ -155,7 +155,7 @@ Item {
|
|||||||
tags: ["date", "format", "topbar"]
|
tags: ["date", "format", "topbar"]
|
||||||
settingKey: "clockDateFormat"
|
settingKey: "clockDateFormat"
|
||||||
text: I18n.tr("Top Bar Format")
|
text: I18n.tr("Top Bar Format")
|
||||||
description: "Preview: " + (SettingsData.clockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat) : new Date().toLocaleDateString(I18n.locale(), "ddd d"))
|
description: I18n.tr("Preview: %1").arg(SettingsData.clockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.clockDateFormat) : new Date().toLocaleDateString(I18n.locale(), "ddd d"))
|
||||||
options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
|
options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
|
||||||
currentValue: {
|
currentValue: {
|
||||||
if (!SettingsData.clockDateFormat || SettingsData.clockDateFormat.length === 0)
|
if (!SettingsData.clockDateFormat || SettingsData.clockDateFormat.length === 0)
|
||||||
@@ -242,7 +242,7 @@ Item {
|
|||||||
tags: ["date", "format", "lock", "screen"]
|
tags: ["date", "format", "lock", "screen"]
|
||||||
settingKey: "lockDateFormat"
|
settingKey: "lockDateFormat"
|
||||||
text: I18n.tr("Lock Screen Format")
|
text: I18n.tr("Lock Screen Format")
|
||||||
description: "Preview: " + (SettingsData.lockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.lockDateFormat) : new Date().toLocaleDateString(I18n.locale(), Locale.LongFormat))
|
description: I18n.tr("Preview: %1").arg(SettingsData.lockDateFormat ? new Date().toLocaleDateString(I18n.locale(), SettingsData.lockDateFormat) : new Date().toLocaleDateString(I18n.locale(), Locale.LongFormat))
|
||||||
options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
|
options: [I18n.tr("System Default", "date format option"), I18n.tr("Day Date", "date format option"), I18n.tr("Day Month Date", "date format option"), I18n.tr("Month Date", "date format option"), I18n.tr("Numeric (M/D)", "date format option"), I18n.tr("Numeric (D/M)", "date format option"), I18n.tr("Full with Year", "date format option"), I18n.tr("ISO Date", "date format option"), I18n.tr("Full Day & Month", "date format option"), I18n.tr("Custom...", "date format option")]
|
||||||
currentValue: {
|
currentValue: {
|
||||||
if (!SettingsData.lockDateFormat || SettingsData.lockDateFormat.length === 0)
|
if (!SettingsData.lockDateFormat || SettingsData.lockDateFormat.length === 0)
|
||||||
|
|||||||
@@ -529,7 +529,8 @@
|
|||||||
"security",
|
"security",
|
||||||
"time",
|
"time",
|
||||||
"weather"
|
"weather"
|
||||||
]
|
],
|
||||||
|
"description": "Preview: %1"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"section": "padHours12Hour",
|
"section": "padHours12Hour",
|
||||||
@@ -646,7 +647,8 @@
|
|||||||
"top",
|
"top",
|
||||||
"topbar",
|
"topbar",
|
||||||
"weather"
|
"weather"
|
||||||
]
|
],
|
||||||
|
"description": "Preview: %1"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"section": "useFahrenheit",
|
"section": "useFahrenheit",
|
||||||
|
|||||||
Reference in New Issue
Block a user