';
+
+ return require('./setting').derive({
+
+ getTpl: function() {
+ return tpl;
+ },
+ onConfirm: function() {
+ var unicode = $('#setting-text-unicode').val();
+ if (unicode.match(/^\$[A-E0-9]+$/i)) {
+ this.fire('change', {
+ unicode: unicode
+ });
+ }
+ else {
+ alert('代码点设置不正确');
+ return false;
+ }
+ }
+ });
+ }
+);
diff --git a/src/fonteditor/dialog/setting.js b/src/fonteditor/dialog/setting.js
new file mode 100644
index 0000000..5fc0359
--- /dev/null
+++ b/src/fonteditor/dialog/setting.js
@@ -0,0 +1,104 @@
+/**
+ * @file setting.js
+ * @author mengke01
+ * @date
+ * @description
+ * 设置框
+ */
+
+
+define(
+ function(require) {
+ var lang = require('common/lang');
+ var observable = require('common/observable');
+
+ /**
+ * 设置框函数
+ *
+ * @constructor
+ */
+ function Setting() {
+ }
+
+ /**
+ * 初始化绑定事件
+ */
+ Setting.prototype.preInit = function() {
+ var dlg = $('#model-dialog');
+ dlg.find('.modal-title').html(this.title);
+ dlg.find('.modal-body').html(this.getTpl());
+
+ dlg.on('hidden.bs.modal', lang.bind(function (e) {
+ if (dlg) {
+ this.un();
+ dlg.off('hidden.bs.modal');
+ dlg.find('.btn-confirm').off('click');
+ dlg = null;
+ }
+ }, this));
+
+ dlg.find('.btn-confirm').on('click', lang.bind(function() {
+ if (false !== this.onConfirm()) {
+ dlg.modal('hide');
+ }
+ }, this));
+ };
+
+ /**
+ * 获取模板
+ *
+ * @return {string} 模板字符串
+ */
+ Setting.prototype.getTpl = function() {
+ return '';
+ };
+
+ /**
+ * 确定事件
+ *
+ * @return {boolean=} 是否关闭对话框
+ */
+ Setting.prototype.onConfirm = function() {
+ };
+
+ /**
+ * 显示
+ */
+ Setting.prototype.show = function() {
+ $('#model-dialog').modal('show');
+ return this;
+ };
+
+ /**
+ * 注销
+ */
+ Setting.prototype.dispose = function() {
+ $('#model-dialog').modal('hide');
+ };
+
+
+ /**
+ * 派生一个setting
+ *
+ * @param {Object} proto 原型函数
+ * @return {Function} 派生类
+ */
+ Setting.derive = function(proto) {
+
+ function Class() {
+ Setting.apply(this, arguments);
+ this.preInit();
+ this.initialize && this.initialize();
+ }
+
+ Class.prototype = new Setting();
+ Class.prototype.constructor = Setting;
+ lang.extend(Class.prototype, proto);
+ observable.mixin(Class.prototype);
+
+ return Class;
+ };
+
+ return Setting;
+ }
+);
diff --git a/src/fonteditor/ttf/main.js b/src/fonteditor/ttf/main.js
index 9a7d9ae..c366af5 100644
--- a/src/fonteditor/ttf/main.js
+++ b/src/fonteditor/ttf/main.js
@@ -14,37 +14,72 @@ define(
var exporter = require('../widget/exporter');
var project = require('../widget/project');
var ProjectViewer = require('../widget/projectviewer');
- var ttfmanager = require('../widget/ttfmanager');
+ var TTFManager = require('../widget/ttfmanager');
var program = require('../program');
var string = require('common/string');
+ var setting = {
+ 'unicode': require('../dialog/setting-unicode')
+ }
+
var actions = {
- new: function() {
- if (program.data.ttf && !window.confirm('是否放弃保存当前项目?')) {
+ 'new': function() {
+ if (program.ttfmanager.get() && !window.confirm('是否放弃保存当前项目?')) {
return;
}
newEmpty();
- },
- open: function() {
+ },
+ 'open': function() {
$('#font-import').click();
},
- import: function() {
+
+ 'import': function() {
$('#font-import').click();
},
- export: function() {
+
+ 'export': function() {
},
- save: function() {
+
+ 'save': function() {
saveProj();
+ },
+
+ 'add-new': function() {
+ program.ttfmanager.addglyf({
+ name: '',
+ unicode:[]
+ });
+ },
+
+ 'setting-unicode': function(e) {
+ var dlg = new setting.unicode();
+
+ dlg.on('change', function(e) {
+ // 此处延迟处理
+ setTimeout(function(){
+ setUnicode(e.unicode);
+ }, 20);
+ });
+
+ dlg.show();
}
};
+ // 设置unicode
+ function setUnicode(unicode) {
+ if (program.ttfmanager.get()) {
+ var glyfList = program.viewer.getSelected();
+ program.ttfmanager.setUnicode(unicode, glyfList);
+ }
+
+ }
// 保存项目
function saveProj() {
- if (program.data.ttf) {
+ if (program.ttfmanager.get()) {
var name = '';
if(name = window.prompt('请输入项目名称：')) {
- var list = project.add(string.encodeHTML(name), program.data.ttf);
+ var list = project.add(string.encodeHTML(name), program.ttfmanager.get());
program.projectViewer.show(list);
}
}
@@ -53,8 +88,7 @@ define(
// 新建空白
function newEmpty() {
$.getJSON('./src/fonteditor/data/empty.json', function(imported) {
- program.data.ttf = imported;
- program.viewer.show(imported);
+ program.ttfmanager.set(imported);
})
}
@@ -63,23 +97,20 @@ define(
var file = e.target.files[0];
if (program.action == 'open' && file.name.match(/(\.ttf|\.woff)$/)) {
- program.data.file = file.name;
loader.load(file, {
type: file.name.slice(file.name.lastIndexOf('.') + 1),
success: function(imported) {
- program.data.ttf = imported;
- program.viewer.show(imported);
+ program.ttfmanager.set(imported);
}
});
}
else if (program.action == 'import' && file.name.match(/(\.ttf|\.woff|\.svg)$/)) {
- if (program.data.ttf) {
+ if (program.ttfmanager.get()) {
loader.load(file, {
type: file.name.slice(file.name.lastIndexOf('.') + 1),
success: function(imported) {
if (imported.glyf.length) {
- ttfmanager.combine(program.data.ttf, imported, {scale: true});
- program.viewer.show(program.data.ttf);
+ program.ttfmanager.combine(imported, {scale: true});
}
}
});
@@ -93,10 +124,9 @@ define(
}
function exportFile(e) {
- var ttf = program.data.ttf;
- if (ttf) {
+ if (program.ttfmanager.get()) {
var target = $(e.target);
- exporter.export(ttf, {
+ exporter.export(program.ttfmanager.get(), {
type: target.attr('data-type'),
target: target
});
@@ -128,21 +158,39 @@ define(
init: function () {
bindEvent();
+ // 查看器
program.viewer = new GLYFViewer($('#glyf-list'));
+ program.viewer.on('del', function(e) {
+ if (e.list) {
+ program.ttfmanager.delglyf(e.list);
+ }
+ });
+
+ // 项目管理
program.projectViewer = new ProjectViewer($('#project-list'));
program.projectViewer.on('open', function(e) {
var imported = project.get(e.projectName);
if (imported) {
- if (program.data.ttf && !window.confirm('是否放弃保存当前项目?')) {
+ if (program.ttfmanager.get() && !window.confirm('是否放弃保存当前项目?')) {
return;
}
- program.data.ttf = imported;
- program.viewer.show(imported);
+ program.ttfmanager.set(imported);
+ }
+ });
+ program.projectViewer.on('del', function(e) {
+ if (e.projectName && window.confirm('是否删除项目?')) {
+ program.projectViewer.show(project.remove(e.projectName));
}
});
program.projectViewer.show(project.items());
+ // ttf管理
+ program.ttfmanager = new TTFManager();
+ program.ttfmanager.on('change', function(e) {
+ program.viewer.show(e.ttf);
+ });
+
}
};
diff --git a/src/fonteditor/widget/glyfviewer.js b/src/fonteditor/widget/glyfviewer.js
index d2a1377..802c3e4 100644
--- a/src/fonteditor/widget/glyfviewer.js
+++ b/src/fonteditor/widget/glyfviewer.js
@@ -10,11 +10,15 @@ define(
function(require) {
var glyf2svg = require('ttf/util/glyf2svg');
var string = require('common/string');
-
+ var lang = require('common/lang');
+ var MouseCapture = require('render/capture/Mouse');
+ var isBoundingBoxCross = require('graphics/isBoundingBoxCross');
+
var GLYF_ITEM_TPL = ''
+ '正在加载...
+
+