From 31bcc6eed93548996ce2b1d2f366b2d6cbaab3d1 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 30 Nov 2011 12:45:49 +0100 Subject: [PATCH] Add Bulgarian language. Update translators list. Pcbnew: prepare work on new algos for connections calculations. --- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_26/lang_bg.cpp | 21 +++++++++++++++++++++ common/build_version.cpp | 4 ++-- common/dialog_about/AboutDialog_main.cpp | 5 +++++ common/edaappl.cpp | 9 ++++++++- include/bitmaps.h | 1 + include/id.h | 1 + packaging/windows/nsis/install.nsi | 5 ++--- pcbnew/class_pad.h | 10 ++++++---- pcbnew/class_track.h | 5 +++-- version.txt | 4 ++-- 11 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 bitmaps_png/cpp_26/lang_bg.cpp diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 9f20489c37..c0d635f7eb 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -279,6 +279,7 @@ set( BMAPS_MID label lang_catalan lang_chinese + lang_bg lang_cs lang_def lang_de diff --git a/bitmaps_png/cpp_26/lang_bg.cpp b/bitmaps_png/cpp_26/lang_bg.cpp new file mode 100644 index 0000000000..8360f4e99e --- /dev/null +++ b/bitmaps_png/cpp_26/lang_bg.cpp @@ -0,0 +1,21 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include "bitmaps.h" + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x00, 0x40, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xfc, 0xff, 0xff, 0xff, + 0x03, 0x06, 0x3a, 0x00, 0x46, 0xa0, 0x45, 0xff, 0x47, 0x2d, 0x1a, 0xb5, 0x68, 0x98, 0x5a, 0xb4, + 0xff, 0xe9, 0x6d, 0xfa, 0x58, 0xc4, 0x30, 0x2d, 0x6f, 0xd4, 0xa2, 0x51, 0x8b, 0x46, 0x2d, 0xa2, + 0xd0, 0xa2, 0xb6, 0x00, 0x13, 0xfa, 0x58, 0x74, 0x4d, 0x4d, 0x68, 0xd4, 0xa2, 0x51, 0x8b, 0x46, + 0x2d, 0xa2, 0x0c, 0x00, 0x00, 0x86, 0xe3, 0x45, 0xe3, 0x66, 0x98, 0x1d, 0x12, 0x00, 0x00, 0x00, + 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE lang_bg_xpm[1] = {{ png, sizeof( png ), "lang_bg_xpm" }}; + +//EOF diff --git a/common/build_version.cpp b/common/build_version.cpp index cdf4ec6cf9..647e000970 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-nov-26 GOST)" +# define KICAD_BUILD_VERSION "(2011-nov-30 GOST)" #else -# define KICAD_BUILD_VERSION "(2011-nov-26)" +# define KICAD_BUILD_VERSION "(2011-nov-30)" #endif #endif diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 865bc4e178..1ea8e353f1 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -248,6 +248,8 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) wxT( "Portuguese (PT)" ), KiBitmapNew( lang_pt_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ), wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Andrey Fedorushkov" ), wxT( "" ), + wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Pedro Martin del Valle" ), wxT( "pkicad@yahoo.es" ), wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Iñigo Zuluaga" ), wxT( "inigo_zuluaga@yahoo.es" ), @@ -264,6 +266,9 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) info.AddTranslator( new Contributor( wxT( "Massimo Cioce" ), wxT( "ciocemax@alice.it" ), wxT( "Italian (IT)" ), KiBitmapNew( lang_it_xpm ) ) ); + info.AddTranslator( new Contributor( wxT( "Evgeniy Ivanov" ), + wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ), + KiBitmapNew( lang_bg_xpm ) ) ); /* TODO: are these all russian translators, placed them here now, or else align them below other language maintainer with mail adress */ info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) ); diff --git a/common/edaappl.cpp b/common/edaappl.cpp index 6d71aeab19..cd7e631f99 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -233,7 +233,14 @@ static struct LANGUAGE_DESCR s_Language_List[] = ID_LANGUAGE_JAPANESE, lang_jp_xpm, _( "Japanese" ) - } + }, + // Bulgarian language + { + wxLANGUAGE_BULGARIAN, + ID_LANGUAGE_BULGARIAN, + lang_bg_xpm, + _( "Bulgarian" ) + } }; diff --git a/include/bitmaps.h b/include/bitmaps.h index 602dd7b7fd..06c0c7f34f 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -243,6 +243,7 @@ EXTERN_BITMAP( kicad_icon_small_xpm ) EXTERN_BITMAP( label2glabel_xpm ) EXTERN_BITMAP( label2text_xpm ) EXTERN_BITMAP( label_xpm ) +EXTERN_BITMAP( lang_bg_xpm ) EXTERN_BITMAP( lang_catalan_xpm ) EXTERN_BITMAP( lang_chinese_xpm ) EXTERN_BITMAP( lang_cs_xpm ) diff --git a/include/id.h b/include/id.h index 73793d12ce..bf4af18c12 100644 --- a/include/id.h +++ b/include/id.h @@ -127,6 +127,7 @@ enum main_id ID_LANGUAGE_CHINESE_SIMPLIFIED, ID_LANGUAGE_DUTCH, ID_LANGUAGE_JAPANESE, + ID_LANGUAGE_BULGARIAN, ID_LANGUAGE_CHOICE_END, ID_SET_REPEAT_OPTION, diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi index 35c9e009bd..09df01e31d 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.11.26" +!define PRODUCT_VERSION "2011.11.30" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define COMPANY_NAME "" @@ -116,8 +116,7 @@ Section $(TITLE_SEC01) SEC01 SetOverwrite try SetOutPath "$INSTDIR" File /nonfatal "..\AUTHORS.txt" - File /nonfatal "..\copyright.txt" - File /nonfatal "..\gpl.txt" + File /nonfatal "..\COPYRIGHT.txt" File /nonfatal "..\licendoc.txt" SetOutPath "$INSTDIR\share\template" File /nonfatal /r "..\share\template\*" diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h index 9dbaf45c0e..5450b3aa63 100644 --- a/pcbnew/class_pad.h +++ b/pcbnew/class_pad.h @@ -16,6 +16,7 @@ class LINE_READER; class EDA_3D_CANVAS; class EDA_DRAW_PANEL; class MODULE; +class TRACK; /* Default layers used for pads, according to the pad type. @@ -126,10 +127,11 @@ public: int m_LocalClearance; // Local mask margins: when NULL, the parent footprint design values are used - int m_LocalSolderMaskMargin; // Local solder mask margin - int m_LocalSolderPasteMargin; // Local solder paste margin absolute value - double m_LocalSolderPasteMarginRatio; // Local solder mask margin ratio value of pad size - // The final margin is the sum of these 2 values + int m_LocalSolderMaskMargin; // Local solder mask margin + int m_LocalSolderPasteMargin; // Local solder paste margin absolute value + double m_LocalSolderPasteMarginRatio; // Local solder mask margin ratio value of pad size + // The final margin is the sum of these 2 values + std::vector m_TracksConnected; // list of other tracks connected to me private: int m_SubRatsnest; // variable used in rats nest computations diff --git a/pcbnew/class_track.h b/pcbnew/class_track.h index 4606836799..e65237e2d1 100644 --- a/pcbnew/class_track.h +++ b/pcbnew/class_track.h @@ -12,7 +12,7 @@ class TRACK; - +class D_PAD; // Via attributes (m_Shape parameter) #define VIA_THROUGH 3 /* Always a through hole via */ @@ -63,7 +63,8 @@ protected: public: BOARD_CONNECTED_ITEM* start; // pointers to a connected item (pad or track) BOARD_CONNECTED_ITEM* end; - std::vector m_TracksConnected; // list of other tracks connected to me + std::vector m_TracksConnected; // list of other tracks connected to me + std::vector m_PadsConnected; // list of pads connected to me int m_Param; // Auxiliary variable ( used in some computations ) diff --git a/version.txt b/version.txt index ab67d861a6..de376a24c7 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: -2011 nov 26 +2011 nov 30 files (.zip,.tgz): -kicad-2011-11-26 +kicad-2011-11-30