diff --git a/packages/calamares-extensions/branding/default/branding.desc b/packages/calamares-extensions/branding/default/branding.desc new file mode 100644 index 0000000..ee19628 --- /dev/null +++ b/packages/calamares-extensions/branding/default/branding.desc @@ -0,0 +1,36 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +--- +componentName: default +welcomeStyleCalamares: false +welcomeExpandingLogo: true +windowExpanding: fullscreen +windowPlacement: center +sidebar: none +strings: + productName: deskOS + shortProductName: deskOS + version: 1 + shortVersion: 1 + versionedName: deskOS 1 + shortVersionedName: deskOS 1 + bootloaderEntryName: deskOS + productUrl: https://nixup.io + supportUrl: https://nixup.io + knownIssuesUrl: https://github.com/nixup-io/desk-os/issues + releaseNotesUrl: https://nixup.io + donateUrl: https://nixup.io +images: + productIcon: "desk-os-logo.png" + productLogo: "desk-os-logo.png" +style: + SidebarBackground: "#292F34" + SidebarText: "#FFFFFF" + SidebarTextCurrent: "#292F34" + SidebarBackgroundCurrent: "#D35400" +slideshow: [] +uploadServer : + type: "fiche" + url: "http://termbin.com:9999" + sizeLimit: -1 diff --git a/packages/calamares-extensions/branding/desk_os/desk-os-logo.png b/packages/calamares-extensions/branding/default/desk-os-logo.png similarity index 100% rename from packages/calamares-extensions/branding/desk_os/desk-os-logo.png rename to packages/calamares-extensions/branding/default/desk-os-logo.png diff --git a/packages/calamares-extensions/branding/desk_os/branding.desc b/packages/calamares-extensions/branding/desk_os/branding.desc deleted file mode 100644 index 2c266a8..0000000 --- a/packages/calamares-extensions/branding/desk_os/branding.desc +++ /dev/null @@ -1,233 +0,0 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 -# ---- -componentName: desk_os - - -### WELCOME / OVERALL WORDING -# -# These settings affect some overall phrasing and looks, -# which are most visible in the welcome page. - -# This selects between different welcome texts. When false, uses -# the traditional "Welcome to the %1 installer.", and when true, -# uses "Welcome to the Calamares installer for %1." This allows -# to distinguish this installer from other installers for the -# same distribution. -welcomeStyleCalamares: false - -# Should the welcome image (productWelcome, below) be scaled -# up beyond its natural size? If false, the image does not grow -# with the window but remains the same size throughout (this -# may have surprising effects on HiDPI monitors). -welcomeExpandingLogo: true - -### WINDOW CONFIGURATION -# -# The settings here affect the placement of the Calamares -# window through hints to the window manager and initial -# sizing of the Calamares window. - -# Size and expansion policy for Calamares. -# - "normal" or unset, expand as needed, use *windowSize* -# - "fullscreen", start as large as possible, ignore *windowSize* -# - "noexpand", don't expand automatically, use *windowSize* -windowExpanding: normal - -# Size of Calamares window, expressed as w,h. Both w and h -# may be either pixels (suffix px) or font-units (suffix em). -# e.g. "800px,600px" -# "60em,480px" -# This setting is ignored if "fullscreen" is selected for -# *windowExpanding*, above. If not set, use constants defined -# in CalamaresUtilsGui, 800x520. -windowSize: 800px,520px - -# Placement of Calamares window. Either "center" or "free". -# Whether "center" actually works does depend on the window -# manager in use (and only makes sense if you're not using -# *windowExpanding* set to "fullscreen"). -windowPlacement: center - -### PANELS CONFIGURATION -# -# Calamares has a main content area, and two panels (navigation -# and progress / sidebar). The panels can be controlled individually, -# or switched off. If both panels are switched off, the layout of -# the main content area loses its margins, on the assumption that -# you're doing something special. - -# Kind of sidebar (panel on the left, showing progress). -# - "widget" or unset, use traditional sidebar (logo, items) -# - "none", hide it entirely -# - "qml", use calamares-sidebar.qml from branding folder -# In addition, you **may** specify a side, separated by a comma, -# from the kind. Valid sides are: -# - "left" (if not specified, uses this) -# - "right" -# - "top" -# - "bottom" -# For instance, "widget,right" is valid; so is "qml", which defaults -# to putting the sidebar on the left. Also valid is "qml,top". -# While "widget,top" is valid, the widgets code is **not** flexible -# and results will be terrible. -sidebar: widget - -# Kind of navigation (button panel on the bottom). -# - "widget" or unset, use traditional navigation -# - "none", hide it entirely -# - "qml", use calamares-navigation.qml from branding folder -# In addition, you **may** specify a side, separated by a comma, -# from the kind. The same sides are valid as for *sidebar*, -# except the default is *bottom*. -navigation: widget - - -### STRINGS, IMAGES AND COLORS -# -# This section contains the "branding proper" of names -# and images, rather than global-look settings. - -# These are strings shown to the user in the user interface. -# There is no provision for translating them -- since they -# are names, the string is included as-is. -# -# The four Url strings are the Urls used by the buttons in -# the welcome screen, and are not shown to the user. Clicking -# on the "Support" button, for instance, opens the link supportUrl. -# If a Url is empty, the corresponding button is not shown. -# -# bootloaderEntryName is how this installation / distro is named -# in the boot loader (e.g. in the GRUB menu). -# -# These strings support substitution from /etc/os-release -# if KDE Frameworks 5.58 are available at build-time. When -# enabled, ${varname} is replaced by the equivalent value -# from os-release. All the supported var-names are in all-caps, -# and are listed on the FreeDesktop.org site, -# https://www.freedesktop.org/software/systemd/man/os-release.html -# Note that ANSI_COLOR and CPE_NAME don't make sense here, and -# are not supported (the rest are). Remember to quote the string -# if it contains substitutions, or you'll get YAML exceptions. -# -# The *Url* entries are used on the welcome page, and they -# are visible as buttons there if the corresponding *show* keys -# are set to "true" (they can also be overridden). -strings: - productName: deskOS - shortProductName: deskOS - version: - shortVersion: - versionedName: deskOS - shortVersionedName: deskOS - bootloaderEntryName: deskOS - productUrl: https://nixup.io/ - supportUrl: https://nixup.io - knownIssuesUrl: https://github.com/nixup-io/desk-os/issues - releaseNotesUrl: https://nixup.io - donateUrl: https://nixup.io - -# These images are loaded from the branding module directory. -# -# productBanner is an optional image, which if present, will be shown -# on the welcome page of the application, above the welcome text. -# It is intended to have a width much greater than height. -# It is displayed at 64px height (also on HiDPI). -# Recommended size is 64px tall, and up to 460px wide. -# productIcon is used as the window icon, and will (usually) be used -# by the window manager to represent the application. This image -# should be square, and may be displayed by the window manager -# as small as 16x16 (but possibly larger). -# productLogo is used as the logo at the top of the left-hand column -# which shows the steps to be taken. The image should be square, -# and is displayed at 80x80 pixels (also on HiDPI). -# productWallpaper is an optional image, which if present, will replace -# the normal solid background on every page of the application. -# It can be any size and proportion, -# and will be tiled to fit the entire window. -# For a non-tiled wallpaper, the size should be the same as -# the overall window, see *windowSize* above (800x520). -# productWelcome is shown on the welcome page of the application in -# the middle of the window, below the welcome text. It can be -# any size and proportion, and will be scaled to fit inside -# the window. Use `welcomeExpandingLogo` to make it non-scaled. -# Recommended size is 320x150. -# -# These filenames can also use substitutions from os-release (see above). -images: - # productBanner: "banner.png" - productIcon: "desk-os-logo.png" - productLogo: "desk-os-logo.png" - # productWallpaper: "wallpaper.png" - # productWelcome: "desk-os-logo.png" - -# Colors for text and background components. -# -# - SidebarBackground is the background of the sidebar -# - SidebarText is the (foreground) text color -# - SidebarBackgroundCurrent sets the background of the current step. -# Optional, and defaults to the application palette. -# - SidebarTextCurrent is the text color of the current step. -# -# These colors can **also** be set through the stylesheet, if the -# branding component also ships a stylesheet.qss. Then they are -# the corresponding CSS attributes of #sidebarApp. -style: - SidebarBackground: "#5277C3" - SidebarText: "#FFFFFF" - SidebarTextCurrent: "#292F34" - SidebarBackgroundCurrent: "#7EBAE4" - -### SLIDESHOW -# -# The slideshow is displayed during execution steps (e.g. when the -# installer is actually writing to disk and doing other slow things). - -# The slideshow can be a QML file (recommended) which can display -# arbitrary things -- text, images, animations, or even play a game -- -# during the execution step. The QML **is** abruptly stopped when the -# execution step is done, though, so maybe a game isn't a great idea. -# -# The slideshow can also be a sequence of images (not recommended unless -# you don't want QML at all in your Calamares). The images are displayed -# at a rate of 1 every 2 seconds during the execution step. -# -# To configure a QML file, list a single filename: -# slideshow: "show.qml" -# To configure images, like the filenames (here, as an inline list): -# slideshow: [ "/etc/calamares/slideshow/0.png", "/etc/logo.png" ] -slideshow: "show.qml" - -# There are two available APIs for a QML slideshow: -# - 1 (the default) loads the entire slideshow when the installation- -# slideshow page is shown and starts the QML then. The QML -# is never stopped (after installation is done, times etc. -# continue to fire). -# - 2 loads the slideshow on startup and calls onActivate() and -# onLeave() in the root object. After the installation is done, -# the show is stopped (first by calling onLeave(), then destroying -# the QML components). -# -# An image slideshow does not need to have the API defined. -slideshowAPI: 2 - - -# These options are to customize online uploading of logs to pastebins: -# - type : Defines the kind of pastebin service to be used. Currently -# it accepts two values: -# - none : disables the pastebin functionality -# - fiche : use fiche pastebin server -# - url : Defines the address of pastebin service to be used. -# Takes string as input. Important bits are the host and port, -# the scheme is not used. -# - sizeLimit : Defines maximum size limit (in KiB) of log file to be pasted. -# The option must be set, to have the log option work. -# Takes integer as input. If < 0, no limit will be forced, -# else only last (approximately) 'n' KiB of log file will be pasted. -# Please note that upload size may be slightly over the limit (due -# to last minute logging), so provide a suitable value. -uploadServer : - type : "fiche" - url : "http://termbin.com:9999" - sizeLimit : -1 diff --git a/packages/calamares-extensions/branding/desk_os/gfx-landing-1.png b/packages/calamares-extensions/branding/desk_os/gfx-landing-1.png deleted file mode 100644 index ca1d3c1..0000000 Binary files a/packages/calamares-extensions/branding/desk_os/gfx-landing-1.png and /dev/null differ diff --git a/packages/calamares-extensions/branding/desk_os/gfx-landing-2.png b/packages/calamares-extensions/branding/desk_os/gfx-landing-2.png deleted file mode 100644 index 0eced2d..0000000 Binary files a/packages/calamares-extensions/branding/desk_os/gfx-landing-2.png and /dev/null differ diff --git a/packages/calamares-extensions/branding/desk_os/gfx-landing-3.png b/packages/calamares-extensions/branding/desk_os/gfx-landing-3.png deleted file mode 100644 index 7b32fde..0000000 Binary files a/packages/calamares-extensions/branding/desk_os/gfx-landing-3.png and /dev/null differ diff --git a/packages/calamares-extensions/branding/desk_os/show.qml b/packages/calamares-extensions/branding/desk_os/show.qml deleted file mode 100644 index 0e694dc..0000000 --- a/packages/calamares-extensions/branding/desk_os/show.qml +++ /dev/null @@ -1,143 +0,0 @@ -/* - * - * SPDX-FileCopyrightText: 2015 Teo Mrnjavac - * SPDX-FileCopyrightText: 2018 Adriaan de Groot - * SPDX-FileCopyrightText: 2022 Victor Fuentes - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Calamares is Free Software: see the License-Identifier above. - * - */ - -import QtQuick 2.0; -import calamares.slideshow 1.0; - -Presentation -{ - id: presentation - - function nextSlide() { - console.log("QML Component (default slideshow) Next slide"); - presentation.goToNextSlide(); - } - - Timer { - id: advanceTimer - interval: 20000 - running: presentation.activatedInCalamares - repeat: true - onTriggered: nextSlide() - } - - Slide { - Text { - id: text1 - anchors.centerIn: parent - text: "Text 1" - font.pixelSize: 30 - wrapMode: Text.WordWrap - width: presentation.width - horizontalAlignment: Text.Center - color: "#6586C8" - } - Image { - id: background1 - source: "gfx-landing-1.png" - width: 200; height: 200 - fillMode: Image.PreserveAspectFit - anchors.bottom: text1.top - anchors.horizontalCenter: parent.horizontalCenter - } - Text { - anchors.horizontalCenter: background1.horizontalCenter - anchors.top: text1.bottom - text: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
"+ - "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
"+ - "quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
"+ - "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse." - wrapMode: Text.WordWrap - width: presentation.width - horizontalAlignment: Text.Center - } - } - - Slide { - Text { - id: text2 - anchors.centerIn: parent - text: "Text 2" - font.pixelSize: 30 - wrapMode: Text.WordWrap - width: presentation.width - horizontalAlignment: Text.Center - color: "#6586C8" - } - Image { - id: background2 - source: "gfx-landing-2.png" - width: 200; height: 200 - fillMode: Image.PreserveAspectFit - anchors.bottom: text2.top - anchors.horizontalCenter: parent.horizontalCenter - } - Text { - anchors.horizontalCenter: background2.horizontalCenter - anchors.top: text2.bottom - text: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
"+ - "quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
"+ - "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse." - wrapMode: Text.WordWrap - width: presentation.width - horizontalAlignment: Text.Center - } - } - - Slide { - Text { - id: text3 - anchors.centerIn: parent - text: "Text 3" - font.pixelSize: 30 - wrapMode: Text.WordWrap - width: presentation.width - horizontalAlignment: Text.Center - color: "#6586C8" - } - Image { - id: background3 - source: "gfx-landing-3.png" - width: 200; height: 200 - fillMode: Image.PreserveAspectFit - anchors.bottom: text3.top - anchors.horizontalCenter: parent.horizontalCenter - } - Text { - anchors.horizontalCenter: background3.horizontalCenter - anchors.top: text3.bottom - text: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
"+ - "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
"+ - "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
"+ - "quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
"+ - "consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse." - wrapMode: Text.WordWrap - width: presentation.width - horizontalAlignment: Text.Center - } - } - - // When this slideshow is loaded as a V1 slideshow, only - // activatedInCalamares is set, which starts the timer (see above). - // - // In V2, also the onActivate() and onLeave() methods are called. - // These example functions log a message (and re-start the slides - // from the first). - function onActivate() { - console.log("QML Component (default slideshow) activated"); - presentation.currentSlide = 0; - } - - function onLeave() { - console.log("QML Component (default slideshow) deactivated"); - } - -} diff --git a/packages/calamares-extensions/branding/desk_os/white.png b/packages/calamares-extensions/branding/desk_os/white.png deleted file mode 100644 index 086544a..0000000 Binary files a/packages/calamares-extensions/branding/desk_os/white.png and /dev/null differ diff --git a/packages/calamares-extensions/config/settings.conf b/packages/calamares-extensions/config/settings.conf index 431198c..2f27fd4 100644 --- a/packages/calamares-extensions/config/settings.conf +++ b/packages/calamares-extensions/config/settings.conf @@ -1,61 +1,8 @@ # SPDX-FileCopyrightText: no # SPDX-License-Identifier: CC0-1.0 # -# Configuration file for Calamares -# -# This is the top-level configuration file for Calamares. -# It specifies what modules will be used, as well as some -# overall characteristics -- is this a setup program, or -# an installer. More specific configuration is devolved -# to the branding file (for the UI) and the individual -# module configuration files (for functionality). --- -# Modules can be job modules (with different interfaces) and QtWidgets view -# modules. They could all be placed in a number of different paths. -# "modules-search" is a list of strings, each of these can either be a full -# path to a directory or the keyword "local". -# -# "local" means: -# - modules in $LIBDIR/calamares/modules, with -# - settings in SHARE/calamares/modules or /etc/calamares/modules. -# In debug-mode (e.g. calamares -d) "local" also adds some paths -# that make sense from inside the build-directory, so that you -# can build-and-run with the latest modules immediately. -# -# Strings other than "local" are taken as paths and interpreted -# relative to wherever Calamares is started. It is therefore **strongly** -# recommended to use only absolute paths here. This is mostly useful -# if your distro has forks of standard Calamares modules, but also -# uses some form of upstream packaging which might overwrite those -# forked modules -- then you can keep modules somewhere outside of -# the "regular" module tree. -# -# -# YAML: list of strings. modules-search: [ local, /run/current-system/sw/lib/calamares/modules ] - -# Sequence section. This section describes the sequence of modules, both -# viewmodules and jobmodules, as they should appear and/or run. -# -# A jobmodule instance key (or name) can only appear in an exec phase, whereas -# a viewmodule instance key (or name) can appear in both exec and show phases. -# There is no limit to the number of show or exec phases. However, the same -# module instance key should not appear more than once per phase, and -# deployers should take notice that the global storage structure is persistent -# throughout the application lifetime, possibly influencing behavior across -# phases. A show phase defines a sequence of viewmodules (and therefore -# pages). These viewmodules can offer up jobs for the execution queue. -# -# An exec phase displays a progress page (with brandable slideshow). This -# progress page iterates over the modules listed in the *immediately -# preceding* show phase, and enqueues their jobs, as well as any other jobs -# from jobmodules, in the order defined in the current exec phase. -# -# It then executes the job queue and clears it. If a viewmodule offers up a -# job for execution, but the module name (or instance key) isn't listed in the -# immediately following exec phase, this job will not be executed. -# -# YAML: list of lists of strings. sequence: - show: - welcome @@ -67,87 +14,16 @@ sequence: - exec: - partition - mount - - desk_os + - desk_os_installation - users - umount - show: - finished -- -# A branding component is a directory, either in SHARE/calamares/branding or -# in /etc/calamares/branding (the latter takes precedence). The directory must -# contain a YAML file branding.desc which may reference additional resources -# (such as images) as paths relative to the current directory. -# -# A branding component can also ship a QML slideshow for execution pages, -# along with translation files. -# -# Only the name of the branding component (directory) should be specified -# here, Calamares then takes care of finding it and loading the contents. -# -# YAML: string. -branding: desk_os - -# If this is set to true, Calamares will show an "Are you sure?" prompt right -# before each execution phase, i.e. at points of no return. If this is set to -# false, no prompt is shown. Default is false, but Calamares will complain if -# this is not explicitly set. -# -# YAML: boolean. +branding: default prompt-install: false - -# If this is set to true, Calamares will execute all target environment -# commands in the current environment, without chroot. This setting should -# only be used when setting up Calamares as a post-install configuration tool, -# as opposed to a full operating system installer. -# -# Some official Calamares modules are not expected to function with this -# setting. (e.g. partitioning seems like a bad idea, since that is expected to -# have been done already) -# -# Default is false (for a normal installer), but Calamares will complain if -# this is not explicitly set. -# -# YAML: boolean. dont-chroot: false - -# If this is set to true, Calamares refers to itself as a "setup program" -# rather than an "installer". Defaults to the value of dont-chroot, but -# Calamares will complain if this is not explicitly set. oem-setup: false - -# If this is set to true, the "Cancel" button will be disabled entirely. -# The button is also hidden from view. -# -# This can be useful if when e.g. Calamares is used as a post-install -# configuration tool and you require the user to go through all the -# configuration steps. -# -# Default is false, but Calamares will complain if this is not explicitly set. -# -# YAML: boolean. disable-cancel: false - -# If this is set to true, the "Cancel" button will be disabled once -# you start the 'Installation', meaning there won't be a way to cancel -# the Installation until it has finished or installation has failed. -# -# Default is false, but Calamares will complain if this is not explicitly set. -# -# YAML: boolean. disable-cancel-during-exec: false - -# If this is set to true, the "Next" and "Back" button will be hidden once -# you start the 'Installation'. -# -# Default is false, but Calamares will complain if this is not explicitly set. -# -# YAML: boolean. -hide-back-and-next-during-exec: false - -# If this is set to true, then once the end of the sequence has -# been reached, the quit (done) button is clicked automatically -# and Calamares will close. Default is false: the user will see -# that the end of installation has been reached, and that things are ok. -# -# +hide-back-and-next-during-exec: true quit-at-end: false diff --git a/packages/calamares-extensions/modules/desk_os/main.py b/packages/calamares-extensions/modules/desk_os_installation/main.py similarity index 100% rename from packages/calamares-extensions/modules/desk_os/main.py rename to packages/calamares-extensions/modules/desk_os_installation/main.py diff --git a/packages/calamares-extensions/modules/desk_os/module.desc b/packages/calamares-extensions/modules/desk_os_installation/module.desc similarity index 78% rename from packages/calamares-extensions/modules/desk_os/module.desc rename to packages/calamares-extensions/modules/desk_os_installation/module.desc index aaba550..81ea707 100644 --- a/packages/calamares-extensions/modules/desk_os/module.desc +++ b/packages/calamares-extensions/modules/desk_os_installation/module.desc @@ -2,6 +2,6 @@ # SPDX-License-Identifier: CC0-1.0 --- type: "job" -name: "desk_os" +name: "desk_os_installation" interface: "python" script: "main.py"