Cleaned up some of the presets.

9 years ago · dd79d12d47
parent 7b5da3b640
commit dd79d12d47
3 changed files with 12 additions and 12 deletions
--- a/layouts.json
+++ b/layouts.json
@ -63,8 +63,8 @@
 			[{"y":-0.65,"x":-1,"h":1.5},"Alt",{"y":0.75},"Space",{"y":-0.35},"fn",{"y":-0.35},"_\n-",{"y":0.35},"\"\n'",{"y":0.25},"Enter"]
 		] },
 		{ "name" : "Kinesis Advantage", "data" : [
-			[{"f":1,"w":0.5,"h":0.5},"\nEsc",{"x":0.25,"w":0.5,"h":0.5},"\nF1",{"x":0.25,"w":0.5,"h":0.5},"\nF2",{"x":0.25,"w":0.5,"h":0.5},"\nF3",{"x":0.25,"w":0.5,"h":0.5},"\nF4",{"x":0.25,"w":0.5,"h":0.5},"\nF5",{"x":0.25,"w":0.5,"h":0.5},"\nF6",{"x":0.25,"w":0.5,"h":0.5},"\nF7",{"x":0.25,"w":0.5,"h":0.5},"\nF8",{"x":5,"w":0.5,"h":0.5},"\nF9",{"x":0.25,"w":0.5,"h":0.5},"Disable Macro\nF10",{"x":0.25,"w":0.5,"h":0.5},"Macro\nF11",{"x":0.25,"w":0.5,"h":0.5},"Remap\nF12",{"x":0.25,"w":0.5,"h":0.5},"PrintScr\n\n\n\n\n\nSysReq",{"x":0.25,"w":0.5,"h":0.5},"Scroll<br>lock",{"x":0.25,"w":0.5,"h":0.5},"Pause\n\n\n\n\n\nBreak",{"x":0.25,"w":0.5,"h":0.5},"Keypad",{"x":0.25,"w":0.5,"h":0.5},"Program"],
-			[{"y":-0.25,"x":2.25,"f":3},"@\n2","#\n3","$\n4","%\n5",{"x":5.5},"^\n6","&\n7\n\n\nNm Lk","*\n8\n\n\n=","(\n9\n\n\n="],
+			[{"f":1,"f2":2,"w":0.675,"h":0.85},"\nEsc",{"x":0.075,"w":0.675,"h":0.85},"\nF1",{"x":0.075,"w":0.675,"h":0.85},"\nF2",{"x":0.075,"w":0.675,"h":0.85},"\nF3",{"x":0.075,"w":0.675,"h":0.85},"\nF4",{"x":0.075,"w":0.675,"h":0.85},"\nF5",{"x":0.075,"w":0.675,"h":0.85},"\nF6",{"x":0.075,"w":0.675,"h":0.85},"\nF7",{"x":0.075,"w":0.675,"h":0.85},"\nF8",{"x":4.825,"w":0.675,"h":0.85},"Repeat Rate\nF9",{"x":0.075,"w":0.675,"h":0.85},"Disable Macro\nF10",{"x":0.075,"w":0.675,"h":0.85},"Macro\nF11",{"x":0.075,"w":0.675,"h":0.85},"Remap\nF12",{"x":0.075,"w":0.675,"h":0.85},"PrintScr SysReq",{"x":0.075,"w":0.675,"h":0.85},"Scroll<br>lock",{"x":0.075,"w":0.675,"h":0.85},"Pause Break",{"x":0.075,"w":0.675,"h":0.85},"Keypad",{"x":0.075,"w":0.675,"h":0.85},"Progrm"],
+			[{"x":2.25,"f":3},"@\n2","#\n3","$\n4","%\n5",{"x":5.5},"^\n6","&\n7\n\n\nNm Lk","*\n8\n\n\n=","(\n9\n\n\n="],
 			[{"y":-0.75,"w":1.25},"+\n=","!\n1",{"x":13.5},")\n0\n\n\n*",{"w":1.25},"_\n-"],
 			[{"y":-0.25,"x":2.25,"f":6},"W","E","R","T",{"x":5.5},"Y","U\n\n\n\n7","I\n\n\n\n8","O\n\n\n\n9"],
 			[{"y":-0.75,"f":3,"w":1.25},"\n\n\n\n\n\nTab",{"f":6},"Q",{"x":13.5},"P\n\n\n\n-",{"f":3,"w":1.25},"|\n\\"],
@ -73,11 +73,11 @@
 			[{"y":-0.25,"x":2.25,"f":6},"X","C","V","B",{"x":5.5},"N","M\n\n\n\n1",{"f":3},"<\n,\n\n\n2",">\n.\n\n\n3"],
 			[{"y":-0.75,"w":1.25},"\n\n\n\n\n\nShift",{"f":6},"Z",{"x":13.5,"f":3},"?\n/\n\n\nEnter",{"w":1.25},"\n\n\n\n\n\nShift"],
 			[{"y":-0.25,"x":2.25},"|\n\\\n\n\nInsert",{"a":5,"f":5},"⇦\n\n\n\n⇦","⇨\n\n\n\n⇨",{"x":7.5},"⇧\n\n\n\n⇧","⇩\n\n\n\n⇩",{"a":4,"f":3},"{\n[\n\n\n."],
-			[{"y":-0.75,"x":1.25},"~\n`",{"x":13.5},"}\n]\n\n\nenter"],
-			[{"r":15,"rx":5.25,"ry":4,"y":-0.25,"x":1.5},"ctrl","alt"],
+			[{"y":-0.75,"x":1.25},"~\n`",{"x":13.5},"}\n]\n\n\nEnter"],
+			[{"r":15,"rx":5.25,"ry":4,"x":1.5},"Ctrl","Alt"],
 			[{"x":0.5,"a":5,"h":2},"\n\n\n\n\n\nBack<br>Space",{"h":2},"\n\n\n\n\n\nDelete","\n\n\n\n\n\nHome"],
 			[{"x":2.5},"\n\n\n\n\n\nEnd"],
-			[{"r":-15,"rx":12.75,"y":-0.25,"x":-3.5,"a":4},"Cmd\n\n\n\n\n\nWin",{"a":5},"\n\n\n\n\n\nCtrl"],
+			[{"r":-15,"rx":12.75,"x":-3.5,"a":4},"Cmd\n\n\n\n\n\nWin",{"a":5},"\n\n\n\n\n\nCtrl"],
 			[{"x":-3.5,"a":6},"Page<br>Up",{"a":5,"h":2},"\n\n\n\n\n\nEnter",{"h":2},"\n\n\n\n\n\nSpace"],
 			[{"x":-3.5,"a":6},"Page<br>Down"]
 		] }
