advanced panels

This commit is contained in:
caranicas 2022-09-15 15:35:41 -04:00
parent 93e71027fd
commit fd3b0c20b6
8 changed files with 314 additions and 281 deletions

View File

@ -1,4 +1,4 @@
import { style, globalStyle } from '@vanilla-extract/css'; import { style, globalStyle } from "@vanilla-extract/css";
export const AdvancedSettingsList = style({ export const AdvancedSettingsList = style({
// font-size: 9pt; // font-size: 9pt;
@ -6,17 +6,32 @@ export const AdvancedSettingsList = style({
// padding-left: 10px; // padding-left: 10px;
// list-style-type: none; // list-style-type: none;
fontSize: '9pt', fontSize: "9pt",
marginBottom: '5px', marginBottom: "5px",
paddingLeft: '10px', paddingLeft: "10px",
listStyleType: 'none', listStyleType: "none",
}); });
export const AdvancedSettingItem = style({ export const AdvancedSettingItem = style({
paddingBottom: '5px', paddingBottom: "5px",
}); });
globalStyle( 'button > h4', { export const MenuButton = style({
color:'lightgrey' display: "block",
width: "100%",
textAlign: "left",
backgroundColor: "transparent",
color: "#fff",
border: "0 none",
cursor: "pointer",
padding: "0",
marginBottom: "10px",
}); });
globalStyle(`${MenuButton}> h4`, {
color: '#e7ba71',
marginTop:"5px !important",
});

View File

@ -1,9 +1,12 @@
import React, {useState} from "react"; import React, { useState } from "react";
import { useImageCreate } from "../../../../../store/imageCreateStore"; import { useImageCreate } from "../../../../../store/imageCreateStore";
import { MenuButton }
from //@ts-ignore
'../advancedsettings.css.ts'
export default function GpuSettings() { export default function GpuSettings() {
const turbo = useImageCreate((state) => state.getValueForRequestKey("turbo")); const turbo = useImageCreate((state) => state.getValueForRequestKey("turbo"));
const use_cpu = useImageCreate((state) => const use_cpu = useImageCreate((state) =>
state.getValueForRequestKey("use_cpu") state.getValueForRequestKey("use_cpu")
@ -24,12 +27,13 @@ export default function GpuSettings() {
<div> <div>
<button <button
type="button" type="button"
className="panel-box-toggle-btn" className={MenuButton}
onClick={toggleGpuOpen} onClick={toggleGpuOpen}
> >
<h4>GPU Settings</h4> <h4>GPU Settings</h4>
</button> </button>
{gpuOpen && <> {gpuOpen && (
<>
<div> <div>
<label> <label>
<input <input
@ -37,8 +41,8 @@ export default function GpuSettings() {
onChange={(e) => setRequestOption("turbo", e.target.checked)} onChange={(e) => setRequestOption("turbo", e.target.checked)}
type="checkbox" type="checkbox"
/> />
Turbo mode (generates images faster, but uses an additional 1 GB of Turbo mode (generates images faster, but uses an additional 1 GB
GPU memory) of GPU memory)
</label> </label>
</div> </div>
<div> <div>
@ -64,7 +68,8 @@ export default function GpuSettings() {
VRAM) VRAM)
</label> </label>
</div> </div>
</>} </>
)}
</div> </div>
); );
} }

View File

@ -1,11 +1,16 @@
import React, {useState} from "react"; import React, { useState } from "react";
import { useImageCreate } from "../../../../../store/imageCreateStore"; import { useImageCreate } from "../../../../../store/imageCreateStore";
export default function ImprovementSettings() { import { MenuButton }
from //@ts-ignore
'../advancedsettings.css.ts';
export default function ImprovementSettings() {
// these are conditionals that should be retired and inferred from the store // these are conditionals that should be retired and inferred from the store
const isUsingUpscaling = useImageCreate((state) => state.isUsingUpscaling()); const isUsingUpscaling = useImageCreate((state) => state.isUsingUpscaling());
const isUsingFaceCorrection = useImageCreate((state) =>state.isUsingFaceCorrection()); const isUsingFaceCorrection = useImageCreate((state) =>
state.isUsingFaceCorrection()
);
const use_upscale = useImageCreate((state) => const use_upscale = useImageCreate((state) =>
state.getValueForRequestKey("use_upscale") state.getValueForRequestKey("use_upscale")
@ -31,17 +36,17 @@ export default function ImprovementSettings() {
setImprovementOpen(!improvementOpen); setImprovementOpen(!improvementOpen);
}; };
return ( return (
<div> <div>
<button <button
type="button" type="button"
className="panel-box-toggle-btn" className={MenuButton}
onClick={toggleImprovementOpen} onClick={toggleImprovementOpen}
> >
<h4>Improvement Settings</h4> <h4>Improvement Settings</h4>
</button> </button>
{improvementOpen && <> {improvementOpen && (
<>
<div> <div>
<label> <label>
<input <input
@ -88,7 +93,8 @@ export default function ImprovementSettings() {
Show only filtered image Show only filtered image
</label> </label>
</div> </div>
</>} </>
)}
</div> </div>
); );
} }

View File

@ -2,9 +2,8 @@ import React, { useEffect } from "react";
import { useImageCreate } from "../../../../store/imageCreateStore"; import { useImageCreate } from "../../../../store/imageCreateStore";
import { import {
AdvancedSettingsList, AdvancedSettingsList,
AdvancedSettingItem AdvancedSettingItem, // @ts-ignore
} // @ts-ignore } from "./advancedsettings.css.ts";
from "./advancedsettings.css.ts";
import ImprovementSettings from "./improvementSettings"; import ImprovementSettings from "./improvementSettings";
import PropertySettings from "./propertySettings"; import PropertySettings from "./propertySettings";
@ -12,7 +11,6 @@ import WorkflowSettings from "./workflowSettings";
import GpuSettings from "./gpuSettings"; import GpuSettings from "./gpuSettings";
function SettingsList() { function SettingsList() {
return ( return (
<ul className={AdvancedSettingsList}> <ul className={AdvancedSettingsList}>
<li className={AdvancedSettingItem}> <li className={AdvancedSettingItem}>

View File

@ -1,7 +1,9 @@
import React, {useState} from "react"; import React, { useState } from "react";
import { useImageCreate } from "../../../../../store/imageCreateStore"; import { useImageCreate } from "../../../../../store/imageCreateStore";
import { MenuButton }
from //@ts-ignore
'../advancedsettings.css.ts'
// todo: move this someplace more global // todo: move this someplace more global
const IMAGE_DIMENSIONS = [ const IMAGE_DIMENSIONS = [
{ value: 128, label: "128 (*)" }, { value: 128, label: "128 (*)" },
@ -21,10 +23,7 @@ const IMAGE_DIMENSIONS = [
{ value: 1024, label: "1024 (*)" }, { value: 1024, label: "1024 (*)" },
]; ];
export default function PropertySettings() { export default function PropertySettings() {
const setRequestOption = useImageCreate((state) => state.setRequestOptions); const setRequestOption = useImageCreate((state) => state.setRequestOptions);
const toggleUseRandomSeed = useImageCreate( const toggleUseRandomSeed = useImageCreate(
(state) => state.toggleUseRandomSeed (state) => state.toggleUseRandomSeed
@ -56,12 +55,13 @@ export default function PropertySettings() {
<div> <div>
<button <button
type="button" type="button"
className="panel-box-toggle-btn" className={MenuButton}
onClick={togglePropertyOpen} onClick={togglePropertyOpen}
> >
<h4>Property Settings</h4> <h4>Property Settings</h4>
</button> </button>
{propertyOpen && <> {propertyOpen && (
<>
<div> <div>
<label> <label>
Seed: Seed:
@ -101,7 +101,9 @@ export default function PropertySettings() {
Guidance Scale: Guidance Scale:
<input <input
value={guidance_scale} value={guidance_scale}
onChange={(e) => setRequestOption("guidance_scale", e.target.value)} onChange={(e) =>
setRequestOption("guidance_scale", e.target.value)
}
type="range" type="range"
min="0" min="0"
max="20" max="20"
@ -166,8 +168,8 @@ export default function PropertySettings() {
</select> </select>
</label> </label>
</div> </div>
</>
</>} )}
</div> </div>
); );
} }

View File

@ -1,8 +1,12 @@
import React, {useState} from "react"; import React, { useState } from "react";
import { useImageCreate } from "../../../../../store/imageCreateStore"; import { useImageCreate } from "../../../../../store/imageCreateStore";
export default function WorkflowSettings() { import { MenuButton }
from //@ts-ignore
'../advancedsettings.css.ts';
export default function WorkflowSettings() {
const num_outputs = useImageCreate((state) => const num_outputs = useImageCreate((state) =>
state.getValueForRequestKey("num_outputs") state.getValueForRequestKey("num_outputs")
); );
@ -10,7 +14,7 @@ export default function WorkflowSettings() {
const isUseAutoSave = useImageCreate((state) => state.isUseAutoSave()); const isUseAutoSave = useImageCreate((state) => state.isUseAutoSave());
const save_to_disk_path = useImageCreate((state) => const save_to_disk_path = useImageCreate((state) =>
state.getValueForRequestKey("save_to_disk_path") state.getValueForRequestKey("save_to_disk_path")
); );
const isSoundEnabled = useImageCreate((state) => state.isSoundEnabled()); const isSoundEnabled = useImageCreate((state) => state.isSoundEnabled());
const setRequestOption = useImageCreate((state) => state.setRequestOptions); const setRequestOption = useImageCreate((state) => state.setRequestOptions);
@ -20,7 +24,6 @@ export default function WorkflowSettings() {
(state) => state.toggleSoundEnabled (state) => state.toggleSoundEnabled
); );
const [workflowOpen, setWorkflowOpen] = useState(true); const [workflowOpen, setWorkflowOpen] = useState(true);
const toggleWorkflowOpen = () => { const toggleWorkflowOpen = () => {
@ -31,12 +34,13 @@ export default function WorkflowSettings() {
<div> <div>
<button <button
type="button" type="button"
className="panel-box-toggle-btn" className={MenuButton}
onClick={toggleWorkflowOpen} onClick={toggleWorkflowOpen}
> >
<h4>Workflow Settings</h4> <h4>Workflow Settings</h4>
</button> </button>
{workflowOpen && <> {workflowOpen && (
<>
<div> <div>
<label> <label>
Number of images to make:{" "} Number of images to make:{" "}
@ -94,7 +98,8 @@ export default function WorkflowSettings() {
Play sound on task completion Play sound on task completion
</label> </label>
</div> </div>
</>} </>
)}
</div> </div>
); );
}; }

View File

@ -1,8 +1,8 @@
import { style } from '@vanilla-extract/css'; import { style } from "@vanilla-extract/css";
export const CreationPaneMain = style({ export const CreationPaneMain = style({
position: 'relative', position: "relative",
width: '100%', width: "100%",
height: '100%', height: "100%",
padding:'0 10px', padding: "0 10px",
}); });

View File

@ -19,7 +19,9 @@ globalStyle(`*`, {
boxSizing: "border-box", boxSizing: "border-box",
}); });
globalStyle(`p`, {
/** RESET */
globalStyle(`p, h3, h4`, {
margin: 0, margin: 0,
}); });