From c073749a5cb89102d8477b36f730ed53f6d84266 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 30 Aug 2020 15:19:17 +0100 Subject: [PATCH] Update clipboard format (host -> generator). Fixes https://gitlab.com/kicad/code/kicad/issues/5413 --- pcbnew/kicad_clipboard.cpp | 8 +++----- pcbnew/kicad_plugin.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pcbnew/kicad_clipboard.cpp b/pcbnew/kicad_clipboard.cpp index 04479cdfb9..13113a1a91 100644 --- a/pcbnew/kicad_clipboard.cpp +++ b/pcbnew/kicad_clipboard.cpp @@ -133,9 +133,8 @@ void CLIPBOARD_IO::SaveSelection( const PCBNEW_SELECTION& aSelected, bool isModE // This means we also need layers and nets LOCALE_IO io; - m_formatter.Print( 0, "(kicad_pcb (version %d) (host pcbnew %s)\n", - SEXPR_BOARD_FILE_VERSION, - m_formatter.Quotew( GetBuildVersion() ).c_str() ); + m_formatter.Print( 0, "(kicad_pcb (version %d) (generator pcbnew)\n", + SEXPR_BOARD_FILE_VERSION ); m_formatter.Print( 0, "\n" ); @@ -306,8 +305,7 @@ void CLIPBOARD_IO::Save( const wxString& aFileName, BOARD* aBoard, m_out = &formatter; - m_out->Print( 0, "(kicad_pcb (version %d) (host pcbnew %s)\n", SEXPR_BOARD_FILE_VERSION, - formatter.Quotew( GetBuildVersion() ).c_str() ); + m_out->Print( 0, "(kicad_pcb (version %d) (generator pcbnew)\n", SEXPR_BOARD_FILE_VERSION ); Format( aBoard, 1 ); diff --git a/pcbnew/kicad_plugin.cpp b/pcbnew/kicad_plugin.cpp index e1d72be034..82093b4980 100644 --- a/pcbnew/kicad_plugin.cpp +++ b/pcbnew/kicad_plugin.cpp @@ -338,7 +338,7 @@ void PCB_IO::Save( const wxString& aFileName, BOARD* aBoard, const PROPERTIES* a { KIDIALOG dlg( nullptr, wxString::Format( _( "Please report this bug. Error validating group structure: %s" - "\n\nSave anyways?" ), sanityResult ), + "\n\nSave anyway?" ), sanityResult ), _( "Internal group data structure corrupt" ), wxOK | wxCANCEL | wxICON_ERROR ); dlg.SetOKLabel( _( "Save Anyway" ) );