Skip to content

Commit

Permalink
merge 0.17.1 (#1924)
Browse files Browse the repository at this point in the history
## 内容

バージョン0.17.1をmainブランチにマージします。
特にコンフリクト発生しないのでFF マージします!

## その他

ちなみにデフォルトの画面サイズが横1024pxになっています。
  • Loading branch information
Hiroshiba authored Mar 9, 2024
2 parents 49a5ce9 + 6a98b2c commit 39b93bc
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 14 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ on:

env:
VOICEVOX_ENGINE_REPO_URL: "https://github.com/VOICEVOX/voicevox_engine"
VOICEVOX_ENGINE_VERSION: 0.16.0
VOICEVOX_RESOURCE_VERSION: 0.16.0
VOICEVOX_ENGINE_VERSION: 0.17.1
VOICEVOX_RESOURCE_VERSION: 0.17.1
VOICEVOX_EDITOR_VERSION:
|- # releaseタグ名か、workflow_dispatchでのバージョン名か、999.999.999-developが入る
${{ github.event.release.tag_name || github.event.inputs.version || '999.999.999-develop' }}
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
rm $name.tar
- name: Upload Linux tar.gz (without nvidia) to Artifacts
if: startsWith(matrix.artifact_name, 'linux-') && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_artifact
if: startsWith(matrix.artifact_name, 'linux-') && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_artifact == 'true'
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.artifact_name }}-targz
Expand Down Expand Up @@ -346,7 +346,7 @@ jobs:
7z rn $name.zip prepackage/ VOICEVOX/
- name: Upload Windows & Mac zip (without nvidia) to Artifacts
if: (startsWith(matrix.artifact_name, 'windows-') || startsWith(matrix.artifact_name, 'macos-')) && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_artifact
if: (startsWith(matrix.artifact_name, 'windows-') || startsWith(matrix.artifact_name, 'macos-')) && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_artifact == 'true'
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.artifact_name }}-zip
Expand Down Expand Up @@ -435,7 +435,7 @@ jobs:
done
- name: Upload Linux AppImage split to Artifacts
if: endsWith(matrix.installer_artifact_name, '-appimage') && github.event.inputs.upload_artifact
if: endsWith(matrix.installer_artifact_name, '-appimage') && github.event.inputs.upload_artifact == 'true'
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.installer_artifact_name }}-release
Expand All @@ -453,7 +453,7 @@ jobs:
target_commitish: ${{ github.sha }}

- name: Upload macOS dmg to Artifacts
if: endsWith(matrix.installer_artifact_name, '-dmg') && github.event.inputs.upload_artifact
if: endsWith(matrix.installer_artifact_name, '-dmg') && github.event.inputs.upload_artifact == 'true'
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.installer_artifact_name }}-release
Expand All @@ -471,7 +471,7 @@ jobs:
target_commitish: ${{ github.sha }}

- name: Upload Windows NSIS Web to Artifacts
if: endsWith(matrix.installer_artifact_name, '-nsis-web') && github.event.inputs.upload_artifact
if: endsWith(matrix.installer_artifact_name, '-nsis-web') && github.event.inputs.upload_artifact == 'true'
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.installer_artifact_name }}-release
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Playwright を使用しているためテストパターンを生成すること
**ブラウザ版を起動している状態で**以下のコマンドを実行してください。

```bash
npx playwright codegen http://localhost:5173/ --viewport-size=800,600
npx playwright codegen http://localhost:5173/ --viewport-size=1024,630
```

