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

Rename SectionItem to just Item and use across option sections

Browse source
This commit is contained in:
Henrik Giesel 2021-05-29 17:44:08 +02:00
parent f895919435
commit e030e6f656
15 changed files with 317 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ts/components/ButtonToolbar.svelte
View file

@ -5,7 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="typescript"> <script lang="typescript">
import { setContext } from "svelte"; import { setContext } from "svelte";
import { writable } from "svelte/store"; import { writable } from "svelte/store";
import SectionItem from "./SectionItem.svelte"; import Item from "./Item.svelte";
import { sectionKey } from "./contextKeys"; import { sectionKey } from "./contextKeys";
import type { Identifier } from "./identifier"; import type { Identifier } from "./identifier";
import { insertElement, appendElement } from "./identifier"; import { insertElement, appendElement } from "./identifier";
@ -84,9 +84,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
<slot /> <slot />
{#each $dynamicItems as item} {#each $dynamicItems as item}
<SectionItem id={item[0].id} registration={item[1]}> <Item id={item[0].id} registration={item[1]}>
<svelte:component this={item[0].component} {...item[0].props} /> <svelte:component this={item[0].component} {...item[0].props} />
</SectionItem> </Item>
{/each} {/each}
</div> </div>

0
ts/components/SectionItem.svelte → ts/components/Item.svelte
View file

6
ts/components/Section.svelte
View file

@ -5,7 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="typescript"> <script lang="typescript">
import { setContext } from "svelte"; import { setContext } from "svelte";
import { writable } from "svelte/store"; import { writable } from "svelte/store";
import SectionItem from "./SectionItem.svelte"; import Item from "./Item.svelte";
import { sectionKey } from "./contextKeys"; import { sectionKey } from "./contextKeys";
import type { Identifier } from "./identifier"; import type { Identifier } from "./identifier";
import { insertElement, appendElement } from "./identifier"; import { insertElement, appendElement } from "./identifier";
@ -56,9 +56,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<div bind:this={sectionRef} {id}> <div bind:this={sectionRef} {id}>
<slot /> <slot />
{#each $dynamicItems as item} {#each $dynamicItems as item}
<SectionItem id={item[0].id} registration={item[1]}> <Item id={item[0].id} registration={item[1]}>
<svelte:component this={item[0].component} {...item[0].props} /> <svelte:component this={item[0].component} {...item[0].props} />
</SectionItem> </Item>
{/each} {/each}
</div> </div>

13
ts/deckoptions/AdvancedOptions.svelte
View file

@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import Item from "components/Item.svelte";
import SpinBoxRow from "./SpinBoxRow.svelte"; import SpinBoxRow from "./SpinBoxRow.svelte";
import SpinBoxFloatRow from "./SpinBoxFloatRow.svelte"; import SpinBoxFloatRow from "./SpinBoxFloatRow.svelte";
import type { DeckOptionsState } from "./lib"; import type { DeckOptionsState } from "./lib";
@ -17,6 +18,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<TitledContainer title={tr.deckConfigAdvancedTitle()} {api}> <TitledContainer title={tr.deckConfigAdvancedTitle()} {api}>
<Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.maximumReviewInterval} bind:value={$config.maximumReviewInterval}
defaultValue={defaults.maximumReviewInterval} defaultValue={defaults.maximumReviewInterval}
@ -26,7 +28,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingMaximumInterval()} {tr.schedulingMaximumInterval()}
</SpinBoxRow> </SpinBoxRow>
</Item>
<Item>
<SpinBoxFloatRow <SpinBoxFloatRow
bind:value={$config.initialEase} bind:value={$config.initialEase}
defaultValue={defaults.initialEase} defaultValue={defaults.initialEase}
@ -36,7 +40,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingStartingEase()} {tr.schedulingStartingEase()}
</SpinBoxFloatRow> </SpinBoxFloatRow>
</Item>
<Item>
<SpinBoxFloatRow <SpinBoxFloatRow
bind:value={$config.easyMultiplier} bind:value={$config.easyMultiplier}
defaultValue={defaults.easyMultiplier} defaultValue={defaults.easyMultiplier}
@ -46,7 +52,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingEasyBonus()} {tr.schedulingEasyBonus()}
</SpinBoxFloatRow> </SpinBoxFloatRow>
</Item>
<Item>
<SpinBoxFloatRow <SpinBoxFloatRow
bind:value={$config.intervalMultiplier} bind:value={$config.intervalMultiplier}
defaultValue={defaults.intervalMultiplier} defaultValue={defaults.intervalMultiplier}
@ -56,7 +64,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingIntervalModifier()} {tr.schedulingIntervalModifier()}
</SpinBoxFloatRow> </SpinBoxFloatRow>
</Item>
<Item>
<SpinBoxFloatRow <SpinBoxFloatRow
bind:value={$config.hardMultiplier} bind:value={$config.hardMultiplier}
defaultValue={defaults.hardMultiplier} defaultValue={defaults.hardMultiplier}
@ -66,7 +76,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingHardInterval()} {tr.schedulingHardInterval()}
</SpinBoxFloatRow> </SpinBoxFloatRow>
</Item>
<Item>
<SpinBoxFloatRow <SpinBoxFloatRow
bind:value={$config.lapseMultiplier} bind:value={$config.lapseMultiplier}
defaultValue={defaults.lapseMultiplier} defaultValue={defaults.lapseMultiplier}
@ -75,4 +87,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingNewInterval()} {tr.schedulingNewInterval()}
</SpinBoxFloatRow> </SpinBoxFloatRow>
</Item>
</TitledContainer> </TitledContainer>

