GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 14:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'main' into dock

Browse source
This commit is contained in:
Emil Hamrin 2025-09-15 19:35:58 +02:00 committed by GitHub
commit 47918a5bd1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
25.09rc1 25.09

2
ftl/core-repo

@ -1 +1 @@
Subproject commit d255301b5a815ebac73c380b48507440d2f5dcce Subproject commit 6552c95a81d162422b2a50126547cc7f1b50c2fd

2
ftl/core/deck-config.ftl
View file

@ -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. # cards that can be recalled or retrieved on a specific date.
deck-config-fsrs-simulator-experimental = FSRS Simulator (Experimental) deck-config-fsrs-simulator-experimental = FSRS Simulator (Experimental)
deck-config-fsrs-simulate-desired-retention-experimental = FSRS Desired Retention 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-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-additional-new-cards-to-simulate = Additional new cards to simulate
deck-config-simulate = Simulate deck-config-simulate = Simulate

5
qt/aqt/stylesheets.py
View file

@ -180,7 +180,7 @@ class CustomStyles:
QPushButton {{ QPushButton {{
margin: 1px; margin: 1px;
}} }}
QPushButton:focus {{ QPushButton:focus, QPushButton:default:hover {{
border: 2px solid {tm.var(colors.BORDER_FOCUS)}; border: 2px solid {tm.var(colors.BORDER_FOCUS)};
outline: none; outline: none;
margin: 0px; margin: 0px;
@ -199,9 +199,6 @@ class CustomStyles:
) )
}; };
}} }}
QPushButton:default:hover {{
border-width: 2px;
}}
QPushButton:pressed, QPushButton:pressed,
QPushButton:checked, QPushButton:checked,
QSpinBox::up-button:pressed, QSpinBox::up-button:pressed,

1
qt/launcher/src/platform/mac.rs
View file

@ -64,6 +64,7 @@ pub fn relaunch_in_terminal() -> Result<()> {
Command::new("open") Command::new("open")
.args(["-na", "Terminal"]) .args(["-na", "Terminal"])
.arg(current_exe) .arg(current_exe)
.env_remove("ANKI_LAUNCHER_WANT_TERMINAL")
.ensure_spawn()?; .ensure_spawn()?;
std::process::exit(0); std::process::exit(0);
} }