From 10268f6a8d22b697fde97ac33daa4acf054bea1f Mon Sep 17 00:00:00 2001 From: kekee000 Date: Tue, 9 Jun 2015 20:26:19 +0800 Subject: [PATCH] add generate name option --- css/preview.css | 10 +++++----- css/preview.less | 2 +- src/fonteditor/controller/default.js | 4 ++-- src/fonteditor/dialog/setting-unicode.js | 13 ++++++++++++- src/fonteditor/i18n/en-us/dialog.js | 1 + src/fonteditor/i18n/zh-cn/dialog.js | 1 + src/fonteditor/template/dialog/setting-ie.tpl | 3 ++- src/fonteditor/template/dialog/setting-ie.tpl.js | 2 +- src/fonteditor/template/export/icon-css.tpl | 4 ++-- src/fonteditor/template/export/icon-css.tpl.js | 2 +- src/fonteditor/template/export/icon-example.tpl | 2 +- src/fonteditor/template/export/icon-example.tpl.js | 2 +- src/fonteditor/template/export/preview-ttf.tpl | 2 +- src/fonteditor/template/export/preview-ttf.tpl.js | 2 +- src/fonteditor/widget/TTFManager.js | 5 +++-- src/fonteditor/widget/exporter.js | 4 ++-- src/fonteditor/widget/loader.js | 6 +++++- src/fonteditor/widget/previewer.js | 4 ++-- src/fonteditor/widget/sync.js | 4 ++-- src/fonteditor/widget/ttfmanager.js | 5 +++-- 20 files changed, 49 insertions(+), 29 deletions(-) diff --git a/css/preview.css b/css/preview.css index 14cf29e..80c25b1 100644 --- a/css/preview.css +++ b/css/preview.css @@ -109,16 +109,16 @@ table { background-color: #fffdef; overflow: auto; } -.icon-list { +.iconfont-list { overflow: hidden; } -.icon-list li { +.iconfont-list li { float: left; width: 100px; height: 150px; text-align: center; } -.icon-list .icon { +.iconfont-list .icon { font-size: 42px; line-height: 100px; margin: 10px 0; @@ -128,10 +128,10 @@ table { -moz-transition: font-size 0.25s ease-out 0s; transition: font-size 0.25s ease-out 0s; } -.icon-list .icon:hover { +.iconfont-list .icon:hover { font-size: 100px; } -.icon-list .code { +.iconfont-list .code { color: green; font-weight: bold; } diff --git a/css/preview.less b/css/preview.less index b0f892c..007531c 100644 --- a/css/preview.less +++ b/css/preview.less @@ -25,7 +25,7 @@ } } -.icon-list { +.iconfont-list { overflow: hidden; li { diff --git a/src/fonteditor/controller/default.js b/src/fonteditor/controller/default.js index 72069b8..5725d9d 100644 --- a/src/fonteditor/controller/default.js +++ b/src/fonteditor/controller/default.js @@ -337,12 +337,12 @@ define( .on('setting-unicode', function (e) { var SettingUnicode = settingSupport.unicode; !new SettingUnicode({ - onChange: function (unicode) { + onChange: function (setting) { // 此处延迟处理 setTimeout(function () { if (program.ttfManager.get()) { var glyfList = program.viewer.getSelected(); - program.ttfManager.setUnicode(unicode, glyfList); + program.ttfManager.setUnicode(setting.unicode, glyfList, setting.isGenerateName); } }, 20); } diff --git a/src/fonteditor/dialog/setting-unicode.js b/src/fonteditor/dialog/setting-unicode.js index ddb8739..4bdc630 100644 --- a/src/fonteditor/dialog/setting-unicode.js +++ b/src/fonteditor/dialog/setting-unicode.js @@ -19,6 +19,14 @@ define( + '' + '' + '' + + '' + + '
' + + '
' + + '${lang.dialog_generage_name}' + + '' + + '' + + '' + + '
' + '
'; return require('./setting').derive({ @@ -32,7 +40,10 @@ define( validate: function () { var unicode = $('#setting-text-unicode').val(); if (unicode.match(/^\$[A-F0-9]+$/i)) { - return (this.setting = unicode); + return (this.setting = { + unicode: unicode, + isGenerateName: $('#setting-text-unicode-name').is(':checked') + }); } alert('代码点设置不正确'); diff --git a/src/fonteditor/i18n/en-us/dialog.js b/src/fonteditor/i18n/en-us/dialog.js index 4dc3a5b..4459e02 100644 --- a/src/fonteditor/i18n/en-us/dialog.js +++ b/src/fonteditor/i18n/en-us/dialog.js @@ -45,6 +45,7 @@ define( dialog_unicode_set: 'Set Unicode', dialog_unicode_start: 'Start Unicode Code', + dialog_generage_name: 'Generate Glyph Name', dialog_metrics: 'Metrics', diff --git a/src/fonteditor/i18n/zh-cn/dialog.js b/src/fonteditor/i18n/zh-cn/dialog.js index 33c56a8..b53e28e 100644 --- a/src/fonteditor/i18n/zh-cn/dialog.js +++ b/src/fonteditor/i18n/zh-cn/dialog.js @@ -45,6 +45,7 @@ define( dialog_unicode_set: '设置代码点', dialog_unicode_start: '起始代码点', + dialog_generage_name: '是否生成字形名称', dialog_metrics: '字体度量', diff --git a/src/fonteditor/template/dialog/setting-ie.tpl b/src/fonteditor/template/dialog/setting-ie.tpl index 73a1b0b..b41e916 100644 --- a/src/fonteditor/template/dialog/setting-ie.tpl +++ b/src/fonteditor/template/dialog/setting-ie.tpl @@ -24,5 +24,6 @@
${lang.dialog_savesetting} -
${lang.dialog_resetsetting} + ${lang.dialog_resetsetting} + diff --git a/src/fonteditor/template/dialog/setting-ie.tpl.js b/src/fonteditor/template/dialog/setting-ie.tpl.js index 6f09169..a4d80da 100644 --- a/src/fonteditor/template/dialog/setting-ie.tpl.js +++ b/src/fonteditor/template/dialog/setting-ie.tpl.js @@ -1 +1 @@ -define(function () {return '
\r\n
\r\n
\r\n ${lang.dialog_combine_svg_single_glyph}\r\n \r\n \r\n \r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n ${lang.dialog_save_with_glyf_name}\r\n \r\n \r\n \r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n ${lang.dialog_savesetting}\r\n \r\n
${lang.dialog_resetsetting}\r\n
\r\n';}); \ No newline at end of file +define(function () {return '
\r\n
\r\n
\r\n ${lang.dialog_combine_svg_single_glyph}\r\n \r\n \r\n \r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n
\r\n ${lang.dialog_save_with_glyf_name}\r\n \r\n \r\n \r\n
\r\n
\r\n
\r\n\r\n
\r\n
\r\n ${lang.dialog_savesetting}\r\n \r\n
\r\n ${lang.dialog_resetsetting}\r\n
\r\n';}); \ No newline at end of file diff --git a/src/fonteditor/template/export/icon-css.tpl b/src/fonteditor/template/export/icon-css.tpl index 27896d8..082642b 100644 --- a/src/fonteditor/template/export/icon-css.tpl +++ b/src/fonteditor/template/export/icon-css.tpl @@ -11,8 +11,8 @@ url("{%=fontFamily%}.svg#uxfonteditor") format("svg"); /* iOS 4.1- */ } -[class^="{%=iconPrefix%}-"], -[class*=" {%=iconPrefix%}-"]:after { +[class*="{%=iconPrefix%}-"], +[class*="{%=iconPrefix%}-"]:after { font-family: "{%=fontFamily%}"; speak: none; font-style: normal; diff --git a/src/fonteditor/template/export/icon-css.tpl.js b/src/fonteditor/template/export/icon-css.tpl.js index 1eccd9d..02214d2 100644 --- a/src/fonteditor/template/export/icon-css.tpl.js +++ b/src/fonteditor/template/export/icon-css.tpl.js @@ -1 +1 @@ -define(function () {return '/**\r\n * @file icon.css\r\n */\r\n\r\n@font-face {\r\n font-family: "{%=fontFamily%}";\r\n src: url("{%=fontFamily%}.eot"); /* IE9 */\r\n src: url("{%=fontFamily%}.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */\r\n url("{%=fontFamily%}.woff") format("woff"), /* chrome、firefox */\r\n url("{%=fontFamily%}.ttf") format("truetype"), /* chrome、firefox、opera、Safari, Android, iOS 4.2+ */\r\n url("{%=fontFamily%}.svg#uxfonteditor") format("svg"); /* iOS 4.1- */\r\n}\r\n\r\n[class^="{%=iconPrefix%}-"],\r\n[class*=" {%=iconPrefix%}-"]:after {\r\n font-family: "{%=fontFamily%}";\r\n speak: none;\r\n font-style: normal;\r\n font-weight: normal;\r\n font-variant: normal;\r\n text-transform: none;\r\n line-height: 1;\r\n -webkit-font-smoothing: antialiased;\r\n -moz-osx-font-smoothing: grayscale;\r\n}\r\n\r\n{% _.each(glyfList, function(glyf) { %}\r\n.icon-{%=glyf.name%}:before {\r\n content: "{%=glyf.codeName%}";\r\n}\r\n{% }); %}\r\n\r\n\r\n';}); \ No newline at end of file +define(function () {return '/**\r\n * @file icon.css\r\n */\r\n\r\n@font-face {\r\n font-family: "{%=fontFamily%}";\r\n src: url("{%=fontFamily%}.eot"); /* IE9 */\r\n src: url("{%=fontFamily%}.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */\r\n url("{%=fontFamily%}.woff") format("woff"), /* chrome、firefox */\r\n url("{%=fontFamily%}.ttf") format("truetype"), /* chrome、firefox、opera、Safari, Android, iOS 4.2+ */\r\n url("{%=fontFamily%}.svg#uxfonteditor") format("svg"); /* iOS 4.1- */\r\n}\r\n\r\n[class*="{%=iconPrefix%}-"],\r\n[class*="{%=iconPrefix%}-"]:after {\r\n font-family: "{%=fontFamily%}";\r\n speak: none;\r\n font-style: normal;\r\n font-weight: normal;\r\n font-variant: normal;\r\n text-transform: none;\r\n line-height: 1;\r\n -webkit-font-smoothing: antialiased;\r\n -moz-osx-font-smoothing: grayscale;\r\n}\r\n\r\n{% _.each(glyfList, function(glyf) { %}\r\n.icon-{%=glyf.name%}:before {\r\n content: "{%=glyf.codeName%}";\r\n}\r\n{% }); %}\r\n\r\n\r\n';}); \ No newline at end of file diff --git a/src/fonteditor/template/export/icon-example.tpl b/src/fonteditor/template/export/icon-example.tpl index d60310e..ed198da 100644 --- a/src/fonteditor/template/export/icon-example.tpl +++ b/src/fonteditor/template/export/icon-example.tpl @@ -9,7 +9,7 @@

{%=fontFamily%} example

-