5
ts/deckoptions/AudioOptions.svelte
View file

@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import Item from "components/Item.svelte";
import CheckBoxRow from "./CheckBoxRow.svelte"; import CheckBoxRow from "./CheckBoxRow.svelte";
import type { DeckOptionsState } from "./lib"; import type { DeckOptionsState } from "./lib";
@ -16,13 +17,16 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<TitledContainer title={tr.deckConfigAudioTitle()} {api}> <TitledContainer title={tr.deckConfigAudioTitle()} {api}>
<Item>
<CheckBoxRow <CheckBoxRow
bind:value={$config.disableAutoplay} bind:value={$config.disableAutoplay}
defaultValue={defaults.disableAutoplay} defaultValue={defaults.disableAutoplay}
> >
{tr.deckConfigDisableAutoplay()} {tr.deckConfigDisableAutoplay()}
</CheckBoxRow> </CheckBoxRow>
</Item>
<Item>
<CheckBoxRow <CheckBoxRow
bind:value={$config.skipQuestionWhenReplayingAnswer} bind:value={$config.skipQuestionWhenReplayingAnswer}
defaultValue={defaults.skipQuestionWhenReplayingAnswer} defaultValue={defaults.skipQuestionWhenReplayingAnswer}
@ -30,4 +34,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingAlwaysIncludeQuestionSideWhenReplaying()} {tr.schedulingAlwaysIncludeQuestionSideWhenReplaying()}
</CheckBoxRow> </CheckBoxRow>
</Item>
</TitledContainer> </TitledContainer>

5
ts/deckoptions/BuryOptions.svelte
View file

