Index: trunk/doc-rnd/Makefile =================================================================== --- trunk/doc-rnd/Makefile (revision 1552) +++ trunk/doc-rnd/Makefile (revision 1553) @@ -1,4 +1,4 @@ -MENU_RES=../src/gpcb-menu.res ../src/pcb-menu.res +MENU_RES=../src/pcb-menu-gtk.lht ../src/pcb-menu-lesstif.lht KEYLIST=../util/keylist.sh all: keys.html @@ -5,3 +5,4 @@ keys.html: $(MENU_RES) $(KEYLIST) $(KEYLIST) $(MENU_RES) > keys.html + Index: trunk/doc-rnd/TODO =================================================================== --- trunk/doc-rnd/TODO (revision 1552) +++ trunk/doc-rnd/TODO (revision 1553) @@ -11,9 +11,9 @@ - gtk: display hotkeys again - lesstif: display hotkeys in the right format (even multikey) - look for warnings - - key html converter for lihata + - key html converter for lihata: multi-key sequences (when accel is a list) -CLEANUP #4 +CLEANUP #5 - libstroke: zoom - cleanup/rewrite resources: - load/swap menus (TODO#1) @@ -26,7 +26,7 @@ - Message() should have a first param that tells if it is an error, info, etc.; pop up window on error, red -CLEANUP #5: +CLEANUP #6: - res: - add anchors - search for vendor in the hid plugins, there should be no trace of it (vendor should register its in submenus with anchors) Index: trunk/doc-rnd/keys.html =================================================================== --- trunk/doc-rnd/keys.html (revision 1552) +++ trunk/doc-rnd/keys.html (revision 1553) @@ -1,576 +1,741 @@

Key to action bindings

