GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-12-17 00:30:58 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

show note about old options screen if any add-ons are installed

Browse source
This commit is contained in:
Damien Elmes 2021-05-19 16:20:25 +10:00
parent cbd2314e27
commit 581480191a
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt/aqt/mediasrv.py
View file

@ -282,9 +282,9 @@ def i18n_resources() -> bytes:
def deck_configs_for_update() -> bytes: def deck_configs_for_update() -> bytes:
args = from_json_bytes(request.data) args = from_json_bytes(request.data)
return aqt.mw.col.decks.get_deck_configs_for_update( msg = aqt.mw.col.decks.get_deck_configs_for_update(deck_id=args["deckId"])
deck_id=args["deckId"] msg.have_addons = aqt.mw.addonManager.dirty
).SerializeToString() return msg.SerializeToString()
def update_deck_configs_request() -> bytes: def update_deck_configs_request() -> bytes:

1
rslib/backend.proto
View file

@ -935,6 +935,7 @@ message DeckConfigsForUpdate {
DeckConfig defaults = 3; DeckConfig defaults = 3;
bool schema_modified = 4; bool schema_modified = 4;
bool v3_scheduler = 5; bool v3_scheduler = 5;
bool have_addons = 6;
} }
message UpdateDeckConfigsIn { message UpdateDeckConfigsIn {

1
rslib/src/deckconfig/update.rs
View file

@ -38,6 +38,7 @@ impl Collection {
.get_collection_timestamps()? .get_collection_timestamps()?
.schema_changed_since_sync(), .schema_changed_since_sync(),
v3_scheduler: self.get_bool(BoolKey::Sched2021), v3_scheduler: self.get_bool(BoolKey::Sched2021),
have_addons: false,
}) })
} }

8
ts/deckoptions/Addons.svelte
View file

@ -11,10 +11,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
const auxData = state.currentAuxData; const auxData = state.currentAuxData;
</script> </script>
{#if $components.length} {#if $components.length || state.haveAddons}
<div> <div>
<h2>Add-ons</h2> <h2>Add-ons</h2>
<p>
If you're using an add-on that hasn't been updated to use this new screen
yet, you can access the old deck options screen by holding down the shift
key when opening the options.
</p>
{#each $components as addon} {#each $components as addon}
<svelte:component this={addon.component} bind:data={$auxData} {...addon} /> <svelte:component this={addon.component} bind:data={$auxData} {...addon} />
{/each} {/each}

2
ts/deckoptions/lib.ts
View file

@ -58,6 +58,7 @@ export class DeckOptionsState {
readonly defaults: ConfigInner; readonly defaults: ConfigInner;
readonly addonComponents: Writable<DynamicSvelteComponent[]>; readonly addonComponents: Writable<DynamicSvelteComponent[]>;
readonly v3Scheduler: boolean; readonly v3Scheduler: boolean;
readonly haveAddons: boolean;
private targetDeckId: number; private targetDeckId: number;
private configs: ConfigWithCount[]; private configs: ConfigWithCount[];
@ -84,6 +85,7 @@ export class DeckOptionsState {
this.configs.findIndex((c) => c.config.id === this.currentDeck.configId) this.configs.findIndex((c) => c.config.id === this.currentDeck.configId)
); );
this.v3Scheduler = data.v3Scheduler; this.v3Scheduler = data.v3Scheduler;
this.haveAddons = data.haveAddons;
// decrement the use count of the starting item, as we'll apply +1 to currently // decrement the use count of the starting item, as we'll apply +1 to currently
// selected one at display time // selected one at display time