Skip to content

K
kityminder-core
Commit 6d8c0fcd authored by Akikonata's avatar Akikonata
Browse files
Options

added percent

parent 84e22037
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 28 deletions
dialogs/markers/images/iconprogress.png
View replaced file @ 84e22037 View file @ 6d8c0fcd
dialogs/markers/images/iconprogress.png

3.74 KB | W: | H:

dialogs/markers/images/iconprogress.png

5.06 KB | W: | H:

dialogs/markers/images/iconprogress.png
dialogs/markers/images/iconprogress.png
dialogs/markers/images/iconprogress.png
dialogs/markers/images/iconprogress.png
  • 2-up
  • Swipe
  • Onion skin
dialogs/markers/markers.js
View file @ 6d8c0fcd
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
".kmui-dialog-<%= container %> .icon.p9{background-position: -160px 0}" + ".kmui-dialog-<%= container %> .icon.p9{background-position: -160px 0}" +
".kmui-dialog-<%= container %> .icon.p0{background-position: -180px 0}" + ".kmui-dialog-<%= container %> .icon.p0{background-position: -180px 0}" +
".kmui-dialog-<%= container %> ul li{width:40%;display:inline-block}" + ".kmui-dialog-<%= container %> ul li{width:40%;display:inline-block}" +
".kmui-dialog-<%= container %> h4{padding:5px 10px; margin:0; background:#eee}" +
"</style>" + "</style>" +
"<h4><%= priority %></h3>" +
"<ul class='icon-list priority'>" + "<ul class='icon-list priority'>" +
"<li value='1' type='priority'><span class='icon p1'></span><span><%= priority %>1</span></li>" + "<li value='1' type='priority'><span class='icon p1'></span><span><%= priority %>1</span></li>" +
"<li value='2' type='priority'><span class='icon p2'></span><span><%= priority %>2</span></li>" + "<li value='2' type='priority'><span class='icon p2'></span><span><%= priority %>2</span></li>" +
...@@ -24,14 +26,20 @@ ...@@ -24,14 +26,20 @@
"<li value='7' type='priority'><span class='icon p7'></span><span><%= priority %>7</span></li>" + "<li value='7' type='priority'><span class='icon p7'></span><span><%= priority %>7</span></li>" +
"<li value='8' type='priority'><span class='icon p8'></span><span><%= priority %>8</span></li>" + "<li value='8' type='priority'><span class='icon p8'></span><span><%= priority %>8</span></li>" +
"<li value='9' type='priority'><span class='icon p9'></span><span><%= priority %>9</span></li>" + "<li value='9' type='priority'><span class='icon p9'></span><span><%= priority %>9</span></li>" +
"<li value='10' type='priority'><span class='icon p0'></span><span><%= priority %>-</span></li>" + "<li value='0' type='priority'><span class='icon p0'></span><span><%= none %></span></li>" +
"</ul>" + "</ul>" +
"<h4><%= progress.title %></h4>" +
"<ul class='icon-list progress'>" + "<ul class='icon-list progress'>" +
"<li value='1' type='progress'><span class='icon p1'></span><span><%= progress.notdone %></span></li>" + "<li value='1' type='progress'><span class='icon p1'></span><span><%= progress.notdone %></span></li>" +
"<li value='2' type='progress'><span class='icon p2'></span><span><%= progress.quarterdone %></span></li>" + "<li value='2' type='progress'><span class='icon p2'></span><span><%= progress.done1 %></span></li>" +
"<li value='3' type='progress'><span class='icon p3'></span><span><%= progress.halfdone %></span></li>" + "<li value='3' type='progress'><span class='icon p3'></span><span><%= progress.done2 %></span></li>" +
"<li value='4' type='progress'><span class='icon p4'></span><span><%= progress.threequartersdone %></span></li>" + "<li value='4' type='progress'><span class='icon p4'></span><span><%= progress.done3 %></span></li>" +
"<li value='5' type='progress'><span class='icon p5'></span><span><%= progress.done %></span></li>" + "<li value='5' type='progress'><span class='icon p5'></span><span><%= progress.done4 %></span></li>" +
"<li value='6' type='progress'><span class='icon p6'></span><span><%= progress.done5 %></span></li>" +
"<li value='7' type='progress'><span class='icon p7'></span><span><%= progress.done6 %></span></li>" +
"<li value='8' type='progress'><span class='icon p8'></span><span><%= progress.done7 %></span></li>" +
"<li value='9' type='progress'><span class='icon p9'></span><span><%= progress.done %></span></li>" +
"<li value='0' type='progress'><span class='icon p0'></span><span><%= none %></span></li>" +
"</ul>", "</ul>",
initContent: function (km, $w) { initContent: function (km, $w) {
var lang = km.getLang('dialogs.markers'); var lang = km.getLang('dialogs.markers');
......
lang/zh-cn/zh-cn.js
View file @ 6d8c0fcd
KityMinder.LANG[ 'zh-cn' ] = { KityMinder.LANG['zh-cn'] = {
'maintopic': '中心主题', 'maintopic': '中心主题',
'topic': '分支主题', 'topic': '分支主题',
'tooltips': { 'tooltips': {
...@@ -39,11 +39,17 @@ KityMinder.LANG[ 'zh-cn' ] = { ...@@ -39,11 +39,17 @@ KityMinder.LANG[ 'zh-cn' ] = {
'lang_input_target': '是否在新窗口打开：' 'lang_input_target': '是否在新窗口打开：'
}, },
'priority': '优先级', 'priority': '优先级',
'none': '无',
'progress': { 'progress': {
'title': '进度',
'notdone': "未完成", 'notdone': "未完成",
'quarterdone': '完成1/4', 'done1': '完成1/8',
'halfdone': '完成1/2', 'done2': '完成1/4',
'threequartersdone': '完成3/4', 'done3': '完成3/8',
'done4': '完成1/2',
'done5': '完成5/8',
'done6': '完成3/4',
'done7': '完成7/8',
'done': '已完成' 'done': '已完成'
} }
}, },
...@@ -52,8 +58,7 @@ KityMinder.LANG[ 'zh-cn' ] = { ...@@ -52,8 +58,7 @@ KityMinder.LANG[ 'zh-cn' ] = {
}, },
'hyperlink': {}, 'hyperlink': {},
'image': {}, 'image': {},
'resource': { 'resource': {}
}
}, },
'node': { 'node': {
'appendsiblingnode': '插入同级节点', 'appendsiblingnode': '插入同级节点',
...@@ -65,11 +70,11 @@ KityMinder.LANG[ 'zh-cn' ] = { ...@@ -65,11 +70,11 @@ KityMinder.LANG[ 'zh-cn' ] = {
'default': '左右展开', 'default': '左右展开',
'bottom': '向下展开' 'bottom': '向下展开'
}, },
'hyperlink':{ 'hyperlink': {
'hyperlink':'插入超链接', 'hyperlink': '插入超链接',
'unhyperlink':"取消超链接" 'unhyperlink': "取消超链接"
}, },
'image':{ 'image': {
'image': '插入图片', 'image': '插入图片',
'removeimage': '删除图片' 'removeimage': '删除图片'
} }
......
src/module/icon.js
View file @ 6d8c0fcd
KityMinder.registerModule("IconModule", function () { KityMinder.registerModule("IconModule", function () {
var minder = this; var minder = this;
var renderPriorityIcon = function (node, val) { var renderPriorityIcon = function (node, val) {
var colors = ["", "#A92E24", "#29A6BD", "#1E8D54", "#eb6100", "#876DDA", "#828282", "#828282", "#828282", "#828282", "#828282"]; var colors = ["", "#A92E24", "#29A6BD", "#1E8D54", "#eb6100", "#876DDA", "#828282", "#828282", "#828282", "#828282"];
var bgcolor = colors[val]; var bgcolor = colors[val];
var _bg = new kity.Rect().fill(colors[val]).setRadius(3).setWidth(20).setHeight(20); var _bg = new kity.Rect().fill(colors[val]).setRadius(3).setWidth(20).setHeight(20);
var _number; var _number = new kity.Text().setContent(val).fill("white").setSize(12);
if (val < 10) {
_number = new kity.Text().setContent(val).fill("white").setSize(12);
} else {
_number = new kity.Rect().fill("white").setWidth(14).setHeight(14).translate(-3, -12);
}
var _rc = new kity.Group(); var _rc = new kity.Group();
_rc.addShapes([_bg, _number]); _rc.addShapes([_bg, _number]);
node.getContRc().addShape(_rc); node.getContRc().addShape(_rc);
...@@ -23,33 +18,48 @@ KityMinder.registerModule("IconModule", function () { ...@@ -23,33 +18,48 @@ KityMinder.registerModule("IconModule", function () {
var _contRc = node.getContRc(); var _contRc = node.getContRc();
var _bg = new kity.Circle().setRadius(8).fill("white").stroke(new kity.Pen("#29A6BD", 2)); var _bg = new kity.Circle().setRadius(8).fill("white").stroke(new kity.Pen("#29A6BD", 2));
var _percent, d; var _percent, d;
if (val < 5) { if (val < 9) {
_percent = new kity.Path(); _percent = new kity.Path();
d = _percent.getDrawer(); d = _percent.getDrawer();
d.moveTo(0, 0).lineTo(6, 0); d.moveTo(0, 0).lineTo(0, -6);
} else _percent = new kity.Group(); } else _percent = new kity.Group();
_rc.addShapes([_bg, _percent]); _rc.addShapes([_bg, _percent]);
_contRc.addShape(_rc); _contRc.addShape(_rc);
//r, laf, sf, x, y
//large-arc-flag 为1 表示大角度弧线，0 代表小角度弧线。
//sweep-flag 为1代表从起点到终点弧线绕中心顺时针方向，0 代表逆时针方向。
switch (val) { switch (val) {
case 1: case 1:
break; break;
case 2: case 2:
d.carcTo(6, 0, 0, 0, -6); d.carcTo(6, 0, 1, 6 * Math.cos(2 * Math.PI / 8), -6 * Math.sin(2 * Math.PI / 8));
break; break;
case 3: case 3:
d.carcTo(6, 0, 0, -6, 0); d.carcTo(6, 0, 1, 6, 0);
break; break;
case 4: case 4:
d.carcTo(6, 1, 0, 0, 6); d.carcTo(6, 0, 1, 6 * Math.cos(2 * Math.PI / 8), 6 * Math.sin(2 * Math.PI / 8));
break; break;
case 5: case 5:
d.carcTo(6, 0, 1, 0, 6);
break;
case 6:
d.carcTo(6, 1, 1, -6 * Math.cos(2 * Math.PI / 8), 6 * Math.sin(2 * Math.PI / 8));
break;
case 7:
d.carcTo(6, 1, 1, -6, 0);
break;
case 8:
d.carcTo(6, 1, 1, -6 * Math.cos(2 * Math.PI / 8), -6 * Math.sin(2 * Math.PI / 8));
break;
case 9:
var check = new kity.Path(); var check = new kity.Path();
_percent.addShapes([new kity.Circle().setRadius(6).fill("#29A6BD"), check]); _percent.addShapes([new kity.Circle().setRadius(6).fill("#29A6BD"), check]);
check.getDrawer().moveTo(-3, 0).lineTo(-1, 3).lineTo(3, -2); check.getDrawer().moveTo(-3, 0).lineTo(-1, 3).lineTo(3, -2);
check.stroke(new kity.Pen("white", 2).setLineCap("round")); check.stroke(new kity.Pen("white", 2).setLineCap("round"));
break; break;
} }
if (val < 5) d.close(); if (val && val < 8) d.close();
_percent.fill("#29A6BD"); _percent.fill("#29A6BD");
var pre = node.getData("PriorityIcon"); var pre = node.getData("PriorityIcon");
var style = minder.getCurrentLayoutStyle()[node.getType()]; var style = minder.getCurrentLayoutStyle()[node.getType()];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment