Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 3ca28e0
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 05:28:00 2024 -0500

    docs: :memo: Update the contributing guide

commit b6077c1
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 05:24:06 2024 -0500

    docs: :memo: Update changelog

commit a3aac5a
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 04:31:57 2024 -0500

    fix: :adhesive_bandage: Move fstab to later during the installation process

commit 0af8787
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 04:25:16 2024 -0500

    chore: :bookmark: Version bump

commit 390b269
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 04:24:28 2024 -0500

    fix: :lipstick: Fix Bootloader screen UI

commit f3145f7
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 03:42:10 2024 -0500

    feat: :sparkles: Add support for Refind bootloader

commit e968120
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 02:47:31 2024 -0500

    feat: :heavy_plus_sign: Add contextualprocess module instance to install grub dependencies

commit 08ea2aa
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 02:46:04 2024 -0500

    refactor: :heavy_minus_sign: Remove unnecessary installation of os-prober

commit 63d3319
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Tue Jul 23 02:44:55 2024 -0500

    refactor: :wrench: Make Grub the default bootloadr

commit 53a7c5a
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Mon Jul 22 23:09:51 2024 -0500

    fix: :bug: Fix bootloader variable name

commit 904d576
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Mon Jul 22 23:03:11 2024 -0500

    fix: :adhesive_bandage: Fix the packagechooserq_bootloader configuration

commit f353cfa
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Mon Jul 22 23:02:37 2024 -0500

    feat: :technologist: Click on logo to open debug window

commit 44603b6
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Mon Jul 22 21:07:16 2024 -0500

    fix: :alien: Update initcpiocfg.conf in response to schema change

commit 1cf9244
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Mon Jul 22 21:06:02 2024 -0500

    fix: :bug: Fix QML filename specified in the packagechooserq_bootloader configuration

commit f1491a5
Author: pvshvp-oss <pvshvp.oss@gmail.com>
Date:   Thu Jun 27 10:01:16 2024 -0500

    WIP
  • Loading branch information
@pvshvp-oss
pvshvp-oss committed Jul 23, 2024
1 parent a6cbb7b commit b7eabc5
Show file tree
Hide file tree
Showing 19 changed files with 577 additions and 33 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# CHANGELOG

## Calamares Configuration `v0.1.40`

### For Users
- Add bootloader choice screen and support for systemd-boot, and refind.
- Do not install os-prober if grub is not selected.
- Move fstab generation to later during the installation process to prevent issues with encrypted volumes.

### For Developers
- Set up launching the debug window by clicking on the RebornOS logo.
- Update initcpiocfg.conf in response to schema change.

## Calamares Configuration `v0.1.39`

### For Users
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@

- [ ] Commit and push all changes through git, for example `git commit -m "Some message" && git push`

- [ ] Create and push a tag, for example `git tag -s -a v0.1.39 -m "This is version 0.1.39" && git push origin v0.1.39`
- [ ] If there was a mistake and if you want to yank the release, run something like `git tag -d v0.1.39 && git push --delete origin v0.1.39`. Then the errors can be fixed and the previous step can be repeated to create a new tag.
- [ ] Create and push a tag, for example `git tag -s -a v0.1.40 -m "This is version 0.1.40" && git push origin v0.1.40`
- [ ] If there was a mistake and if you want to yank the release, run something like `git tag -d v0.1.40 && git push --delete origin v0.1.40`. Then the errors can be fixed and the previous step can be repeated to create a new tag.
163 changes: 163 additions & 0 deletions etc/calamares/branding/rebornos/BIOS.qml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,163 @@
/* === This file is part of Calamares - <https://calamares.io> ===
*
* SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
*
*/

import io.calamares.core 1.0
import io.calamares.ui 1.0

import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3

Column {
id: column
anchors.centerIn: parent
spacing: 5

ButtonGroup {
id: switchGroup
}

Component.onCompleted: {
config.packageChoice = "grub"
}

Rectangle {
//id: rectangle
width: 700
height: 50
color: "#2a2e32"
border.width: 0
Text {
height: 25
anchors.centerIn: parent
text: qsTr("Please select a <strong>bootloader</strong> option for your install, or leave the already selected default option, <strong>GRUB</strong>.")
font.pointSize: 11
color: "#ffffff"
wrapMode: Text.WordWrap
}
}

Rectangle {
width: 700
height: 150
color: "#1b1e20"
radius: 5
border.width: 1
border.color: "#646b75"
Text {
width: 600
height: 104
anchors.centerIn: parent
text: qsTr("<strong>Grub Bootloader</strong><br><br>The GRand Unified Bootloader is the reference implementation<br>of the Free Software Foundation's Multiboot Specification,<br>which provides a user the choice<br>to boot one of multiple operating systems installed on a computer.")
font.pointSize: 10
color: "#ffffff"
anchors.verticalCenterOffset: 0
anchors.horizontalCenterOffset: -20.0
wrapMode: Text.WordWrap
}

Switch {
id: element2
x: 500
y: 110
width: 187
height: 14
text: qsTr("GRUB")
checked: true
hoverEnabled: true
ButtonGroup.group: switchGroup

indicator: Rectangle {
implicitWidth: 40
implicitHeight: 14
radius: 10
color: element2.checked ? "#3498db" : "#B9B9B9"
border.color: element2.checked ? "#3498db" : "#cccccc"

Rectangle {
x: element2.checked ? parent.width - width : 0
y: (parent.height - height) / 2
width: 20
height: 20
radius: 10
color: element2.down ? "#cccccc" : "#ffffff"
border.color: element2.checked ? (element2.down ? "#3498db" : "#3498db") : "#999999"
}
}

onCheckedChanged: {
if (! checked) {
print("grub not used")
} else {
config.packageChoice = "grub"
print(config.packageChoice)
}
}
}
}

Rectangle {
width: 700
height: 150
color: "#1b1e20"
radius: 5
border.width: 1
border.color: "#646b75"
Text {
width: 600
height: 104
anchors.centerIn: parent
text: qsTr("<strong>No Bootloader</strong><br><br>Selecting no bootloader might result in an <strong>un-bootable system</strong>,<br>If you don't already have a bootloader that you can add this install to.")
font.pointSize: 10
color: "#ffffff"
anchors.verticalCenterOffset: 0
anchors.horizontalCenterOffset: -20.0
wrapMode: Text.WordWrap
}

Switch {
id: element3
x: 500
y: 110
width: 187
height: 14
text: qsTr("No bootloader")
checked: false
hoverEnabled: true
ButtonGroup.group: switchGroup

indicator: Rectangle {
implicitWidth: 40
implicitHeight: 14
radius: 10
color: element3.checked ? "#3498db" : "#B9B9B9"
border.color: element3.checked ? "#3498db" : "#cccccc"

Rectangle {
x: element3.checked ? parent.width - width : 0
y: (parent.height - height) / 2
width: 20
height: 20
radius: 10
color: element3.down ? "#cccccc" : "#ffffff"
border.color: element3.checked ? (element3.down ? "#3498db" : "#3498db") : "#999999"
}
}

onCheckedChanged: {
if (! checked) {
print("no btl not checked")
} else {
print("no bootloader")
config.packageChoice = "none"
}
}
}
}
}
Loading

0 comments on commit b7eabc5

Please sign in to comment.