From 32526511de56fb98e1304af8013d9b99e9d6aa87 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 27 Oct 2011 07:43:44 +0200 Subject: [PATCH] Fix message in KiCad Dialog About (forgotten USE_BOOST_POLYGON_LIBRARY option removed). --- common/build_version.cpp | 4 ++-- common/dialog_about/AboutDialog_main.cpp | 8 ++------ kicad/commandframe.cpp | 11 ++++++----- kicad/mainframe.cpp | 2 +- packaging/windows/nsis/install.nsi | 2 +- version.txt | 4 ++-- 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/common/build_version.cpp b/common/build_version.cpp index 67df2e32c7..c48e99b90a 100644 --- a/common/build_version.cpp +++ b/common/build_version.cpp @@ -7,9 +7,9 @@ #ifndef KICAD_BUILD_VERSION #if defined KICAD_GOST -# define KICAD_BUILD_VERSION "(2011-oct-15 GOST)" +# define KICAD_BUILD_VERSION "(2011-oct-27 GOST)" #else -# define KICAD_BUILD_VERSION "(2011-oct-15)" +# define KICAD_BUILD_VERSION "(2011-oct-27)" #endif #endif diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 31f8e6a14d..865bc4e178 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -80,13 +80,9 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) #else << wxT( " Ansi " ); #endif - libVersion << wxT( "and " ) -#if USE_BOOST_POLYGON_LIBRARY - << wxT( "boost::polygon" ); -#else - << wxT( "kbool library" ); -#endif + libVersion << wxT( "and boost C++ libraries" ); + libVersion << wxT( "\n" ); /* Operating System Information */ diff --git a/kicad/commandframe.cpp b/kicad/commandframe.cpp index 7d3aa9b185..4edec906e3 100644 --- a/kicad/commandframe.cpp +++ b/kicad/commandframe.cpp @@ -1,6 +1,7 @@ -/*****************************************************/ -/* commandframe.cpp: window handling comman buttons */ -/*****************************************************/ +/** + * @file commandframe.cpp + * @brief Frame showing fast launch buttons and messages box + */ #include "fctsys.h" #include "macros.h" @@ -24,7 +25,7 @@ RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) : CreateCommandToolbar(); m_ButtonsPanelHeight = m_ButtonsListPosition.y + m_bitmapButtons_maxHeigth + 10; - // Add the wxTextCtrl showaing all messages from KiCad: + // Add the wxTextCtrl showing all messages from KiCad: m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_READONLY ); @@ -87,7 +88,7 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void ) Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W picture" ) ); btn = AddBitmapButton( ID_TO_PCB_CALCULATOR, KiBitmap( icon_pcbcalculator_xpm ) ); - btn->SetToolTip( _( "Pcb calculator" ) ); + btn->SetToolTip( _( "Pcb calculator, the Suiss army knife..." ) ); } diff --git a/kicad/mainframe.cpp b/kicad/mainframe.cpp index 87234bcf76..2e2b83d0c1 100644 --- a/kicad/mainframe.cpp +++ b/kicad/mainframe.cpp @@ -88,7 +88,7 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, wxAuiPaneInfo(info).Name( wxT( "m_LeftWin" ) ).Left(). BestSize( m_LeftWin_Width, clientsize.y ). Layer( 1 ) ); - + m_auimgr.Update(); } diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi index c605d82cb5..8587d16047 100644 --- a/packaging/windows/nsis/install.nsi +++ b/packaging/windows/nsis/install.nsi @@ -17,7 +17,7 @@ ; General Product Description Definitions !define PRODUCT_NAME "KiCad" -!define PRODUCT_VERSION "2011.10.15" +!define PRODUCT_VERSION "2011.10.27" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define COMPANY_NAME "" diff --git a/version.txt b/version.txt index 38ae813006..ea95446a7f 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: -2011 oct 15 +2011 oct 27 files (.zip,.tgz): -kicad-2011-10-15 +kicad-2011-10-27