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

Pcbnew: fix dialog default button handler issues. 

Set the focus to some control in the copper zone, non-copper zone, and
keep out zone dialogs required for the default button action to work
properly.  This only seem to affect windows dialogs.

Fixes lp:1818397

https://bugs.launchpad.net/kicad/+bug/1818397
This commit is contained in:
Wayne Stambaugh 2019-03-04 11:34:04 -05:00
parent a7f3462637
commit cabc33b4cd
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/dialogs/dialog_copper_zones.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2017 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2017 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -52,8 +52,8 @@ private:
bool m_NetSortingByPadCount; bool m_NetSortingByPadCount;
long m_NetFiltering; long m_NetFiltering;
static wxString m_netNameShowFilter; // the filter to show nets (default * "*"). static wxString m_netNameShowFilter; // the filter to show nets (default * "*"). Static
// static to keep this pattern for an entire Pcbnew session // to keep this pattern for an entire Pcbnew session
int m_cornerSmoothingType; int m_cornerSmoothingType;
UNIT_BINDER m_cornerRadius; UNIT_BINDER m_cornerRadius;
@ -66,8 +66,8 @@ private:
bool TransferDataFromWindow() override; bool TransferDataFromWindow() override;
/** /**
* Function AcceptOptions * @param aUseExportableSetupOnly is true to use exportable parameters only (used to
* @param aUseExportableSetupOnly is true to use exportable parameters only (used to export this setup to other zones). * export this setup to other zones).
* @return bool - false if incorrect options, true if ok. * @return bool - false if incorrect options, true if ok.
*/ */
bool AcceptOptions( bool aUseExportableSetupOnly = false ); bool AcceptOptions( bool aUseExportableSetupOnly = false );
@ -175,6 +175,8 @@ bool DIALOG_COPPER_ZONE::TransferDataToWindow()
// Build list of nets: // Build list of nets:
buildAvailableListOfNets(); buildAvailableListOfNets();
m_ListNetNameSelection->SetFocus();
return true; return true;
} }
@ -217,6 +219,7 @@ bool DIALOG_COPPER_ZONE::TransferDataFromWindow()
return true; return true;
} }
void DIALOG_COPPER_ZONE::OnClose( wxCloseEvent& event ) void DIALOG_COPPER_ZONE::OnClose( wxCloseEvent& event )
{ {
EndModal( m_settingsExported ? ZONE_EXPORT_VALUES : wxID_CANCEL ); EndModal( m_settingsExported ? ZONE_EXPORT_VALUES : wxID_CANCEL );

4
pcbnew/dialogs/dialog_keepout_area_properties.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -93,6 +93,8 @@ bool DIALOG_KEEPOUT_AREA_PROPERTIES::TransferDataToWindow()
case ZONE_CONTAINER::DIAGONAL_FULL: m_OutlineAppearanceCtrl->SetSelection( 2 ); break; case ZONE_CONTAINER::DIAGONAL_FULL: m_OutlineAppearanceCtrl->SetSelection( 2 ); break;
} }
m_OutlineAppearanceCtrl->SetFocus();
return true; return true;
} }

4
pcbnew/dialogs/dialog_non_copper_zones_properties.cpp
View File

@ -6,7 +6,7 @@
* *
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2014 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -92,6 +92,8 @@ bool DIALOG_NON_COPPER_ZONES_EDITOR::TransferDataToWindow()
case ZONE_CONTAINER::DIAGONAL_FULL: m_OutlineAppearanceCtrl->SetSelection( 2 ); break; case ZONE_CONTAINER::DIAGONAL_FULL: m_OutlineAppearanceCtrl->SetSelection( 2 ); break;
} }
m_OutlineAppearanceCtrl->SetFocus();
return true; return true;
} }