詳細は [Playwright ドキュメントの Test generator](https://playwright.dev/docs/codegen-intro) を参照してください。
Expand Down
5 changes: 5 additions & 0 deletions public/howtouse.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,11 @@ VOICEVOX では、歌声合成機能がプロトタイプ版として提供さ

将来的にこの値は自動設定される予定です。

### ソング機能のよくある質問

Q. 上に赤いバーが出て声が再生されない
A. なにかしらのエラー状態を示しています。現在のバージョンでは、1つのノート(音符)につき日本語1文字分のみ入力できます。またノートが重なっていてもエラーとなります。

## オプション

「設定」の「オプション」でいろいろな設定を変更することができます。
Expand Down
35 changes: 35 additions & 0 deletions public/updateInfos.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,39 @@
[
{
"version": "0.17.1",
"descriptions": [
"キャラクター「玄野武宏」「白上虎太郎」「青山龍星」「冥鳴ひまり」「九州そら」のハミングを追加",
"キャラクター「もち子さん」「剣崎雌雄」のハミングを追加",
"音域調整・声量調整機能",
"バグ修正"
],
"contributors": ["Hiroshiba", "sigprogramming"]
},
{
"version": "0.17.0",
"descriptions": [
"サードパーティアプリ向けのランタイム情報ファイルを出力",
"ソング:プロジェクトファイルに保存",
"トーク:連続再生中に裏で音声合成",
"ソング:元に戻す・やり直す機能",
"ソング:ショートカットキー機能",
"開発環境の向上",
"バグ修正"
],
"contributors": [
"cm-ayf",
"Hiroshiba",
"nmori",
"P0ngCh4ng",
"romot-co",
"sabonerune",
"sevenc-nanashi",
"sigprogramming",
"tsym77yoshi",
"weweweok",
"y-chan"
]
},
{
"version": "0.16.1",
"descriptions": ["マルチエンジン稼働時に起動しないバグを修正"],
Expand Down
4 changes: 2 additions & 2 deletions src/backend/electron/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,8 @@ let filePathOnMac: string | undefined = undefined;
// create window
async function createWindow() {
const mainWindowState = windowStateKeeper({
defaultWidth: 800,
defaultHeight: 600,
defaultWidth: 1024,
defaultHeight: 630,
});

const currentTheme = configManager.get("currentTheme");
Expand Down
8 changes: 5 additions & 3 deletions src/components/Talk/TalkEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,11 @@ const removeAudioItem = async () => {
};
// view
const DEFAULT_PORTRAIT_PANE_WIDTH = 25; // %
const DEFAULT_PORTRAIT_PANE_WIDTH = 22; // %
const MIN_PORTRAIT_PANE_WIDTH = 0;
const MAX_PORTRAIT_PANE_WIDTH = 40;
const MIN_AUDIO_INFO_PANE_WIDTH = 160; // px
const DEFAULT_AUDIO_INFO_PANE_WIDTH = 200; // px
const MIN_AUDIO_INFO_PANE_WIDTH = 160;
const MAX_AUDIO_INFO_PANE_WIDTH = 250;
const MIN_AUDIO_DETAIL_PANE_HEIGHT = 185; // px
const MAX_AUDIO_DETAIL_PANE_HEIGHT = 500;
Expand Down Expand Up @@ -365,7 +366,8 @@ watch(shouldShowPanes, (val, old) => {
);
audioInfoPaneWidth.value = clamp(
splitterPosition.value.audioInfoPaneWidth ?? MIN_AUDIO_INFO_PANE_WIDTH,
splitterPosition.value.audioInfoPaneWidth ??
DEFAULT_AUDIO_INFO_PANE_WIDTH,
MIN_AUDIO_INFO_PANE_WIDTH,
MAX_AUDIO_INFO_PANE_WIDTH
);
Expand Down
4 changes: 4 additions & 0 deletions src/store/command.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ export const commandStore = createPartialStore<CommandStoreTypes>({
action({ commit, dispatch }, { editor }: { editor: EditorType }) {
commit("UNDO", { editor });
if (editor === "song") {
// TODO: 存在しないノートのみ選択解除、あるいはSELECTED_NOTE_IDS getterを作る
commit("DESELECT_ALL_NOTES");
dispatch("RENDER");
}
},
Expand All @@ -134,6 +136,8 @@ export const commandStore = createPartialStore<CommandStoreTypes>({
action({ commit, dispatch }, { editor }: { editor: EditorType }) {
commit("REDO", { editor });
if (editor === "song") {
// TODO: 存在しないノートのみ選択解除、あるいはSELECTED_NOTE_IDS getterを作る
commit("DESELECT_ALL_NOTES");
dispatch("RENDER");
}
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests/e2e/navigators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { getNewestQuasarDialog, getQuasarMenu } from "./locators";
*/
export async function gotoHome({ page }: { page: Page }) {
const BASE_URL = "http://localhost:7357/";
await page.setViewportSize({ width: 800, height: 600 });
await page.setViewportSize({ width: 1024, height: 630 });
await page.goto(BASE_URL);
}

Expand Down

0 comments on commit 39b93bc

Please sign in to comment.