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

Standardize pad properties terminology. 

Fixes: lp:1743153
* https://bugs.launchpad.net/kicad/+bug/1743153
This commit is contained in:
Jeff Young 2018-02-12 23:42:37 +00:00 committed by Wayne Stambaugh
parent ac09cfaef4
commit cd2f5cdbd5
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/dialogs/dialog_global_pads_edition_base.cpp
View File

@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014) // C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_global_pads_edition_base.h" #include "dialog_global_pads_edition_base.h"
@ -22,13 +22,13 @@ DIALOG_GLOBAL_PADS_EDITION_BASE::DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* pare
wxStaticBoxSizer* sbSizer1; wxStaticBoxSizer* sbSizer1;
sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Filter :") ), wxVERTICAL ); sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Filter :") ), wxVERTICAL );
m_Pad_Shape_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having a different shape"), wxDefaultPosition, wxDefaultSize, 0 ); m_Pad_Shape_Filter_CB = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Do not modify pads having a different shape"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer1->Add( m_Pad_Shape_Filter_CB, 0, wxALL, 5 ); sbSizer1->Add( m_Pad_Shape_Filter_CB, 0, wxALL, 5 );
m_Pad_Layer_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having different layers"), wxDefaultPosition, wxDefaultSize, 0 ); m_Pad_Layer_Filter_CB = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Do not modify pads having different layers"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer1->Add( m_Pad_Layer_Filter_CB, 0, wxALL, 5 ); sbSizer1->Add( m_Pad_Layer_Filter_CB, 0, wxALL, 5 );
m_Pad_Orient_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having a different orientation"), wxDefaultPosition, wxDefaultSize, 0 ); m_Pad_Orient_Filter_CB = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Do not modify pads having a different orientation"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer1->Add( m_Pad_Orient_Filter_CB, 0, wxALL, 5 ); sbSizer1->Add( m_Pad_Orient_Filter_CB, 0, wxALL, 5 );
@ -40,7 +40,7 @@ DIALOG_GLOBAL_PADS_EDITION_BASE::DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* pare
wxBoxSizer* bRightSizer; wxBoxSizer* bRightSizer;
bRightSizer = new wxBoxSizer( wxVERTICAL ); bRightSizer = new wxBoxSizer( wxVERTICAL );
m_buttonPadEditor = new wxButton( this, ID_CHANGE_GET_PAD_SETTINGS, _("Pad Editor"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonPadEditor = new wxButton( this, ID_CHANGE_GET_PAD_SETTINGS, _("Pad Properties..."), wxDefaultPosition, wxDefaultSize, 0 );
bRightSizer->Add( m_buttonPadEditor, 0, wxALL|wxEXPAND, 5 ); bRightSizer->Add( m_buttonPadEditor, 0, wxALL|wxEXPAND, 5 );

5
pcbnew/dialogs/dialog_global_pads_edition_base.fbp
View File

@ -47,7 +47,7 @@
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Global Pads Edition</property> <property name="title">Push Pad Properties</property>
<property name="tooltip"></property> <property name="tooltip"></property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
@ -112,6 +112,7 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">sbSizer1</property> <property name="name">sbSizer1</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property> <property name="permission">none</property>
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -424,7 +425,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">ID_CHANGE_GET_PAD_SETTINGS</property> <property name="id">ID_CHANGE_GET_PAD_SETTINGS</property>
<property name="label">Pad Editor</property> <property name="label">Pad Properties...</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>

8
pcbnew/dialogs/dialog_global_pads_edition_base.h
View File

@ -1,8 +1,8 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014) // C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_GLOBAL_PADS_EDITION_BASE_H__ #ifndef __DIALOG_GLOBAL_PADS_EDITION_BASE_H__
@ -11,8 +11,6 @@
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
class DIALOG_SHIM;
#include "dialog_shim.h" #include "dialog_shim.h"
#include <wx/string.h> #include <wx/string.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
@ -55,7 +53,7 @@ class DIALOG_GLOBAL_PADS_EDITION_BASE : public DIALOG_SHIM
public: public:
wxButton* m_buttonIdModules; wxButton* m_buttonIdModules;
DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Pads Edition"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Push Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_GLOBAL_PADS_EDITION_BASE(); ~DIALOG_GLOBAL_PADS_EDITION_BASE();
}; };

6
pcbnew/footprint_editor_onclick.cpp
View File

