Skip to content

Commit 7ea343c

Browse files
tidy(ui): remove "staging" from the new settings verbiage
1 parent 12179da commit 7ea343c

File tree

9 files changed

+66
-68
lines changed

9 files changed

+66
-68
lines changed

invokeai/frontend/web/public/locales/en.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@
19621962
"recalculateRects": "Recalculate Rects",
19631963
"clipToBbox": "Clip Strokes to Bbox",
19641964
"outputOnlyMaskedRegions": "Output Only Generated Regions",
1965-
"saveAllStagingImagesToGallery": "Save All Staging Images to Gallery",
1965+
"saveAllImagesToGallery": "Save All Images to Gallery",
19661966
"addLayer": "Add Layer",
19671967
"duplicate": "Duplicate",
19681968
"moveToFront": "Move to Front",
@@ -2331,8 +2331,8 @@
23312331
"label": "Preserve Masked Region",
23322332
"alert": "Preserving Masked Region"
23332333
},
2334-
"saveAllStagingImagesToGallery": {
2335-
"alert": "Saving All Staging Images to Gallery"
2334+
"saveAllImagesToGallery": {
2335+
"alert": "Saving All Images to Gallery"
23362336
},
23372337
"isolatedStagingPreview": "Isolated Staging Preview",
23382338
"isolatedPreview": "Isolated Preview",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { Alert, AlertIcon, AlertTitle } from '@invoke-ai/ui-library';
2+
import { useAppSelector } from 'app/store/storeHooks';
3+
import { selectSaveAllImagesToGallery } from 'features/controlLayers/store/canvasSettingsSlice';
4+
import { memo } from 'react';
5+
import { useTranslation } from 'react-i18next';
6+
7+
export const CanvasAlertsSaveAllImagesToGallery = memo(() => {
8+
const { t } = useTranslation();
9+
const saveAllImagesToGallery = useAppSelector(selectSaveAllImagesToGallery);
10+
11+
if (!saveAllImagesToGallery) {
12+
return null;
13+
}
14+
15+
return (
16+
<Alert status="info" borderRadius="base" fontSize="sm" shadow="md" w="fit-content">
17+
<AlertIcon />
18+
<AlertTitle>{t('controlLayers.settings.saveAllImagesToGallery.alert')}</AlertTitle>
19+
</Alert>
20+
);
21+
});
22+
23+
CanvasAlertsSaveAllImagesToGallery.displayName = 'CanvasAlertsSaveAllImagesToGallery';

invokeai/frontend/web/src/features/controlLayers/components/CanvasAlerts/CanvasAlertsSaveAllStagingImagesToGallery.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsPopover.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { CanvasSettingsPreserveMaskCheckbox } from 'features/controlLayers/compo
2626
import { CanvasSettingsPressureSensitivityCheckbox } from 'features/controlLayers/components/Settings/CanvasSettingsPressureSensitivity';
2727
import { CanvasSettingsRecalculateRectsButton } from 'features/controlLayers/components/Settings/CanvasSettingsRecalculateRectsButton';
2828
import { CanvasSettingsRuleOfThirdsSwitch } from 'features/controlLayers/components/Settings/CanvasSettingsRuleOfThirdsGuideSwitch';
29-
import { CanvasSettingsSaveAllStagingImagesToGalleryCheckbox } from 'features/controlLayers/components/Settings/CanvasSettingsSaveAllStagingImagesToGalleryCheckbox';
29+
import { CanvasSettingsSaveAllImagesToGalleryCheckbox } from 'features/controlLayers/components/Settings/CanvasSettingsSaveAllImagesToGalleryCheckbox';
3030
import { CanvasSettingsShowHUDSwitch } from 'features/controlLayers/components/Settings/CanvasSettingsShowHUDSwitch';
3131
import { CanvasSettingsShowProgressOnCanvas } from 'features/controlLayers/components/Settings/CanvasSettingsShowProgressOnCanvasSwitch';
3232
import { memo } from 'react';
@@ -62,7 +62,7 @@ export const CanvasSettingsPopover = memo(() => {
6262
<CanvasSettingsPreserveMaskCheckbox />
6363
<CanvasSettingsClipToBboxCheckbox />
6464
<CanvasSettingsOutputOnlyMaskedRegionsCheckbox />
65-
<CanvasSettingsSaveAllStagingImagesToGalleryCheckbox />
65+
<CanvasSettingsSaveAllImagesToGalleryCheckbox />
6666
</Flex>
6767

6868
<Divider />
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { Checkbox, FormControl, FormLabel } from '@invoke-ai/ui-library';
2+
import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
3+
import {
4+
selectSaveAllImagesToGallery,
5+
settingsSaveAllImagesToGalleryToggled,
6+
} from 'features/controlLayers/store/canvasSettingsSlice';
7+
import { memo, useCallback } from 'react';
8+
import { useTranslation } from 'react-i18next';
9+
10+
export const CanvasSettingsSaveAllImagesToGalleryCheckbox = memo(() => {
11+
const { t } = useTranslation();
12+
const dispatch = useAppDispatch();
13+
const saveAllImagesToGallery = useAppSelector(selectSaveAllImagesToGallery);
14+
const onChange = useCallback(() => {
15+
dispatch(settingsSaveAllImagesToGalleryToggled());
16+
}, [dispatch]);
17+
return (
18+
<FormControl w="full">
19+
<FormLabel flexGrow={1}>{t('controlLayers.saveAllImagesToGallery')}</FormLabel>
20+
<Checkbox isChecked={saveAllImagesToGallery} onChange={onChange} />
21+
</FormControl>
22+
);
23+
});
24+
25+
CanvasSettingsSaveAllImagesToGalleryCheckbox.displayName = 'CanvasSettingsSaveAllImagesToGalleryCheckbox';

invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsSaveAllStagingImagesToGalleryCheckbox.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

invokeai/frontend/web/src/features/controlLayers/store/canvasSettingsSlice.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type CanvasSettingsState = {
8080
/**
8181
* Whether to save all staging images to the gallery instead of keeping them as intermediate images.
8282
*/
83-
saveAllStagingImagesToGallery: boolean;
83+
saveAllImagesToGallery: boolean;
8484
};
8585

8686
const initialState: CanvasSettingsState = {
@@ -101,7 +101,7 @@ const initialState: CanvasSettingsState = {
101101
isolatedLayerPreview: true,
102102
pressureSensitivity: true,
103103
ruleOfThirds: false,
104-
saveAllStagingImagesToGallery: false,
104+
saveAllImagesToGallery: false,
105105
};
106106

107107
export const canvasSettingsSlice = createSlice({
@@ -159,8 +159,8 @@ export const canvasSettingsSlice = createSlice({
159159
settingsRuleOfThirdsToggled: (state) => {
160160
state.ruleOfThirds = !state.ruleOfThirds;
161161
},
162-
settingsSaveAllStagingImagesToGalleryToggled: (state) => {
163-
state.saveAllStagingImagesToGallery = !state.saveAllStagingImagesToGallery;
162+
settingsSaveAllImagesToGalleryToggled: (state) => {
163+
state.saveAllImagesToGallery = !state.saveAllImagesToGallery;
164164
},
165165
},
166166
});
@@ -183,7 +183,7 @@ export const {
183183
settingsIsolatedLayerPreviewToggled,
184184
settingsPressureSensitivityToggled,
185185
settingsRuleOfThirdsToggled,
186-
settingsSaveAllStagingImagesToGalleryToggled,
186+
settingsSaveAllImagesToGalleryToggled,
187187
} = canvasSettingsSlice.actions;
188188

189189
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
@@ -218,6 +218,4 @@ export const selectIsolatedStagingPreview = createCanvasSettingsSelector((settin
218218
export const selectIsolatedLayerPreview = createCanvasSettingsSelector((settings) => settings.isolatedLayerPreview);
219219
export const selectPressureSensitivity = createCanvasSettingsSelector((settings) => settings.pressureSensitivity);
220220
export const selectRuleOfThirds = createCanvasSettingsSelector((settings) => settings.ruleOfThirds);
221-
export const selectSaveAllStagingImagesToGallery = createCanvasSettingsSelector(
222-
(settings) => settings.saveAllStagingImagesToGallery
223-
);
221+
export const selectSaveAllImagesToGallery = createCanvasSettingsSelector((settings) => settings.saveAllImagesToGallery);

invokeai/frontend/web/src/features/nodes/util/graph/graphBuilderUtils.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createSelector } from '@reduxjs/toolkit';
22
import type { RootState } from 'app/store/store';
33
import { getPrefixedId } from 'features/controlLayers/konva/util';
4-
import { selectSaveAllStagingImagesToGallery } from 'features/controlLayers/store/canvasSettingsSlice';
4+
import { selectSaveAllImagesToGallery } from 'features/controlLayers/store/canvasSettingsSlice';
55
import {
66
selectImg2imgStrength,
77
selectMainModelConfig,
@@ -45,11 +45,11 @@ export const selectCanvasOutputFields = (state: RootState) => {
4545
// Advanced session means working on canvas - images are not saved to gallery or added to a board.
4646
// Simple session means working in YOLO mode - images are saved to gallery & board.
4747
const tab = selectActiveTab(state);
48-
const saveAllStagingImagesToGallery = selectSaveAllStagingImagesToGallery(state);
48+
const saveAllImagesToGallery = selectSaveAllImagesToGallery(state);
4949

50-
// If we're on canvas and the save all staging images setting is enabled, save to gallery
51-
const is_intermediate = tab === 'canvas' && !saveAllStagingImagesToGallery;
52-
const board = tab === 'canvas' && !saveAllStagingImagesToGallery ? undefined : getBoardField(state);
50+
// If we're on canvas and the save all images setting is enabled, save to gallery
51+
const is_intermediate = tab === 'canvas' && !saveAllImagesToGallery;
52+
const board = tab === 'canvas' && !saveAllImagesToGallery ? undefined : getBoardField(state);
5353

5454
return {
5555
is_intermediate,

invokeai/frontend/web/src/features/ui/layouts/CanvasWorkspacePanel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ContextMenu, Divider, Flex, IconButton, Menu, MenuButton, MenuList } fr
22
import { useAppSelector } from 'app/store/storeHooks';
33
import { CanvasAlertsInvocationProgress } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsInvocationProgress';
44
import { CanvasAlertsPreserveMask } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsPreserveMask';
5-
import { CanvasAlertsSaveAllStagingImagesToGallery } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSaveAllStagingImagesToGallery';
5+
import { CanvasAlertsSaveAllImagesToGallery } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSaveAllImagesToGallery';
66
import { CanvasAlertsSelectedEntityStatus } from 'features/controlLayers/components/CanvasAlerts/CanvasAlertsSelectedEntityStatus';
77
import { CanvasBusySpinner } from 'features/controlLayers/components/CanvasBusySpinner';
88
import { CanvasContextMenuGlobalMenuItems } from 'features/controlLayers/components/CanvasContextMenu/CanvasContextMenuGlobalMenuItems';
@@ -89,7 +89,7 @@ export const CanvasWorkspacePanel = memo(() => {
8989
{showHUD && <CanvasHUD />}
9090
<CanvasAlertsSelectedEntityStatus />
9191
<CanvasAlertsPreserveMask />
92-
<CanvasAlertsSaveAllStagingImagesToGallery />
92+
<CanvasAlertsSaveAllImagesToGallery />
9393
<CanvasAlertsInvocationProgress />
9494
</Flex>
9595
<Flex position="absolute" top={1} insetInlineEnd={1}>

0 commit comments

Comments
 (0)