Skip to content

Commit

Permalink
ソングエディタの編集状態を保存できるようにする (#1829)
Browse files Browse the repository at this point in the history 
* add sing schema

* change project file shape and schema

* fix missing attribute

* make all editor states required in project file

* remove await and use commit

* separate phrases map and phrase data map

* add project load/save buttons to sing editor

* fmt

* add generate singing store initial score func

* initialize song project in create new project

* rename editor detect variable

* remove phrases

* rename sing to song

* use dispatch

* improve comment

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

* add await for set singer and score

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

* improve comment

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>

* extract object in migration

* Revert "separate phrases map and phrase data map"

This reverts commit 97d68a8.

* revert phrase schema

* remove last active editor property from project

* ｍove talk project validation

* remove phrases from sing store initial score

Co-authored-by: Sig <sigprogrammer@gmail.com>

* add comment of not using generate singing store initial score func

* add key shift to song initial object

* add set voice key shift to loading project

* create apply talk project to store

* create apply song project to store func

* add missing await

---------

Co-authored-by: Hiroshiba <hihokaruta@gmail.com>
Co-authored-by: Sig <sigprogrammer@gmail.com>
  • Loading branch information
@y-chan @Hiroshiba @sigprogramming
3 people authored Feb 17, 2024
1 parent 948c6dd commit 821d298
Show file tree
Hide file tree
Showing 6 changed files with 392 additions and 231 deletions.
111 changes: 110 additions & 1 deletion src/components/Menu/MenuBar/BaseMenuBar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import TitleBarButtons from "./TitleBarButtons.vue";
import TitleBarEditorSwitcher from "./TitleBarEditorSwitcher.vue";
import { useStore } from "@/store";
import { base64ImageToUri } from "@/helpers/imageHelper";
import { HotkeyActionType, HotkeyReturnType } from "@/type/preload";
import { setHotkeyFunctions } from "@/store/setting";
const props =
defineProps<{
Expand Down Expand Up @@ -119,6 +121,65 @@ const openHelpDialog = () => {
});
};
const createNewProject = async () => {
if (!uiLocked.value) {
await store.dispatch("CREATE_NEW_PROJECT", {});
}
};
const saveProject = async () => {
if (!uiLocked.value) {
await store.dispatch("SAVE_PROJECT_FILE", { overwrite: true });
}
};
const saveProjectAs = async () => {
if (!uiLocked.value) {
await store.dispatch("SAVE_PROJECT_FILE", {});
}
};
const importProject = () => {
if (!uiLocked.value) {
store.dispatch("LOAD_PROJECT_FILE", {});
}
};
// 「最近使ったプロジェクト」のメニュー
const recentProjectsSubMenuData = ref<MenuItemData[]>([]);
const updateRecentProjects = async () => {
const recentlyUsedProjects = await store.dispatch(
"GET_RECENTLY_USED_PROJECTS"
);
recentProjectsSubMenuData.value =
recentlyUsedProjects.length === 0
? [
{
type: "button",
label: "最近使ったプロジェクトはありません",
onClick: () => {
// 何もしない
},
disabled: true,
disableWhenUiLocked: false,
},
]
: recentlyUsedProjects.map((projectFilePath) => ({
type: "button",
label: projectFilePath,
onClick: () => {
store.dispatch("LOAD_PROJECT_FILE", {
filePath: projectFilePath,
});
},
disableWhenUiLocked: false,
}));
};
const projectFilePath = computed(() => store.state.projectFilePath);
watch(projectFilePath, updateRecentProjects, {
immediate: true,
});
// 「エンジン」メニューのエンジン毎の項目
const engineSubMenuData = computed<MenuItemData[]>(() => {
let subMenu: MenuItemData[] = [];
Expand Down Expand Up @@ -223,7 +284,46 @@ const menudata = computed<MenuItemData[]>(() => [
closeAllDialog();
},
disableWhenUiLocked: false,
subMenu: props.fileSubMenuData,
subMenu: [
...props.fileSubMenuData,
{ type: "separator" },
{
type: "button",
label: "新規プロジェクト",
onClick: createNewProject,
disableWhenUiLocked: true,
},
{
type: "button",
label: "プロジェクトを上書き保存",
onClick: async () => {
await saveProject();
},
disableWhenUiLocked: true,
},
{
type: "button",
label: "プロジェクトを名前を付けて保存",
onClick: async () => {
await saveProjectAs();
},
disableWhenUiLocked: true,
},
{
type: "button",
label: "プロジェクト読み込み",
onClick: () => {
importProject();
},
disableWhenUiLocked: true,
},
{
type: "root",
label: "最近使ったプロジェクト",
disableWhenUiLocked: true,
subMenu: recentProjectsSubMenuData.value,
},
],
},
{
type: "root",
Expand Down Expand Up @@ -338,6 +438,15 @@ watch(uiLocked, () => {
subMenuOpenFlags.value = [...Array(menudata.value.length)].map(() => false);
}
});
const hotkeyMap = new Map<HotkeyActionType, () => HotkeyReturnType>([
["新規プロジェクト", createNewProject],
["プロジェクトを上書き保存", saveProject],
["プロジェクトを名前を付けて保存", saveProjectAs],
["プロジェクト読み込み", importProject],
]);
setHotkeyFunctions(hotkeyMap);
</script>

<style lang="scss">
Expand Down
14 changes: 7 additions & 7 deletions src/components/Sing/MenuBar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,26 +31,26 @@ const exportWaveFile = async () => {
const fileSubMenuData: MenuItemData[] = [
{
type: "button",
label: "MIDI読み込み",
label: "音声を出力",
onClick: () => {
importMidiFile();
exportWaveFile();
},
disableWhenUiLocked: true,
},
{ type: "separator" },
{
type: "button",
label: "MusicXML読み込み",
label: "MIDI読み込み",
onClick: () => {
importMusicXMLFile();
importMidiFile();
},
disableWhenUiLocked: true,
},
{ type: "separator" },
{
type: "button",
label: "音声を出力",
label: "MusicXML読み込み",
onClick: () => {
exportWaveFile();
importMusicXMLFile();
},
disableWhenUiLocked: true,
},
Expand Down
102 changes: 1 addition & 101 deletions src/components/Talk/MenuBar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
</template>

<script setup lang="ts">
import { computed, ref, watch } from "vue";
import { computed } from "vue";
import { MenuItemData } from "@/components/Menu/type";
import {
generateAndConnectAndSaveAudioWithDialog,
Expand All @@ -20,12 +20,6 @@ import { setHotkeyFunctions } from "@/store/setting";
const store = useStore();
const uiLocked = computed(() => store.getters.UI_LOCKED);
const createNewProject = async () => {
if (!uiLocked.value) {
await store.dispatch("CREATE_NEW_PROJECT", {});
}
};
const generateAndSaveAllAudio = async () => {
if (!uiLocked.value) {
await multiGenerateAndSaveAudioWithDialog({
Expand Down Expand Up @@ -91,59 +85,6 @@ const importTextFile = () => {
}
};
const saveProject = async () => {
if (!uiLocked.value) {
await store.dispatch("SAVE_PROJECT_FILE", { overwrite: true });
}
};
const saveProjectAs = async () => {
if (!uiLocked.value) {
await store.dispatch("SAVE_PROJECT_FILE", {});
}
};
const importProject = () => {
if (!uiLocked.value) {
store.dispatch("LOAD_PROJECT_FILE", {});
}
};
// 「最近使ったプロジェクト」のメニュー
const recentProjectsSubMenuData = ref<MenuItemData[]>([]);
const updateRecentProjects = async () => {
const recentlyUsedProjects = await store.dispatch(
"GET_RECENTLY_USED_PROJECTS"
);
recentProjectsSubMenuData.value =
recentlyUsedProjects.length === 0
? [
{
type: "button",
label: "最近使ったプロジェクトはありません",
onClick: () => {
// 何もしない
},
disabled: true,
disableWhenUiLocked: false,
},
]
: recentlyUsedProjects.map((projectFilePath) => ({
type: "button",
label: projectFilePath,
onClick: () => {
store.dispatch("LOAD_PROJECT_FILE", {
filePath: projectFilePath,
});
},
disableWhenUiLocked: false,
}));
};
const projectFilePath = computed(() => store.state.projectFilePath);
watch(projectFilePath, updateRecentProjects, {
immediate: true,
});
// 「ファイル」メニュー
const fileSubMenuData = computed<MenuItemData[]>(() => [
{
Expand Down Expand Up @@ -187,54 +128,13 @@ const fileSubMenuData = computed<MenuItemData[]>(() => [
},
disableWhenUiLocked: true,
},
{ type: "separator" },
{
type: "button",
label: "新規プロジェクト",
onClick: createNewProject,
disableWhenUiLocked: true,
},
{
type: "button",
label: "プロジェクトを上書き保存",
onClick: async () => {
await saveProject();
},
disableWhenUiLocked: true,
},
{
type: "button",
label: "プロジェクトを名前を付けて保存",
onClick: async () => {
await saveProjectAs();
},
disableWhenUiLocked: true,
},
{
type: "button",
label: "プロジェクト読み込み",
onClick: () => {
importProject();
},
disableWhenUiLocked: true,
},
{
type: "root",
label: "最近使ったプロジェクト",
disableWhenUiLocked: true,
subMenu: recentProjectsSubMenuData.value,
},
]);
const hotkeyMap = new Map<HotkeyActionType, () => HotkeyReturnType>([
["新規プロジェクト", createNewProject],
["音声書き出し", generateAndSaveAllAudio],
["選択音声を書き出し", generateAndSaveSelectedAudio],
["音声を繋げて書き出し", generateAndConnectAndSaveAllAudio],
["テキスト読み込む", importTextFile],
["プロジェクトを上書き保存", saveProject],
["プロジェクトを名前を付けて保存", saveProjectAs],
["プロジェクト読み込み", importProject],
]);
setHotkeyFunctions(hotkeyMap);
Expand Down
Loading

0 comments on commit 821d298

Please sign in to comment.