Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:invoke-ai/InvokeAI into main

Browse Source
This commit is contained in:
Lincoln Stein 2023-07-03 10:55:12 -04:00
commit 73a27918c6
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
invokeai/frontend/web/src/features/gallery/components/ImageContextMenu.tsx
View File

@ -217,13 +217,13 @@ const ImageContextMenu = ({ image, children }: Props) => {
{t('parameters.sendToUnifiedCanvas')} {t('parameters.sendToUnifiedCanvas')}
</MenuItem> </MenuItem>
)} )}
<MenuItem {/* <MenuItem
icon={<FaFolder />} icon={<FaFolder />}
isDisabled={isInBatch} isDisabled={isInBatch}
onClickCapture={handleAddToBatch} onClickCapture={handleAddToBatch}
> >
Add to Batch Add to Batch
</MenuItem> </MenuItem> */}
<MenuItem icon={<FaFolder />} onClickCapture={handleAddToBoard}> <MenuItem icon={<FaFolder />} onClickCapture={handleAddToBoard}>
{image.board_id ? 'Change Board' : 'Add to Board'} {image.board_id ? 'Change Board' : 'Add to Board'}
</MenuItem> </MenuItem>
@ -252,12 +252,12 @@ const ImageContextMenu = ({ image, children }: Props) => {
> >
Move Selection to Board Move Selection to Board
</MenuItem> </MenuItem>
<MenuItem {/* <MenuItem
icon={<FaFolderPlus />} icon={<FaFolderPlus />}
onClickCapture={handleAddSelectionToBatch} onClickCapture={handleAddSelectionToBatch}
> >
Add Selection to Batch Add Selection to Batch
</MenuItem> </MenuItem> */}
<MenuItem <MenuItem
sx={{ color: 'error.600', _dark: { color: 'error.300' } }} sx={{ color: 'error.600', _dark: { color: 'error.300' } }}
icon={<FaTrash />} icon={<FaTrash />}

7
invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/InitialImageDisplay.tsx
View File

@ -114,7 +114,7 @@ const InitialImageDisplay = () => {
Initial Image Initial Image
</Text> </Text>
<Spacer /> <Spacer />
<IAIButton {/* <IAIButton
tooltip={useBatchAsInitialImage ? 'Disable Batch' : 'Enable Batch'} tooltip={useBatchAsInitialImage ? 'Disable Batch' : 'Enable Batch'}
aria-label={useBatchAsInitialImage ? 'Disable Batch' : 'Enable Batch'} aria-label={useBatchAsInitialImage ? 'Disable Batch' : 'Enable Batch'}
leftIcon={<FaLayerGroup />} leftIcon={<FaLayerGroup />}
@ -122,7 +122,7 @@ const InitialImageDisplay = () => {
onClick={handleClickUseBatch} onClick={handleClickUseBatch}
> >
{useBatchAsInitialImage ? 'Batch' : 'Single'} {useBatchAsInitialImage ? 'Batch' : 'Single'}
</IAIButton> </IAIButton> */}
<IAIIconButton <IAIIconButton
tooltip={ tooltip={
useBatchAsInitialImage ? 'Upload to Batch' : 'Upload Initial Image' useBatchAsInitialImage ? 'Upload to Batch' : 'Upload Initial Image'
@ -146,7 +146,8 @@ const InitialImageDisplay = () => {
isDisabled={isResetButtonDisabled} isDisabled={isResetButtonDisabled}
/> />
</Flex> </Flex>
{useBatchAsInitialImage ? <BatchImageContainer /> : <InitialImage />} <InitialImage />
{/* {useBatchAsInitialImage ? <BatchImageContainer /> : <InitialImage />} */}
<input {...getUploadInputProps()} /> <input {...getUploadInputProps()} />
</Flex> </Flex>
); );

10
invokeai/frontend/web/src/features/ui/components/InvokeTabs.tsx
View File

@ -66,11 +66,11 @@ const tabs: InvokeTabInfo[] = [
icon: <Icon as={MdDeviceHub} sx={{ boxSize: 6, pointerEvents: 'none' }} />, icon: <Icon as={MdDeviceHub} sx={{ boxSize: 6, pointerEvents: 'none' }} />,
content: <NodesTab />, content: <NodesTab />,
}, },
{ // {
id: 'batch', // id: 'batch',
icon: <Icon as={FaLayerGroup} sx={{ boxSize: 6, pointerEvents: 'none' }} />, // icon: <Icon as={FaLayerGroup} sx={{ boxSize: 6, pointerEvents: 'none' }} />,
content: <BatchTab />, // content: <BatchTab />,
}, // },
]; ];
const enabledTabsSelector = createSelector( const enabledTabsSelector = createSelector(