From f2b0e18510ab9c6d234ceb11801dbb0e49bcec68 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 1 Apr 2011 19:10:16 +0200 Subject: [PATCH] Minor fixes to prepare wxWidget 2.9.1 use: * store selected language by name instead of wx language id (that changes between wxWidgets version) * accept always comma and point as flotating point separator. --- common/base_screen.cpp | 11 + common/build_version.cpp | 2 +- common/common.cpp | 4 + common/edaappl.cpp | 52 +++- eeschema/lib_polyline.cpp | 2 +- .../HersheySimplexRoman_sans_normal.h.unused | 232 ------------------ include/class_base_screen.h | 6 +- packaging/windows/nsis/install.nsi | 2 +- version.txt | 4 +- 9 files changed, 64 insertions(+), 251 deletions(-) delete mode 100644 include/HersheySimplexRoman_sans_normal.h.unused diff --git a/common/base_screen.cpp b/common/base_screen.cpp index 98e460d897..5145fc0d02 100644 --- a/common/base_screen.cpp +++ b/common/base_screen.cpp @@ -99,6 +99,17 @@ void BASE_SCREEN::SetPageSize( wxSize& aPageSize ) } +/** + * Function GetScalingFactor + * @return the the current scale used to draw items on screen + * draw coordinates are user coordinates * GetScalingFactor( ) + */ +double BASE_SCREEN::GetScalingFactor() const +{ + double scale = (double) m_ZoomScalar / (double) GetZoom(); + return scale; +} + /** * Function SetScalingFactor * calculates the .m_Zoom member to have a given scaling factor diff --git a/common/build_version.cpp b/common/build_version.cpp index a4c910ee1d..ae7c43ecf2 100644 --- a/common/build_version.cpp +++ b/common/build_version.cpp @@ -6,7 +6,7 @@ #endif #ifndef KICAD_BUILD_VERSION -#define KICAD_BUILD_VERSION "(2011-03-30)" +#define KICAD_BUILD_VERSION "(2011-04-01)" #endif // uncomment this line only when creating a stable version diff --git a/common/common.cpp b/common/common.cpp index af39971c3d..a54bc49a5e 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -397,6 +397,10 @@ int ReturnValueFromString( UserUnitType aUnit, const wxString& TextValue, /* Convert the period in decimal point */ buf.Replace( wxT( "." ), wxString( decimal_point, 1 ) ); + // An ugly fix needed by WxWidgets 2.9.1 that sometimes + // back to a point as separator, although the separator is the comma + // TODO: remove this line if WxWidgets 2.9.2 fixes this issue + buf.Replace( wxT( "," ), wxString( decimal_point, 1 ) ); /* Find the end of the numeric part */ unsigned brk_point = 0; diff --git a/common/edaappl.cpp b/common/edaappl.cpp index 949f5fd2b8..73c6ae3dd2 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -81,6 +81,9 @@ struct LANGUAGE_DESCR /** * Language list struct + * Note: because this list is not created on the fly, wxTranslation + * must be called when a language name must be displayed after translation. + * Do don change this behavior, because m_Lang_Label is also used as key in config */ static struct LANGUAGE_DESCR s_Language_List[] = { @@ -249,7 +252,7 @@ WinEDA_App::WinEDA_App() m_EDA_Config = NULL; m_Env_Defined = FALSE; m_LanguageId = wxLANGUAGE_DEFAULT; - m_PdfBrowserIsDefault = TRUE; + m_PdfBrowserIsDefault = true; m_Locale = NULL; m_ProjectConfig = NULL; m_EDA_CommonConfig = NULL; @@ -337,9 +340,20 @@ void WinEDA_App::InitEDA_Appl( const wxString& aName, id_app_type aId ) ReadPdfBrowserInfos(); // Internationalization: loading the kicad suitable Dictionary - m_EDA_CommonConfig->Read( languageCfgKey, &m_LanguageId, wxLANGUAGE_DEFAULT ); + wxString languageSel; + m_EDA_CommonConfig->Read( languageCfgKey, &languageSel); + m_LanguageId = wxLANGUAGE_DEFAULT; + // Search for the current selection + for( unsigned int ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) + { + if( s_Language_List[ii].m_Lang_Label == languageSel ) + { + m_LanguageId = s_Language_List[ii].m_WX_Lang_Identifier; + break; + } + } - bool succes = SetLanguage( TRUE ); + bool succes = SetLanguage( true ); if( !succes ) { } @@ -459,7 +473,7 @@ bool WinEDA_App::SetBinDir() while( m_BinDir.Last() != '/' && !m_BinDir.IsEmpty() ) m_BinDir.RemoveLast(); - return TRUE; + return true; } @@ -627,7 +641,19 @@ void WinEDA_App::GetSettings(bool aReopenLastUsedDirectory) m_HelpSize.x = 500; m_HelpSize.y = 400; - m_LanguageId = m_EDA_CommonConfig->Read( languageCfgKey, wxLANGUAGE_DEFAULT ); + wxString languageSel; + m_EDA_CommonConfig->Read( languageCfgKey, &languageSel); + m_LanguageId = wxLANGUAGE_DEFAULT; + // Search for the current selection + for( unsigned int ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) + { + if( s_Language_List[ii].m_Lang_Label == languageSel ) + { + m_LanguageId = s_Language_List[ii].m_WX_Lang_Identifier; + break; + } + } + m_EditorName = m_EDA_CommonConfig->Read( wxT( "Editor" ) ); m_fileHistory.Load( *m_EDA_Config ); @@ -717,7 +743,17 @@ bool WinEDA_App::SetLanguage( bool first_time ) if( !first_time ) { - m_EDA_CommonConfig->Write( languageCfgKey, m_LanguageId ); + wxString languageSel; + // Search for the current selection + for( unsigned int ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) + { + if( s_Language_List[ii].m_WX_Lang_Identifier == m_LanguageId ) + { + languageSel = s_Language_List[ii].m_Lang_Label; + break; + } + } + m_EDA_CommonConfig->Write( languageCfgKey, languageSel ); } // Test if floating point notation is working (bug in cross compilation, using wine) @@ -758,12 +794,10 @@ bool WinEDA_App::SetLanguage( bool first_time ) */ void WinEDA_App::SetLanguageIdentifier( int menu_id ) { - unsigned int ii; - wxLogDebug( wxT( "Select language ID %d from %d possible languages." ), menu_id, LANGUAGE_DESCR_COUNT ); - for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) + for( unsigned int ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) { if( menu_id == s_Language_List[ii].m_KI_Lang_Identifier ) { diff --git a/eeschema/lib_polyline.cpp b/eeschema/lib_polyline.cpp index 0cc366519b..6f4f42e032 100644 --- a/eeschema/lib_polyline.cpp +++ b/eeschema/lib_polyline.cpp @@ -502,7 +502,7 @@ void LIB_POLYLINE::EndEdit( const wxPoint& aPosition, bool aAbort ) if( m_PolyPoints.size() > 2 // do not delete last two points... keep it alive && ( m_ModifyIndex > 0 && m_PolyPoints[ m_ModifyIndex ] == m_PolyPoints[ m_ModifyIndex - 1 ] - || m_ModifyIndex < m_PolyPoints.size() - 1 + || m_ModifyIndex < (int)m_PolyPoints.size() - 1 && m_PolyPoints[ m_ModifyIndex ] == m_PolyPoints[ m_ModifyIndex + 1 ] ) ) { m_PolyPoints.erase( m_PolyPoints.begin() + m_ModifyIndex ); // delete a point on this diff --git a/include/HersheySimplexRoman_sans_normal.h.unused b/include/HersheySimplexRoman_sans_normal.h.unused deleted file mode 100644 index f77a522967..0000000000 --- a/include/HersheySimplexRoman_sans_normal.h.unused +++ /dev/null @@ -1,232 +0,0 @@ -/* Automatically converted font */ - -/* Hershey Simplex Roman (sans) definition - * First shape has unicode (or ascii) value 0x20 (space) -*/ -const static char* hershey_simplex[] = -{ - "JZ", // ' ' - "MWRFRT RQZR[Q[QZRZR[", - "JZNFNL RVFVL", - "H]LM[M RRDL_ RYVJV RS_YD", - "H\\RDR] RLZO[T[VZWYXWXUWSVRTQPPNOMNLLLJMHNGPFUFXG", - "F^J[ZF RMFOGPIOKMLKKJIKGMF RYZZXYVWUUVTXUZW[YZ", - "E_[[Z[XZUWPQNNMKMINGPFQFSGTITJSLRMLQKRJTJWKYLZN[Q[SZTYWUXRXP", - "MWRFRL", - "KYVbUaS^R\\QYPTPPQKRHSFUCVB", - "KYNbOaQ^R\\SYTTTPSKRHQFOCNB", - "JZRFRK RMIRKWI ROORKUO", - "E_JQZQ RRYRI", - "MWRZR\\Q^P_", - "E_JQZQ", - "MWQZR[Q[QZRZR[", - "G][DI_", - "H\\QFSFUGVHWJXNXSWWVYUZS[Q[OZNYMWLSLNMJNHOGQF", - "H\\N[W[ RS[SFQIOKML", - "H\\LHMGOFTFVGWHXJXLWOK[X[", - "H\\KFXFQNTNVOWPXRXWWYVZT[N[LZKY", - "H\\VMV[ RQELTYT", - "H\\WFMFLPMOONTNVOWPXRXWWYVZT[O[MZLY", - "H\\VFRFPGOHMKLOLWMYNZP[T[VZWYXWXRWPVOTNPNNOMPLR", - "H\\KFYFP[", - "H\\PONNMMLKLJMHNGPFTFVGWHXJXKWMVNTOPONPMQLSLWMYNZP[T[VZWYXWXSWQVPTO", - "H\\N[R[TZUYWVXRXJWHVGTFPFNGMHLJLOMQNRPSTSVRWQXO", - "MWQZR[Q[QZRZR[ RQNROQOQNRNRO", - "MWRZR\\Q^P_ RQNROQOQNRNRO", - "F^YWJQYK", - "E_JNZN RZTJT", - "F^JWYQJK", - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT", - "D_VQUPSOQOOPNQMSMUNWOXQYSYUXVW RVOVWWXXXZW[U[PYMVKRJNKKMIPHTIXK[N]R^V]Y[", - "I[MUWU RK[RFY[", - "G\\SPVQWRXTXWWYVZT[L[LFSFUGVHWJWLVNUOSPLP", - "H]YYXZU[S[PZNXMVLRLOMKNIPGSFUFXGYH", - "G\\L[LFQFTGVIWKXOXRWVVXTZQ[L[", - "H[MPTP RW[M[MFWF", - "HZMPTP RTPMP RM[MFWF", - "H]XGVFSFPGNIMKLOLRMVNXPZS[U[XZYYYRUR", - "G]L[LF RLPXP RX[XF", - "NVR[RF", - "JZUFUUTXRZO[M[", - "G\\L[LF RX[OO RXFLR", - "HYV[M[MF", - "F^K[KFRUYFY[", - "G]L[LFX[XF", - "G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[", - "G\\L[LFTFVGWHXJXMWOVPTQLQ", - "G]Z]X\\VZSWQVOV RP[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[", - "G\\X[QQ RL[LFTFVGWHXJXMWOVPTQLQ", - "H\\LZO[T[VZWYXWXUWSVRTQPPNOMNLLLJMHNGPFUFXG", - "JZLFXF RR[RF", - "G]LGLWMYNZP[T[VZWYXWXG", - "I[KFR[YF", - "F^IFN[RLV[[F", - "H\\L[XF RLFX[", - "I[RQR[ RKFRQYF", - "H\\X[L[XFLF", - "KYVaQaQCVC", - "KYID[_", - "KYNaSaSCNC", - "JZNIREVI", - "JZJ]Z]", - "MWPERH", - "I\\W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR", - "H[M[MF RMNOMSMUNVOWQWWVYUZS[O[MZ", - "I[WZU[Q[OZNYMWMQNOONQMUMWN", - "I\\W[WF RWZU[Q[OZNYMWMQNOONQMUMWN", - "I[VZT[P[NZMXMPNNPMTMVNWPWRMT", - "MYPMVM RR[RISGUFWF", - "I\\WMW^V`UaSbPbNa RWZU[Q[OZNYMWMQNOONQMUMWN", - "H[M[MF RMNOMSMUNVOWQW[", - "NVR[RM RQFRGQGQFRFRG", - "LVRMR_QaObNb RQFRGQGQFRFRG", - "IZN[NF RV[OT RVMNU", - "NVU[SZRXRF", - "CaH[HM RR[ROQNOMKMINHO R][]Q\\O[NYMUMSNRO", - "H[MMM[ RW[WQVOUNSMOMMN", - "H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[", - "H[MMMb RMNOMSMUNVOWQWWVYUZS[O[MZ", - "I\\WMWb RWZU[Q[OZNYMWMQNOONQMUMWN", - "KXP[PM RPOQNSMUMWN", - "IZMZO[S[UZVXVWUUSTPTNSMQMPNNPMSMUN", - "MYPMVM RV[U[SZRXRF", - "I\\WMW[ RMMMWNYOZQ[U[WZ", - "JZMMR[WM", - "G]JMN[RQV[ZM", - "IZL[WM RLMW[", - "JZMMR[ RWMR[P`OaMb", - "IZMMVMM[V[", - "KYVbUbSaR_RUQSORQQRORESCUBVB", - "NVRbRB", - "KYNbObQaR_RUSSURSQROREQCOBNB", - "F^KHLGNFOFQGRHTIUIWHXG", - "F^K[KFYFY[K[", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "RR", - "JZ", - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// EXCLAM_DOWN not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// CENT not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// POUND not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// CURRENCY not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// YEN not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// BROKEN not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SECTION not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// DIAERESIS not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// COPYRIGHT not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SUP_SMALL_A not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// GUILLEMET_DBL_LEFT not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// NOT not found! - "RR", - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// REGISTERED not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// MACRON not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// DEGREE not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// PLUS_MINUS not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SUP_DIGIT_2 not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SUP_DIGIT_3 not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// ACUTE not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SMALL_MU not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// PILCROW not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// MIDDLE_DOT not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// CEDILLA not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SUP_DIGIT_1 not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SUP_SMALL_O not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// GUILLEMET_DBL_RIGHT not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// FRAC_1_4 not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// FRAC_1_2 not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// FRAC_3_4 not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// QUESTION_DOWN not found! - "I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent GRAVE_CAP not found! - "I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE_CAP not found! - "I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CIRCUMFLEX_CAP not found! - "I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent TILDE_CAP not found! - "I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS_CAP not found! - "I[MUWU RK[RFY[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent RING_ABOVE_CAP not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// CAPITAL_AE not found! - "H]YYXZU[S[PZNXMVLRLOMKNIPGSFUFXGYH RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CEDILLA not found! - "H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent GRAVE_CAP not found! - "H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE_CAP not found! - "H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CURCUMFLEX_CAP not found! - "H[MPTP RW[M[MFWF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS_CAP not found! - "NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent GRAVE_CAP not found! - "NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE_CAP not found! - "NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CURCUMFLEX_CAP not found! - "NVR[RF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS_CAP not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// CAPITAL_ETH not found! - "G]L[LFX[XF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent TILDE_CAP not found! - "G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent GRAVE_CAP not found! - "G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE_CAP not found! - "G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CIRCUMFLEX_CAP not found! - "G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent TILDE_CAP not found! - "G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS_CAP not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// MULTIPLY not found! - "G]P[NZLXKTKMLINGPFTFVGXIYMYTXXVZT[P[ R[DI_", - "G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent GRAVE_CAP not found! - "G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE_CAP not found! - "G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CURCUMFLEX_CAP not found! - "G]LGLWMYNZP[T[VZWYXWXG RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS_CAP not found! - "I[RQR[ RKFRQYF RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE_CAP not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// CAPITAL_THORN not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// ESZETT not found! - "I\\W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RPERH", - "I\\W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE not found! - "I\\W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RNIREVI", - "I\\W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RKHLGNFOFQGRHTIUIWHXG", - "I\\W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS not found! - "I\\W[WPVNTMPMNN RWZU[P[NZMXMVNTPSUSWR RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent RING_ABOVE not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SMALL_AE not found! - "I[WZU[Q[OZNYMWMQNOONQMUMWN RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CEDILLA not found! - "I[VZT[P[NZMXMPNNPMTMVNWPWRMT RPERH", - "I[VZT[P[NZMXMPNNPMTMVNWPWRMT RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE not found! - "I[VZT[P[NZMXMPNNPMTMVNWPWRMT RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CURCUMFLEX not found! - "I[VZT[P[NZMXMPNNPMTMVNWPWRMT RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS not found! - "NVR[RM RPERH", - "NVR[RM RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE not found! - "NVR[RM RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CURCUMFLEX not found! - "NVR[RM RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SMALL_ETH not found! - "H[MMM[ RW[WQVOUNSMOMMN RKHLGNFOFQGRHTIUIWHXG", - "H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RPERH", - "H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE not found! - "H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RNIREVI", - "H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RKHLGNFOFQGRHTIUIWHXG", - "H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// DIVIDE not found! - "H[P[NZMYLWLQMONNPMSMUNVOWQWWVYUZS[P[ R[DI_", - "I\\WMW[ RMMMWNYOZQ[U[WZ RPERH", - "I\\WMW[ RMMMWNYOZQ[U[WZ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE not found! - "I\\WMW[ RMMMWNYOZQ[U[WZ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent CURCUMFLEX not found! - "I\\WMW[ RMMMWNYOZQ[U[WZ RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS not found! - "JZMMR[ RWMR[P`OaMb RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent ACUTE not found! - "I[Q[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// SMALL_THORN not found! - "JZMMR[ RWMR[P`OaMb RQ[QZRZR[Q[RZ RMHNGPFSFUGVHWJWLVNUOSPRQQSQT",// accent DIAERESIS not found! -}; diff --git a/include/class_base_screen.h b/include/class_base_screen.h index 00875faf1c..46a1edd051 100644 --- a/include/class_base_screen.h +++ b/include/class_base_screen.h @@ -263,11 +263,7 @@ public: * @return the the current scale used to draw items on screen * draw coordinates are user coordinates * GetScalingFactor( ) */ - double GetScalingFactor() const - { - return (double) m_ZoomScalar / (double) GetZoom(); - } - + double GetScalingFactor() const; /** * Function SetScalingFactor diff --git a/packaging/windows/nsis/install.nsi b/packaging/windows/nsis/install.nsi index 56e8411138..66a3ab3c41 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.03.30" +!define PRODUCT_VERSION "2011.04.01" !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 2a1daa9348..1755168516 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ release version: -2011 mar 30 +2011 apr 01 files (.zip,.tgz): -kicad-2011-03-30 +kicad-2011-04-01