--- a/samples/keycool84
+++ b/samples/keycool84
@ -1,8 +1,8 @@
 [
-["\n\n\n\n\n\nEsc","\n\n\n\n\n\nF1","\n\n\n\n\n\nF2","\n\n\n\n\n\nF3","\n\n\n\n\n\nF4","\n\n\n\n\n\nF5","\n\n\n\n\n\nF6","\n\n\n\n\n\nF7","\n\n\n\n\n\nF8","\n\n\n\n\n\nF9","\n\n\n\n\n\nF10","\n\n\n\n\n\nF11","\n\n\n\n\n\nF12",{"a":5},"PrtSc\nNmLk","Pause\nScrLk","Delete\nInsert"],
-[{"a":4},"~\n`",{"x":-1},"","!\n1","@\n2","#\n3","$\n4","%\n5","^\n6","&\n7","*\n8","(\n9",")\n0","_\n-","+\n=",{"w":2},"Backspace","\n\n\n\n\n\nHome"],
-[{"w":1.5},"Tab","Q","W","E","R","T","Y","U","I","O","P","{\n[","}\n]",{"w":1.5},"|\n\\","\n\n\n\n\n\nPage Up"],
-[{"w":1.75},"Caps Lock","A","S","D","F","G","H","J","K","L",":\n;","\"\n'",{"w":2.25},"Enter","\n\n\n\n\n\nPage Down"],
-[{"w":2.25},"Shift","Z","X","C","V","B","N","M","<\n,",">\n.","?\n/",{"w":1.75},"Shift",{"a":5},"\n\n\n\n\n\n↑",{"a":4},"\n\n\n\n\n\nEnd"],
-[{"w":1.25},"Ctrl",{"w":1.25},"Win",{"w":1.25},"Alt",{"w":6.25},"","Alt","Fn","Ctrl",{"a":5},"\n\n\n\n\n\n←","\n\n\n\n\n\n↓","\n\n\n\n\n\n→"]
+[{"a": 6 }, "Esc", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", {"a": 5 }, "PrtSc\nNmLk", "Pause\nScrLk", "Delete\nInsert"],
+[{"a": 4 }, "~\n`", "!\n1", "@\n2", "#\n3", "$\n4", "%\n5", "^\n6", "&\n7", "*\n8", "(\n9", ")\n0", "_\n-", "+\n=", {"a": 6, "w": 2 }, "Backspace", "Home"],
+[{"a": 4, "w": 1.5 }, "Tab", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "{\n[", "}\n]", {"w": 1.5 }, "|\n\\", {"a": 6 }, "Page Up"], 
+[{"a": 4, "w": 1.75 }, "Caps Lock", "A", "S", "D", "F", "G", "H", "J", "K", "L", ":\n;", "\"\n'", {"a": 6, "w": 2.25 }, "Enter", "Page Down"],
+[{"w": 2.25 }, "Shift", {"a": 4 }, "Z", "X", "C", "V", "B", "N", "M", "<\n,", ">\n.", "?\n/", {"a": 6, "w": 1.75 }, "Shift", {"a": 7 }, "↑", {"a": 6 }, "End"], 
+[{"w": 1.25 }, "Ctrl", {"w": 1.25 }, "Win", {"w": 1.25 }, "Alt", {"w": 6.25 }, "", "Alt", "Fn", "Ctrl", {"a": 7 }, "←", "↓", "→"]
 ]
--- a/samples/televideo-ts-800a
+++ b/samples/televideo-ts-800a
@ -1,6 +1,6 @@
 [
 {"backcolor":"#151A21"},
-[{"x":0.25,"c":"#84877B","t":"#EFF5DE;","p":"DSA","a":5,"f":2},"<u>&nbsp;SET UP&nbsp;</u>\nNO SCROLL",{"a":7,"f":7},"F1","F2","F3","F4","F5","F6","F7","F8","F9","F10","F11",{"f":2},"LINE INSERT","LINE DELETE","CHAR INSERT","CHAR DELETE",{"x":0.5},"LINE ERASE","PAGE ERASE","SEND"],
+[{"x":0.25,"c":"#84877B","t":"#EFF5DE;","p":"DSA","a":5,"f":2},"<u>&nbsp;SET&nbsp;UP&nbsp;</u>\nNO SCROLL",{"a":7,"f":7},"F1","F2","F3","F4","F5","F6","F7","F8","F9","F10","F11",{"f":2},"LINE INSERT","LINE DELETE","CHAR INSERT","CHAR DELETE",{"x":0.5},"LINE ERASE","PAGE ERASE","SEND"],
 [{"x":0.25,"c":"#2A3233","a":5},"LOC<br><u>&nbsp;&nbsp;&nbsp;ESC&nbsp;&nbsp;&nbsp;</u>\nESC",{"f":6},"!\n1","@\n2","#\n3","$\n4","%\n5","^\n6","&\n7","*\n8","(\n9",")\n0","_\n-","+\n=","~\n`","|\n\\",{"a":7,"f":2},"BACK SPACE",{"x":0.5,"f":9},"7","8","9"],
 [{"x":0.25,"f":2,"w":1.5},"TAB",{"f":9},"Q","W","E","R","T","Y","U","I","O","P",{"a":5,"f":6},"[\n]",{"a":7,"f":2,"w":1.5},"LINE<br>FEED",{"x":0.75,"w":1.25},"CLEAR SPACE",{"x":0.5,"f":9},"4","5","6"],
 [{"c":"#84877B","f":2},"CTRL",{"c":"#2A3233"},"ALPHA LOCK",{"f":9},"A","S","D","F","G","H","J","K","L",{"a":5,"f":6},":\n;","\"\n'",{"c":"#84877B","a":7,"f":2,"w":2,"w2":0.75,"h2":2,"x2":1.25,"y2":-1},"RETURN","BREAK",{"x":0.75,"c":"#2A3233","f":9},"1","2","3"],