feat: one setting per application, and never the shape of the machine
A laptop is going in for the women's Bible study, and the obvious way to
build that — a laptop profile that turns off the children's church
applications — is the wrong way. A laptop may well take children's church,
and a tower may well be a Bible study. Hardware cannot be allowed to
decide purpose, so every optional application gets a setting of its own:
WONDERINK_ENABLED already existed; behaviour unchanged
DVD_ENABLED new
PARENT_CALL_ENABLED new
and DEVICE_TYPE says only what the hardware IS. classroom-desktop-layout
never reads it, and there is a test that says so, because this is the rule
that will be under pressure the first time somebody adds a device.
All three default to true, so an existing classroom that has never heard
of any of them comes up exactly as it did before. The settings are
appended to device.conf by the same mechanism every other setting has
used, so an upgrade gains them without losing a byte an administrator
wrote.
The disc player is the one place hardware still votes, and it is a veto:
DVD_ENABLED can take the player away from a machine that has a drive,
nothing can put it on a machine that has none. A button that cannot work
is worse than no button.
The layout's launcher markers are replaced by a feature block of three
plain booleans. The old mechanism commented a line out of an array, which
worked for launchers and could not express Parent Call, because that is a
whole widget rather than one entry. Three booleans express both, and the
launcher list is now built from them in one fixed order, so a disabled
application closes the row up rather than leaving a gap, and the same
enabled set produces the same bar on every machine in the church.
Also here, because it is the bar and not a feature: sortingStrategy=0.
Plasma's default is 1, "manually", and the task manager accepts a
reordering drop only in that mode — MouseHandler.qml tests
tasksModel.sortMode === SortManual before it will move anything. The
classroom never wrote the key, so it had the default, and any teacher
could drag the launchers into a different order. This is the applet's own
lever refusing the drop rather than something of ours putting the bar back
afterwards.
The test now runs the layout the package actually ships, in node, with
Plasma's API stubbed, and asserts the launcher string that comes out.
Asserting against a copy of the file's text in the test was how the old
one worked, and a copy is a thing that drifts.
Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 5
parent
fc764b0621
commit
7f4a122900
@@ -10,6 +10,23 @@
|
||||
// applications, the right is the small amount of status a teacher needs.
|
||||
// Nothing else is on the screen.
|
||||
|
||||
// WHICH APPLICATIONS THIS DEVICE OFFERS.
|
||||
//
|
||||
// classroom-desktop-layout rewrites the three lines between the markers
|
||||
// to match device.conf and this machine's hardware, and nothing else in
|
||||
// this file. Each application is its own line because each is its own
|
||||
// setting: a laptop taking children's church needs Wonder Ink and a tower
|
||||
// used for Bible study does not, so the shape of the machine is never
|
||||
// allowed to decide what it is for.
|
||||
//
|
||||
// All true here is the shipped default, which is what an existing
|
||||
// classroom must come up as.
|
||||
/* CLASSROOM-FEATURES-BEGIN */
|
||||
var WONDERINK = true;
|
||||
var DVD = true;
|
||||
var PARENT_CALL = true;
|
||||
/* CLASSROOM-FEATURES-END */
|
||||
|
||||
var WALLPAPER = "/usr/share/backgrounds/ekklesia/classroom-calm.png";
|
||||
|
||||
// Matches the 76px strip the classroom has always used, so muscle memory
|
||||
@@ -52,18 +69,20 @@ panel.opacity = "adaptive";
|
||||
// lesson's tasks.
|
||||
//
|
||||
// Quick Launch reads the entry live and shows nothing but the button.
|
||||
var parentCall = panel.addWidget("org.kde.plasma.quicklaunch");
|
||||
parentCall.currentConfigGroup = ["General"];
|
||||
// A file URL, not applications:. Quick Launch resolves the entry itself
|
||||
// and does not copy it, so the path is a live reference to what the
|
||||
// package installs.
|
||||
parentCall.writeConfig(
|
||||
"launcherUrls",
|
||||
"file:///usr/share/applications/ekklesia-parent-call.desktop"
|
||||
);
|
||||
parentCall.writeConfig("showLauncherNames", false);
|
||||
parentCall.writeConfig("enablePopup", false);
|
||||
parentCall.writeConfig("maxSectionCount", 1);
|
||||
if (PARENT_CALL) {
|
||||
var parentCall = panel.addWidget("org.kde.plasma.quicklaunch");
|
||||
parentCall.currentConfigGroup = ["General"];
|
||||
// A file URL, not applications:. Quick Launch resolves the entry
|
||||
// itself and does not copy it, so the path is a live reference to
|
||||
// what the package installs.
|
||||
parentCall.writeConfig(
|
||||
"launcherUrls",
|
||||
"file:///usr/share/applications/ekklesia-parent-call.desktop"
|
||||
);
|
||||
parentCall.writeConfig("showLauncherNames", false);
|
||||
parentCall.writeConfig("enablePopup", false);
|
||||
parentCall.writeConfig("maxSectionCount", 1);
|
||||
}
|
||||
|
||||
var leftGap = panel.addWidget("org.kde.plasma.panelspacer");
|
||||
leftGap.currentConfigGroup = ["General"];
|
||||
@@ -73,21 +92,49 @@ leftGap.writeConfig("expanding", true);
|
||||
// story. This applet is the reason the classroom stops writing a dock.
|
||||
var tasks = panel.addWidget("org.kde.plasma.icontasks");
|
||||
tasks.currentConfigGroup = ["General"];
|
||||
// Two of these three lines are rewritten by classroom-desktop-layout to
|
||||
// match the machine, and each is marked so the edit is a line replacement
|
||||
// and not a parse.
|
||||
// THE LAUNCHERS, IN ONE FIXED ORDER.
|
||||
//
|
||||
// The disc player follows the hardware: a room with no optical drive has
|
||||
// it removed, so no teacher is offered a player that cannot exist.
|
||||
// The order is written here and nowhere else, so the same set of enabled
|
||||
// applications produces the same bar on every machine in the church.
|
||||
// Anything switched off is left out of the list rather than blanked, so
|
||||
// the remaining launchers close up and there is never a gap where a
|
||||
// disabled application used to be.
|
||||
//
|
||||
// Wonder Ink follows WONDERINK_ENABLED in device.conf: a device that is
|
||||
// not a classroom — the laptop that goes out with a volunteer — has no
|
||||
// lesson application, and the ordinary browser is unaffected either way.
|
||||
tasks.writeConfig("launchers", [
|
||||
/* CLASSROOM-WONDERINK-LAUNCHER */ "applications:ekklesia-wonderink.desktop",
|
||||
"applications:google-chrome.desktop",
|
||||
/* CLASSROOM-DVD-LAUNCHER */ "applications:ekklesia-dvd.desktop"
|
||||
].join(","));
|
||||
// The browser is always present. Wonder Ink and the disc player are
|
||||
// answered above.
|
||||
var launchers = [];
|
||||
|
||||
if (WONDERINK) {
|
||||
launchers.push("applications:ekklesia-wonderink.desktop");
|
||||
}
|
||||
|
||||
launchers.push("applications:google-chrome.desktop");
|
||||
|
||||
if (DVD) {
|
||||
launchers.push("applications:ekklesia-dvd.desktop");
|
||||
}
|
||||
|
||||
tasks.writeConfig("launchers", launchers.join(","));
|
||||
|
||||
// THE ORDER STAYS PUT.
|
||||
//
|
||||
// 0 is "do not sort", and it is what stops a teacher dragging the
|
||||
// launchers into a different order. Plasma's default is 1, "manually",
|
||||
// and manual sorting is the only mode in which the task manager accepts a
|
||||
// reordering drop at all — see MouseHandler.qml, which tests
|
||||
// tasksModel.sortMode === SortManual before it will move anything. The
|
||||
// classroom shipped without this line, so it had Plasma's default and the
|
||||
// bar could be rearranged by anybody who dragged an icon.
|
||||
//
|
||||
// This is the supported lever rather than a patched task manager: the
|
||||
// drop is refused by the applet's own code, not caught afterwards by
|
||||
// something of ours putting the bar back.
|
||||
tasks.writeConfig("sortingStrategy", 0);
|
||||
// Launchers stay together at the start of the row and running windows
|
||||
// appear after them, so opening or closing an application cannot move a
|
||||
// pinned icon. This is Plasma's default; it is written down because the
|
||||
// classroom depends on it.
|
||||
tasks.writeConfig("separateLaunchers", true);
|
||||
// Every window gets its own button. Teachers should never have to open a
|
||||
// group to find out that a second window exists.
|
||||
tasks.writeConfig("groupingStrategy", 0);
|
||||
|
||||
Reference in New Issue
Block a user