Commit graph

165 commits

Author SHA1 Message Date
iandoug
acc392dff4 Aligned my version with IJP master 2015-08-26 16:21:29 +02:00
iandoug
3449009df8 Not sure why Git needs this .... 2015-08-26 15:20:10 +02:00
iandoug
d4b184215c Add function to print the Summary tab 2015-08-26 15:10:26 +02:00
Ian Prest
962bd6ba78 A few tweaks to the switch summary display
-- Reverted to using lowercase "IDs" in switches.json (no need to
change, and would break existing files))
-- Now showing the "display name" of the switches in the summary
display.
2015-08-25 00:13:12 -04:00
Ian Prest
9a2987be25 Merge branch 'master' of git://github.com/iandoug/keyboard-layout-editor into iandoug-master
Conflicts:
	kb.html
2015-08-23 23:51:31 -04:00
Ian Prest
bb5c5c1249 Merge branch 'editor-select' 2015-08-23 23:35:31 -04:00
iandoug
4728a6d39a Removed link to non-working SVG save 2015-08-21 23:52:32 +02:00
iandoug
c1843d8fb0 Made the keycap and switch summary tables a little more presentable 2015-08-21 23:44:06 +02:00
Ian Prest
0d642dc06c Minor tweaks to styling of summary tab
-- moved content inside tab (looks better, plus doesn't render garbage
on page load)
-- got rid of extra border
2015-08-17 23:19:47 -04:00
Ian Prest
4cf6ab134b Whitespace changes 2015-08-17 23:04:48 -04:00
iandoug
78b26c1f89 Use coloured squares to show keycap colour in summary instead of coloured text. Use OL instead of UL.. immediately shows how many different keycaps are used. 2015-08-14 21:51:53 +02:00
iandoug
245f2528c7 Print the key count lines in same colour as key. White is an issue. 2015-08-13 22:08:46 +02:00
iandoug
0c4dfb61f8 Added switch counts to summary. 2015-08-13 13:53:44 +02:00
iandoug
a56307d112 Now count keys by size and colour 2015-08-13 00:18:29 +02:00
iandoug
3efd78bfa0 Added initial Summary as first step to address #88 2015-08-12 21:57:30 +02:00
iandoug
fed6a86732 Added Download Thumbnail function 2015-08-12 00:58:50 +02:00
iandoug
1a35452bd8 Added Download as JPG 2015-08-11 19:28:24 +02:00
Ian Prest
36b09f8183 Converted JSONL parser to EBNF form to be more hackable 2015-08-11 00:18:48 -04:00
Ian Prest
5b972cf6f6 Misc changes, mostly for per-key switch type
-- Switches.json -> now using hash for "switches" for easy lookup
-- Serialization changed so that we use "" for default switch types, and
this round-trips properly.
-- Had to switch from <select> to bootstrap-style dropdowns; when I
started trying to handle the 'default' settings better (i.e., when the
per-key setting was blank), Angular was throwing errors using the
<select> element.
-- Changing switch mount blanks out brand/type, etc.
-- Now disabling switch mount/brand/type controls when appropriate
-- PNG rendering now only doing #keyboard-bg, which allows me to make
#keyboard full-width again.
2015-08-10 21:40:53 -04:00
Ian Prest
319fbdef00 Fixed HTML tags for checkboxes 2015-08-09 15:26:19 -04:00
Ian Prest
931c2ee3e2 Consolidated download options under a dropdown button 2015-08-09 12:48:41 -04:00
Ian Prest
52ce8d91c3 Switch Download PNG from JQuery-style to Angular-style 2015-08-09 12:41:36 -04:00
Ian Prest
7fd550002a Get html2canvas via bower 2015-08-09 12:34:45 -04:00
Ian Prest
9964874e9e Merge branch 'master' of git://github.com/iandoug/keyboard-layout-editor into iandoug-master 2015-08-09 12:10:37 -04:00
Ian Prest
4d23305696 Added syntax-highlighting to the various text editors
-- Using ACE Editor, which was just a drop-in replacement for the
TEXTAREAs
-- Implements #22
2015-08-09 11:59:03 -04:00
iandoug
3eaba1fa28 Think I have fixed the background size issue when saving as PNG. However it looks like the background size calculation is off by about 30 pixels. 2015-08-09 17:32:32 +02:00
iandoug
7a0d0e4dca Moved html2canvas.js to root folder 2015-08-09 17:11:13 +02:00
iandoug
e4bd575cc2 Initial experimental support for Save as PNG. 2015-08-09 16:32:19 +02:00
iandoug
112f82dd87 Cleanup some untidyness.. 2015-08-08 22:00:50 +02:00
iandoug
292624ba1e Added switch settings for each key 2015-08-08 21:55:46 +02:00
iandoug
a2c95f3edb Integrated patch for Colors in Keyboard (issue #52) 2015-08-07 21:34:58 +02:00
iandoug
fdc61d61ec Moved mounting options to same line as default switch, partly to save space but mostly because I could not get the label to line up. 2015-08-07 18:07:15 +02:00
iandoug
f0cea7a5f8 Added Switch Mounting (PCB/Plate) settings 2015-08-07 14:34:08 +02:00
Ian Prest
e3b4dd2bb3 Updated switches data to be a bit more descriptive
-- Found part numbers for a few switch types
-- Split switch data into a JS object, rather than a simple string
-- Small tweaks to UI layout
-- When setting mount-type, brand & switch-type are reset
-- When setting brand, switch-type is reset
2015-08-06 22:57:52 -04:00
Ian Prest
899228097c Merge branch 'defaultswitches' of git://github.com/iandoug/keyboard-layout-editor into iandoug-defaultswitches
Conflicts:
	kb.js
2015-08-06 20:59:41 -04:00
Ian Prest
df8378d52d Added 'Status LEDs' to the 'Add Key' dropdown. 2015-08-05 23:37:18 -04:00
Ian Prest
362b1bb692 Disable fields that don't make sense on decals 2015-08-04 23:29:18 -04:00
Ian Prest
46057c9adc Fix SVG export for decals 2015-08-04 22:05:18 -04:00
iandoug
a3b070cda5 Updated kb.html to use default switch data from one JSON file 2015-08-04 18:58:36 +02:00
Ian Prest
ad24eadc87 Implemented keyboard 'decals'
-- Intended to put decorative labels (logos, etc.) on keyboard layouts.
-- They're basically just invisible keycaps; this works pretty well,
since there are already so many formatting options for text on keycaps,
and it saves us from having to manage a completely separate type of
thing.
-- Props to iandoug for the idea!

Also:
-- Disable x2,y2,width2,height2 on decals
-- Increase max keycap size to 18x18 (allows for really large decals)
2015-08-03 23:40:42 -04:00
Ian Prest
1f6e1ddef2 Fix some IE rendering issues
-- Couldn't handle 'style' with Angular properties in it
-- Couldn't use 'ng-style', because I needed to insert plain CSS text
-- Using 'ng-attr-style', which seems to work on IE, Chrome, and FF
2015-08-03 19:12:55 -04:00
Ian Prest
02d9c57f52 Tweak style defn to always generate valid CSS 2015-08-03 18:51:30 -04:00
Ian Prest
4943a246f1 Tweaked serialization to omit background completely when removed 2015-08-03 18:41:30 -04:00
Ian Prest
b2c73fdc9c Moved radii field inline with other background fields
-- Renamed backgroundradii --> radii
-- Update PKB sample
2015-08-03 18:28:31 -04:00
Ian Prest
3917a010b3 Removed background-width field, since it's auto-calculated
-- Also updated iandoug's Programmer's Keyboard sample
2015-08-03 18:15:03 -04:00
Ian Prest
354377f559 Rejiggered the background-image dropdown & data
-- Also auto-calculating the keyboard width
2015-08-03 17:45:53 -04:00
iandoug
890875795c Merge the three switch json files into one, update html and js to handle, not working yet 2015-08-03 22:06:38 +02:00
Ian Prest
7724b33fc1 Merge branch 'backgrounds' of git://github.com/iandoug/keyboard-layout-editor into iandoug-backgrounds
Conflicts:
	kb.css
	kb.js
2015-08-03 11:30:26 -04:00
Ian Prest
594884024e Fix ridiculous input widths on Firefox
-- Looked bad, plus was overlapping my new button :)
2015-08-03 11:01:55 -04:00
Ian Prest
c919ae5b64 Support deleting layout gists 2015-08-02 22:13:39 -04:00