diff --git a/proto/anki/deckconfig.proto b/proto/anki/deckconfig.proto index f4e40015e..7121b565c 100644 --- a/proto/anki/deckconfig.proto +++ b/proto/anki/deckconfig.proto @@ -165,9 +165,8 @@ message DeckConfigsForUpdate { DeckConfig defaults = 3; bool schema_modified = 4; bool v3_scheduler = 5; - bool have_addons = 6; // only applies to v3 scheduler - string card_state_customizer = 7; + string card_state_customizer = 6; } message UpdateDeckConfigsRequest { diff --git a/qt/aqt/mediasrv.py b/qt/aqt/mediasrv.py index 76a00f43e..27f63f33d 100644 --- a/qt/aqt/mediasrv.py +++ b/qt/aqt/mediasrv.py @@ -26,7 +26,7 @@ import aqt.operations from anki import hooks from anki._vendor import stringcase from anki.collection import OpChanges -from anki.decks import DeckConfigsForUpdate, UpdateDeckConfigs +from anki.decks import UpdateDeckConfigs from anki.scheduler_pb2 import SchedulingStates from anki.utils import dev_mode from aqt.changenotetype import ChangeNotetypeDialog @@ -385,10 +385,7 @@ def congrats_info() -> bytes: def get_deck_configs_for_update() -> bytes: - config_bytes = aqt.mw.col._backend.get_deck_configs_for_update_raw(request.data) - configs = DeckConfigsForUpdate.FromString(config_bytes) - configs.have_addons = aqt.mw.addonManager.dirty - return configs.SerializeToString() + return aqt.mw.col._backend.get_deck_configs_for_update_raw(request.data) def update_deck_configs() -> bytes: diff --git a/rslib/src/deckconfig/update.rs b/rslib/src/deckconfig/update.rs index e99064b02..b9c152a81 100644 --- a/rslib/src/deckconfig/update.rs +++ b/rslib/src/deckconfig/update.rs @@ -46,7 +46,6 @@ impl Collection { .get_collection_timestamps()? .schema_changed_since_sync(), v3_scheduler: self.get_config_bool(BoolKey::Sched2021), - have_addons: false, card_state_customizer: self.get_config_string(StringKey::CardStateCustomizer), }) } diff --git a/ts/deck-options/Addons.svelte b/ts/deck-options/Addons.svelte index d9516335c..a5c8a3cfc 100644 --- a/ts/deck-options/Addons.svelte +++ b/ts/deck-options/Addons.svelte @@ -12,14 +12,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html const auxData = state.currentAuxData; -{#if $components.length || state.haveAddons} +{#if $components.length} -

- 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. -

- {#each $components as addon} {/each} diff --git a/ts/deck-options/lib.ts b/ts/deck-options/lib.ts index 9428bf356..6f8a4a65a 100644 --- a/ts/deck-options/lib.ts +++ b/ts/deck-options/lib.ts @@ -39,7 +39,6 @@ export class DeckOptionsState { readonly defaults: DeckConfig.DeckConfig.Config; readonly addonComponents: Writable; readonly v3Scheduler: boolean; - readonly haveAddons: boolean; private targetDeckId: number; private configs: ConfigWithCount[]; @@ -67,7 +66,6 @@ export class DeckOptionsState { this.configs.findIndex((c) => c.config.id === this.currentDeck.configId), ); this.v3Scheduler = data.v3Scheduler; - this.haveAddons = data.haveAddons; this.cardStateCustomizer = writable(data.cardStateCustomizer); this.deckLimits = writable(data.currentDeck?.limits ?? createLimits());