@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import Item from "components/Item.svelte";
import CheckBoxRow from "./CheckBoxRow.svelte"; import CheckBoxRow from "./CheckBoxRow.svelte";
import type { DeckOptionsState } from "./lib"; import type { DeckOptionsState } from "./lib";
@ -16,6 +17,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<TitledContainer title={tr.deckConfigBuryTitle()} {api}> <TitledContainer title={tr.deckConfigBuryTitle()} {api}>
<Item>
<CheckBoxRow <CheckBoxRow
bind:value={$config.buryNew} bind:value={$config.buryNew}
defaultValue={defaults.buryNew} defaultValue={defaults.buryNew}
@ -23,7 +25,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigBuryNewSiblings()} {tr.deckConfigBuryNewSiblings()}
</CheckBoxRow> </CheckBoxRow>
</Item>
<Item>
<CheckBoxRow <CheckBoxRow
bind:value={$config.buryReviews} bind:value={$config.buryReviews}
defaultValue={defaults.buryReviews} defaultValue={defaults.buryReviews}
@ -31,4 +35,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigBuryReviewSiblings()} {tr.deckConfigBuryReviewSiblings()}
</CheckBoxRow> </CheckBoxRow>
</Item>
</TitledContainer> </TitledContainer>

10
ts/deckoptions/ConfigSelector.svelte
View file

@ -12,7 +12,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import TextInputModal from "./TextInputModal.svelte"; import TextInputModal from "./TextInputModal.svelte";
import StickyBar from "components/StickyBar.svelte"; import StickyBar from "components/StickyBar.svelte";
import ButtonToolbar from "components/ButtonToolbar.svelte"; import ButtonToolbar from "components/ButtonToolbar.svelte";
import SectionItem from "components/SectionItem.svelte"; import Item from "components/Item.svelte";
import ButtonGroup from "components/ButtonGroup.svelte"; import ButtonGroup from "components/ButtonGroup.svelte";
import ButtonGroupItem from "components/ButtonGroupItem.svelte"; import ButtonGroupItem from "components/ButtonGroupItem.svelte";
@ -89,7 +89,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<StickyBar> <StickyBar>
<ButtonToolbar class="justify-content-between" size={2.3} wrap={false}> <ButtonToolbar class="justify-content-between" size={2.3} wrap={false}>
<SectionItem> <Item>
<ButtonGroup class="flex-grow-1"> <ButtonGroup class="flex-grow-1">
<ButtonGroupItem> <ButtonGroupItem>
<SelectButton class="flex-grow-1" on:change={blur}> <SelectButton class="flex-grow-1" on:change={blur}>
@ -104,15 +104,15 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</SelectButton> </SelectButton>
</ButtonGroupItem> </ButtonGroupItem>
</ButtonGroup> </ButtonGroup>
</SectionItem> </Item>
<SectionItem> <Item>
<SaveButton <SaveButton
{state} {state}
on:add={promptToAdd} on:add={promptToAdd}
on:clone={promptToClone} on:clone={promptToClone}
on:rename={promptToRename} on:rename={promptToRename}
/> />
</SectionItem> </Item>
</ButtonToolbar> </ButtonToolbar>
</StickyBar> </StickyBar>

10
ts/deckoptions/DailyLimits.svelte
View file

@ -5,7 +5,7 @@
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import SectionItem from "components/SectionItem.svelte"; import Item from "components/Item.svelte";
import SpinBoxRow from "./SpinBoxRow.svelte"; import SpinBoxRow from "./SpinBoxRow.svelte";
import Warning from "./Warning.svelte"; import Warning from "./Warning.svelte";
import type { DeckOptionsState } from "./lib"; import type { DeckOptionsState } from "./lib";
@ -39,7 +39,7 @@
</script> </script>
<TitledContainer title={tr.deckConfigDailyLimits()} {api}> <TitledContainer title={tr.deckConfigDailyLimits()} {api}>
<SectionItem> <Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.newPerDay} bind:value={$config.newPerDay}
defaultValue={defaults.newPerDay} defaultValue={defaults.newPerDay}
@ -49,9 +49,9 @@
</SpinBoxRow> </SpinBoxRow>
<Warning warning={newCardsGreaterThanParent} /> <Warning warning={newCardsGreaterThanParent} />
</SectionItem> </Item>
<SectionItem> <Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.reviewsPerDay} bind:value={$config.reviewsPerDay}
defaultValue={defaults.reviewsPerDay} defaultValue={defaults.reviewsPerDay}
@ -61,5 +61,5 @@
</SpinBoxRow> </SpinBoxRow>
<Warning warning={reviewsTooLow} /> <Warning warning={reviewsTooLow} />
</SectionItem> </Item>
</TitledContainer> </TitledContainer>

