rebased and made more chnges

This commit is contained in:
Rohinish 2024-01-22 11:34:20 +05:30 committed by psychedelicious
parent 37bc4f78d0
commit dad364da17
4 changed files with 12 additions and 15 deletions

View File

@ -17,7 +17,7 @@ const BoardAutoAddSelect = () => {
selectFromResult: ({ data }) => { selectFromResult: ({ data }) => {
const options: ComboboxOption[] = [ const options: ComboboxOption[] = [
{ {
label: 'None', label: t('controlnet.none'),
value: 'none', value: 'none',
}, },
].concat( ].concat(

View File

@ -126,7 +126,7 @@ const GalleryImageGrid = () => {
loadingText={t('gallery.loading')} loadingText={t('gallery.loading')}
flexShrink={0} flexShrink={0}
> >
{`Load More (${currentData.ids.length} of ${currentViewTotal})`} {`${t('accessibility.loadMore')} (${currentData.ids.length} of ${currentViewTotal})`}
</Button> </Button>
</> </>
); );

View File

@ -7,16 +7,19 @@ import { isParameterMaskBlurMethod } from 'features/parameters/types/parameterSc
import { memo, useCallback, useMemo } from 'react'; import { memo, useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
const options: ComboboxOption[] = [
{ label: 'Box Blur', value: 'box' },
{ label: 'Gaussian Blur', value: 'gaussian' },
];
const ParamMaskBlurMethod = () => { const ParamMaskBlurMethod = () => {
const maskBlurMethod = useAppSelector((s) => s.generation.maskBlurMethod); const maskBlurMethod = useAppSelector((s) => s.generation.maskBlurMethod);
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const { t } = useTranslation(); const { t } = useTranslation();
const options: ComboboxOption[] = useMemo(
() => [
{ label: t('parameters.boxBlur'), value: 'box' },
{ label: t('parameters.gaussianBlur'), value: 'gaussian' },
],
[t]
);
const onChange = useCallback<ComboboxOnChange>( const onChange = useCallback<ComboboxOnChange>(
(v) => { (v) => {
if (!isParameterMaskBlurMethod(v?.value)) { if (!isParameterMaskBlurMethod(v?.value)) {

View File

@ -75,8 +75,8 @@ const InitialImageDisplay = () => {
</Text> </Text>
<Spacer /> <Spacer />
<IconButton <IconButton
tooltip="Upload Initial Image" tooltip={t('toast.uploadInitialImage')}
aria-label="Upload Initial Image" aria-label={t('toast.uploadInitialImage')}
icon={<PiUploadSimpleBold />} icon={<PiUploadSimpleBold />}
{...getUploadButtonProps()} {...getUploadButtonProps()}
/> />
@ -87,15 +87,9 @@ const InitialImageDisplay = () => {
onClick={handleUseSizeInitialImage} onClick={handleUseSizeInitialImage}
isDisabled={!initialImage} isDisabled={!initialImage}
/> />
<<<<<<< HEAD
<IconButton <IconButton
tooltip="Reset Initial Image"
aria-label="Reset Initial Image"
=======
<InvIconButton
tooltip={t('toast.resetInitialImage')} tooltip={t('toast.resetInitialImage')}
aria-label={t('toast.resetInitialImage')} aria-label={t('toast.resetInitialImage')}
>>>>>>> a94e09658 (more strings and translations added)
icon={<PiArrowCounterClockwiseBold />} icon={<PiArrowCounterClockwiseBold />}
onClick={handleReset} onClick={handleReset}
isDisabled={!initialImage} isDisabled={!initialImage}