@ -317,9 +317,9 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
msg = AddHotkeyName( _("Edit Pad..." ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); msg = AddHotkeyName( _("Edit Pad..." ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM );
AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_PAD, msg, KiBitmap( options_pad_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_PCB_EDIT_PAD, msg, KiBitmap( options_pad_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_PCB_COPY_PAD_SETTINGS, AddMenuItem( PopMenu, ID_POPUP_PCB_COPY_PAD_SETTINGS,
_( "Copy Pad Settings" ), KiBitmap( copy_pad_settings_xpm ) ); _( "Copy Pad Properties" ), KiBitmap( copy_pad_settings_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_PCB_APPLY_PAD_SETTINGS, AddMenuItem( PopMenu, ID_POPUP_PCB_APPLY_PAD_SETTINGS,
_( "Apply Pad Settings" ), KiBitmap( apply_pad_settings_xpm ) ); _( "Apply Pad Properties" ), KiBitmap( apply_pad_settings_xpm ) );
msg = AddHotkeyName( _("Delete Pad" ), g_Module_Editor_Hokeys_Descr, HK_DELETE ); msg = AddHotkeyName( _("Delete Pad" ), g_Module_Editor_Hokeys_Descr, HK_DELETE );
AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_PAD, msg, KiBitmap( delete_pad_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_PCB_DELETE_PAD, msg, KiBitmap( delete_pad_xpm ) );
@ -337,7 +337,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
{ {
PopMenu->AppendSeparator(); PopMenu->AppendSeparator();
AddMenuItem( PopMenu, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS, AddMenuItem( PopMenu, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS,
_( "Push Pad Settings..." ), KiBitmap( push_pad_settings_xpm ) ); _( "Push Pad Properties..." ), KiBitmap( push_pad_settings_xpm ) );
} }
break; break;

2
pcbnew/footprint_editor_utils.cpp
View File

@ -966,7 +966,7 @@ void FOOTPRINT_EDIT_FRAME::OnVerticalToolbar( wxCommandEvent& aEvent )
} }
else else
{ {
SetToolID( id, wxCURSOR_ARROW, _( "Pad settings" ) ); SetToolID( id, wxCURSOR_ARROW, _( "Pad properties" ) );
InstallPadOptionsFrame( NULL ); InstallPadOptionsFrame( NULL );
SetNoToolSelected(); SetNoToolSelected();
} }

8
pcbnew/onrightclick.cpp
View File

@ -945,16 +945,16 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu )
sub_menu_Pad->AppendSeparator(); sub_menu_Pad->AppendSeparator();
AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_COPY_PAD_SETTINGS, AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_COPY_PAD_SETTINGS,
_( "Copy Pad Settings" ), _( "Copy Pad Properties" ),
wxEmptyString, wxEmptyString,
KiBitmap( copy_pad_settings_xpm ) ); KiBitmap( copy_pad_settings_xpm ) );
AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_APPLY_PAD_SETTINGS, AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_APPLY_PAD_SETTINGS,
_( "Apply Pad Settings" ), _( "Apply Pad Properties" ),
wxEmptyString, wxEmptyString,
KiBitmap( apply_pad_settings_xpm ) ); KiBitmap( apply_pad_settings_xpm ) );
AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS, AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS,
_( "Push Pad Settings..." ), _( "Push Pad Properties..." ),
_( "Copy this pad's settings to all pads in this footprint (or similar footprints)" ), _( "Copy this pad's properties to all pads in this footprint (or similar footprints)" ),
KiBitmap( push_pad_settings_xpm ) ); KiBitmap( push_pad_settings_xpm ) );
sub_menu_Pad->AppendSeparator(); sub_menu_Pad->AppendSeparator();

13
pcbnew/tools/edit_tool.cpp
View File

