Index: src/pcb-menu-mkey.lht =================================================================== --- src/pcb-menu-mkey.lht (revision 1617) +++ src/pcb-menu-mkey.lht (revision 1618) @@ -40,8 +40,8 @@ ha:File { m=F li:submenu { - ha:Save Layout = { m=S; li:a={{f;s}; {Ctrls}}; action=Save(Layout); tip=Saves current layout } - ha:Save Layout As... = { m=A; li:a={{f;a}; {Shift Ctrls}}; action=Save(LayoutAs); tip=Saves current layout into a new file } + ha:Save Layout = { m=S; li:a={{f;s}; {Ctrls};}; action=Save(Layout); tip=Saves current layout } + ha:Save Layout As... = { m=A; li:a={{f;a}; {Shift Ctrls};}; action=Save(LayoutAs); tip=Saves current layout into a new file } - ha:Revert = { a={f;r}; action=Load(Revert,none); tip=Revert to the layout stored on disk } - @@ -65,11 +65,11 @@ ha:Export layout... = { a={f;i}; action=Export()} ha:Calibrate Printer... = { action=PrintCalibrate()} - - ha:Start New Layout = { li:a={{f;n}; {Ctrln}}; action=New() } + ha:Start New Layout = { li:a={{f;n}; {Ctrln};}; action=New() } - ha:Preferences... = { action=DoWindows(Preferences)} - - ha:Quit Program = { li:a={{f;c}; {Ctrlq}}; action=Quit() } + ha:Quit Program = { li:a={{f;c}; {Ctrlq};}; action=Quit() } } } @@ -76,12 +76,12 @@ ha:Edit { m=E li:submenu { - ha:Undo last operation = { li:a={{e; Shiftu}; {Ctrlz}; {u}}; action=Undo() } - ha:Redo last undone operation = { li:a={{e; Shiftr}; {Ctrly}; {Shiftr}}; action=Redo() } + ha:Undo last operation = { li:a={{e; Shiftu}; {Ctrlz}; {u};}; action=Undo() } + ha:Redo last undone operation = { li:a={{e; Shiftr}; {Ctrly}; {Shiftr};}; action=Redo() } ha:Clear undo-buffer = { a=Shift Ctrlu; action=Undo(ClearList) } - ha:Cut selection to buffer = { a=Ctrlx; li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer) } } - ha:Copy selection to buffer = { li:a={{e; c}; {Ctrlc;}} li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } } + ha:Copy selection to buffer = { li:a={{e; c}; {Ctrlc;};} li:action={ GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); Unselect(All); Mode(PasteBuffer) } } ha:Paste buffer to layout = { a=Ctrlv; action=Mode(PasteBuffer) } - ha:Unselect all = { a=Shift Alta; action=Unselect(All) } @@ -89,10 +89,10 @@ - ha:Edit name of { li:submenu { - ha:text on layout = { li:a={{e;x}; {n}}; action=ChangeName(Object) } - ha:pin on layout = { a=Shift Ctrln; action=ChangeName(Object, Number) } - ha:layout = { action=ChangeName(Layout) } - ha:active layer = { action=ChangeName(Layer) } + ha:text on layout = { li:a={{e;x}; {n};}; action=ChangeName(Object) } + ha:pin on layout = { a=Shift Ctrln; action=ChangeName(Object, Number) } + ha:layout = { action=ChangeName(Layout) } + ha:active layer = { action=ChangeName(Layer) } } } ha:Edit attributes of { @@ -146,8 +146,8 @@ ha:0.5 mm = { checked=gridsize,0.50mm; li:action={SetUnits(mm); SetValue(Grid,0.5mm)} } ha:1 mm = { checked=gridsize,1mm; li:action={SetUnits(mm); SetValue(Grid,1mm)} } - - ha:Grid -5mil = { li:a={{[}{Shiftg}}; action=SetValue(Grid,-5,mil) } - ha:Grid +5mil = { li:a={{]}{g}}; action=SetValue(Grid,+5,mil) } + ha:Grid -5mil = { li:a={{[};{Shiftg};}; action=SetValue(Grid,-5,mil) } + ha:Grid +5mil = { li:a={{]};{g};}; action=SetValue(Grid,+5,mil) } ha:Grid -0.05mm = { a=Shift Ctrlg; action=SetValue(Grid,-0.05,mm) } ha:Grid +0.05mm = { a=Ctrlg; action=SetValue(Grid,+0.05,mm) } } @@ -167,7 +167,7 @@ ha:Zoom Out 20% = { m=O; a=Shiftz; action=Zoom(+1.2) } ha:More zooms and view changes { li:submenu { - ha:Zoom Max = { li:a={{v;f}; {v;e}}; m=M; action=Zoom() } + ha:Zoom Max = { li:a={{v;f}; {v;e};}; m=M; action=Zoom() } ha:Zoom In 2X = { a={v;i}; action=Zoom(-2) } ha:Zoom Out 2X = { a={v;o}; action=Zoom(+2) } ha:Zoom to 0.1mil/px = { action={Zoom(=0.1mil)} } @@ -321,7 +321,7 @@ ha:Cut selection to buffer = { li:action={GetXY(Click to set the snap point for this buffer); PasteBuffer(Clear); PasteBuffer(AddSelected); RemoveSelected(); Mode(PasteBuffer)} } ha:Paste buffer to layout = { action=Mode(PasteBuffer) } - - ha:Rotate buffer 90 deg CCW = { a={{e; r}; {ShiftF7}}; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1)} } + ha:Rotate buffer 90 deg CCW = { a={{e; r}; {ShiftF7};}; li:action={Mode(PasteBuffer); PasteBuffer(Rotate,1)} } ha:Rotate buffer 90 deg CW = { li:action={Mode(PasteBuffer); PasteBuffer(Rotate,3)} } ha:Arbitrarily Rotate Buffer = { li:action={Mode(PasteBuffer); FreeRotateBuffer()} } ha:Mirror buffer (up/down) = { a={e; i}; li:action={Mode(PasteBuffer); PasteBuffer(Mirror)} } @@ -407,7 +407,7 @@ ha:Report found pins\/pads = { action=Report(FoundPins) } ha:Key Bindings { li:submenu { - ha:Remove = { li:a={{e;d};{Delete}}; li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} } + ha:Remove = { li:a={{e;d};{Delete};}; li:action={Mode(Save); Mode(Remove); Mode(Notify); Mode(Restore)} } ha:Remove Selected = { a=BackSpace; action=RemoveSelected() } ha:Remove Connected = { a=ShiftBackSpace; li:action={Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)} } ha:Remove Connected = { li:action={Atomic(Save); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Restore); Connection(Find); Atomic(Restore); Select(Connection); Atomic(Restore); RemoveSelected(); Atomic(Restore); Connection(Reset); Atomic(Restore); Unselect(All); Atomic(Block)} } @@ -554,10 +554,10 @@ li:submenu { ha:None = { checked=nomode,1; action=Mode(None) } ha:Via = { checked=viamode,1; a=F1; action=Mode(Via) } - ha:Line = { checked=linemode,1; li:a={{a;n}; {a;l}; {F2}}; action=Mode(Line) } + ha:Line = { checked=linemode,1; li:a={{a;n}; {a;l}; {F2};}; action=Mode(Line) } ha:Arc = { checked=arcmode,1; li:a={{a;r}; {F3}}; action=Mode(Arc) } - ha:Text = { checked=textmode,1; li:a={{a;t}; {F4}}; action=Mode(Text) } - ha:Rectangle = { checked=rectanglemode,1; li:a={{a;p}; {a;v}; {F5}}; action=Mode(Rectangle) } + ha:Text = { checked=textmode,1; li:a={{a;t}; {F4};}; action=Mode(Text) } + ha:Rectangle = { checked=rectanglemode,1; li:a={{a;p}; {a;v}; {F5};}; action=Mode(Rectangle) } ha:Polygon = { checked=polygonmode,1; a=F6; action=Mode(Polygon) } ha:Polygon Hole = { checked=polygonholemode,1; action=Mode(PolygonHole) } ha:Buffer = { checked=pastebuffermode,1; a=F7; action=Mode(PasteBuffer) } @@ -568,7 +568,7 @@ ha:Insert Point = { checked=insertpointmode,1; a=Insert; action=Mode(InsertPoint) } ha:Move = { checked=movemode,1; action=Mode(Move) } ha:Copy = { checked=copymode,1; action=Mode(Copy) } - ha:Lock = { checked=lockmode,1; li:a={{e;l};{e;Shiftl}; {F12}}; action=Mode(Lock) } + ha:Lock = { checked=lockmode,1; li:a={{e;l}; {e;Shiftl}; {F12};}; action=Mode(Lock) } ha:Cancel = { a=Escape; action=Mode(Escape) } } }