38
ts/deckoptions/DeckOptionsPage.svelte
View file

@ -5,7 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import ConfigSelector from "./ConfigSelector.svelte"; import ConfigSelector from "./ConfigSelector.svelte";
import Container from "components/Container.svelte"; import Container from "components/Container.svelte";
import SectionItem from "components/SectionItem.svelte"; import Item from "components/Item.svelte";
import DailyLimits from "./DailyLimits.svelte"; import DailyLimits from "./DailyLimits.svelte";
import DisplayOrder from "./DisplayOrder.svelte"; import DisplayOrder from "./DisplayOrder.svelte";
import NewOptions from "./NewOptions.svelte"; import NewOptions from "./NewOptions.svelte";
@ -58,36 +58,36 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<ConfigSelector {state} /> <ConfigSelector {state} />
<Container api={options}> <Container api={options}>
<SectionItem> <Item>
<DailyLimits {state} api={dailyLimits} /> <DailyLimits {state} api={dailyLimits} />
</SectionItem> </Item>
<SectionItem> <Item>
<NewOptions {state} api={newOptions} /> <NewOptions {state} api={newOptions} />
</SectionItem> </Item>
<SectionItem> <Item>
<LapseOptions {state} api={lapseOptions} /> <LapseOptions {state} api={lapseOptions} />
</SectionItem> </Item>
<SectionItem> <Item>
<BuryOptions {state} api={buryOptions} /> <BuryOptions {state} api={buryOptions} />
</SectionItem> </Item>
{#if state.v3Scheduler} {#if state.v3Scheduler}
<SectionItem> <Item>
<DisplayOrder {state} api={displayOrder} /> <DisplayOrder {state} api={displayOrder} />
</SectionItem> </Item>
{/if} {/if}
<SectionItem> <Item>
<TimerOptions {state} api={timerOptions} /> <TimerOptions {state} api={timerOptions} />
</SectionItem> </Item>
<SectionItem> <Item>
<AudioOptions {state} api={audioOptions} /> <AudioOptions {state} api={audioOptions} />
</SectionItem> </Item>
<SectionItem> <Item>
<Addons {state} api={addonOptions} /> <Addons {state} api={addonOptions} />
</SectionItem> </Item>
<SectionItem> <Item>
<AdvancedOptions {state} api={advancedOptions} /> <AdvancedOptions {state} api={advancedOptions} />
</SectionItem> </Item>
</Container> </Container>

11
ts/deckoptions/DisplayOrder.svelte
View file

@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import Item from "components/Item.svelte";
import EnumSelectorRow from "./EnumSelectorRow.svelte"; import EnumSelectorRow from "./EnumSelectorRow.svelte";
import type { DeckOptionsState } from "./lib"; import type { DeckOptionsState } from "./lib";
@ -39,6 +40,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<TitledContainer title={tr.deckConfigOrderingTitle()} {api}> <TitledContainer title={tr.deckConfigOrderingTitle()} {api}>
<Item>
<EnumSelectorRow <EnumSelectorRow
bind:value={$config.newCardGatherPriority} bind:value={$config.newCardGatherPriority}
defaultValue={defaults.newCardGatherPriority} defaultValue={defaults.newCardGatherPriority}
@ -47,7 +49,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigNewGatherPriority()} {tr.deckConfigNewGatherPriority()}
</EnumSelectorRow> </EnumSelectorRow>
</Item>
<Item>
<EnumSelectorRow <EnumSelectorRow
bind:value={$config.newCardSortOrder} bind:value={$config.newCardSortOrder}
defaultValue={defaults.newCardSortOrder} defaultValue={defaults.newCardSortOrder}
@ -56,7 +60,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigNewCardSortOrder()} {tr.deckConfigNewCardSortOrder()}
</EnumSelectorRow> </EnumSelectorRow>
</Item>
<Item>
<EnumSelectorRow <EnumSelectorRow
bind:value={$config.newMix} bind:value={$config.newMix}
defaultValue={defaults.newMix} defaultValue={defaults.newMix}
@ -65,7 +71,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigNewReviewPriority()} {tr.deckConfigNewReviewPriority()}
</EnumSelectorRow> </EnumSelectorRow>
</Item>
<Item>
<EnumSelectorRow <EnumSelectorRow
bind:value={$config.interdayLearningMix} bind:value={$config.interdayLearningMix}
defaultValue={defaults.interdayLearningMix} defaultValue={defaults.interdayLearningMix}
@ -74,7 +82,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigInterdayStepPriority()} {tr.deckConfigInterdayStepPriority()}
</EnumSelectorRow> </EnumSelectorRow>
</Item>
<Item>
<EnumSelectorRow <EnumSelectorRow
bind:value={$config.reviewOrder} bind:value={$config.reviewOrder}
defaultValue={defaults.reviewOrder} defaultValue={defaults.reviewOrder}
@ -83,4 +93,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigReviewSortOrder()} {tr.deckConfigReviewSortOrder()}
</EnumSelectorRow> </EnumSelectorRow>
</Item>
</TitledContainer>> </TitledContainer>>

