diff --git a/settings_offline.conf b/settings_offline.conf index da7fcff..64a4974 100644 --- a/settings_offline.conf +++ b/settings_offline.conf @@ -12,8 +12,8 @@ instances: config: packages_offline.conf - id: offline - module: welcome - config: welcome_offline.conf + module: welcomeq + config: welcomeq_offline.conf - id: offline module: eos_bootloader @@ -86,7 +86,7 @@ instances: sequence: - show: - - welcome@offline + - welcomeq@offline - locale - keyboard - packagechooserq diff --git a/settings_online.conf b/settings_online.conf index e0da7b3..766ce98 100644 --- a/settings_online.conf +++ b/settings_online.conf @@ -12,8 +12,8 @@ instances: config: packages_online.conf - id: online - module: welcome - config: welcome_online.conf + module: welcomeq + config: welcomeq_online.conf # - shellprocess_copy_packages_dont_chroot - id: copy_packages_dont_chroot @@ -92,7 +92,7 @@ instances: sequence: - show: - - welcome@online + - welcomeq@online - locale - keyboard # - packagechooser diff --git a/src/modules/welcome/welcome.conf b/src/modules/welcome/welcome.conf index 896f4b2..c0637c9 100644 --- a/src/modules/welcome/welcome.conf +++ b/src/modules/welcome/welcome.conf @@ -36,7 +36,7 @@ requirements: # Use a privacy-respecting URL here, preferably in your distro's domain. # # The URL is only used if "internet" is in the *check* list below. - internetCheckUrl: + internetCheckUrl: - https://melawy.ru/installation - https://google.com # @@ -78,7 +78,7 @@ requirements: - storage - ram - power - - internet + #- internet - root - screen @@ -90,7 +90,7 @@ requirements: - storage - ram - root - - internet + #- internet # GeoIP checking # diff --git a/src/modules/welcome/welcome_offline.conf b/src/modules/welcome/welcome_offline.conf index f0103f0..c0637c9 100644 --- a/src/modules/welcome/welcome_offline.conf +++ b/src/modules/welcome/welcome_offline.conf @@ -36,7 +36,7 @@ requirements: # Use a privacy-respecting URL here, preferably in your distro's domain. # # The URL is only used if "internet" is in the *check* list below. - internetCheckUrl: + internetCheckUrl: - https://melawy.ru/installation - https://google.com # diff --git a/src/modules/welcome/welcome_online.conf b/src/modules/welcome/welcome_online.conf index 896f4b2..62d63d6 100644 --- a/src/modules/welcome/welcome_online.conf +++ b/src/modules/welcome/welcome_online.conf @@ -36,7 +36,7 @@ requirements: # Use a privacy-respecting URL here, preferably in your distro's domain. # # The URL is only used if "internet" is in the *check* list below. - internetCheckUrl: + internetCheckUrl: - https://melawy.ru/installation - https://google.com # diff --git a/src/modules/welcomeq/img/chevron-left-solid.svg b/src/modules/welcomeq/img/chevron-left-solid.svg new file mode 100644 index 0000000..41061c2 --- /dev/null +++ b/src/modules/welcomeq/img/chevron-left-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/modules/welcomeq/img/language-icon-48px.png b/src/modules/welcomeq/img/language-icon-48px.png new file mode 100644 index 0000000..4012a4b Binary files /dev/null and b/src/modules/welcomeq/img/language-icon-48px.png differ diff --git a/src/modules/welcomeq/img/squid.png b/src/modules/welcomeq/img/squid.png new file mode 100644 index 0000000..452e445 Binary files /dev/null and b/src/modules/welcomeq/img/squid.png differ diff --git a/src/modules/welcomeq/welcomeq.conf b/src/modules/welcomeq/welcomeq.conf new file mode 100644 index 0000000..86c95b1 --- /dev/null +++ b/src/modules/welcomeq/welcomeq.conf @@ -0,0 +1,45 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the welcomeq module. +# +# The configuration for welcomeq is exactly the same +# as the welcome module, with the one exception of +# *qmlSearch* which governs QML loading. +# +# No documentation is given here: look in the welcome module. +--- +# Setting for QML loading: use QRC, branding, or both sources of files +qmlSearch: both + +# Everythin below here is documented in `welcome.conf` +showSupportUrl: false +showKnownIssuesUrl: false +showReleaseNotesUrl: false +showDonateUrl: false + +requirements: + requiredStorage: 150.0 + requiredRam: 4.0 + internetCheckUrl: + - https://melawy.ru/installation + - https://google.com + check: + - storage + - ram + - power +# - internet + - root + - screen + required: + - storage + - ram + - root + #- internet + +geoip: + style: "xml" + url: "https://geoip.kde.org/v1/ubiquity" # extended XML format + selector: "CountryCode" # blank uses default, which is wrong + +#languageIcon: languages diff --git a/src/modules/welcomeq/welcomeq_offline.conf b/src/modules/welcomeq/welcomeq_offline.conf new file mode 100644 index 0000000..86c95b1 --- /dev/null +++ b/src/modules/welcomeq/welcomeq_offline.conf @@ -0,0 +1,45 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the welcomeq module. +# +# The configuration for welcomeq is exactly the same +# as the welcome module, with the one exception of +# *qmlSearch* which governs QML loading. +# +# No documentation is given here: look in the welcome module. +--- +# Setting for QML loading: use QRC, branding, or both sources of files +qmlSearch: both + +# Everythin below here is documented in `welcome.conf` +showSupportUrl: false +showKnownIssuesUrl: false +showReleaseNotesUrl: false +showDonateUrl: false + +requirements: + requiredStorage: 150.0 + requiredRam: 4.0 + internetCheckUrl: + - https://melawy.ru/installation + - https://google.com + check: + - storage + - ram + - power +# - internet + - root + - screen + required: + - storage + - ram + - root + #- internet + +geoip: + style: "xml" + url: "https://geoip.kde.org/v1/ubiquity" # extended XML format + selector: "CountryCode" # blank uses default, which is wrong + +#languageIcon: languages diff --git a/src/modules/welcomeq/welcomeq_online.conf b/src/modules/welcomeq/welcomeq_online.conf new file mode 100644 index 0000000..a5cfc31 --- /dev/null +++ b/src/modules/welcomeq/welcomeq_online.conf @@ -0,0 +1,45 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration for the welcomeq module. +# +# The configuration for welcomeq is exactly the same +# as the welcome module, with the one exception of +# *qmlSearch* which governs QML loading. +# +# No documentation is given here: look in the welcome module. +--- +# Setting for QML loading: use QRC, branding, or both sources of files +qmlSearch: both + +# Everythin below here is documented in `welcome.conf` +showSupportUrl: false +showKnownIssuesUrl: false +showReleaseNotesUrl: false +showDonateUrl: false + +requirements: + requiredStorage: 150.0 + requiredRam: 4.0 + internetCheckUrl: + - https://melawy.ru/installation + - https://google.com + check: + - storage + - ram + - power + - internet + - root + - screen + required: + - storage + - ram + - root + - internet + +geoip: + style: "xml" + url: "https://geoip.kde.org/v1/ubiquity" # extended XML format + selector: "CountryCode" # blank uses default, which is wrong + +#languageIcon: languages