fix: replaced maximiziation with full screen

wldhg · Jul 21, 2022 · a0b94ff · a0b94ff
1 parent bda91c8
commit a0b94ff
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 62 deletions.
diff --git 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
@@ -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
@@ -250,33 +250,39 @@ const AppToolbar = (props: AppToolbarProps) => {
           </Tooltip>
         )
       )}
-      <IconButton
-        onClick={() => {
-          ctx.toggleTheme();
-        }}
-      >
-        {ctx.isLightTheme ? <DarkMode /> : <LightMode />}
-      </IconButton>
-      <IconButton
-        onClick={() => {
-          if (isMaximized) {
-            window.electron.ipcRenderer.sendMessage('app-unmaximize', []);
-            setIsMaximized(false);
-          } else {
-            window.electron.ipcRenderer.sendMessage('app-maximize', []);
-            setIsMaximized(true);
-          }
-        }}
-      >
-        {isMaximized ? <FullscreenExit /> : <Fullscreen />}
-      </IconButton>
-      <IconButton
-        onClick={() => {
-          window.electron.ipcRenderer.sendMessage('app-close', []);
-        }}
-      >
-        <Clear />
-      </IconButton>
+      <Tooltip title={ctx.isLightTheme ? 'Dark Mode' : 'Light Mode'}>
+        <IconButton
+          onClick={() => {
+            ctx.toggleTheme();
+          }}
+        >
+          {ctx.isLightTheme ? <DarkMode /> : <LightMode />}
+        </IconButton>
+      </Tooltip>
+      <Tooltip title={isMaximized ? 'Window Mode' : 'Full Screen'}>
+        <IconButton
+          onClick={() => {
+            if (isMaximized) {
+              window.electron.ipcRenderer.sendMessage('app-unmaximize', []);
+              setIsMaximized(false);
+            } else {
+              window.electron.ipcRenderer.sendMessage('app-maximize', []);
+              setIsMaximized(true);
+            }
+          }}
+        >
+          {isMaximized ? <FullscreenExit /> : <Fullscreen />}
+        </IconButton>
+      </Tooltip>
+      <Tooltip title="Exit VisLab">
+        <IconButton
+          onClick={() => {
+            window.electron.ipcRenderer.sendMessage('app-close', []);
+          }}
+        >
+          <Clear />
+        </IconButton>
+      </Tooltip>
       {children}
     </Toolbar>
   );

diff --git 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
@@ -9,6 +9,7 @@ const EditorNotice = () => {
       style={{
         fontFamily: '"Nanum Gothic Coding", monospace',
         fontSmooth: 'always',
+        fontSize: '14px',
       }}
     >
       <h3 className="exception-title">주의/예외 사항</h3>
@@ -28,25 +29,40 @@ const EditorNotice = () => {
       <ul className="exception-list">
         <li>
           <span>
-            [초성] A타입 자음&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+ [중성] B타입 단모음
+            말할 때{' '}
+            <b>
+              [초성] A타입 자음&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+ [중성] B타입
+              단모음
+            </b>{' '}
+            이 나오면
           </span>
           &nbsp;&mdash;&nbsp;
           <span className="exception-strong">
-            모음 앞에 <i className="unk-btn-mock btn-mock">XX</i> 추가
+            모음 <big>앞</big>에 <i className="unk-btn-mock btn-mock">XX</i>{' '}
+            추가
           </span>
         </li>
         <li>
-          <span>[중성] B타입 단모음&nbsp;&nbsp;&nbsp;+ [종성] A타입 자음</span>
-          &nbsp;&nbsp;&nbsp;&mdash;&nbsp;
+          <span>
+            말할 때{' '}
+            <b>[중성] B타입 단모음&nbsp;&nbsp;&nbsp;+ [종성] A타입 자음</b>
+            &nbsp;&nbsp;&nbsp;이 나오면
+          </span>
+          &nbsp;&mdash;&nbsp;
           <span className="exception-strong">
-            모음 뒤에 <i className="unk-btn-mock btn-mock">XX</i> 추가
+            모음 <big>뒤</big>에 <i className="unk-btn-mock btn-mock">XX</i>{' '}
+            추가
           </span>
         </li>
         <li>
-          <span>[중성] C타입 이중모음 + [종성] A타입 자음</span>
-          &nbsp;&nbsp;&nbsp;&mdash;&nbsp;
+          <span>
+            말할 때 <b>[중성] C타입 이중모음 + [종성] A타입 자음</b>
+            &nbsp;&nbsp;&nbsp;이 나오면
+          </span>
+          &nbsp;&mdash;&nbsp;
           <span className="exception-strong">
-            모음 뒤에 <i className="unk-btn-mock btn-mock">XX</i> 추가
+            모음 <big>뒤</big>에 <i className="unk-btn-mock btn-mock">XX</i>{' '}
+            추가
           </span>
         </li>
       </ul>

diff --git 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
@@ -15,6 +15,8 @@ export type VisemeDefMap = {
     disp: string;
     desc?: string;
     keybind?: string;
+    keybind_disp?: string;
+    track_disp?: string;
   };
 };