9
ts/deckoptions/LapseOptions.svelte
View file

@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import Item from "components/Item.svelte";
import StepsInputRow from "./StepsInputRow.svelte"; import StepsInputRow from "./StepsInputRow.svelte";
import SpinBoxRow from "./SpinBoxRow.svelte"; import SpinBoxRow from "./SpinBoxRow.svelte";
import EnumSelectorRow from "./EnumSelectorRow.svelte"; import EnumSelectorRow from "./EnumSelectorRow.svelte";
@ -32,6 +33,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<TitledContainer title={tr.schedulingLapses()} {api}> <TitledContainer title={tr.schedulingLapses()} {api}>
<Item>
<StepsInputRow <StepsInputRow
bind:value={$config.relearnSteps} bind:value={$config.relearnSteps}
defaultValue={defaults.relearnSteps} defaultValue={defaults.relearnSteps}
@ -39,7 +41,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigRelearningSteps()} {tr.deckConfigRelearningSteps()}
</StepsInputRow> </StepsInputRow>
</Item>
<Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.minimumLapseInterval} bind:value={$config.minimumLapseInterval}
defaultValue={defaults.minimumLapseInterval} defaultValue={defaults.minimumLapseInterval}
@ -50,7 +54,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</SpinBoxRow> </SpinBoxRow>
<Warning warning={stepsExceedMinimumInterval} /> <Warning warning={stepsExceedMinimumInterval} />
</Item>
<Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.leechThreshold} bind:value={$config.leechThreshold}
defaultValue={defaults.leechThreshold} defaultValue={defaults.leechThreshold}
@ -59,7 +65,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingLeechThreshold()} {tr.schedulingLeechThreshold()}
</SpinBoxRow> </SpinBoxRow>
</Item>
<Item>
<EnumSelectorRow <EnumSelectorRow
bind:value={$config.leechAction} bind:value={$config.leechAction}
defaultValue={defaults.leechAction} defaultValue={defaults.leechAction}
@ -69,4 +77,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingLeechAction()} {tr.schedulingLeechAction()}
</EnumSelectorRow> </EnumSelectorRow>
</Item>
</TitledContainer> </TitledContainer>

9
ts/deckoptions/NewOptions.svelte
View file

