From 01cec2e361294aac3107fb221b5ca865a471dbcc Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 27 Apr 2022 12:52:42 +0200 Subject: [PATCH 1/4] [keybaordq] setting line height needed --- src/modules/keyboardq/keyboardq.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/keyboardq/keyboardq.qml b/src/modules/keyboardq/keyboardq.qml index 1d59cf30e..be96ec85a 100644 --- a/src/modules/keyboardq/keyboardq.qml +++ b/src/modules/keyboardq/keyboardq.qml @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma + * SPDX-FileCopyrightText: 2020 - 2022 Anke Boersma * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -137,6 +137,7 @@ Item { hoverEnabled: true width: parent.width + height: 18 highlighted: ListView.isCurrentItem RowLayout { @@ -216,6 +217,7 @@ Item { delegate: ItemDelegate { hoverEnabled: true width: parent.width + height: 18 highlighted: ListView.isCurrentItem RowLayout { From b80fde365b95fa27494e891c04bf465c4a236da2 Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 27 Apr 2022 12:55:18 +0200 Subject: [PATCH 2/4] [localeq] Offline.qml, setting line height needed --- src/modules/localeq/Offline.qml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/localeq/Offline.qml b/src/modules/localeq/Offline.qml index e5e6b31cf..937554cf6 100644 --- a/src/modules/localeq/Offline.qml +++ b/src/modules/localeq/Offline.qml @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * SPDX-FileCopyrightText: 2020-2021 Anke Boersma + * SPDX-FileCopyrightText: 2020-2022 Anke Boersma * SPDX-License-Identifier: GPL-3.0-or-later * * Calamares is Free Software: see the License-Identifier above. @@ -72,6 +72,7 @@ Page { hoverEnabled: true width: parent.width + height: 30 highlighted: ListView.isCurrentItem Label { @@ -146,6 +147,7 @@ Page { hoverEnabled: true width: parent.width + height: 30 highlighted: ListView.isCurrentItem Label { From ade0fc7e197a44bb5b9aec8106787dc3ebf8790e Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 27 Apr 2022 12:59:02 +0200 Subject: [PATCH 3/4] [usersq] add close button to all inline messages --- src/modules/usersq/usersq.qml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modules/usersq/usersq.qml b/src/modules/usersq/usersq.qml index 9d49e6a7d..febdb5be5 100644 --- a/src/modules/usersq/usersq.qml +++ b/src/modules/usersq/usersq.qml @@ -1,6 +1,6 @@ /* === This file is part of Calamares - === * - * SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma + * SPDX-FileCopyrightText: 2020 - 2022 Anke Boersma * SPDX-FileCopyrightText: 2021 Adriaan de Groot * SPDX-License-Identifier: GPL-3.0-or-later * @@ -123,6 +123,7 @@ Kirigami.ScrollablePage { Kirigami.InlineMessage { id: userMessage Layout.fillWidth: true + showCloseButton: true visible: false type: Kirigami.MessageType.Error text: qsTr("Only lowercase letters, numbers, underscore and hyphen are allowed.") @@ -131,6 +132,7 @@ Kirigami.ScrollablePage { Kirigami.InlineMessage { id: forbiddenMessage Layout.fillWidth: true + showCloseButton: true visible: false type: Kirigami.MessageType.Error text: qsTr("root is not allowed as username.") @@ -185,6 +187,7 @@ Kirigami.ScrollablePage { Kirigami.InlineMessage { id: hostMessage Layout.fillWidth: true + showCloseButton: true visible: false type: Kirigami.MessageType.Error text: qsTr("Only letters, numbers, underscore and hyphen are allowed, minimal of two characters.") @@ -193,6 +196,7 @@ Kirigami.ScrollablePage { Kirigami.InlineMessage { id: forbiddenHost Layout.fillWidth: true + showCloseButton: true visible: false type: Kirigami.MessageType.Error text: qsTr("localhost is not allowed as hostname.") From 1ef2fff03ebd1b65dc3fd6fecdfb22c73664f65a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 3 May 2022 11:41:53 +0200 Subject: [PATCH 4/4] [displaymanager] For greetd, write the desktop file name See #1937 --- src/modules/displaymanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/displaymanager/main.py b/src/modules/displaymanager/main.py index 3cfdb069a..d77c0ab6c 100644 --- a/src/modules/displaymanager/main.py +++ b/src/modules/displaymanager/main.py @@ -895,7 +895,7 @@ class DMgreetd(DisplayManager): def desktop_environment_setup(self, default_desktop_environment): with open(self.environments_path(), 'w') as envs_file: - envs_file.write(default_desktop_environment) + envs_file.write(default_desktop_environment.desktop_file) def greeter_setup(self): pass