diff --git a/archiso/airootfs/usr/lib/calamares/modules/packagechooserq/libcalamares_viewmodule_packagechooserq.so b/archiso/airootfs/usr/lib/calamares/modules/packagechooserq/libcalamares_viewmodule_packagechooserq.so new file mode 100755 index 0000000..6db516d Binary files /dev/null and b/archiso/airootfs/usr/lib/calamares/modules/packagechooserq/libcalamares_viewmodule_packagechooserq.so differ diff --git a/archiso/airootfs/usr/lib/calamares/modules/packagechooserq/module.desc b/archiso/airootfs/usr/lib/calamares/modules/packagechooserq/module.desc new file mode 100644 index 0000000..7e048d8 --- /dev/null +++ b/archiso/airootfs/usr/lib/calamares/modules/packagechooserq/module.desc @@ -0,0 +1,7 @@ +# AUTO-GENERATED metadata file +# Syntax is YAML 1.2 +--- +type: "viewmodule" +name: "packagechooserq" +interface: "qtplugin" +load: "libcalamares_viewmodule_packagechooserq.so" diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh index 26bb3f1..4eb51e8 100755 --- a/archiso/airootfs/usr/local/bin/calamares-online.sh +++ b/archiso/airootfs/usr/local/bin/calamares-online.sh @@ -73,6 +73,9 @@ EOF cat "$tmp" printf '\n}\n' } | sudo tee "$sqml/Items.qml" > /dev/null + # Same rows, plain JSON: packagechooserq's prettyStatus() override + # reads this to show the Summary step's choice as labels, not ids. + sudo cp "$tmp" "$sqml/items.json" fi rm -f "$tmp" diff --git a/archiso/airootfs/usr/local/share/steamify-installer/SteamifyPage.qml b/archiso/airootfs/usr/local/share/steamify-installer/SteamifyPage.qml index e06f551..34874db 100644 --- a/archiso/airootfs/usr/local/share/steamify-installer/SteamifyPage.qml +++ b/archiso/airootfs/usr/local/share/steamify-installer/SteamifyPage.qml @@ -25,6 +25,8 @@ Item { SystemPalette { id: pal; colorGroup: SystemPalette.Active } readonly property color accent: "#00CED1" + Rectangle { anchors.fill: parent; color: pal.window } + // Only what can be set up here (Steamify leaves out the rest). readonly property var rows: Items.rows.filter(function (r) { return r.selectable; }) property var want: ({}) @@ -56,7 +58,11 @@ Item { for (var i = 0; i < rows.length; i++) if (rows[i].kind === "toggle" && want[rows[i].id]) on.push(rows[i].id); if (want.gaming && boot === "desktop") on.push("boot"); - return on.length ? on.join(",") : "none"; + // ", " (not ","): Calamares' packagechooser Summary step shows this + // value raw ("Install option: "); steamify-install still + // parses it fine (${choice//,/ } + bash word-splitting collapses + // the extra space). + return on.length ? on.join(", ") : "none"; } onWantChanged: config.packageChoice = choice() onBootChanged: config.packageChoice = choice() @@ -102,12 +108,12 @@ Item { readonly property var it: modelData readonly property bool vis: page.shown(it) readonly property bool selected: vis && index === page.sel - width: list.width - 12 + width: list.width - 25 height: vis ? 52 : 0 visible: vis radius: 4 - color: selected ? Qt.rgba(page.accent.r, page.accent.g, page.accent.b, 0.18) : pal.base - border.width: 1 + color: pal.base + border.width: selected ? 2 : 1 border.color: selected ? page.accent : Qt.rgba(pal.windowText.r, pal.windowText.g, pal.windowText.b, 0.15) MouseArea { @@ -118,9 +124,16 @@ Item { } RowLayout { anchors.fill: parent - anchors.leftMargin: row.it.parent ? 32 : 12 + anchors.leftMargin: row.it.parent ? 12 : 12 anchors.rightMargin: 12 - spacing: 12 + spacing: 8 + Label { + visible: !!row.it.parent + text: "└" + color: pal.text + opacity: 0.6 + font.pointSize: 11 + } ColumnLayout { Layout.fillWidth: true spacing: 0