@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import Item from "components/Item.svelte";
import StepsInputRow from "./StepsInputRow.svelte"; import StepsInputRow from "./StepsInputRow.svelte";
import SpinBoxRow from "./SpinBoxRow.svelte"; import SpinBoxRow from "./SpinBoxRow.svelte";
import EnumSelectorRow from "./EnumSelectorRow.svelte"; import EnumSelectorRow from "./EnumSelectorRow.svelte";
@ -40,6 +41,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<TitledContainer title={tr.schedulingNewCards()} {api}> <TitledContainer title={tr.schedulingNewCards()} {api}>
<Item>
<StepsInputRow <StepsInputRow
bind:value={$config.learnSteps} bind:value={$config.learnSteps}
defaultValue={defaults.learnSteps} defaultValue={defaults.learnSteps}
@ -47,7 +49,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigLearningSteps()} {tr.deckConfigLearningSteps()}
</StepsInputRow> </StepsInputRow>
</Item>
<Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.graduatingIntervalGood} bind:value={$config.graduatingIntervalGood}
defaultValue={defaults.graduatingIntervalGood} defaultValue={defaults.graduatingIntervalGood}
@ -57,7 +61,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</SpinBoxRow> </SpinBoxRow>
<Warning warning={stepsExceedGraduatingInterval} /> <Warning warning={stepsExceedGraduatingInterval} />
</Item>
<Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.graduatingIntervalEasy} bind:value={$config.graduatingIntervalEasy}
defaultValue={defaults.graduatingIntervalEasy} defaultValue={defaults.graduatingIntervalEasy}
@ -67,7 +73,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</SpinBoxRow> </SpinBoxRow>
<Warning warning={goodExceedsEasy} /> <Warning warning={goodExceedsEasy} />
</Item>
<Item>
<EnumSelectorRow <EnumSelectorRow
bind:value={$config.newCardInsertOrder} bind:value={$config.newCardInsertOrder}
defaultValue={defaults.newCardInsertOrder} defaultValue={defaults.newCardInsertOrder}
@ -77,4 +85,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigNewInsertionOrder()} {tr.deckConfigNewInsertionOrder()}
</EnumSelectorRow> </EnumSelectorRow>
</Item>
</TitledContainer> </TitledContainer>

5
ts/deckoptions/TimerOptions.svelte
View file

@ -5,6 +5,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<script lang="ts"> <script lang="ts">
import * as tr from "lib/i18n"; import * as tr from "lib/i18n";
import TitledContainer from "./TitledContainer.svelte"; import TitledContainer from "./TitledContainer.svelte";
import Item from "components/Item.svelte";
import SpinBoxRow from "./SpinBoxRow.svelte"; import SpinBoxRow from "./SpinBoxRow.svelte";
import CheckBoxRow from "./CheckBoxRow.svelte"; import CheckBoxRow from "./CheckBoxRow.svelte";
import type { DeckOptionsState } from "./lib"; import type { DeckOptionsState } from "./lib";
@ -17,6 +18,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</script> </script>
<TitledContainer title={tr.deckConfigTimerTitle()} {api}> <TitledContainer title={tr.deckConfigTimerTitle()} {api}>
<Item>
<SpinBoxRow <SpinBoxRow
bind:value={$config.capAnswerTimeToSecs} bind:value={$config.capAnswerTimeToSecs}
defaultValue={defaults.capAnswerTimeToSecs} defaultValue={defaults.capAnswerTimeToSecs}
@ -26,7 +28,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.deckConfigMaximumAnswerSecs()} {tr.deckConfigMaximumAnswerSecs()}
</SpinBoxRow> </SpinBoxRow>
</Item>
<Item>
<CheckBoxRow <CheckBoxRow
bind:value={$config.showTimer} bind:value={$config.showTimer}
defaultValue={defaults.showTimer} defaultValue={defaults.showTimer}
@ -34,4 +38,5 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
{tr.schedulingShowAnswerTimer()} {tr.schedulingShowAnswerTimer()}
</CheckBoxRow> </CheckBoxRow>
</Item>
</TitledContainer> </TitledContainer>

22
ts/editor/EditorToolbar.svelte
View file