- - - - + + - + + + - + + + - + + + + - + + + - + + + + - + + + - + + + - - + - + + + + - + - - - + - + - - + + + + - + + + + + + + - + + + + + + + + + + - + + + + + - + + - + + + - + + + + - - + - + + - - - - + + - - - - - - + + + - + - + + + + + - + + - + + + - + + + - + + + + + - + - + + + + - + + +
key modifiers pcb-menu.res
lesstif 		gpcb-menu.res
gtk +
key modifiers pcb-menu-lesstif.lht
pcb-menu-gtk.lht
.   - Display(Toggle45Degree) - Display(Toggle45Degree) + Display(Toggle45Degree) + Display(ToggleAllDirections)
/   - Display(CycleClip) - Display(CycleClip) + Display(CycleClip) + Display(CycleClip)
1 - shift - PasteBuffer(1) - PasteBuffer(1) -
2 - shift - PasteBuffer(2) - PasteBuffer(2) + 0 +   + SelectLayer(10) + SelectLayer(10)
3 - shift - PasteBuffer(3) - PasteBuffer(3) + alt + SelectLayer(20) + SelectLayer(20) +
alt-ctrl + ToggleView(20) + ToggleView(20) +
ctrl + ToggleView(10) + ToggleView(10)
4 + 1 +   + SelectLayer(1) + SelectLayer(1) +
alt + SelectLayer(11) + SelectLayer(11) +
alt-ctrl + ToggleView(11) + ToggleView(11) +
ctrl + ToggleView(1) + ToggleView(1) +
shift - PasteBuffer(4) - PasteBuffer(4) + PasteBuffer(1) + PasteBuffer(1)
5 + 2 +   + SelectLayer(2) + SelectLayer(2) +
alt + SelectLayer(12) + SelectLayer(12) +
alt-ctrl + ToggleView(12) + ToggleView(12) +
ctrl + ToggleView(2) + ToggleView(2) +
shift - PasteBuffer(5) - PasteBuffer(5) + PasteBuffer(2) + PasteBuffer(2)
: + 3   - Command() - Command() + SelectLayer(3) + SelectLayer(3) +
alt + SelectLayer(13) + SelectLayer(13) +
alt-ctrl + ToggleView(13) + ToggleView(13) +
ctrl + ToggleView(3) + ToggleView(3) +
shift + PasteBuffer(3) + PasteBuffer(3)
= + 4   - djopt(simple) - djopt(simple) + SelectLayer(4) + SelectLayer(4)
alt + SelectLayer(14) + SelectLayer(14) +
alt-ctrl + ToggleView(14) + ToggleView(14) +
ctrl + ToggleView(4) + ToggleView(4) +
shift - djopt(auto) - djopt(auto) + PasteBuffer(4) + PasteBuffer(4)
[ + 5   - Mode(Save) - Mode(Save) + SelectLayer(5) + SelectLayer(5) +
alt + SelectLayer(15) + SelectLayer(15) +
alt-ctrl + ToggleView(15) + ToggleView(15) +
ctrl + ToggleView(5) + ToggleView(5) +
shift + PasteBuffer(5) + PasteBuffer(5)
] + 6   - Mode(Release) - Mode(Release) + SelectLayer(6) + SelectLayer(6) +
alt + SelectLayer(16) + SelectLayer(16) +
alt-ctrl + ToggleView(16) + ToggleView(16) +
ctrl + ToggleView(6) + ToggleView(6)
` + 7   - Zoom(Toggle) -   + SelectLayer(7) + SelectLayer(7) +
alt + SelectLayer(17) + SelectLayer(17) +
alt-ctrl + ToggleView(17) + ToggleView(17) +
ctrl + ToggleView(7) + ToggleView(7)
a + 8   - SetSame() - SetSame() + SelectLayer(8) + SelectLayer(8)
alt - Select(All) - Select(All) + SelectLayer(18) + SelectLayer(18)
alt-shift - Unselect(All) - Unselect(All) + alt-ctrl + ToggleView(18) + ToggleView(18) +
ctrl + ToggleView(8) + ToggleView(8)
b + 9   - Flip(Object) - Flip(Object) + SelectLayer(9) + SelectLayer(9)
alt + SelectLayer(19) + SelectLayer(19) +
alt-ctrl -   - SavePatch() + ToggleView(19) + ToggleView(19)
ctrl + ToggleView(9) + ToggleView(9) +
: +   + Command() + Command() +
= +   + djopt(simple) + djopt(simple) +
shift - Flip(SelectedElements) - Flip(SelectedElements) + djopt(auto) + djopt(auto)
backspace + [   - Delete(Selected) - RemoveSelected() + Mode(Save);Mode(Arrow);Mode(Notify) + Mode(Save);Mode(Arrow);Mode(Notify) +
] +   + Mode(Release);Mode(Restore) + Mode(Release);Mode(Restore)
shift - Atomic(Save) - Atomic(Save) + ` +   + Zoom(Toggle) +  
c + a   - Center() - Center() + SetSame() + SetSame()
ctrl - Mode(PasteBuffer) - Mode(PasteBuffer) + alt + Select(All) + Select(All) +
alt-shift + Unselect(All) + Unselect(All)
d + b   - Display(PinOrPadName) - Display(PinOrPadName) + Flip(Object) + Flip(Object)
alt-ctrl +   + SavePatch() +
shift - Display(Pinout) - Display(Pinout) + Flip(SelectedElements) + Flip(SelectedElements)
delete + backspace   - Delete(Selected) - Mode(Save) + Delete(Selected) + RemoveSelected()
shift - Atomic(Save) - RemoveSelected() + 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) + 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)
down + c   - Cursor(Warp,0,-1,grid) - Cursor(Warp,0,-1,grid) + Center() + Center()
ctrl + GetXY(Click to set the snap point for this buffer);PasteBuffer(Clear);PasteBuffer(AddSelected);Mode(PasteBuffer) + GetXY(Click to set the snap point for this buffer);PasteBuffer(Clear);PasteBuffer(AddSelected);Unselect(All);Mode(PasteBuffer) +
d +   + Display(PinOrPadName) + Display(PinOrPadName) +
shift - Cursor(Pan,0,-50,view) - Cursor(Pan,0,-50,view) + Display(Pinout) + Display(Pinout) +
delete +   + Delete(Selected) + Mode(Save);Mode(Remove);Mode(Notify);Mode(Restore) +
shift + 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) + RemoveSelected()
e + down   - DeleteRats(AllRats) - DeleteRats(AllRats) + Cursor(Warp,0,-1,grid) + Cursor(Warp,0,-1,grid)
shift - DeleteRats(SelectedRats) - DeleteRats(SelectedRats) + Cursor(Pan,0,-50,view) + Cursor(Pan,0,-50,view)
e +   + DeleteRats(AllRats) + DeleteRats(AllRats) +
shift + DeleteRats(SelectedRats) + DeleteRats(SelectedRats) +
enter   - Mode(Notify) - Mode(Notify) -
Mode(Notify);Mode(Release) + Mode(Notify);Mode(Release) +
escape   - Mode(Cancel) - Mode(Escape) -
Mode(Cancel) + Mode(Escape) +
f   - Connection(Reset) - Connection(Reset) -
Connection(Reset);Connection(Find) + Connection(Reset);Connection(Find) +
alt-shift   - ReplaceFootprint() -
ReplaceFootprint() +
ctrl - Connection(Find) - Connection(Find) + GetXY(Click on the object);Connection(Find) + GetXY(Click on the object);Connection(Find) +
shift + Connection(Reset);Display(Redraw) + Connection(Reset);Display(Redraw)
shift - Display(Redraw) - Display(Redraw) -
f1   - Mode(Via) - Mode(Via) -
Mode(Via) + Mode(Via) +
f10   - Mode(Thermal) - Mode(Thermal) -
Mode(Thermal) + Mode(Thermal) +
f11   - Mode(Arrow) - Mode(Arrow) -
Mode(Arrow) + Mode(Arrow) +
f12   - Mode(Lock) - Mode(Lock) -
Mode(Lock) + Mode(Lock) +
f2   - Mode(Line) - Mode(Line) -
Mode(Line) + Mode(Line) +
f3   - Mode(Arc) - Mode(Arc) -
Mode(Arc) + Mode(Arc) +
f4   - Mode(Text) - Mode(Text) -
Mode(Text) + Mode(Text) +
f5   - Mode(Rectangle) - Mode(Rectangle) -
Mode(Rectangle) + Mode(Rectangle) +
f6   - Mode(Polygon) - Mode(Polygon) -
Mode(Polygon) + Mode(Polygon) +
f7   - Mode(PasteBuffer) - Mode(PasteBuffer) + Mode(PasteBuffer) + Mode(PasteBuffer) +
shift + Mode(PasteBuffer);PasteBuffer(Rotate,1) + Mode(PasteBuffer);PasteBuffer(Rotate,1)
shift - PasteBuffer(Rotate,1) - PasteBuffer(Rotate,1) -
f8   - Mode(Remove) - Mode(Remove) -
Mode(Remove) + Mode(Remove) +
f9   - Mode(Rotate) - Mode(Rotate) -
Mode(Rotate) + Mode(Rotate) +
g   - SetValue(Grid,+5,mil) - SetValue(Grid,+5,mil) -
SetValue(Grid,+5,mil) + SetValue(Grid,+5,mil) +
ctrl - SetValue(Grid,+0.05,mm) - SetValue(Grid,+0.05,mm) -
SetValue(Grid,+0.05,mm) + SetValue(Grid,+0.05,mm) +
ctrl-shift - SetValue(Grid,-0.05,mm) - SetValue(Grid,-0.05,mm) + SetValue(Grid,-0.05,mm) + SetValue(Grid,-0.05,mm) +
shift + SetValue(Grid,-5,mil) + SetValue(Grid,-5,mil)
shift - SetValue(Grid,-5,mil) - SetValue(Grid,-5,mil) -
h   - ToggleHideName(Object) - ToggleHideName(Object) -
ToggleHideName(Object) + ToggleHideName(Object) +
ctrl - ChangeHole(Object) - ChangeHole(Object) + ChangeHole(Object) + ChangeHole(Object) +
shift + ToggleHideName(SelectedElements) + ToggleHideName(SelectedElements)
shift - ToggleHideName(SelectedElements) - ToggleHideName(SelectedElements) -
i     - DoWindows(Library) -
DoWindows(Library) +
insert   - Mode(InsertPoint) - Mode(InsertPoint) -
Mode(InsertPoint) + Mode(InsertPoint) +
j   - ChangeJoin(Object) - ChangeJoin(Object) + ChangeJoin(Object) + ChangeJoin(Object) +
shift + ChangeJoin(SelectedObjects) + ChangeJoin(SelectedObjects)
shift - ChangeJoin(SelectedObjects) - ChangeJoin(SelectedObjects) -
k   - ChangeClearSize(Object,+2,mil) - ChangeClearSize(Object,+2,mil) -
ChangeClearSize(Object,+2,mil) + ChangeClearSize(Object,+2,mil) +
ctrl - ChangeClearSize(SelectedObjects,+2,mil) - ChangeClearSize(SelectedObjects,+2,mil) -
ChangeClearSize(SelectedObjects,+2,mil) + ChangeClearSize(SelectedObjects,+2,mil) +
ctrl-shift - ChangeClearSize(SelectedObjects,-2,mil) - ChangeClearSize(SelectedObjects,-2,mil) + ChangeClearSize(SelectedObjects,-2,mil) + ChangeClearSize(SelectedObjects,-2,mil) +
shift + ChangeClearSize(Object,-2,mil) + ChangeClearSize(Object,-2,mil)
l +   + SetValue(LineSize,+5,mil) + SetValue(LineSize,+5,mil) +
shift - ChangeClearSize(Object,-2,mil) - ChangeClearSize(Object,-2,mil) + SetValue(LineSize,-5,mil) + SetValue(LineSize,-5,mil)
l + left   - SetValue(LineSize,+5,mil) - SetValue(LineSize,+5,mil) + Cursor(Warp,-1,0,grid) + Cursor(Warp,-1,0,grid)
shift - SetValue(LineSize,-5,mil) - SetValue(LineSize,-5,mil) + Cursor(Pan,-50,0,view) + Cursor(Pan,-50,0,view)
left + m   - Cursor(Warp,-1,0,grid) - Cursor(Warp,-1,0,grid) + MoveToCurrentLayer(Object) + MoveToCurrentLayer(Object)
ctrl + MarkCrosshair() + MarkCrosshair() +
shift - Cursor(Pan,-50,0,view) - Cursor(Pan,-50,0,view) + MoveToCurrentLayer(Selected) + MoveToCurrentLayer(Selected)
m + n   - MoveToCurrentLayer(Object) - MoveToCurrentLayer(Object) + ChangeName(Object) + ChangeName(Object)
alt +   + ChangeNonetlist(Element) +
ctrl - MarkCrosshair() - MarkCrosshair() + New() + New()
ctrl-shift + ChangeName(Object, Number) + ChangeName(Object, Number) +
shift - MoveToCurrentLayer(Selected) - MoveToCurrentLayer(Selected) + AddRats(Close) + AddRats(Close)
n + o   - ChangeName(Object) - ChangeName(Object) + Atomic(Save);DeleteRats(AllRats);Atomic(Restore);AddRats(AllRats);Atomic(Block) + Atomic(Save);DeleteRats(AllRats);Atomic(Restore);AddRats(AllRats);Atomic(Block)
alt -   - ChangeNonetlist(Element) -
ctrl - New() - New() + ChangeOctagon(Object) + ChangeOctagon(Object)
ctrl-shift - Number) - Number) -
shift - AddRats(Close) - AddRats(Close) + Atomic(Save);DeleteRats(AllRats);Atomic(Restore);AddRats(SelectedRats);Atomic(Block) + Atomic(Save);DeleteRats(AllRats);Atomic(Restore);AddRats(SelectedRats);Atomic(Block)
o + p   - Atomic(Block) - Atomic(Block) + Polygon(PreviousPoint) + Polygon(PreviousPoint)
alt + ManagePlugins() + ManagePlugins() +
ctrl - ChangeOctagon(Object) - ChangeOctagon(Object) + AutoPlaceSelected() + AutoPlaceSelected()
ctrl-shift + Display(ToggleThindrawPoly) + Display(ToggleThindrawPoly) +
shift - Atomic(Save) - Atomic(Save) + Polygon(Close) + Polygon(Close)
p + q   - Polygon(PreviousPoint) - Polygon(PreviousPoint) + ChangeSquare(Object) + ChangeSquare(ToggleObject)
alt - ManagePlugins() - ManagePlugins() -
ctrl - AutoPlaceSelected() - AutoPlaceSelected() -
ctrl-shift - Display(ToggleThindrawPoly) - Display(ToggleThindrawPoly) -
shift - Polygon(Close) - Polygon(Close) + Quit() + Quit()
q -   - ChangeSquare(Object) - ChangeSquare(ToggleObject) -
ctrl - Quit() - Quit() -
r   - Report(NetLength) + Report(NetLength)   -
alt - AutoRoute(SelectedRats) - AutoRoute(SelectedRats) -
AutoRoute(SelectedRats) + AutoRoute(SelectedRats) +
ctrl - ReportObject() - ReportObject() + ReportObject() + ReportObject() +
shift + Redo() + Redo()
shift - Redo() - Redo() -
right   - Cursor(Warp,1,0,grid) - Cursor(Warp,1,0,grid) + Cursor(Warp,1,0,grid) + Cursor(Warp,1,0,grid) +
shift + Cursor(Pan,50,0,view) + Cursor(Pan,50,0,view)
shift - Cursor(Pan,50,0,view) - Cursor(Pan,50,0,view) -
s   - ChangeSize(Object,+5,mil) - ChangeSize(Object,+5,mil) -
ChangeSize(Object,+5,mil) + ChangeSize(Object,+5,mil) +
alt - ChangeDrillSize(Object,+5,mil) - ChangeDrillSize(Object,+5,mil) -
ChangeDrillSize(Object,+5,mil) + ChangeDrillSize(Object,+5,mil) +
alt-shift - ChangeDrillSize(Object,-5,mil) - ChangeDrillSize(Object,-5,mil) -
ChangeDrillSize(Object,-5,mil) + ChangeDrillSize(Object,-5,mil) +
ctrl + Save(Layout) Save(Layout) - Save(Layout) -
ctrl-shift + Save(LayoutAs) Save(LayoutAs) - Save(LayoutAs) +
shift + ChangeSize(Object,-5,mil) + ChangeSize(Object,-5,mil)
shift - ChangeSize(Object,-5,mil) - ChangeSize(Object,-5,mil) -
space   - Mode(Arrow) - Mode(Arrow) -
Mode(Arrow) + Mode(Arrow) +
t   - SetValue(TextScale,+10,mil) - SetValue(TextScale,+10,mil) + SetValue(TextScale,+10,mil) + SetValue(TextScale,+10,mil) +
shift + SetValue(TextScale,-10,mil) + SetValue(TextScale,-10,mil)
shift - SetValue(TextScale,-10,mil) - SetValue(TextScale,-10,mil) -
tab   - SwapSides(V) - SwapSides(V) -
SwapSides(V) + SwapSides(V) +
ctrl - SwapSides(R) - SwapSides(R) -
SwapSides(R) + SwapSides(R) +
ctrl-shift - SwapSides() - SwapSides() + SwapSides() + SwapSides() +
shift + SwapSides(H) + SwapSides(H)
shift - SwapSides(H) - SwapSides(H) -
u   - Undo() - Undo() -
Undo() + Undo() +
ctrl-shift Undo(ClearList) - Undo(ClearList) -
Undo(ClearList) +
up   - Cursor(Warp,0,1,grid) - Cursor(Warp,0,1,grid) + Cursor(Warp,0,1,grid) + Cursor(Warp,0,1,grid) +
shift + Cursor(Pan,0,50,view) + Cursor(Pan,0,50,view)
shift - Cursor(Pan,0,50,view) - Cursor(Pan,0,50,view) -
v   - Zoom() - Zoom() -
Zoom() + Zoom() +
alt - SetValue(ViaDrillingHole,+5,mil) - SetValue(ViaDrillingHole,+5,mil) -
SetValue(ViaDrillingHole,+5,mil) + SetValue(ViaDrillingHole,+5,mil) +
alt-shift - SetValue(ViaDrillingHole,-5,mil) - SetValue(ViaDrillingHole,-5,mil) -
SetValue(ViaDrillingHole,-5,mil) + SetValue(ViaDrillingHole,-5,mil) +
ctrl - Mode(PasteBuffer) - Mode(PasteBuffer) -
Mode(PasteBuffer) + Mode(PasteBuffer) +
ctrl-shift - SetValue(ViaSize,-5,mil) - SetValue(ViaSize,-5,mil) + SetValue(ViaSize,-5,mil) + SetValue(ViaSize,-5,mil) +
shift + SetValue(ViaSize,+5,mil) + SetValue(ViaSize,+5,mil)
shift - SetValue(ViaSize,+5,mil) - SetValue(ViaSize,+5,mil) -
w   - AddRats(AllRats) - AddRats(AllRats) + AddRats(AllRats) + AddRats(AllRats) +
shift + AddRats(SelectedRats) + AddRats(SelectedRats)
shift - AddRats(SelectedRats) - AddRats(SelectedRats) -
x     - CycleDrag() -
CycleDrag() +
ctrl - Mode(PasteBuffer) - Mode(PasteBuffer) -
GetXY(Click to set the snap point for this buffer);PasteBuffer(Clear);PasteBuffer(AddSelected);RemoveSelected();Mode(PasteBuffer) + GetXY(Click to set the snap point for this buffer);PasteBuffer(Clear);PasteBuffer(AddSelected);RemoveSelected();Mode(PasteBuffer) +
shift   - net(swap) -
net(swap) +
y   - Puller() - Puller() + Puller() + Puller() +
shift + ChangeSizes(Object,style,mil) + ChangeSizes(Object,style,mil)
shift - ChangeSizes(Object,style,mil); - ChangeSizes(Object,style,mil); -
z   - Zoom(-1.2) - Zoom(-1.2) -
Zoom(-1.2) + Zoom(-1.2) +
alt - Undo() + Undo()   -
shift Zoom(+1.2) - Zoom(+1.2) -
Zoom(+1.2) +
|   - Display(ToggleThindraw) - Display(ToggleThindraw) + Display(ToggleThindraw) + Display(ToggleThindraw)