@ -80,18 +80,19 @@ TOOL_ACTION PCB_ACTIONS::editFootprintInFpEditor( "pcbnew.InteractiveEdit.editFo
TOOL_ACTION PCB_ACTIONS::copyPadToSettings( "pcbnew.InteractiveEdit.copyPadToSettings", TOOL_ACTION PCB_ACTIONS::copyPadToSettings( "pcbnew.InteractiveEdit.copyPadToSettings",
AS_GLOBAL, 0, AS_GLOBAL, 0,
_( "Copy Pad Settings to Current Settings" ), _( "Copy Pad Properties to Default Pad Properties" ),
_( "Copies the properties of selected pad to the current template pad settings." ) ); _( "Copies the properties of the selected pad to the default pad properties." ) );
TOOL_ACTION PCB_ACTIONS::copySettingsToPads( "pcbnew.InteractiveEdit.copySettingsToPads", TOOL_ACTION PCB_ACTIONS::copySettingsToPads( "pcbnew.InteractiveEdit.copySettingsToPads",
AS_GLOBAL, 0, AS_GLOBAL, 0,
_( "Copy Current Settings to Pads" ), _( "Copy Default Pad Properties to Pads" ),
_( "Copies the current template pad settings to the selected pad(s)." ) ); _( "Copies the default pad properties to the selected pad(s)." ) );
TOOL_ACTION PCB_ACTIONS::globalEditPads( "pcbnew.InteractiveEdit.globalPadEdit", TOOL_ACTION PCB_ACTIONS::globalEditPads( "pcbnew.InteractiveEdit.globalPadEdit",
AS_GLOBAL, 0, AS_GLOBAL, 0,
_( "Global Pad Edition" ), _( "Push Pad Settings..." ),
_( "Changes pad properties globally." ), push_pad_settings_xpm ); _( "Copies the selected pad's properties to all pads in its footprint (or similar footprints)." ),
push_pad_settings_xpm );
TOOL_ACTION PCB_ACTIONS::editActivate( "pcbnew.InteractiveEdit", TOOL_ACTION PCB_ACTIONS::editActivate( "pcbnew.InteractiveEdit",
AS_GLOBAL, 0, AS_GLOBAL, 0,

12
pcbnew/tools/pad_tool.cpp
View File

@ -48,19 +48,19 @@
TOOL_ACTION PCB_ACTIONS::copyPadSettings( TOOL_ACTION PCB_ACTIONS::copyPadSettings(
"pcbnew.PadTool.CopyPadSettings", "pcbnew.PadTool.CopyPadSettings",
AS_GLOBAL, 0, AS_GLOBAL, 0,
_( "Copy Pad Settings" ), _( "Copy current pad's settings to the board design settings" ), _( "Copy Pad Properties" ), _( "Copy current pad's properties to the default pad properties" ),
copy_pad_settings_xpm ); copy_pad_settings_xpm );
TOOL_ACTION PCB_ACTIONS::applyPadSettings( TOOL_ACTION PCB_ACTIONS::applyPadSettings(
"pcbnew.PadTool.ApplyPadSettings", "pcbnew.PadTool.ApplyPadSettings",
AS_GLOBAL, 0, AS_GLOBAL, 0,
_( "Apply Pad Settings" ), _( "Copy the board design settings pad properties to the current pad" ), _( "Apply Pad Properties" ), _( "Copy the default pad properties to the current pad" ),
apply_pad_settings_xpm ); apply_pad_settings_xpm );
TOOL_ACTION PCB_ACTIONS::pushPadSettings( TOOL_ACTION PCB_ACTIONS::pushPadSettings(
"pcbnew.PadTool.PushPadSettings", "pcbnew.PadTool.PushPadSettings",
AS_GLOBAL, 0, AS_GLOBAL, 0,
_( "Push Pad Settings..." ), _( "Copy the current pad settings to other pads" ), _( "Push Pad Properties..." ), _( "Copy the current pad settings to other pads" ),
push_pad_settings_xpm ); push_pad_settings_xpm );
@ -195,7 +195,7 @@ bool PAD_TOOL::Init()
( SELECTION_CONDITIONS::HasType( PCB_PAD_T ) ( SELECTION_CONDITIONS::HasType( PCB_PAD_T )
|| SELECTION_CONDITIONS::Count( 0 ) ); || SELECTION_CONDITIONS::Count( 0 ) );
menu.AddMenu( contextMenu.get(), false, showCond ); menu.AddMenu( contextMenu.get(), false, showCond, 1000 );
} }
return true; return true;
@ -225,7 +225,7 @@ int PAD_TOOL::applyPadSettings( const TOOL_EVENT& aEvent )
} }
} }
commit.Push( _( "Apply Pad Settings" ) ); commit.Push( _( "Apply Pad Properties" ) );
m_toolMgr->RunAction( PCB_ACTIONS::selectionModified, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionModified, true );
frame.Refresh(); frame.Refresh();
@ -378,7 +378,7 @@ int PAD_TOOL::pushPadSettings( const TOOL_EVENT& aEvent )
DIALOG_GLOBAL_PADS_EDITION::m_Pad_Orient_Filter, DIALOG_GLOBAL_PADS_EDITION::m_Pad_Orient_Filter,
DIALOG_GLOBAL_PADS_EDITION::m_Pad_Layer_Filter ); DIALOG_GLOBAL_PADS_EDITION::m_Pad_Layer_Filter );
commit.Push( _( "Apply Pad Settings" ) ); commit.Push( _( "Apply Pad Properties" ) );
m_toolMgr->RunAction( PCB_ACTIONS::selectionModified, true ); m_toolMgr->RunAction( PCB_ACTIONS::selectionModified, true );
frame.Refresh(); frame.Refresh();