@ -33,7 +33,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import { isApplePlatform } from "lib/platform"; import { isApplePlatform } from "lib/platform";
import StickyBar from "components/StickyBar.svelte"; import StickyBar from "components/StickyBar.svelte";
import ButtonToolbar from "components/ButtonToolbar.svelte"; import ButtonToolbar from "components/ButtonToolbar.svelte";
import SectionItem from "components/SectionItem.svelte"; import Item from "components/Item.svelte";
import NoteTypeButtons from "./NoteTypeButtons.svelte"; import NoteTypeButtons from "./NoteTypeButtons.svelte";
import FormatInlineButtons from "./FormatInlineButtons.svelte"; import FormatInlineButtons from "./FormatInlineButtons.svelte";
@ -54,24 +54,24 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<StickyBar> <StickyBar>
<ButtonToolbar {size} {wrap} api={toolbar}> <ButtonToolbar {size} {wrap} api={toolbar}>
<SectionItem id="notetype"> <Item id="notetype">
<NoteTypeButtons api={notetypeButtons} /> <NoteTypeButtons api={notetypeButtons} />
</SectionItem> </Item>
<SectionItem id="inlineFormatting"> <Item id="inlineFormatting">
<FormatInlineButtons api={formatInlineButtons} /> <FormatInlineButtons api={formatInlineButtons} />
</SectionItem> </Item>
<SectionItem id="blockFormatting"> <Item id="blockFormatting">
<FormatBlockButtons api={formatBlockButtons} /> <FormatBlockButtons api={formatBlockButtons} />
</SectionItem> </Item>
<SectionItem id="color"> <Item id="color">
<ColorButtons api={colorButtons} /> <ColorButtons api={colorButtons} />
</SectionItem> </Item>
<SectionItem id="template"> <Item id="template">
<TemplateButtons api={templateButtons} /> <TemplateButtons api={templateButtons} />
</SectionItem> </Item>
</ButtonToolbar> </ButtonToolbar>
</StickyBar> </StickyBar>

10
ts/editor/FormatBlockButtons.svelte
View file

@ -10,7 +10,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
import ButtonGroupItem from "components/ButtonGroupItem.svelte"; import ButtonGroupItem from "components/ButtonGroupItem.svelte";
import IconButton from "components/IconButton.svelte"; import IconButton from "components/IconButton.svelte";
import ButtonDropdown from "components/ButtonDropdown.svelte"; import ButtonDropdown from "components/ButtonDropdown.svelte";
import SectionItem from "components/SectionItem.svelte"; import Item from "components/Item.svelte";
import WithDropdownMenu from "components/WithDropdownMenu.svelte"; import WithDropdownMenu from "components/WithDropdownMenu.svelte";
import OnlyEditable from "./OnlyEditable.svelte"; import OnlyEditable from "./OnlyEditable.svelte";
import CommandIconButton from "./CommandIconButton.svelte"; import CommandIconButton from "./CommandIconButton.svelte";
@ -71,7 +71,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</OnlyEditable> </OnlyEditable>
<ButtonDropdown id={menuId}> <ButtonDropdown id={menuId}>
<SectionItem id="justify"> <Item id="justify">
<ButtonGroup> <ButtonGroup>
<ButtonGroupItem> <ButtonGroupItem>
<CommandIconButton <CommandIconButton
@ -109,9 +109,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
> >
</ButtonGroupItem> </ButtonGroupItem>
</ButtonGroup> </ButtonGroup>
</SectionItem> </Item>
<SectionItem id="indentation"> <Item id="indentation">
<ButtonGroup> <ButtonGroup>
<ButtonGroupItem> <ButtonGroupItem>
<OnlyEditable let:disabled> <OnlyEditable let:disabled>
@ -137,7 +137,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
</OnlyEditable> </OnlyEditable>
</ButtonGroupItem> </ButtonGroupItem>
</ButtonGroup> </ButtonGroup>
</SectionItem> </Item>
</ButtonDropdown> </ButtonDropdown>
</WithDropdownMenu> </WithDropdownMenu>
</ButtonGroupItem> </ButtonGroupItem>