Index: trunk/src/funchash_core_list.h =================================================================== --- trunk/src/funchash_core_list.h (revision 14631) +++ trunk/src/funchash_core_list.h (revision 14632) @@ -28,7 +28,6 @@ action_entry(Drag) action_entry(DrillReport) action_entry(Element) -action_entry(ElementByName) action_entry(ElementConnections) action_entry(ElementToBuffer) action_entry(Escape) @@ -48,14 +47,10 @@ action_entry(Move) action_entry(MoveSelected) action_entry(Netlist) -action_entry(NetByName) action_entry(None) action_entry(Notify) action_entry(Object) -action_entry(ObjectByName) action_entry(PasteBuffer) -action_entry(PadByName) -action_entry(PinByName) action_entry(PinOrPadName) action_entry(Pinout) action_entry(Polygon) @@ -90,7 +85,6 @@ action_entry(Subc) action_entry(SubcID) action_entry(Text) -action_entry(TextByName) action_entry(TextScale) action_entry(Thermal) action_entry(ToLayout) @@ -122,7 +116,6 @@ action_entry(ToggleUniqueNames) action_entry(ToggleStroke) action_entry(Via) -action_entry(ViaByName) action_entry(ViaDrillingHole) action_entry(ViaSize) action_entry(Zoom) Index: trunk/src/pcb-menu-gtk.lht =================================================================== --- trunk/src/pcb-menu-gtk.lht (revision 14631) +++ trunk/src/pcb-menu-gtk.lht (revision 14632) @@ -126,7 +126,6 @@ li:submenu { ha:Layout = { action=Attributes(Layout) } ha:CurrentLayer = { action=Attributes(Layer) } - ha:Element = { action=Attributes(Element) } ha:Subcircuit = { action=Attributes(Subc) } } } @@ -309,16 +308,6 @@ ha:Unselect all objects = { action=Unselect(All) } ha:unselect all connected objects = { action=Unselect(Connection) } - - ha:Select by name { - li:submenu { - ha:All objects = { active=rc/have_regex; action=Select(ObjectByName) } - ha:Elements = { active=rc/have_regex; action=Select(ElementByName) } - ha:Pads = { active=rc/have_regex; action=Select(PadByName) } - ha:Pins = { active=rc/have_regex; action=Select(PinByName) } - ha:Text = { active=rc/have_regex; action=Select(TextByName) } - ha:Vias = { active=rc/have_regex; action=Select(ViaByName) } - } - } #TODO: this is gtk-specific ha:Advanced search and select= { action=DoWindows(search) } - Index: trunk/src/pcb-menu-lesstif.lht =================================================================== --- trunk/src/pcb-menu-lesstif.lht (revision 14631) +++ trunk/src/pcb-menu-lesstif.lht (revision 14632) @@ -88,7 +88,7 @@ ha:Center cursor = { a=c; action=Center() } ha:Show soldermask = { checked=editor/show_mask; action=Display(ToggleMask) } - - ha:Displayed element-name... = { foreground=grey50; sensitive=false } + ha:Displayed subcircuit ID... = { foreground=grey50; sensitive=false } ha:refdes = { checked=ChkSubcID(); action=Display(SubcID) } ha:footprint = { checked=ChkSubcID(%a.footprint%); action=Display(SubcID,"%a.footprint%") } ha:value = { checked=ChkSubcID(%a.value%); action=Display(SubcID,"%a.value%") } @@ -287,14 +287,6 @@ ha:Unselect all objects = { action=Unselect(All) } ha:unselect all connected objects = { action=Unselect(Connection) } - - ha:Select by name = { foreground=grey50; sensitive=false } - ha:All objects = { active=rc/have_regex; action=Select(ObjectByName) } - ha:Elements = { active=rc/have_regex; action=Select(ElementByName) } - ha:Pads = { active=rc/have_regex; action=Select(PadByName) } - ha:Pins = { active=rc/have_regex; action=Select(PinByName) } - ha:Text Objects = { active=rc/have_regex; action=Select(TextByName) } - ha:Vias = { active=rc/have_regex; action=Select(ViaByName) } - - ha:Auto-place selected subcircuits = { a=Ctrlp; action=AutoPlaceSelected() } ha:Disperse all subcircuits = { action=DisperseElements(All) } ha:Move selected subcircuits to other side = { a=Shiftb; action=Flip(SelectedElements) } Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 14631) +++ trunk/src/select_act.c (revision 14632) @@ -87,9 +87,7 @@ static const char pcb_acts_Select[] = "Select(Object|ToggleObject)\n" "Select(All|Block|Connection)\n" - "Select(ElementByName|ObjectByName|PadByName|PinByName)\n" - "Select(ElementByName|ObjectByName|PadByName|PinByName, Name)\n" - "Select(TextByName|ViaByName|NetByName)\n" "Select(TextByName|ViaByName|NetByName, Name)\n" "Select(Convert)"; + "Select(Convert)"; static const char pcb_acth_Select[] = "Toggles or sets the selection."; @@ -97,19 +95,6 @@ @table @code -@item ElementByName -@item ObjectByName -@item PadByName -@item PinByName -@item TextByName -@item ViaByName -@item NetByName - -These all rely on having a regular expression parser built into -@code{pcb}. If the name is not specified then the user is prompted -for a pattern, and all objects that match the pattern and are of the -type specified are selected. - @item Object @item ToggleObject Selects the object under the cursor. @@ -138,42 +123,7 @@ int type; switch (pcb_funchash_get(function, NULL)) { /* select objects by their names */ - case F_ElementByName: - type = PCB_TYPE_ELEMENT; - goto commonByName; - case F_ObjectByName: - type = PCB_TYPEMASK_ALL; - goto commonByName; - case F_PadByName: - type = PCB_TYPE_PAD; - goto commonByName; - case F_PinByName: - type = PCB_TYPE_PIN; - goto commonByName; - case F_TextByName: - type = PCB_TYPE_TEXT; - goto commonByName; - case F_ViaByName: - type = PCB_TYPE_VIA; - goto commonByName; - case F_NetByName: - type = PCB_TYPE_NET; - goto commonByName; - commonByName: - { - const char *pattern = PCB_ACTION_ARG(1); - pcb_search_method_t method = PCB_SM_REGEX; - - if (pattern || (pattern = gui_get_pat(&method)) != NULL) { - if (pcb_select_object_by_name(PCB, type, pattern, pcb_true, method)) - pcb_board_set_changed_flag(pcb_true); - if (PCB_ACTION_ARG(1) == NULL) - free((char*)pattern); - } - break; - } - /* select a single object */ case F_ToggleObject: case F_Object: @@ -272,10 +222,7 @@ /* --------------------------------------------------------------------------- */ static const char pcb_acts_Unselect[] = - "Unselect(All|Block|Connection)\n" - "Unselect(ElementByName|ObjectByName|PadByName|PinByName)\n" - "Unselect(ElementByName|ObjectByName|PadByName|PinByName, Name)\n" - "Unselect(TextByName|ViaByName)\n" "Unselect(TextByName|ViaByName, Name)\n"; + "Unselect(All|Block|Connection)\n"; static const char pcb_acth_Unselect[] = "Unselects the object at the pointer location or the specified objects."; @@ -292,19 +239,6 @@ @item Connection Unselect all connections with the ``found'' flag set. -@item ElementByName -@item ObjectByName -@item PadByName -@item PinByName -@item TextByName -@item ViaByName - -These all rely on having a regular expression parser built into -@code{pcb}. If the name is not specified then the user is prompted -for a pattern, and all objects that match the pattern and are of the -type specified are unselected. - - @end table %end-doc */ @@ -315,43 +249,7 @@ if (function) { int type; switch (pcb_funchash_get(function, NULL)) { - /* select objects by their names */ - case F_ElementByName: - type = PCB_TYPE_ELEMENT; - goto commonByName; - case F_ObjectByName: - type = PCB_TYPEMASK_ALL; - goto commonByName; - case F_PadByName: - type = PCB_TYPE_PAD; - goto commonByName; - case F_PinByName: - type = PCB_TYPE_PIN; - goto commonByName; - case F_TextByName: - type = PCB_TYPE_TEXT; - goto commonByName; - case F_ViaByName: - type = PCB_TYPE_VIA; - goto commonByName; - case F_NetByName: - type = PCB_TYPE_NET; - goto commonByName; - commonByName: - { - const char *pattern = PCB_ACTION_ARG(1); - pcb_search_method_t method = PCB_SM_REGEX; - - if (pattern || (pattern = gui_get_pat(&method)) != NULL) { - if (pcb_select_object_by_name(PCB, type, pattern, pcb_false, method)) - pcb_board_set_changed_flag(pcb_true); - if (PCB_ACTION_ARG(1) == NULL) - free((char*)pattern); - } - break; - } - /* all objects in block */ case F_Block: {