Commit 69de7189 authored by unknown's avatar unknown Committed by jean-pierre charras

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

parent 425ddb92
...@@ -86,6 +86,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( SCH_EDIT_FRAME* aParent, std::vector<RES ...@@ -86,6 +86,7 @@ DIALOG_RESCUE_EACH::DIALOG_RESCUE_EACH( SCH_EDIT_FRAME* aParent, std::vector<RES
m_insideUpdateEvent( false ) m_insideUpdateEvent( false )
{ {
m_Config = Kiface().KifaceSettings(); m_Config = Kiface().KifaceSettings();
m_stdButtonsOK->SetDefault();
} }
...@@ -99,10 +100,10 @@ bool DIALOG_RESCUE_EACH::TransferDataToWindow() ...@@ -99,10 +100,10 @@ bool DIALOG_RESCUE_EACH::TransferDataToWindow()
if( !wxDialog::TransferDataToWindow() ) if( !wxDialog::TransferDataToWindow() )
return false; return false;
m_ListOfConflicts->AppendToggleColumn( _("Rescue symbol") ); m_ListOfConflicts->AppendToggleColumn( _( "Rescue symbol" ) );
m_ListOfConflicts->AppendTextColumn( _("Symbol name") ); m_ListOfConflicts->AppendTextColumn( _( "Symbol name" ) );
m_ListOfInstances->AppendTextColumn( _("Reference") ); m_ListOfInstances->AppendTextColumn( _( "Reference" ) );
m_ListOfInstances->AppendTextColumn( _("Value") ); m_ListOfInstances->AppendTextColumn( _( "Value" ) );
PopulateConflictList(); PopulateConflictList();
PopulateInstanceList(); PopulateInstanceList();
...@@ -152,7 +153,7 @@ void DIALOG_RESCUE_EACH::PopulateInstanceList() ...@@ -152,7 +153,7 @@ void DIALOG_RESCUE_EACH::PopulateInstanceList()
data.clear(); data.clear();
data.push_back( each_component->GetRef( & m_Parent->GetCurrentSheet() ) ); 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 ); m_ListOfInstances->AppendItem( data );
} }
......
...@@ -247,7 +247,7 @@ static void find_rescues( std::vector<SCH_COMPONENT*>& aComponents, PART_LIBS* a ...@@ -247,7 +247,7 @@ static void find_rescues( std::vector<SCH_COMPONENT*>& aComponents, PART_LIBS* a
static PART_LIB* create_rescue_library( wxFileName& aFileName ) static PART_LIB* create_rescue_library( wxFileName& aFileName )
{ {
wxFileName fn( g_RootSheet->GetScreen()->GetFileName() ); wxFileName fn( g_RootSheet->GetScreen()->GetFileName() );
fn.SetName( fn.GetName() + wxT("-rescue") ); fn.SetName( fn.GetName() + wxT( "-rescue" ) );
fn.SetExt( SchematicLibraryFileExtension ); fn.SetExt( SchematicLibraryFileExtension );
aFileName.SetPath( fn.GetPath() ); aFileName.SetPath( fn.GetPath() );
aFileName.SetName( fn.GetName() ); aFileName.SetName( fn.GetName() );
...@@ -321,7 +321,7 @@ bool SCH_EDIT_FRAME::RescueCacheConflicts( bool aRunningOnDemand ) ...@@ -321,7 +321,7 @@ bool SCH_EDIT_FRAME::RescueCacheConflicts( bool aRunningOnDemand )
get_components( components ); get_components( components );
prj = &Prj(); prj = &Prj();
libs = prj->SchLibs(); libs = prj->SchLibs();
part_name_suffix = wxT("-RESCUE-") + prj->GetProjectName(); part_name_suffix = wxT( "-RESCUE-" ) + prj->GetProjectName();
// Start! // Start!
find_rescues( components, libs, candidates ); find_rescues( components, libs, candidates );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment