From e332008fa887e6760144a1e444216399acdfbc06 Mon Sep 17 00:00:00 2001 From: Stefan Frederik Date: Wed, 13 Jan 2021 13:44:57 +0100 Subject: [PATCH] removed/updated obsolete keybinding descriptions, removed status check on Delete key events --- doc/xschem_man/commands.html | 6 +++++- src/callback.c | 2 +- src/keys.help | 6 +++++- src/xschem.tcl | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/xschem_man/commands.html b/doc/xschem_man/commands.html index 69299c53..cc8b25d9 100644 --- a/doc/xschem_man/commands.html +++ b/doc/xschem_man/commands.html @@ -62,6 +62,11 @@ Ctrl + LeftButton drag Select objects by area to perform a Shift + Select objects by area without unselecting Ctrl + LeftButton drag to perform a subsequent 'stretch' move operation +Shift + Right Button Select all connected wires/labels/pins + +Ctrl + Right Button Select all connected wires/labels/pins, stopping at + wire junctions + Mouse Wheel Zoom in / out MidButton drag Pan viewable area @@ -85,7 +90,6 @@ LeftButton Double click Terminate Polygon placement ---------------------------------------------------------------------- - BackSpace Back to parent schematic - Delete Delete selected objects -shift Delete select all connected wires/labels/probes - Insert Insert element from library - Down Move down ctrl Enter Confirm closing dialog boxes diff --git a/src/callback.c b/src/callback.c index 0b50a29b..2633c9bf 100644 --- a/src/callback.c +++ b/src/callback.c @@ -646,7 +646,7 @@ int callback(int event, int mx, int my, KeySym key, dbg(1, "callback(): new color: %d\n",color_index[xctx->rectcolor]); break; } - if(key==XK_Delete && (xctx->ui_state & SELECTION) && state == 0) /* delete objects */ + if(key==XK_Delete && (xctx->ui_state & SELECTION) ) /* delete objects */ { if(xctx->semaphore >= 2) break; delete();break; diff --git a/src/keys.help b/src/keys.help index 32414e72..dfbe30c9 100644 --- a/src/keys.help +++ b/src/keys.help @@ -21,6 +21,11 @@ Ctrl + LeftButton drag Select objects by area to perform a Shift + Select objects by area without unselecting Ctrl + LeftButton drag to perform a subsequent 'stretch' move operation +Shift + Right Button Select all connected wires/labels/pins + +Ctrl + Right Button Select all connected wires/labels/pins, stopping at + wire junctions + Mouse Wheel Zoom in / out MidButton drag Pan viewable area @@ -44,7 +49,6 @@ LeftButton Double click Terminate Polygon placement ---------------------------------------------------------------------- - BackSpace Back to parent schematic - Delete Delete selected objects -shift Delete select all connected wires/labels/probes - Insert Insert element from library - Down Move down ctrl Enter Confirm closing dialog boxes diff --git a/src/xschem.tcl b/src/xschem.tcl index fc33888d..54505e22 100644 --- a/src/xschem.tcl +++ b/src/xschem.tcl @@ -4056,9 +4056,9 @@ if { ( $::OS== "Windows" || [string length [lindex [array get env DISPLAY] 1] ] xschem redraw } } - .menubar.tools.menu add command -label "Select all connected wires/labels/pins" -accelerator {Shift-Delete} \ + .menubar.tools.menu add command -label "Select all connected wires/labels/pins" -accelerator {Shift-Right Butt.} \ -command { xschem connected_nets} - .menubar.tools.menu add command -label "Select conn. wires, stop at junctions" -accelerator {Ctrl-Delete} \ + .menubar.tools.menu add command -label "Select conn. wires, stop at junctions" -accelerator {Ctrl-Righ Butt.} \ -command { xschem connected_nets 1 } .menubar.hilight.menu add command -label {Highlight net-pin name mismatches on selected instancs} \