napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'calamares' into work-3.3

Browse Source
This commit is contained in:
Adriaan de Groot 2022-05-04 00:18:44 +02:00
commit ee1232b10a
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/displaymanager/main.py
View File

@ -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

4
src/modules/keyboardq/keyboardq.qml
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2020 - 2022 Anke Boersma <demm@kaosx.us>
* 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 {

4
src/modules/localeq/Offline.qml
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2020-2021 Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2020-2022 Anke Boersma <demm@kaosx.us>
* 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 {

6
src/modules/usersq/usersq.qml
View File

@ -1,6 +1,6 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2020 - 2021 Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2020 - 2022 Anke Boersma <demm@kaosx.us>
* SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
* 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.")