haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DIALOG_NET_INSPECTOR: add a close button to allow closing the dlg by ESC. 

Fixes #15624
https://gitlab.com/kicad/code/kicad/-/issues/15624
This commit is contained in:
jean-pierre charras 2023-09-12 09:28:17 +02:00
parent 66021f0657
commit 7bc0e138fb
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcbnew/dialogs/dialog_net_inspector.cpp
View File

@ -1100,6 +1100,9 @@ DIALOG_NET_INSPECTOR::DIALOG_NET_INSPECTOR( PCB_EDIT_FRAME* aParent ) :
m_deleteNet->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
SetupStandardButtons();
// Now SetupStandardButtons is called, change the label of Cancel button
// to a better name
m_sdbSizerCancel->SetLabel( _( "Close" ) );
m_renameNet->Disable();
m_deleteNet->Disable();

9
pcbnew/dialogs/dialog_net_inspector_base.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -87,6 +87,13 @@ DIALOG_NET_INSPECTOR_BASE::DIALOG_NET_INSPECTOR_BASE( wxWindow* parent, wxWindow
bSizerListButtons->Add( 0, 0, 1, wxEXPAND, 5 );
m_sdbSizer = new wxStdDialogButtonSizer();
m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer->AddButton( m_sdbSizerCancel );
m_sdbSizer->Realize();
bSizerListButtons->Add( m_sdbSizer, 0, wxEXPAND, 5 );
m_ReportButt = new wxButton( this, wxID_ANY, _("Create Report..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizerListButtons->Add( m_ReportButt, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

18
pcbnew/dialogs/dialog_net_inspector_base.fbp
View File

@ -770,6 +770,24 @@
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property>
<property name="Cancel">1</property>
<property name="ContextHelp">0</property>
<property name="Help">0</property>
<property name="No">0</property>
<property name="OK">0</property>
<property name="Save">0</property>
<property name="Yes">0</property>
<property name="minimum_size"></property>
<property name="name">m_sdbSizer</property>
<property name="permission">protected</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>

4
pcbnew/dialogs/dialog_net_inspector_base.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b)
// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -52,6 +52,8 @@ class DIALOG_NET_INSPECTOR_BASE : public DIALOG_SHIM
STD_BITMAP_BUTTON* m_addNet;
STD_BITMAP_BUTTON* m_renameNet;
STD_BITMAP_BUTTON* m_deleteNet;
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerCancel;
wxButton* m_ReportButt;
// Virtual event handlers, override them in your derived class