Skip to content

Commit

Permalink
Merge branch 'add/loop_2224' of https://github.com/romot-co/voicevox
Browse files Browse the repository at this point in the history
…into add/loop_2224
  • Loading branch information
romot-co committed Feb 5, 2025
2 parents 84bdd08 + 13a789e commit 080b833
Show file tree
Hide file tree
Showing 24 changed files with 556 additions and 313 deletions.
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

"license:generate": "tsx tools/generateLicenses.mts",
"license:merge": "tsx tools/mergeLicenses.mts",
"check-suspicious-imports": "tsx tools/checkSuspiciousImports.mts",

"test:unit": "vitest --run",
"test-watch:unit": "vitest --watch",
Expand All @@ -33,10 +34,10 @@
"test-watch:storybook-vrt": "cross-env TARGET=storybook PWTEST_WATCH=1 playwright test",
"test-ui:storybook-vrt": "cross-env TARGET=storybook playwright test --ui",

"electron:build": "cross-env VITE_TARGET=electron vite build && electron-builder --config electron-builder.config.js --publish never",
"electron:serve": "cross-env VITE_TARGET=electron vite",
"electron:build": "cross-env VITE_TARGET=electron NODE_ENV=production vite build && electron-builder --config electron-builder.config.js --publish never",
"browser:serve": "cross-env VITE_TARGET=browser vite",
"browser:build": "cross-env VITE_TARGET=browser vite build",
"browser:build": "cross-env VITE_TARGET=browser NODE_ENV=production vite build",
"storybook": "storybook dev --port 6006",
"storybook:build": "storybook build",

Expand Down Expand Up @@ -114,6 +115,8 @@
"@vue/eslint-config-prettier": "9.0.0",
"@vue/eslint-config-typescript": "13.0.0",
"@vue/test-utils": "2.4.5",
"acorn": "8.14.0",
"acorn-walk": "8.3.4",
"chromatic": "11.5.4",
"cross-env": "7.0.3",
"dotenv": "16.0.0",
Expand Down
14 changes: 14 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/components/Dialog/Dialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ export type NotifyAndNotShowAgainButtonOption = {
tipName: keyof ConfirmedTips;
};

export type LoadingScreenOption = { message: string };

// 汎用ダイアログを表示

/** メッセージを知らせるダイアログ */
Expand Down Expand Up @@ -404,6 +402,8 @@ export const showNotifyAndNotShowAgainButton = (
});
};

type LoadingScreenOption = { message: string };

export const showLoadingScreen = (options: LoadingScreenOption) => {
Loading.show({
spinnerColor: "primary",
Expand Down
6 changes: 0 additions & 6 deletions src/components/Dialog/SettingDialog/SettingDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -681,16 +681,10 @@ const acceptRetrieveTelemetryComputed = computed({
});
const changeUseGpu = async (useGpu: boolean) => {
void store.actions.SHOW_LOADING_SCREEN({
message: "起動モードを変更中です",
});
await store.actions.CHANGE_USE_GPU({
useGpu,
engineId: selectedEngineId.value,
});
void store.actions.HIDE_ALL_LOADING_SCREEN();
};
const changeinheritAudioInfo = async (inheritAudioInfo: boolean) => {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Sing/SequencerGrid/Presentation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -262,15 +262,15 @@ const octaveLineIndices = computed(() => gridLines.value.octaveLines);
}
.sequencer-grid-measure-line {
stroke: var(--scheme-color-sing-grid-beat-line);
stroke: var(--scheme-color-sing-grid-measure-line);
}
.sequencer-grid-octave-line {
stroke: var(--scheme-color-sing-grid-beat-line);
}
.sequencer-grid-beat-line {
stroke: transparent;
stroke: var(--scheme-color-sing-grid-beat-line);
}
}
</style>
Loading

0 comments on commit 080b833

Please sign in to comment.