every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ui' into for_webui

Browse Source
This commit is contained in:
Sakamoto Shiina
2024-12-21 01:03:10 +09:00
parent 61920a19db 2aab58d1ea
commit 899c4c08ef
7 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locales/en.yml
View File

@@ -60,7 +60,7 @@ main_page:
update_modal:
cpu_desc: Use CPU only as the compute device
cuda_desc: Selectable between CPU and GPU as compute devices
cuda_desc: Selectable between CPU and NVIDIA GPUs as compute devices
cuda_disk_space_desc: Requires approximately {{size}} of disk space
close_modal: Close
download_latest_and_restart: |-

2
locales/ja.yml
View File

@@ -59,7 +59,7 @@ main_page:
update_modal:
cpu_desc: 処理デバイスとしてCPUのみを使用
cuda_desc: 処理デバイスとしてCPUとGPUの両方を選択可能
cuda_desc: 処理デバイスとしてCPUとNVIDIA製のGPUを選択可能
cuda_disk_space_desc: 約{{size}}のディスク容量が必要
close_modal: 閉じる
download_latest_and_restart: |-

1
src-ui/app/config_page/setting_section/setting_box/_components/radio_button/RadioButton.module.scss
View File

@@ -6,6 +6,7 @@
position: relative;
flex-shrink: 0;
flex-wrap: wrap;
max-width: 70%;
&.column {
flex-direction: column;
}

4
src-ui/app/config_page/setting_section/setting_box/appearance/Appearance.jsx
View File

@@ -75,7 +75,7 @@ const UiScalingContainer = () => {
const createMarks = (min, max) => {
const marks = [];
for (let value = min; value <= max; value += 10) {
const label = ([50,70,130,140,160,170,190].includes(value)) ? "" : value;
const label = ([50,70,90,110,130,150,170,190].includes(value)) ? "" : value;
marks.push({ value, label: `${label}` });
}
return marks;
@@ -117,7 +117,7 @@ export const MessageLogUiScalingContainer = () => {
const createMarks = (min, max) => {
const marks = [];
for (let value = min; value <= max; value += 10) {
const label = ([50,70,130,140,160,170,190].includes(value)) ? "" : value;
const label = ([50,70,90,110,130,150,170,190].includes(value)) ? "" : value;
marks.push({ value, label: `${label}` });
}
return marks;

4
src-ui/app/modal_controller/update_modal/UpdateModal.jsx
View File

@@ -43,7 +43,7 @@ export const UpdateModal = () => {
<button className={cpu_accept_button_class_name} onClick={onClickUpdateSoftware}>CPU</button>
{is_cpu_version ? <CurrentVersionLabel is_latest_version_already={is_latest_version_already} /> : null}
</div>
<div>
<div className={styles.version_desc_container}>
<VersionDescComponent desc={t("update_modal.cpu_desc")} />
</div>
</div>
@@ -52,7 +52,7 @@ export const UpdateModal = () => {
<button className={cuda_accept_button_class_name} onClick={onClickUpdateSoftware_CUDA}>CUDA (GPU)</button>
{!is_cpu_version ? <CurrentVersionLabel is_latest_version_already={is_latest_version_already} is_cuda={true}/> : null}
</div>
<div>
<div className={styles.version_desc_container}>
<VersionDescComponent desc={t("update_modal.cuda_desc")} />
<VersionDescComponent desc={t("update_modal.cuda_disk_space_desc", {size: "5GB"})} />
</div>

7
src-ui/app/modal_controller/update_modal/UpdateModal.module.scss
View File

@@ -52,6 +52,7 @@
width: 16rem;
justify-content: space-between;
position: relative;
flex-shrink: 0;
}
.deny_button, .accept_button {
@@ -124,6 +125,12 @@
}
}
.version_desc_container {
display: flex;
flex-direction: column;
gap: 0.4rem;
}
.version_desc_wrapper {
display: flex;
align-items: center;

2
src-ui/store.js
View File

@@ -132,7 +132,7 @@ export const { atomInstance: Atom_ForegroundStatus, useHook: useStore_Foreground
export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook([], "MessageLogs");
// export const { atomInstance: Atom_MessageLogs, useHook: useStore_MessageLogs } = createAtomWithHook(generateTestData(20), "MessageLogs"); // For testing
export const { atomInstance: Atom_MessageInputValue, useHook: useStore_MessageInputValue } = createAtomWithHook("", "MessageInputValue");
export const { atomInstance: Atom_IsVisibleResendButton, useHook: useStore_IsVisibleResendButton } = createAtomWithHook(false, "IsVisibleResendButton");
export const { atomInstance: Atom_IsVisibleResendButton, useHook: useStore_IsVisibleResendButton } = createAtomWithHook(false, "IsVisibleResendButton", {is_state_ok: true});
export const { atomInstance: Atom_IsAppliedInitMessageBoxHeight, useHook: useStore_IsAppliedInitMessageBoxHeight } = createAtomWithHook(false, "IsAppliedInitMessageBoxHeight");
export const { atomInstance: Atom_SelectableLanguageList, useHook: useStore_SelectableLanguageList } = createAtomWithHook([], "SelectableLanguageList");