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

lib-cache-rescue coding style fix. lib-cache-rescue set default button OK in dialog.

This commit is contained in:
unknown 2015-05-04 09:35:17 +02:00 committed by jean-pierre charras
parent 425ddb92a7
commit 69de718910
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eeschema/dialogs/dialog_rescue_each.cpp
View File

@ -86,6 +86,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( SCH_EDIT_FRAME* aParent, std::vector<RES
m_insideUpdateEvent( false )
{
m_Config = Kiface().KifaceSettings();
m_stdButtonsOK->SetDefault();
}
@ -99,10 +100,10 @@ bool DIALOG_RESCUE_EACH::TransferDataToWindow()
if( !wxDialog::TransferDataToWindow() )
return false;
m_ListOfConflicts->AppendToggleColumn( _("Rescue symbol") );
m_ListOfConflicts->AppendTextColumn( _("Symbol name") );
m_ListOfInstances->AppendTextColumn( _("Reference") );
m_ListOfInstances->AppendTextColumn( _("Value") );
m_ListOfConflicts->AppendToggleColumn( _( "Rescue symbol" ) );
m_ListOfConflicts->AppendTextColumn( _( "Symbol name" ) );
m_ListOfInstances->AppendTextColumn( _( "Reference" ) );
m_ListOfInstances->AppendTextColumn( _( "Value" ) );
PopulateConflictList();
PopulateInstanceList();
@ -152,7 +153,7 @@ void DIALOG_RESCUE_EACH::PopulateInstanceList()
data.clear();
data.push_back( each_component->GetRef( & m_Parent->GetCurrentSheet() ) );
data.push_back( valueField ? valueField->GetText() : wxT("") );
data.push_back( valueField ? valueField->GetText() : wxT( "" ) );
m_ListOfInstances->AppendItem( data );
}

4
eeschema/lib_cache_rescue.cpp
View File

@ -247,7 +247,7 @@ static void find_rescues( std::vector<SCH_COMPONENT*>& aComponents, PART_LIBS* a
static PART_LIB* create_rescue_library( wxFileName& aFileName )
{
wxFileName fn( g_RootSheet->GetScreen()->GetFileName() );
fn.SetName( fn.GetName() + wxT("-rescue") );
fn.SetName( fn.GetName() + wxT( "-rescue" ) );
fn.SetExt( SchematicLibraryFileExtension );
aFileName.SetPath( fn.GetPath() );
aFileName.SetName( fn.GetName() );
@ -321,7 +321,7 @@ bool SCH_EDIT_FRAME::RescueCacheConflicts( bool aRunningOnDemand )
get_components( components );
prj = &Prj();
libs = prj->SchLibs();
part_name_suffix = wxT("-RESCUE-") + prj->GetProjectName();
part_name_suffix = wxT( "-RESCUE-" ) + prj->GetProjectName();
// Start!
find_rescues( components, libs, candidates );