realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Honor escape key policy for sheet pin synchronization dialog.

Browse Source
This commit is contained in:
Wayne Stambaugh 2025-06-03 08:59:09 -04:00
parent 4ebe0686e2
commit 1cef61c34f
5 changed files with 36 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/sync_sheet_pin/dialog_sync_sheet_pins.cpp
View File

@ -119,12 +119,6 @@ DIALOG_SYNC_SHEET_PINS::DIALOG_SYNC_SHEET_PINS(
DIALOG_SYNC_SHEET_PINS::~DIALOG_SYNC_SHEET_PINS() = default; DIALOG_SYNC_SHEET_PINS::~DIALOG_SYNC_SHEET_PINS() = default;
void DIALOG_SYNC_SHEET_PINS::OnCloseBtnClick( wxCommandEvent& event )
{
Close();
}
void DIALOG_SYNC_SHEET_PINS::OnClose( wxCloseEvent& aEvent ) void DIALOG_SYNC_SHEET_PINS::OnClose( wxCloseEvent& aEvent )
{ {
aEvent.Skip(); aEvent.Skip();

2
eeschema/sync_sheet_pin/dialog_sync_sheet_pins.h
View File

@ -53,8 +53,6 @@ public:
~DIALOG_SYNC_SHEET_PINS() override; ~DIALOG_SYNC_SHEET_PINS() override;
void OnCloseBtnClick( wxCommandEvent& event ) override;
void OnClose( wxCloseEvent& aEvent ); void OnClose( wxCloseEvent& aEvent );
/** /**

12
eeschema/sync_sheet_pin/dialog_sync_sheet_pins_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -29,7 +29,9 @@ DIALOG_SYNC_SHEET_PINS_BASE::DIALOG_SYNC_SHEET_PINS_BASE( wxWindow* parent, wxWi
m_labelTip->Wrap( -1 ); m_labelTip->Wrap( -1 );
bSizer8->Add( m_labelTip, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bSizer8->Add( m_labelTip, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_btnClose = new wxButton( this, wxID_ANY, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_btnClose = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
m_btnClose->SetDefault();
bSizer8->Add( m_btnClose, 0, wxALL, 5 ); bSizer8->Add( m_btnClose, 0, wxALL, 5 );
@ -41,14 +43,8 @@ DIALOG_SYNC_SHEET_PINS_BASE::DIALOG_SYNC_SHEET_PINS_BASE( wxWindow* parent, wxWi
m_sizerMain->Fit( this ); m_sizerMain->Fit( this );
this->Centre( wxBOTH ); this->Centre( wxBOTH );
// Connect Events
m_btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYNC_SHEET_PINS_BASE::OnCloseBtnClick ), NULL, this );
} }
DIALOG_SYNC_SHEET_PINS_BASE::~DIALOG_SYNC_SHEET_PINS_BASE() DIALOG_SYNC_SHEET_PINS_BASE::~DIALOG_SYNC_SHEET_PINS_BASE()
{ {
// Disconnect Events
m_btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SYNC_SHEET_PINS_BASE::OnCloseBtnClick ), NULL, this );
} }

61
eeschema/sync_sheet_pin/dialog_sync_sheet_pins_base.fbp
View File

@ -1,34 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="17"/> <FileVersion major="1" minor="18"/>
<object class="Project" expanded="true"> <object class="Project" expanded="true">
<property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
<property name="disconnect_events">1</property> <property name="cpp_class_decoration"></property>
<property name="disconnect_mode">source_name</property> <property name="cpp_disconnect_events">1</property>
<property name="disconnect_php_events">0</property> <property name="cpp_event_generation">connect</property>
<property name="disconnect_python_events">0</property> <property name="cpp_help_provider">none</property>
<property name="cpp_namespace"></property>
<property name="cpp_precompiled_header"></property>
<property name="cpp_use_array_enum">0</property>
<property name="cpp_use_enum">0</property>
<property name="embedded_files_path">res</property> <property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_sync_sheet_pins_base</property> <property name="file">dialog_sync_sheet_pins_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="image_path_wrapper_function_name"></property>
<property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="lua_skip_events">1</property>
<property name="lua_ui_table">UI</property>
<property name="name">dialog_sync_sheet_pins_base</property> <property name="name">dialog_sync_sheet_pins_base</property>
<property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header"></property> <property name="php_disconnect_events">0</property>
<property name="php_disconnect_mode">source_name</property>
<property name="php_skip_events">1</property>
<property name="python_disconnect_events">0</property>
<property name="python_disconnect_mode">source_name</property>
<property name="python_image_path_wrapper_function_name"></property>
<property name="python_indent_with_spaces"></property>
<property name="python_skip_events">1</property>
<property name="relative_path">1</property> <property name="relative_path">1</property>
<property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property>
<property name="skip_python_events">1</property>
<property name="ui_table">UI</property>
<property name="use_array_enum">0</property>
<property name="use_enum">0</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<property name="use_native_eol">0</property>
<object class="Dialog" expanded="true"> <object class="Dialog" expanded="true">
<property name="aui_managed">0</property> <property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@ -71,10 +73,10 @@
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_layer"></property> <property name="aui_layer">0</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="aui_position"></property> <property name="aui_position">0</property>
<property name="aui_row"></property> <property name="aui_row">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmapsize"></property> <property name="bitmapsize"></property>
@ -150,10 +152,10 @@
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_layer"></property> <property name="aui_layer">0</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="aui_position"></property> <property name="aui_position">0</property>
<property name="aui_row"></property> <property name="aui_row">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
@ -212,10 +214,10 @@
<property name="LeftDockable">1</property> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_layer"></property> <property name="aui_layer">0</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="aui_position"></property> <property name="aui_position">0</property>
<property name="aui_row"></property> <property name="aui_row">0</property>
<property name="auth_needed">0</property> <property name="auth_needed">0</property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
@ -227,7 +229,7 @@
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="current"></property> <property name="current"></property>
<property name="default">0</property> <property name="default">1</property>
<property name="default_pane">0</property> <property name="default_pane">0</property>
<property name="disabled"></property> <property name="disabled"></property>
<property name="dock">Dock</property> <property name="dock">Dock</property>
@ -241,7 +243,7 @@
<property name="font"></property> <property name="font"></property>
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_CANCEL</property>
<property name="label">Close</property> <property name="label">Close</property>
<property name="margins"></property> <property name="margins"></property>
<property name="markup">0</property> <property name="markup">0</property>
@ -275,7 +277,6 @@
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnButtonClick">OnCloseBtnClick</event>
</object> </object>
</object> </object>
</object> </object>

7
eeschema/sync_sheet_pin/dialog_sync_sheet_pins_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) // C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -27,7 +27,6 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_SYNC_SHEET_PINS_BASE /// Class DIALOG_SYNC_SHEET_PINS_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -41,10 +40,6 @@ class DIALOG_SYNC_SHEET_PINS_BASE : public DIALOG_SHIM
wxStaticText* m_labelTip; wxStaticText* m_labelTip;
wxButton* m_btnClose; wxButton* m_btnClose;
// Virtual event handlers, override them in your derived class
virtual void OnCloseBtnClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
DIALOG_SYNC_SHEET_PINS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronize sheet pins and hierarchical labels"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_SYNC_SHEET_PINS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronize sheet pins and hierarchical labels"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );