From 40c5a46f388cf2c944dbc7c6699227ceb258c501 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 13 May 2012 17:31:58 +0200 Subject: [PATCH] Libedit: fix Bug #994014. Pcbnew: fix Pcbnew name capitalization in messages. About dialog: add a link to kicad-pcb.org --- common/dialog_about/AboutDialog_main.cpp | 4 ++-- eeschema/block_libedit.cpp | 3 ++- pcbnew/hotkeys.h | 2 +- pcbnew/legacy_plugin.cpp | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 24e24c6902..e77ba1997f 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -147,8 +147,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) HtmlHyperlink( wxT( "https://launchpad.net/kicad" ), _( "Project on Launchpad" ) ) << wxT( "" ); description << wxT( "
  • " ) << - HtmlHyperlink( wxT( "http://kicad.sourceforge.net" ), - _( "Wiki on Sourceforge with many information" ) ) << wxT( "
    • " ); + HtmlHyperlink( wxT( "http://www.kicad-pcb.org" ), + _( "The new KiCad site" ) ) << wxT( "" ); description << wxT( "
  • " ) << HtmlHyperlink( wxT( "http://www.kicadlib.org" ), _( "Repository with additional component libraries" ) ) << wxT( "
    • " ); diff --git a/eeschema/block_libedit.cpp b/eeschema/block_libedit.cpp index 8432863830..75a756a840 100644 --- a/eeschema/block_libedit.cpp +++ b/eeschema/block_libedit.cpp @@ -271,7 +271,8 @@ void LIB_EDIT_FRAME::HandleBlockPlace( wxDC* DC ) SaveCopyInUndoList( m_component ); pt = GetScreen()->m_BlockLocate.Centre(); - pt.y *= -1; + pt = GetScreen()->GetNearestGridPosition( pt ); + NEGATE( pt.y ); if ( m_component ) { diff --git a/pcbnew/hotkeys.h b/pcbnew/hotkeys.h index 262b4997e7..d3246fd2ad 100644 --- a/pcbnew/hotkeys.h +++ b/pcbnew/hotkeys.h @@ -1,6 +1,6 @@ /** * @file pcbnew/hotkeys.h - * PCBNew hotkeys + * Pcbnew hotkeys */ #ifndef _PCBNEW_KOTKEYS_H #define _PCBNEW_HOTKEYS_H diff --git a/pcbnew/legacy_plugin.cpp b/pcbnew/legacy_plugin.cpp index fe8ac7f5e0..1a7d7ce7a1 100644 --- a/pcbnew/legacy_plugin.cpp +++ b/pcbnew/legacy_plugin.cpp @@ -88,7 +88,7 @@ #include -#define VERSION_ERROR_FORMAT _( "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade PCBNew to load this file." ) +#define VERSION_ERROR_FORMAT _( "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file." ) #define UNKNOWN_GRAPHIC_FORMAT _( "unknown graphic type: %d") #define UNKNOWN_PAD_FORMAT _( "unknown pad type: %d") #define UNKNOWN_PAD_ATTRIBUTE _( "unknown pad attribute: %d" ) @@ -324,7 +324,7 @@ void LEGACY_PLUGIN::checkVersion() #if !defined(DEBUG) if( ver > LEGACY_BOARD_FILE_VERSION ) { - // "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade PCBNew to load this file." + // "File '%s' is format version: %d.\nI only support format version <= %d.\nPlease upgrade Pcbnew to load this file." m_error.Printf( VERSION_ERROR_FORMAT, m_reader->GetSource().GetData(), ver, LEGACY_BOARD_FILE_VERSION ); THROW_IO_ERROR( m_error ); @@ -358,7 +358,7 @@ void LEGACY_PLUGIN::loadGENERAL() diskToBiu = 10000/25.4; #else - THROW_IO_ERROR( _( "May not load millimeter *.brd file into 'PCBNew compiled for deci-mils'" ) ); + THROW_IO_ERROR( _( "May not load millimeter *.brd file into 'Pcbnew compiled for deci-mils'" ) ); #endif } } @@ -3844,7 +3844,7 @@ void FPL_CACHE::ReadAndVerifyHeader( LINE_READER* aReader ) m_owner->diskToBiu = 10000/25.4; #else - THROW_IO_ERROR( _( "May not load millimeter legacy library file into 'PCBNew compiled for deci-mils'" ) ); + THROW_IO_ERROR( _( "May not load millimeter legacy library file into 'Pcbnew compiled for deci-mils'" ) ); #endif }