From 6e5cfde4b11f82f6d270f64911d26c8dc606cf33 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Wed, 5 Oct 2011 14:26:22 -0400 Subject: [PATCH] Minor copy version information to clipboard improvements. * Add KiCad build option states to copy version information to clipboard function. * Add a note to the main CMakeList.txt file to let developers know that new option states should be added to the copy version information to clipboard function. --- CMakeLists.txt | 8 ++++++++ common/basicframe.cpp | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8909beb89c..33b8d8ae15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,14 @@ endif(WIN32) # Path to local CMake modules. set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules) +# +# KiCad build options go here. +# +# If you add a new build option, please add it's state to the CopyVersionInfoToClipboard() +# function in common/basicframe.cpp so that build option settings can be includeed in bug +# reports. +# + option(USE_PNG_BITMAPS "use PNG bitmaps instead of XPM (default ON)" ON) # Russian GOST patch diff --git a/common/basicframe.cpp b/common/basicframe.cpp index ae4a16b6d0..7aef5f82df 100644 --- a/common/basicframe.cpp +++ b/common/basicframe.cpp @@ -440,7 +440,45 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event ) << FROM_UTF8( KICAD_BUILD_OPTIONS_SIGNATURE() ) << wxT( "\n" ) << wxT( "Platform: " ) << wxGetOsDescription() << wxT( ", " ) << info.GetArchName() << wxT( ", " ) << info.GetEndiannessName() << wxT( ", " ) - << info.GetPortIdName(); + << info.GetPortIdName() << wxT( "\n" ); + + tmp << wxT( "Options: " ); + + tmp << wxT( "USE_PNG_BITMAPS=" ); +#ifdef USE_PNG_BITMAPS + tmp << wxT( "ON\n" ); +#else + tmp << wxT( "OFF\n" ); +#endif + + tmp << wxT( " KICAD_GOST=" ); +#ifdef KICAD_GOST + tmp << wxT( "ON\n" ); +#else + tmp << wxT( "OFF\n" ); +#endif + + tmp << wxT( " USE_WX_GRAPHICS_CONTEXT=" ); +#ifdef USE_WX_GRAPHICS_CONTEXT + tmp << wxT( "ON\n" ); +#else + tmp << wxT( "OFF\n" ); +#endif + + tmp << wxT( " USE_WX_OVERLAY=" ); +#ifdef USE_WX_OVERLAY + tmp << wxT( "ON\n" ); +#else + tmp << wxT( "OFF\n" ); +#endif + + tmp << wxT( " USE_BOOST_POLYGON_LIBRARY=" ); +#ifdef USE_BOOST_POLYGON_LIBRARY + tmp << wxT( "ON\n" ); +#else + tmp << wxT( "OFF\n" ); +#endif + wxTheClipboard->SetData( new wxTextDataObject( tmp ) ); wxTheClipboard->Close(); }