From 77c9a14460a37f634ba8961178ccc86cd5dfa6df Mon Sep 17 00:00:00 2001
From: tengge1 <930372551@qq.com>
Date: Sun, 29 Dec 2019 10:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E4=BD=93?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
ShadowEditor.Web/locales/zh-CN.json | 3 ++-
.../src/editor/menu/window/CreateFontWindow.jsx | 11 ++++++++++-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index ad4de4f0f..6005115e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,4 @@ __pycache__
/ShadowEditor.Web/Upload3
/test/TensorEditor/build
/ShadowEditor.Web/backup
+/ShadowEditor.Web/assets/fonts/custom
diff --git a/ShadowEditor.Web/locales/zh-CN.json b/ShadowEditor.Web/locales/zh-CN.json
index f62ba747b..86aec9ad9 100644
--- a/ShadowEditor.Web/locales/zh-CN.json
+++ b/ShadowEditor.Web/locales/zh-CN.json
@@ -970,5 +970,6 @@
"Create Font": "创建字体",
"Font File": "字体文件",
"Reverse direction": "反转方向",
- "Character set": "字符集"
+ "Character set": "字符集",
+ ".ttc to .ttf": ".ttc转.ttf"
}
\ No newline at end of file
diff --git a/ShadowEditor.Web/src/editor/menu/window/CreateFontWindow.jsx b/ShadowEditor.Web/src/editor/menu/window/CreateFontWindow.jsx
index 8b3adaa2d..baa5d9a5e 100644
--- a/ShadowEditor.Web/src/editor/menu/window/CreateFontWindow.jsx
+++ b/ShadowEditor.Web/src/editor/menu/window/CreateFontWindow.jsx
@@ -1,5 +1,5 @@
import './css/CreateFontWindow.css';
-import { Window, Content, Buttons, Button, Label, Input, CheckBox, Form, FormControl } from '../../../third_party';
+import { Window, Content, Buttons, Button, Label, Input, CheckBox, Form, FormControl, LinkButton } from '../../../third_party';
/**
* 创建字体窗口
@@ -15,6 +15,7 @@ class CreateFontWindow extends React.Component {
};
this.handleChange = this.handleChange.bind(this);
+ this.handleConvertFontType = this.handleConvertFontType.bind(this);
this.handleOK = this.handleOK.bind(this);
this.handleClose = this.handleClose.bind(this);
}
@@ -53,6 +54,10 @@ class CreateFontWindow extends React.Component {
onChange={this.handleChange}
/>
+
+
+ {'https://transfonter.org/ttc-unpack'}
+
@@ -73,6 +78,10 @@ class CreateFontWindow extends React.Component {
});
}
+ handleConvertFontType() {
+ window.open('https://transfonter.org/ttc-unpack', '_blank');
+ }
+
handleOK() {
}