From a0b94ff7ad17a8bc03e7893de28b42f21a3d213d Mon Sep 17 00:00:00 2001 From: Jio Date: Fri, 22 Jul 2022 00:13:47 +0900 Subject: [PATCH] fix: replaced maximiziation with full screen --- release/app/package.json | 2 +- src/channel/main.ts | 4 +- src/renderer/AppToolbar.tsx | 60 ++++++++------- src/renderer/EditorLabelVisualizerTrack.tsx | 5 +- src/renderer/EditorNotice.tsx | 32 ++++++-- src/visemes/visemedef.json | 84 +++++++++++++++------ src/visemes/visemes.tsx | 2 + 7 files changed, 127 insertions(+), 62 deletions(-) diff --git a/release/app/package.json b/release/app/package.json index da65eb7..598dfbe 100644 --- a/release/app/package.json +++ b/release/app/package.json @@ -1,6 +1,6 @@ { "name": "viseme-labeler", - "version": "1.2.10", + "version": "1.2.11", "description": "Viseme labeling tool", "license": "MIT", "author": { diff --git a/src/channel/main.ts b/src/channel/main.ts index 0290042..9d1697e 100644 --- a/src/channel/main.ts +++ b/src/channel/main.ts @@ -146,7 +146,7 @@ export default ( ipcMain.on('app-unmaximize', () => { getHermes() .then(({ mainWindow }) => { - mainWindow.unmaximize(); + mainWindow.setFullScreen(false); return null; }) .catch(console.error); @@ -155,7 +155,7 @@ export default ( ipcMain.on('app-maximize', () => { getHermes() .then(({ mainWindow }) => { - mainWindow.maximize(); + mainWindow.setFullScreen(true); return null; }) .catch(console.error); diff --git a/src/renderer/AppToolbar.tsx b/src/renderer/AppToolbar.tsx index feec151..f204087 100644 --- a/src/renderer/AppToolbar.tsx +++ b/src/renderer/AppToolbar.tsx @@ -250,33 +250,39 @@ const AppToolbar = (props: AppToolbarProps) => { ) )} - { - ctx.toggleTheme(); - }} - > - {ctx.isLightTheme ? : } - - { - if (isMaximized) { - window.electron.ipcRenderer.sendMessage('app-unmaximize', []); - setIsMaximized(false); - } else { - window.electron.ipcRenderer.sendMessage('app-maximize', []); - setIsMaximized(true); - } - }} - > - {isMaximized ? : } - - { - window.electron.ipcRenderer.sendMessage('app-close', []); - }} - > - - + + { + ctx.toggleTheme(); + }} + > + {ctx.isLightTheme ? : } + + + + { + if (isMaximized) { + window.electron.ipcRenderer.sendMessage('app-unmaximize', []); + setIsMaximized(false); + } else { + window.electron.ipcRenderer.sendMessage('app-maximize', []); + setIsMaximized(true); + } + }} + > + {isMaximized ? : } + + + + { + window.electron.ipcRenderer.sendMessage('app-close', []); + }} + > + + + {children} ); diff --git a/src/renderer/EditorLabelVisualizerTrack.tsx b/src/renderer/EditorLabelVisualizerTrack.tsx index 5575a46..678faf3 100644 --- a/src/renderer/EditorLabelVisualizerTrack.tsx +++ b/src/renderer/EditorLabelVisualizerTrack.tsx @@ -53,14 +53,15 @@ const EditorLabelVisualizerTrack = (props: EditorLabelVisualizerTrackProps) => { ed.labelData.label[track][ri] !== EditorLabelNotLabelled && ed.labelData.label[track][ri] !== visemes.emptyStrID ) { + const tracklabData = visemes.def[ed.labelData.label[track][ri]]; if (ed.labelData.timing.length - 1 === ri) { // Last tick - dispLabel = visemes.def[ed.labelData.label[track][ri]]?.disp; + dispLabel = tracklabData?.track_disp || tracklabData?.disp; } else if ( ed.labelData.label[track][ri + 1] !== ed.labelData.label[track][ri] ) { // Different label - dispLabel = visemes.def[ed.labelData.label[track][ri]]?.disp; + dispLabel = tracklabData?.track_disp || tracklabData?.disp; } } diff --git a/src/renderer/EditorNotice.tsx b/src/renderer/EditorNotice.tsx index b30e83a..edd0982 100644 --- a/src/renderer/EditorNotice.tsx +++ b/src/renderer/EditorNotice.tsx @@ -9,6 +9,7 @@ const EditorNotice = () => { style={{ fontFamily: '"Nanum Gothic Coding", monospace', fontSmooth: 'always', + fontSize: '14px', }} >

주의/예외 사항

@@ -28,25 +29,40 @@ const EditorNotice = () => { diff --git a/src/visemes/visemedef.json b/src/visemes/visemedef.json index daa7035..ce71d7e 100644 --- a/src/visemes/visemedef.json +++ b/src/visemes/visemedef.json @@ -3,95 +3,135 @@ "em": { "type": "empty_str", "disp": "-", - "desc": "공백/노이즈" + "desc": "공백/노이즈", + "keybind": "-" }, "xx": { "type": "unknown", "disp": "XX", - "desc": "복합 (명시된 예외에만 사용)" + "desc": "복합 (명시된 예외에만 사용)", + "keybind": "x" }, "ww": { "type": "wrong", "disp": "오류", - "desc": "말을 하지 않는데 입이 움직이는 것" + "desc": "말을 하지 않는데 입이 움직이는 것", + "keybind": "e" }, "pm": { "type": "typea", - "disp": "ㅁ,ㅂ,ㅃ,ㅍ" + "disp": "ㅁ,ㅂ,ㅃ,ㅍ", + "track_disp": "ㅂ", + "keybind": "q", + "keybind_disp": "ㅂ" }, "aa": { "type": "typeb", - "disp": "ㅏ" + "disp": "ㅏ", + "keybind": "k", + "keybind_disp": "ㅏ" }, "jy+aa": { "type": "typeb", - "disp": "ㅑ" + "disp": "ㅑ", + "keybind": "i", + "keybind_disp": "ㅑ" }, "eo": { "type": "typeb", - "disp": "ㅓ" + "disp": "ㅓ", + "keybind": "j", + "keybind_disp": "ㅓ" }, "jy+eo": { "type": "typeb", - "disp": "ㅕ" + "disp": "ㅕ", + "keybind": "u", + "keybind_disp": "ㅕ" }, "oo": { "type": "typeb", - "disp": "ㅗ" + "disp": "ㅗ", + "keybind": "h", + "keybind_disp": "ㅗ" }, "jy+oo": { "type": "typeb", - "disp": "ㅛ" + "disp": "ㅛ", + "keybind": "y", + "keybind_disp": "ㅛ" }, "uu": { "type": "typeb", - "disp": "ㅜ" + "disp": "ㅜ", + "keybind": "n", + "keybind_disp": "ㅜ" }, "jy+uu": { "type": "typeb", - "disp": "ㅠ" + "disp": "ㅠ", + "keybind": "b", + "keybind_disp": "ㅠ" }, "eu": { "type": "typeb", - "disp": "ㅡ" + "disp": "ㅡ", + "keybind": "m", + "keybind_disp": "ㅡ" }, "ii": { "type": "typeb", - "disp": "ㅣ" + "disp": "ㅣ", + "keybind": "l", + "keybind_disp": "ㅣ" }, "ee": { "type": "typec", - "disp": "ㅐ,ㅔ" + "disp": "ㅐ,ㅔ", + "track_disp": "ㅐ", + "keybind": "o", + "keybind_disp": "o" }, "jy+ee": { "type": "typec", - "disp": "ㅒ,ㅖ" + "disp": "ㅒ,ㅖ", + "track_disp": "ㅒ", + "keybind": "shift+o" }, "ww+aa": { "type": "typec", - "disp": "ㅘ" + "disp": "ㅘ", + "keybind": "a" }, "ww+ee": { "type": "typec", - "disp": "ㅙ,ㅚ,ㅞ" + "disp": "ㅙ,ㅚ,ㅞ", + "track_disp": "ㅚ", + "keybind": "s" }, "ww+eo": { "type": "typec", - "disp": "ㅝ" + "disp": "ㅝ", + "keybind": "d" }, "ww+ii": { "type": "typec", - "disp": "ㅟ" + "disp": "ㅟ", + "keybind": "f" }, "eu+jy": { "type": "typec", "disp": "ㅢ", - "desc": "첫 음소가 A타입이 아닌 음절의 'ㅢ'" + "desc": "첫 음소가 A타입이 아닌 음절의 'ㅢ'", + "track_disp": "ㅢB", + "keybind": "g" }, "eu+ii": { "type": "typec", "disp": "ㅢ[A]", - "desc": "첫 음소가 A타입인 음절의 'ㅢ'" + "desc": "첫 음소가 A타입인 음절의 'ㅢ'", + "track_disp": "ㅢA", + "keybind": "shift+g" } }, "types": { diff --git a/src/visemes/visemes.tsx b/src/visemes/visemes.tsx index 1814a4b..3ae5d1e 100644 --- a/src/visemes/visemes.tsx +++ b/src/visemes/visemes.tsx @@ -15,6 +15,8 @@ export type VisemeDefMap = { disp: string; desc?: string; keybind?: string; + keybind_disp?: string; + track_disp?: string; }; };