Skip to content

Vendor catalog search: Search button, native selection highlight #6270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
heffneil wants to merge 5 commits into from
Closed

Vendor catalog search: Search button, native selection highlight #6270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b239e9b
Add Next button + yellow highlight for vendor catalog search
Apr 30, 2026
eebaa3c
Search makes found item the active selection with focused styling
Apr 30, 2026
f1f598b
Bind Enter key for vendor catalog search
Apr 30, 2026
7aad48c
Address Copilot review: wxs style sync + suppress SEL_CHANGED clearin…
May 1, 2026
5a4a119
Vendor catalog Search: also drop the search-driven selection on clear
heffneil May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src-ui-wx/import_export/VendorModelDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ const wxWindowID VendorModelDialog::ID_BUTTON2 = wxNewId();
const wxWindowID VendorModelDialog::ID_STATICBITMAP2 = wxNewId();
const wxWindowID VendorModelDialog::ID_ANIMATIONCTRL1 = wxNewId();
const wxWindowID VendorModelDialog::ID_BUTTON3 = wxNewId();
const wxWindowID VendorModelDialog::ID_BUTTON4 = wxNewId();
const wxWindowID VendorModelDialog::ID_PANEL5 = wxNewId();
const wxWindowID VendorModelDialog::ID_TEXTCTRL2 = wxNewId();
const wxWindowID VendorModelDialog::ID_STATICTEXT7 = wxNewId();
Expand Down Expand Up @@ -801,6 +802,7 @@ VendorModelDialog::VendorModelDialog(wxWindow* parent, const std::string& showFo
wxFlexGridSizer* FlexGridSizer6;
wxFlexGridSizer* FlexGridSizer7;
wxFlexGridSizer* FlexGridSizer8;
wxFlexGridSizer* FlexGridSizer9;


Create(parent, id, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCAPTION|wxRESIZE_BORDER|wxCLOSE_BOX|wxMAXIMIZE_BOX, _T("id"));
Expand All @@ -819,10 +821,15 @@ VendorModelDialog::VendorModelDialog(wxWindow* parent, const std::string& showFo
FlexGridSizer2->AddGrowableRow(0);
TreeCtrl_Navigator = new wxTreeCtrl(Panel3, ID_TREECTRL1, wxDefaultPosition, wxSize(200,-1), wxTR_FULL_ROW_HIGHLIGHT|wxTR_HIDE_ROOT|wxTR_ROW_LINES|wxTR_MULTIPLE|wxTR_DEFAULT_STYLE|wxVSCROLL|wxHSCROLL, wxDefaultValidator, _T("ID_TREECTRL1"));
FlexGridSizer2->Add(TreeCtrl_Navigator, 1, wxALL|wxEXPAND, 5);
FlexGridSizer9 = new wxFlexGridSizer(0, 2, 0, 0);
FlexGridSizer9->AddGrowableCol(0);
TextCtrl_Search = new wxSearchCtrl(Panel3, ID_TEXTCTRL3, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
TextCtrl_Search->SetDescriptiveText("Search models...");
TextCtrl_Search->ShowCancelButton(true);
FlexGridSizer2->Add(TextCtrl_Search, 0, wxALL|wxEXPAND, 5);
FlexGridSizer9->Add(TextCtrl_Search, 1, wxALL|wxEXPAND, 5);
Button_Search = new wxButton(Panel3, ID_BUTTON4, _("Next"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON4"));
FlexGridSizer9->Add(Button_Search, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
Comment thread
heffneil marked this conversation as resolved.
FlexGridSizer2->Add(FlexGridSizer9, 1, wxALL|wxEXPAND, 5);
Panel3->SetSizer(FlexGridSizer2);
Panel1 = new wxPanel(SplitterWindow1, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _T("ID_PANEL1"));
FlexGridSizer3 = new wxFlexGridSizer(0, 1, 0, 0);
Expand Down Expand Up @@ -908,6 +915,7 @@ VendorModelDialog::VendorModelDialog(wxWindow* parent, const std::string& showFo
Connect(ID_HYPERLINKCTRL2, wxEVT_COMMAND_HYPERLINK, (wxObjectEventFunction)&VendorModelDialog::OnHyperlinkCtrl_WebsiteClick);
Connect(ID_BUTTON2, wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&VendorModelDialog::OnButton_PriorClick);
Connect(ID_BUTTON3, wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&VendorModelDialog::OnButton_NextClick);
Connect(ID_BUTTON4, wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&VendorModelDialog::OnButton_SearchClick);
Connect(ID_HYPERLINKCTRL3, wxEVT_COMMAND_HYPERLINK, (wxObjectEventFunction)&VendorModelDialog::OnHyperlinkCtrl_ModelWebLinkClick);
Connect(ID_BUTTON1, wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&VendorModelDialog::OnButton_InsertModelClick);
Connect(ID_NOTEBOOK1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, (wxObjectEventFunction)&VendorModelDialog::OnNotebookPanelsPageChanged);
Expand Down Expand Up @@ -1464,6 +1472,7 @@ void VendorModelDialog::OnTreeCtrl_NavigatorSelectionChanged(wxTreeEvent& event)
// User manually selected a different item — clear the search bold/cursor.
if (_lastSearchItem.IsOk() && startid != _lastSearchItem) {
TreeCtrl_Navigator->SetItemBold(_lastSearchItem, false);
TreeCtrl_Navigator->SetItemBackgroundColour(_lastSearchItem, wxNullColour);
_lastSearchItem = wxTreeItemId();
}
UpdatePanelForItem(startid);
Expand Down Expand Up @@ -1932,6 +1941,7 @@ void VendorModelDialog::OnTextCtrl_SearchText(wxCommandEvent& event)
{
if (_lastSearchItem.IsOk()) {
TreeCtrl_Navigator->SetItemBold(_lastSearchItem, false);
TreeCtrl_Navigator->SetItemBackgroundColour(_lastSearchItem, wxNullColour);
}
_lastSearchItem = wxTreeItemId();
ValidateWindow();
Expand All @@ -1941,6 +1951,7 @@ void VendorModelDialog::OnSearchCancelClick(wxCommandEvent& event)
{
if (_lastSearchItem.IsOk()) {
TreeCtrl_Navigator->SetItemBold(_lastSearchItem, false);
TreeCtrl_Navigator->SetItemBackgroundColour(_lastSearchItem, wxNullColour);
}
_lastSearchItem = wxTreeItemId();
TextCtrl_Search->SetValue("");
Expand Down Expand Up @@ -2031,9 +2042,11 @@ void VendorModelDialog::OnButton_SearchClick(wxCommandEvent& event)
// on Windows, which would wipe out the user's Ctrl+click choices.
if (_lastSearchItem.IsOk()) {
TreeCtrl_Navigator->SetItemBold(_lastSearchItem, false);
TreeCtrl_Navigator->SetItemBackgroundColour(_lastSearchItem, wxNullColour);
}
_lastSearchItem = current;
TreeCtrl_Navigator->SetItemBold(current, true);
TreeCtrl_Navigator->SetItemBackgroundColour(current, wxColour(255, 235, 130));
TreeCtrl_Navigator->EnsureVisible(current);
Comment thread
heffneil marked this conversation as resolved.
UpdatePanelForItem(current);
if (current == start)
Expand Down
2 changes: 2 additions & 0 deletions src-ui-wx/import_export/VendorModelDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class VendorModelDialog: public wxDialog
wxButton* Button_InsertModel;
wxButton* Button_Next;
wxButton* Button_Prior;
wxButton* Button_Search;
wxCheckBox* CheckBox_DontDownload;
wxHyperlinkCtrl* HyperlinkCtrl_Facebook;
wxHyperlinkCtrl* HyperlinkCtrl_ModelWebLink;
Expand Down Expand Up @@ -141,6 +142,7 @@ class VendorModelDialog: public wxDialog
static const wxWindowID ID_STATICBITMAP2;
static const wxWindowID ID_ANIMATIONCTRL1;
static const wxWindowID ID_BUTTON3;
static const wxWindowID ID_BUTTON4;
static const wxWindowID ID_PANEL5;
static const wxWindowID ID_TEXTCTRL2;
static const wxWindowID ID_STATICTEXT7;
Expand Down
8 changes: 6 additions & 2 deletions src-ui-wx/wxsmith/VendorModelDialog.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,20 @@
<cols>2</cols>
<growablecols>0</growablecols>
<object class="sizeritem">
<object class="wxTextCtrl" name="ID_TEXTCTRL3" variable="TextCtrl_Search" member="yes">
<object class="wxSearchCtrl" name="ID_TEXTCTRL3" variable="TextCtrl_Search" member="yes">
<hint>Search models...</hint>
<style>wxTE_PROCESS_ENTER</style>
<handler function="OnTextCtrl_SearchText" entry="EVT_TEXT" />
Comment thread
heffneil marked this conversation as resolved.
<handler function="OnButton_SearchClick" entry="EVT_SEARCHCTRL_SEARCH_BTN" />
<handler function="OnSearchCancelClick" entry="EVT_SEARCHCTRL_CANCEL_BTN" />
Comment thread
heffneil marked this conversation as resolved.
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
<option>1</option>
</object>
<object class="sizeritem">
<object class="wxButton" name="ID_BUTTON4" variable="Button_Search" member="yes">
<label>Search</label>
<label>Next</label>
<handler function="OnButton_SearchClick" entry="EVT_BUTTON" />
</object>
<flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
Expand Down
Loading