diff --git a/.version b/.version index 280125b32..834db75c6 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -25.09rc1 +25.09 diff --git a/ftl/core-repo b/ftl/core-repo index d255301b5..6552c95a8 160000 --- a/ftl/core-repo +++ b/ftl/core-repo @@ -1 +1 @@ -Subproject commit d255301b5a815ebac73c380b48507440d2f5dcce +Subproject commit 6552c95a81d162422b2a50126547cc7f1b50c2fd diff --git a/ftl/core/deck-config.ftl b/ftl/core/deck-config.ftl index e365d9553..1e193dc04 100644 --- a/ftl/core/deck-config.ftl +++ b/ftl/core/deck-config.ftl @@ -498,7 +498,7 @@ deck-config-desired-retention-below-optimal = Your desired retention is below op # cards that can be recalled or retrieved on a specific date. deck-config-fsrs-simulator-experimental = FSRS Simulator (Experimental) deck-config-fsrs-simulate-desired-retention-experimental = FSRS Desired Retention Simulator (Experimental) -deck-config-fsrs-simulate-save-preset = After optimizing, please save your config before running the simulator. +deck-config-fsrs-simulate-save-preset = After optimizing, please save your deck preset before running the simulator. deck-config-fsrs-desired-retention-help-me-decide-experimental = Help Me Decide (Experimental) deck-config-additional-new-cards-to-simulate = Additional new cards to simulate deck-config-simulate = Simulate diff --git a/qt/aqt/stylesheets.py b/qt/aqt/stylesheets.py index 6b4eff1f5..6817b7063 100644 --- a/qt/aqt/stylesheets.py +++ b/qt/aqt/stylesheets.py @@ -180,7 +180,7 @@ class CustomStyles: QPushButton {{ margin: 1px; }} - QPushButton:focus {{ + QPushButton:focus, QPushButton:default:hover {{ border: 2px solid {tm.var(colors.BORDER_FOCUS)}; outline: none; margin: 0px; @@ -199,9 +199,6 @@ class CustomStyles: ) }; }} - QPushButton:default:hover {{ - border-width: 2px; - }} QPushButton:pressed, QPushButton:checked, QSpinBox::up-button:pressed, diff --git a/qt/launcher/src/platform/mac.rs b/qt/launcher/src/platform/mac.rs index 8662ba9f5..3f5b0ce2e 100644 --- a/qt/launcher/src/platform/mac.rs +++ b/qt/launcher/src/platform/mac.rs @@ -64,6 +64,7 @@ pub fn relaunch_in_terminal() -> Result<()> { Command::new("open") .args(["-na", "Terminal"]) .arg(current_exe) + .env_remove("ANKI_LAUNCHER_WANT_TERMINAL") .ensure_spawn()?; std::process::exit(0); }