From 2aa2d6ca8cff8200ef5ce01312e2595e97c2221a Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Mon, 17 Dec 2012 11:34:54 -0500 Subject: [PATCH 1/4] minor cursor update. --- img/cursor-draw-connect.png | Bin 335 -> 349 bytes img/source/cursors.svg | 623 +++++++++++++++++++----------------- 2 files changed, 332 insertions(+), 291 deletions(-) diff --git a/img/cursor-draw-connect.png b/img/cursor-draw-connect.png index 45e2052d902e0e2a850beaef7486dedb72f1a780..f4ebd69f3179eed8008a9740865c67a65a4feec7 100644 GIT binary patch delta 247 zcmV&gd^4lr)kLKYh-5-v0_#qvMH%%7EQ?t#_NP|`-yr=-oOlI=eUG%-d4&Cs50 zG!#veZ6gWWnjLKlmM3&Q>K14KciB6X)e zocbjdl71yw((rFh@p3T>;8=yyyYCkRp6p0c0en@Ve0mO#?B7oSKVy#S)J~mqQiamM x0eBb_S_2=zI=!4L_t(Ijm?uW4uU`wMBjJ{O6k0S^qz&pNIaAGpmQr5duXk^ z00$VGl^{V7HPN3;vH6>qKYw;*n{U)&tSPCGbd|K5B-wr{pa~%uXvXf@Mq}0_**21} zt+%bsss97rm%0TSz+Lqg@17c9+xFw7GKAoP>L&A0G0n0M`eJyZ-^VX0kyJ^tr194p z?G4#XfI7=l?@t>8o;{JI1UP1Sx?1N;&W8&?J?pRaC&}{EKn)~QpdD}pig>PuAZ`4w j3K)dE1&XS=5Zl}U6I+u0ji05&00000NkvXXu0mjfjUsP= diff --git a/img/source/cursors.svg b/img/source/cursors.svg index 914e89d4e..0116bfd99 100644 --- a/img/source/cursors.svg +++ b/img/source/cursors.svg @@ -7,7 +7,6 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" @@ -26,8 +25,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="-92.003606" - inkscape:cy="924.48054" + inkscape:cx="-62.679714" + inkscape:cy="998.30763" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -37,7 +36,7 @@ inkscape:window-y="105" inkscape:window-maximized="0" inkscape:snap-bbox="true" - showguides="false" + showguides="true" inkscape:guide-bbox="true" inkscape:snap-nodes="true" inkscape:object-paths="true" @@ -45,14 +44,6 @@ - - @@ -70,13 +61,6 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - + inkscape:export-ydpi="90" + transform="translate(0,-140)"> + style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" /> + d="M -85.15625,27.375 C -85.4375,27.421875 -86,27.624998 -86,28.375 l 0,1 c 0,0 0,0.5 -0.5,0.5 -0.5,0 -0.5,-0.5 -0.5,-0.5 l 0,-4 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,5 0,2 0,1 -1.5,-1.5 c -0.554688,-0.554688 -1.242341,-0.757012 -1.6875,-0.5 -0.435451,0.251408 -0.661558,0.895414 -0.3125,1.5 0.353553,0.612372 3.5,4.5 3.5,4.5 0.239676,0.415132 0.658877,0.607941 1.1875,0.75 0.09511,0.02556 0.177664,0.0743 0.28125,0.09375 0.257037,0.06287 0.567031,0.07046 0.875,0.09375 0.09849,0.0063 0.177945,0.02706 0.28125,0.03125 0.02248,10e-4 0.0397,-9.12e-4 0.0625,0 0.408742,0.01508 0.835216,0.03125 1.3125,0.03125 l 3,0 c 1.40324,0 1.950823,-1.420979 2.40625,-3 0.19368,-0.671514 0.59375,-3.328645 0.59375,-4 l 0,-2 c 0,-1 -1,-1 -1,-1 l -1,2 0,-1 0,-1 c 0,-1 -1,-1 -1,-1 0,0 -1,0 -1,1 l 0,1 c 0,0 0.01305,0.5 -0.5,0.5 -0.501327,0 -0.5,-0.5 -0.5,-0.5 l 0,-1 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.01563 -0.15625,0 z" + style="color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" /> @@ -219,7 +204,7 @@ id="g56199"> - - - + + - - - - + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/Users/saman/work_repos/iD/img/cursor-draw-connect.png" + id="g58331"> - - - - - - - - - + + + + + + + + + + + + + + + + + inkscape:export-ydpi="90" + transform="translate(0,-2)"> + transform="translate(100,-140)"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + cursor-pointer.png + + cursor-pointing.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f1e553f9248f77d037a627826fd0a6927dd08c0c Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 17 Dec 2012 10:55:05 -0800 Subject: [PATCH 2/4] Always show empty row in inspector --- js/id/ui/inspector.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js index 421a0ced4..573211fcc 100644 --- a/js/id/ui/inspector.js +++ b/js/id/ui/inspector.js @@ -36,15 +36,25 @@ iD.Inspector = function() { selection.each(function(entity) { function draw(data) { - function setValue(d, i) { d.value = this.value; } - function setKey(d, i) { d.key = this.value; } - function emptyTag(d) { return d.key === ''; } + data.push({key: '', value: ''}); + + function setValue(d, i) { + d.value = this.value; + } + + function setKey(d, i) { + d.key = this.value; + } + + function emptyTag(d) { + return d.key === ''; + } function pushMore(d, i) { if (d3.event.keyCode === 9) { var tags = grabtags(); if (i == tags.length - 1 && !tags.filter(emptyTag).length) { - draw(tags.concat([{ key: '', value: '' }])); + draw(tags); } } } @@ -186,9 +196,7 @@ iD.Inspector = function() { inspectorwrap.append('h4').text('Edit tags'); - var tags = d3.entries(_.cloneDeep(entity.tags)); - if (tags.length === 0) tags = [{ key: '', value: '' }]; - draw(tags); + draw(d3.entries(_.cloneDeep(entity.tags))); selection.select('input').node().focus(); From d4e08550eb153af2e57612045cae3f275c51ec04 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 17 Dec 2012 10:55:40 -0800 Subject: [PATCH 3/4] Don't show help/remove buttons for empty row --- css/app.css | 24 ++++++++++++++---------- js/id/ui/inspector.js | 8 +++++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/css/app.css b/css/app.css index 7c260d9db..d7d35fb00 100644 --- a/css/app.css +++ b/css/app.css @@ -405,16 +405,6 @@ button.Browse .label { border-bottom: 1px solid #ccc; } -.inspector-inner button { - position: absolute; - top: 0; - right: 0; -} - -.inspector-inner button.tag-help { - right: 30px; -} - .inspector-wrap a.permalink { text-decoration:none; margin-right:1em; @@ -453,6 +443,20 @@ button.Browse .label { border-right: 1px solid #ccc; } +.tag-row button { + position: absolute; + top: 0; + right: 0; +} + +.tag-row-empty button { + display: none; +} + +.tag-row button.tag-help { + right: 30px; +} + .inspector-buttons { border-top: 1px solid #ccc; } diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js index 573211fcc..78b726881 100644 --- a/js/id/ui/inspector.js +++ b/js/id/ui/inspector.js @@ -70,23 +70,25 @@ iD.Inspector = function() { } var li = inspectorwrap.selectAll('li') - .data(data, function(d) { return [d.key, d.value]; }); + .data(data, function(d) { return d.key; }); li.exit().remove(); var row = li.enter().append('li').attr('class','tag-row'); var inputs = row.append('div').attr('class','input-wrap'); + li.classed('tag-row-empty', emptyTag); + inputs.append('input') .property('type', 'text') .attr('class', 'key') - .property('value', function(d, i) { return d.key; }) + .property('value', function(d) { return d.key; }) .on('keyup.update', setKey); inputs.append('input') .property('type', 'text') .attr('class', 'value') - .property('value', function(d, i) { return d.value; }) + .property('value', function(d) { return d.value; }) .on('keyup.update', setValue) .on('keydown.push-more', pushMore) .each(bindTypeahead); From 6ca8e321ac5a65d398988127c35181c276800570 Mon Sep 17 00:00:00 2001 From: Saman Bemel-Benrud Date: Mon, 17 Dec 2012 15:44:48 -0500 Subject: [PATCH 4/4] updating cursors + mock-up. --- img/cursor-draw-finish.png | Bin 0 -> 346 bytes img/cursor-select-path.png | Bin 0 -> 466 bytes img/source/cursors.svg | 161 +- img/source/design.svg | 3447 ++++++++++++++++++++---------------- 4 files changed, 2087 insertions(+), 1521 deletions(-) create mode 100644 img/cursor-draw-finish.png create mode 100644 img/cursor-select-path.png diff --git a/img/cursor-draw-finish.png b/img/cursor-draw-finish.png new file mode 100644 index 0000000000000000000000000000000000000000..44ec4c92963f15f4490bd86d93afda5b9595a520 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|mSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&KtEaEbpZ#do9QM0vu_CjQ0^9tV#rsm<}NVUkbaXkgZ+f8U&sqxnA4>jF= zi~JhI3gl!T-t82d@#ov+3tBA?gip-<+5F_$s@*T%b^mMpJ4wqka8mHPhDYL-8uMPV z9=TZa;^y@mi+^5l*b=)Z)^pUXO@geCywWr|_| literal 0 HcmV?d00001 diff --git a/img/cursor-select-path.png b/img/cursor-select-path.png new file mode 100644 index 0000000000000000000000000000000000000000..b2ea3de0e74190fe3c361109fa612e8f9bcaa785 GIT binary patch literal 466 zcmV;@0WJQCP)!!X%T)W@o?rGyfV%{6|Cp#u$a18)MG? zL<))|Nkvg8Ns={i1#~3QHg}+TQ52G-s;ZRdxquho@>tMWk|gV@s0S_U4%`55p`QN$wHg6t*4mYGuC~^`0<)t* zzzJ~cy{`c|=W1XL#8KP-W{in|>nzJI;yA{8&vZI{l+=;5X{#gxCRvs}d+)b{!C>C# z+JVJB42Q#e@BOyl?>_+(AU*~(v(~;Ym& + transform="translate(50,-140)"> cursor-cursor-drawpointing.png + x="105.25726" + y="-47.216827">connect.png + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/source/design.svg b/img/source/design.svg index 66c195cc0..27ef8cd15 100644 --- a/img/source/design.svg +++ b/img/source/design.svg @@ -382,6 +382,43 @@ ry="0.5" /> + + + + + + + + + style="display:inline" /> - + Area - Commit @@ -1323,16 +1260,6 @@ id="rect5323" style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate" /> - - - @@ -1343,13 +1270,26 @@ id="path5387" inkscape:connector-curvature="0" /> - + + + + + + Point - - + + + + Welcome to the iD editor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - handle selected - path selected - - - - - noselection - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 24 + + + Changes + + + Added to an area + + + Moved a node + + Created a node + + + + Changes + + + + + + + + + + + + + + Added a point + + + + + + + + + + + + Moved an area + Added a point + + + + + + + + + + + + style="display:inline" + id="g48109" + transform="translate(-570,10)"> + transform="matrix(1.3812956,0,0,1.3812956,-281.33115,-136.73404)" + d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z" + sodipodi:ry="4.34375" + sodipodi:rx="4.34375" + sodipodi:cy="348.03125" + sodipodi:cx="318.78125" + id="path48051-0" + style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + + + + + + transform="matrix(1.1510778,0,0,1.1510778,-697.94204,-44.611059)" + d="m 323.125,348.03125 a 4.34375,4.34375 0 1 1 -8.6875,0 4.34375,4.34375 0 1 1 8.6875,0 z" + sodipodi:ry="4.34375" + sodipodi:rx="4.34375" + sodipodi:cy="348.03125" + sodipodi:cx="318.78125" + id="path48139" + style="opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> +