Merge branch 'main' into ally-fix-border-ratio-too-low

build/configure/src/python.rs

@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-use std::env;
-
 use anyhow::Result;
 use ninja_gen::action::BuildAction;
 use ninja_gen::archives::Platform;
@@ -125,7 +123,14 @@ impl BuildAction for BuildWheel {
     }
 
     fn files(&mut self, build: &mut impl FilesHandle) {
+        if std::env::var("OFFLINE_BUILD").ok().as_deref() == Some("1") {
+            let uv_path =
+                std::env::var("UV_BINARY").expect("UV_BINARY must be set in OFFLINE_BUILD mode");
+            build.add_inputs("uv", inputs![uv_path]);
+        } else {
             build.add_inputs("uv", inputs![":uv_binary"]);
+        }
+
         build.add_inputs("", &self.deps);
 
         // Set the project directory based on which package we're building
@@ -222,15 +227,19 @@ struct Sphinx {
 
 impl BuildAction for Sphinx {
     fn command(&self) -> &str {
-        if env::var("OFFLINE_BUILD").is_err() {
+        if std::env::var("OFFLINE_BUILD").ok().as_deref() == Some("1") {
-            "$uv sync --extra sphinx && $python python/sphinx/build.py"
-        } else {
             "$python python/sphinx/build.py"
+        } else {
+            "$uv sync --extra sphinx && $python python/sphinx/build.py"
         }
     }
 
     fn files(&mut self, build: &mut impl FilesHandle) {
-        if env::var("OFFLINE_BUILD").is_err() {
+        if std::env::var("OFFLINE_BUILD").ok().as_deref() == Some("1") {
+            let uv_path =
+                std::env::var("UV_BINARY").expect("UV_BINARY must be set in OFFLINE_BUILD mode");
+            build.add_inputs("uv", inputs![uv_path]);
+        } else {
             build.add_inputs("uv", inputs![":uv_binary"]);
             // Set environment variable to use the existing pyenv
             build.add_variable("pyenv_path", "$builddir/pyenv");

ftl/core/deck-config.ftl

@@ -514,6 +514,7 @@ deck-config-advanced-settings = Advanced Settings
 deck-config-smooth-graph = Smooth graph
 deck-config-suspend-leeches = Suspend leeches
 deck-config-save-options-to-preset = Save Changes to Preset
+deck-config-save-options-to-preset-confirm = Overwrite the options in your current preset with the options that are currently set in the simulator?
 # Radio button in the FSRS simulation diagram (Deck options -> FSRS) selecting
 # to show the total number of cards that can be recalled or retrieved on a
 # specific date.

qt/launcher/src/platform/unix.rs

@@ -9,17 +9,23 @@ use anyhow::Result;
 pub fn relaunch_in_terminal() -> Result<()> {
     let current_exe = std::env::current_exe().context("Failed to get current executable path")?;
 
-    // Try terminals in order of preference
+    // Try terminals in roughly most specific to least specific.
+    // First, try commonly used terminals for riced systems.
+    // Second, try the minimalist/compatibility terminals.
+    // Finally, try terminals usually installed by default.
     let terminals = [
-        ("x-terminal-emulator", vec!["-e"]),
+        // commonly used for riced systems
-        ("gnome-terminal", vec!["--"]),
-        ("konsole", vec!["-e"]),
-        ("xfce4-terminal", vec!["-e"]),
         ("alacritty", vec!["-e"]),
         ("kitty", vec![]),
+        // minimalistic terminals for constrained systems
         ("foot", vec![]),
         ("urxvt", vec!["-e"]),
         ("xterm", vec!["-e"]),
+        ("x-terminal-emulator", vec!["-e"]),
+        // default installs for the most common distros
+        ("xfce4-terminal", vec!["-e"]),
+        ("gnome-terminal", vec!["--"]),
+        ("konsole", vec!["-e"]),
     ];
 
     for (terminal_cmd, args) in &terminals {

ts/lib/components/HelpModal.svelte

@@ -181,6 +181,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         margin-bottom: 1.5rem;
     }
 
+    .modal {
+        z-index: 1066;
+        background-color: rgba($color: black, $alpha: 0.5);
+    }
+
     .modal-title {
         margin-inline-end: 0.75rem;
     }

ts/lib/components/RevertButton.svelte

@@ -76,7 +76,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     .hide :global(.badge) {
-        opacity: 0;
+        display: none;
         cursor: initial;
     }
 </style>

ts/routes/deck-options/EasyDaysInput.svelte

@@ -20,27 +20,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 </script>
 
 <Item>
+    <div class="container">
         <div class="easy-days-settings">
-        <table>
+            <span></span>
-            <thead>
+            <span class="header min-col">{tr.deckConfigEasyDaysMinimum()}</span>
-                <tr>
+            <span class="header">{tr.deckConfigEasyDaysReduced()}</span>
-                    <th></th>
+            <span class="header normal-col">{tr.deckConfigEasyDaysNormal()}</span>
-                    <th class="header min-col">
+
-                        <span>{tr.deckConfigEasyDaysMinimum()}</span>
-                    </th>
-                    <th class="header text-center">
-                        <span>{tr.deckConfigEasyDaysReduced()}</span>
-                    </th>
-                    <th class="header normal-col">
-                        <span>{tr.deckConfigEasyDaysNormal()}</span>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
             {#each easyDays as day, index}
-                    <tr>
+                <span class="day">{day}</span>
-                        <td class="day">{day}</td>
+                <div class="input-container">
-                        <td colspan="3">
                     <input
                         type="range"
                         bind:value={values[index]}
@@ -49,25 +38,47 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         min={0.0}
                         list="easy_day_steplist"
                     />
-                        </td>
+                </div>
-                    </tr>
             {/each}
-            </tbody>
+        </div>
-        </table>
     </div>
 </Item>
 
-<style>
+<style lang="scss">
-    .easy-days-settings table {
+    .container {
-        width: 100%;
+        display: flex;
-        border-collapse: collapse;
+        justify-content: center;
-        table-layout: fixed;
     }
-    .easy-days-settings th,
+    .easy-days-settings {
-    .easy-days-settings td {
+        width: 100%;
-        padding: 8px;
+        max-width: 1000px;
+        border-collapse: collapse;
+
+        display: grid;
+        grid-template-columns: auto 1fr 1fr 1fr;
+
+        border-collapse: collapse;
+        & > * {
+            padding: 8px 16px;
             border-bottom: var(--border) solid 1px;
         }
+    }
+    .input-container {
+        grid-column: 2 / span 3;
+    }
+    span {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        &.min-col {
+            justify-content: flex-start;
+        }
+
+        &.normal-col {
+            justify-content: flex-end;
+        }
+    }
     .header {
         word-wrap: break-word;
         font-size: smaller;
@@ -80,12 +91,4 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         word-wrap: break-word;
         font-size: smaller;
     }
-
-    .min-col {
-        text-align: start;
-    }
-
-    .normal-col {
-        text-align: end;
-    }
 </style>

ts/routes/deck-options/SimulatorModal.svelte

@@ -296,7 +296,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     min={0}
                     max={9999}
                 >
-                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
+                    <SettingTitle on:click={() => openHelpModal("newLimit")}>
                         {tr.schedulingNewCardsday()}
                     </SettingTitle>
                 </SpinBoxRow>
@@ -307,7 +307,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     min={0}
                     max={9999}
                 >
-                    <SettingTitle on:click={() => openHelpModal("simulateFsrsReview")}>
+                    <SettingTitle on:click={() => openHelpModal("reviewLimit")}>
                         {tr.schedulingMaximumReviewsday()}
                     </SettingTitle>
                 </SpinBoxRow>
@@ -327,9 +327,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         min={1}
                         max={36500}
                     >
-                        <SettingTitle
+                        <SettingTitle on:click={() => openHelpModal("maximumInterval")}>
-                            on:click={() => openHelpModal("simulateFsrsReview")}
-                        >
                             {tr.schedulingMaximumInterval()}
                         </SettingTitle>
                     </SpinBoxRow>
@@ -339,9 +337,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         defaultValue={$config.reviewOrder}
                         choices={reviewOrderChoices($fsrs)}
                     >
-                        <SettingTitle
+                        <SettingTitle on:click={() => openHelpModal("reviewSortOrder")}>
-                            on:click={() => openHelpModal("simulateFsrsReview")}
-                        >
                             {tr.deckConfigReviewSortOrder()}
                         </SettingTitle>
                     </EnumSelectorRow>
@@ -351,7 +347,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         defaultValue={$newCardsIgnoreReviewLimit}
                     >
                         <SettingTitle
-                            on:click={() => openHelpModal("simulateFsrsReview")}
+                            on:click={() => openHelpModal("newCardsIgnoreReviewLimit")}
                         >
                             <GlobalLabel
                                 title={tr.deckConfigNewCardsIgnoreReviewLimit()}
@@ -372,9 +368,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                         defaultValue={$config.leechAction ==
                             DeckConfig_Config_LeechAction.SUSPEND}
                     >
-                        <SettingTitle
+                        <SettingTitle on:click={() => openHelpModal("leechAction")}>
-                            on:click={() => openHelpModal("simulateFsrsReview")}
-                        >
                             {tr.deckConfigSuspendLeeches()}
                         </SettingTitle>
                     </SwitchRow>
@@ -387,7 +381,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                             max={9999}
                         >
                             <SettingTitle
-                                on:click={() => openHelpModal("simulateFsrsReview")}
+                                on:click={() => openHelpModal("leechThreshold")}
                             >
                                 {tr.schedulingLeechThreshold()}
                             </SettingTitle>
@@ -447,10 +441,13 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                     class="btn {computing ? 'btn-warning' : 'btn-primary'}"
                     disabled={computing}
                     on:click={() => {
+                        if (confirm(tr.deckConfigSaveOptionsToPresetConfirm())) {
                             $config.newPerDay = simulateFsrsRequest.newLimit;
                             $config.reviewsPerDay = simulateFsrsRequest.reviewLimit;
-                        $config.maximumReviewInterval = simulateFsrsRequest.maxInterval;
+                            $config.maximumReviewInterval =
-                        $config.desiredRetention = simulateFsrsRequest.desiredRetention;
+                                simulateFsrsRequest.maxInterval;
+                            $config.desiredRetention =
+                                simulateFsrsRequest.desiredRetention;
                             $newCardsIgnoreReviewLimit =
                                 simulateFsrsRequest.newCardsIgnoreReviewLimit;
                             $config.reviewOrder = simulateFsrsRequest.reviewOrder;
@@ -460,6 +457,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
                             $config.leechThreshold = leechThreshold;
                             $config.easyDaysPercentages = [...easyDayPercentages];
                             onPresetChange();
+                        }
                     }}
                 >
                     {tr.deckConfigSaveOptionsToPreset()}