lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #850 from notiant/patch-1

Browse Source 
LockScreen: Re-add some reverted changes
This commit is contained in:
Lysec
2025-11-25 01:49:40 +01:00
committed by GitHub
parent 8afb6cfb6a d28c89afcd
commit 6b5a2d2339
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/LockScreen/LockScreen.qml
+7 -9
View File
@@ -344,14 +344,14 @@ Loader {
var lang = I18n.locale.name.split("_")[0];
var formats = {
"de": "dddd, d. MMMM",
"en": "dddd, MMMM d",
"es": "dddd, d 'de' MMMM",
"fr": "dddd d MMMM",
"nl": "dddd d MMMM",
"pt": "dddd, d 'de' MMMM",
"zh": "yyyy年M月d日 dddd",
"uk": "dddd, d MMMM",
"tr": "dddd, d MMMM"
"zh": "yyyy年M月d日 dddd"
};
return I18n.locale.toString(Time.now, formats[lang] || "dddd, MMMM d");
return I18n.locale.toString(Time.now, formats[lang] || "dddd, d MMMM");
}
pointSize: Style.fontSizeXL
font.weight: Font.Medium
@@ -525,7 +525,7 @@ Loader {
}
Text {
id: hibernateText
text: I18n.tr("session-menu.hibernate")
text: Settings.data.general.showHibernateOnLockScreen ? I18n.tr("session-menu.hibernate") : ""
font.pointSize: buttonRowTextMeasurer.fontSize
font.weight: Font.Medium
}
@@ -752,7 +752,7 @@ Loader {
}
}
// 3-day forecast
// Forecast
RowLayout {
visible: Settings.data.location.weatherEnabled && LocationService.data.weather !== null
Layout.preferredWidth: 260
@@ -760,7 +760,7 @@ Loader {
spacing: 4
Repeater {
model: 3
model: MediaService.currentPlayer && MediaService.canPlay ? 3 : 4
delegate: ColumnLayout {
Layout.fillWidth: true
spacing: 3
@@ -807,8 +807,6 @@ Loader {
Item {
Layout.fillWidth: true
visible: !(Settings.data.location.weatherEnabled && LocationService.data.weather !== null)
Layout.preferredWidth: visible ? 1 : 0
}
// Battery and Keyboard Layout (full mode only)