Merge branch 'master' into teardrops

bitmaps_png/CMakeLists.txt

@@ -337,6 +337,7 @@ set( BMAPS_MID
     library_table
     libview
     lines90
+    list_nets
     load_module_board
     load_module_lib
     local_ratsnest

bitmaps_png/cpp_26/list_nets.cpp

+
+/* 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, 0x02, 0x3a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x94, 0x3f, 0x68, 0x13,
+ 0x51, 0x1c, 0xc7, 0xdf, 0xa5, 0x43, 0xc0, 0x14, 0xeb, 0xe8, 0x18, 0x6e, 0x70, 0x76, 0x30, 0x43,
+ 0x08, 0xb1, 0xc5, 0x16, 0x74, 0xb0, 0xa5, 0x94, 0x0c, 0x0d, 0x55, 0x32, 0x78, 0xe2, 0xd2, 0x82,
+ 0x52, 0x08, 0xa5, 0x90, 0x90, 0x10, 0xcc, 0x35, 0x90, 0xbb, 0xa3, 0x1d, 0x4c, 0x6a, 0x23, 0x15,
+ 0x85, 0x90, 0xa1, 0xe0, 0x94, 0xc9, 0x2d, 0x43, 0x1a, 0x50, 0xe8, 0x22, 0xe2, 0x98, 0x0e, 0x3d,
+ 0x34, 0x84, 0x52, 0x6b, 0x0c, 0x09, 0xa9, 0xf9, 0xf9, 0x7b, 0xd2, 0xab, 0x77, 0x47, 0x8e, 0x77,
+ 0x97, 0xfe, 0x19, 0x3e, 0xcb, 0xfd, 0xde, 0x97, 0x0f, 0xf7, 0xf8, 0xbd, 0x2f, 0x01, 0x00, 0x62,
+ 0x46, 0x25, 0x24, 0x82, 0x1c, 0x22, 0xca, 0xa0, 0xf9, 0x30, 0x67, 0xad, 0xc2, 0xfb, 0x08, 0x20,
+ 0x27, 0xc8, 0x18, 0x43, 0x64, 0xeb, 0xac, 0x55, 0xf8, 0xfb, 0x69, 0x98, 0x72, 0x93, 0x21, 0xb2,
+ 0x75, 0x76, 0xe0, 0xc7, 0x03, 0x0c, 0x7f, 0x74, 0xbb, 0x61, 0x9f, 0xe3, 0x2e, 0x56, 0x44, 0x36,
+ 0x88, 0x9b, 0x6c, 0x93, 0x1b, 0x14, 0xdf, 0x03, 0xdf, 0xa3, 0xe5, 0xd9, 0x99, 0xde, 0xfb, 0xad,
+ 0x2d, 0x88, 0x3d, 0x5e, 0x80, 0xd9, 0xfb, 0x77, 0x25, 0x6d, 0x36, 0x88, 0xaf, 0x1e, 0xf2, 0xe3,
+ 0xdb, 0x35, 0x02, 0x94, 0xf4, 0x3d, 0x72, 0xeb, 0x6c, 0xf6, 0x8e, 0x78, 0x0c, 0x22, 0xf2, 0x96,
+ 0x3c, 0x41, 0x8e, 0x11, 0xa0, 0x4c, 0x3e, 0x9b, 0x04, 0x55, 0x55, 0xcf, 0x88, 0x44, 0x23, 0xc0,
+ 0xbd, 0xe6, 0x40, 0x9b, 0x3b, 0xa0, 0x8f, 0xc8, 0x7a, 0xd1, 0xae, 0x36, 0x74, 0x6d, 0xba, 0x60,
+ 0x29, 0xbe, 0x64, 0x10, 0xed, 0x7c, 0xd8, 0x01, 0x4f, 0xcc, 0x33, 0x8c, 0x88, 0xd2, 0x26, 0x09,
+ 0xe2, 0xd2, 0x44, 0x33, 0xc8, 0x01, 0x72, 0x44, 0x19, 0x7f, 0x3a, 0xde, 0xd3, 0x8b, 0xe6, 0x9f,
+ 0xcf, 0xff, 0xe1, 0xde, 0x70, 0x47, 0xda, 0xdc, 0xcc, 0x68, 0x9e, 0xf4, 0xaf, 0xe7, 0x08, 0x50,
+ 0xb8, 0x6d, 0xf2, 0x53, 0x37, 0x53, 0xf1, 0x0a, 0x57, 0x2c, 0x97, 0x21, 0x10, 0x08, 0x04, 0x57,
+ 0xa6, 0xa6, 0xba, 0xeb, 0xab, 0xab, 0x10, 0x9b, 0x9e, 0x86, 0x85, 0x60, 0xf0, 0xc5, 0xa5, 0x6d,
+ 0x1d, 0x0d, 0xef, 0x8d, 0x8c, 0x5c, 0xfe, 0x7a, 0x5f, 0xd9, 0x3b, 0xb2, 0x0a, 0x27, 0x12, 0x09,
+ 0x1f, 0x32, 0xa1, 0xe7, 0x13, 0xcf, 0x1f, 0x7e, 0xf6, 0x7a, 0x81, 0xf2, 0x4a, 0x10, 0xe6, 0xcc,
+ 0xf3, 0x53, 0x6e, 0xdb, 0x16, 0xe1, 0xe1, 0x3b, 0xc9, 0x64, 0xf2, 0x44, 0x92, 0xa4, 0x5f, 0x7a,
+ 0xd6, 0x45, 0xb1, 0xbf, 0x21, 0x8a, 0x40, 0x91, 0x25, 0xa9, 0x65, 0x9e, 0x53, 0x68, 0xce, 0x89,
+ 0x68, 0x42, 0x96, 0xe5, 0x56, 0xb7, 0xdb, 0x05, 0xa7, 0x88, 0xa2, 0xd8, 0xbe, 0x5a, 0x91, 0xbe,
+ 0x82, 0xac, 0x6a, 0x65, 0xf1, 0xe5, 0xe2, 0x43, 0x14, 0xfd, 0xa6, 0xc1, 0x50, 0x28, 0x04, 0x7e,
+ 0xbf, 0x9f, 0x49, 0x38, 0x1c, 0xfe, 0x2f, 0x32, 0x57, 0x90, 0x15, 0xde, 0xbc, 0x17, 0xd6, 0x94,
+ 0xb5, 0x7f, 0xc1, 0x46, 0xa3, 0x01, 0xf5, 0x7a, 0x9d, 0x49, 0xb3, 0xd9, 0x34, 0x88, 0x76, 0xed,
+ 0xd4, 0x89, 0x5e, 0x14, 0x8d, 0x46, 0x41, 0x10, 0x04, 0x26, 0xa9, 0x54, 0xca, 0x20, 0x32, 0x54,
+ 0x90, 0x55, 0xad, 0xf0, 0x79, 0xbe, 0x85, 0xa2, 0x3e, 0x0d, 0x56, 0x2a, 0x15, 0x28, 0x97, 0xcb,
+ 0x4c, 0x6a, 0xb5, 0xda, 0xf9, 0x96, 0xa1, 0x58, 0x2c, 0x42, 0x26, 0x93, 0x61, 0x92, 0xcb, 0xe5,
+ 0xa0, 0xd3, 0xe9, 0x0c, 0x2f, 0x2a, 0x95, 0x4a, 0xa0, 0x28, 0x0a, 0x93, 0x42, 0xa1, 0x70, 0xbe,
+ 0x3f, 0xa2, 0x57, 0x62, 0xe7, 0xea, 0xaa, 0xd5, 0x2a, 0x53, 0xf4, 0x45, 0x27, 0x1a, 0x33, 0x8b,
+ 0xe2, 0xf1, 0xb8, 0xad, 0x65, 0xa0, 0x4b, 0xc3, 0x12, 0xcd, 0x21, 0x7b, 0xc8, 0xb2, 0xae, 0xe7,
+ 0x2e, 0xbe, 0x19, 0x06, 0x41, 0x45, 0xd9, 0x6c, 0xb6, 0x4d, 0xdf, 0x90, 0x53, 0xd2, 0xe9, 0x74,
+ 0xc7, 0x89, 0x88, 0xc7, 0x77, 0x71, 0x8c, 0x05, 0xd9, 0x73, 0x0a, 0xe6, 0x9a, 0x7f, 0x01, 0x31,
+ 0x67, 0x9a, 0xae, 0x6b, 0x45, 0x2e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
+ 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE list_nets_xpm[1] = {{ png, sizeof( png ), "list_nets_xpm" }};
+
+//EOF

common/basicframe.cpp

@@ -551,7 +551,7 @@ static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE()
     " (release,"
 #endif
     __WX_BO_UNICODE __ABI_VERSION __BO_COMPILER __WX_BO_STL
-    __WX_BO_WXWIN_COMPAT_2_4 __WX_BO_WXWIN_COMPAT_2_6 ")"
+    __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 ")"
     ;
 }
 
@@ -572,9 +572,9 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent&  event )
     tmp = wxT( "Application: " ) + Pgm().App().GetAppName() + wxT( "\n" );
     tmp << wxT( "Version: " ) << GetBuildVersion()
 #ifdef DEBUG
-        << wxT( " Debug" )
+        << wxT( " debug" )
 #else
-        << wxT( " Release" )
+        << wxT( " release" )
 #endif
         << wxT( " build\n" );
     tmp << wxT( "wxWidgets: Version " ) << FROM_UTF8( wxVERSION_NUM_DOT_STRING )
@@ -632,7 +632,7 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent&  event )
     tmp << wxT( "OFF\n" );
 #endif
 
-    wxMessageBox( tmp, _("Version Information (copied to the clipboard)") );
+    wxMessageBox( tmp, _( "Version Information (copied to the clipboard)" ) );
 
     wxTheClipboard->SetData( new wxTextDataObject( tmp ) );
     wxTheClipboard->Close();

common/dialog_about/AboutDialog_main.cpp

@@ -26,6 +26,7 @@
 #include <aboutinfo.h>
 #include <wx/aboutdlg.h>
 #include <wx/textctrl.h>
+#include <boost/version.hpp>
 
 
 /* Used icons:
@@ -50,7 +51,7 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
 
 
 /**
- * Initializes the <code>AboutAppInfo</code> object with applicaion specific information.
+ * Initializes the <code>AboutAppInfo</code> object with application specific information.
  *
  * This the object which holds all information about the application
  */
@@ -79,7 +80,14 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
 
     /* KiCad build version */
     wxString version;
-    version << wxT( "Build: " ) << GetBuildVersion();
+    version << wxT( "Version: " ) << GetBuildVersion()
+#ifdef DEBUG
+            << wxT( ", debug" )
+#else
+            << wxT( ", release" )
+#endif
+            << wxT( " build" );
+
     info.SetBuildVersion( version );
 
     /* wxWidgets version */
@@ -90,46 +98,25 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
         << wxMINOR_VERSION << wxT( "." )
         << wxRELEASE_NUMBER
 
-    /* Unicode or Ansi version */
+    /* Unicode or ANSI version */
 #if wxUSE_UNICODE
         << wxT( " Unicode " );
 #else
-        << wxT( " Ansi " );
+        << wxT( " ANSI " );
 #endif
 
-    libVersion << wxT( "and boost C++ libraries" );
-
-    libVersion << wxT( "\n" );
-
-    /* Operating System Information */
-
-#if defined __WIN64__
-    libVersion << wxT( "on 64 Bits Windows" );
+    // Just in case someone builds KiCad with the platform native of Boost instead of
+    // the version included with the KiCad source.
+    libVersion << wxT( "and Boost " ) << ( BOOST_VERSION / 100000 ) << wxT( "." )
+               << ( BOOST_VERSION / 100 % 1000 ) << wxT( "." ) << ( BOOST_VERSION % 100 )
+               << wxT( "\n" );
 
-#   elif defined __WINDOWS__
-    libVersion << wxT( "on 32 Bits Windows" );
+    // Operating System Information
 
-    /* Check for wxMAC */
-#   elif defined __WXMAC__
-    libVersion << wxT( "on Macintosh" );
+    wxPlatformInfo platformInfo;
 
-    /* Linux 64 bits */
-#   elif defined _LP64 && __LINUX__
-    libVersion << wxT( "on 64 Bits GNU/Linux" );
-
-    /* Linux 32 bits */
-#   elif defined __LINUX__
-    libVersion << wxT( "on 32 Bits GNU/Linux" );
-
-    /* OpenBSD */
-#   elif defined __OpenBSD__
-    libVersion << wxT( "on OpenBSD" );
-
-    /* FreeBSD */
-#   elif defined __FreeBSD__
-    libVersion << wxT( "on FreeBSD" );
-
-#endif
+    libVersion << wxT( "Platform: " ) << wxGetOsDescription() << wxT( ", " )
+               << platformInfo.GetArchName();
 
     info.SetLibVersion( libVersion );
 
@@ -153,7 +140,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
     description << wxT( "<p>" );
     description << wxT( "<b><u>" ) << _( "KiCad on the web" ) << wxT( "</u></b>" ); // bold & underlined font for caption
 
-    // bulletet list with some http links
+    // bullet-ed list with some http links
     description << wxT( "<ul>" );
     description << wxT( "<li>" ) << HtmlHyperlink( wxT(
                                                       "http://iut-tice.ujf-grenoble.fr/kicad" ),
@@ -175,7 +162,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
     description << wxT( "<p>" );
     description << wxT( "<b><u>" ) << _( "Contribute to KiCad" ) << wxT( "</u></b>" ); // bold & underlined font caption
 
-    // bulletet list with some http links
+    // bullet-ed list with some http links
     description << wxT( "<ul>" );
     description << wxT( "<li>" ) <<
     HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),

include/bitmaps.h

@@ -305,6 +305,7 @@ EXTERN_BITMAP( library_xpm )
 EXTERN_BITMAP( library_table_xpm )
 EXTERN_BITMAP( libview_xpm )
 EXTERN_BITMAP( lines90_xpm )
+EXTERN_BITMAP( list_nets_xpm )
 EXTERN_BITMAP( load_module_board_xpm )
 EXTERN_BITMAP( load_module_lib_xpm )
 EXTERN_BITMAP( local_ratsnest_xpm )

pcb_calculator/dialogs/pcb_calculator_frame_base.cpp

@@ -707,7 +707,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
 	m_SubsPrm7_choiceUnit->SetSelection( 0 );
 	fgSizerSubstPrms->Add( m_SubsPrm7_choiceUnit, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
 	
-	m_substrate_prm8_label = new wxStaticText( m_panelTransline, wxID_ANY, _("Mur"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_substrate_prm8_label = new wxStaticText( m_panelTransline, wxID_ANY, _("mu Rel"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_substrate_prm8_label->Wrap( -1 );
 	fgSizerSubstPrms->Add( m_substrate_prm8_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 );
 	
@@ -720,7 +720,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
 	m_SubsPrm8_choiceUnit->SetSelection( 0 );
 	fgSizerSubstPrms->Add( m_SubsPrm8_choiceUnit, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 	
-	m_substrate_prm9_label = new wxStaticText( m_panelTransline, wxID_ANY, _("MurC"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_substrate_prm9_label = new wxStaticText( m_panelTransline, wxID_ANY, _("mu Rel C"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_substrate_prm9_label->Wrap( -1 );
 	fgSizerSubstPrms->Add( m_substrate_prm9_label, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 	

pcb_calculator/dialogs/pcb_calculator_frame_base.fbp

@@ -10426,7 +10426,7 @@
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">wxID_ANY</property>
-                                                                    <property name="label">Mur</property>
+                                                                    <property name="label">mu Rel</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
@@ -10688,7 +10688,7 @@
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <property name="id">wxID_ANY</property>
-                                                                    <property name="label">MurC</property>
+                                                                    <property name="label">mu Rel C</property>
                                                                     <property name="max_size"></property>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>

pcb_calculator/transline_ident.cpp

@@ -171,10 +171,10 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM,
                                    _( "Rough" ), _( "Conductor Roughness" ), 0.0, true ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM,
-                                   _( "Mur" ),
-                                   _( "Relative Permeability of Substrate" ), 1, false ) );
+                                   _( "mu Rel S" ),
+                                   _( "Relative Permeability (mu) of Substrate" ), 1, false ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
@@ -204,7 +204,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
                                    _( "T" ), _( "Strip Thickness" ), 0.035, true ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
@@ -236,7 +236,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
                                    _( "T" ), _( "Strip Thickness" ), 0.035, true ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
@@ -267,11 +267,11 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         m_Messages.Add( _( "TM-Modes" ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM,
-                                   _( "Mur" ), _( "Relative Permeability of Insulator" ), 1, false ) );
+                                   _( "mu Rel I" ), _( "Relative Permeability (mu) of Insulator" ), 1, false ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TANM_PRM,
                                    _( "TanM" ), _( "Magnetic Loss Tangent" ), 0, false ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
@@ -300,9 +300,9 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         m_Messages.Add( _( "TM-Modes" ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM,
-                                   _( "Mur" ), _( "Relative Permeability of Insulator" ), 1, false ) );
+                                   _( "mu Rel I" ), _( "Relative Permeability (mu) of Insulator" ), 1, false ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_IN_PRM,
@@ -341,7 +341,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM,
                                    _( "Rough" ), _( "Conductor Roughness" ), 0.0, true ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
@@ -376,7 +376,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
                                    _( "T" ), _( "Strip Thickness" ), 0.035, true ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
 
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
@@ -404,7 +404,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_TWIST_PRM,
                                    _( "Twists" ), _( "Number of Twists per Length" ), 0.0, false ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
-                                   _( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
+                                   _( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
                                    false ) );
         AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_EPSILONR_ENV_PRM,
                                    _( "ErEnv" ), _( "Relative Permittivity of Environment" ), 1,

pcbnew/menubar_pcbframe.cpp

@@ -351,7 +351,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
 
     AddMenuItem( viewMenu, ID_MENU_LIST_NETS,
                  _( "&List Nets" ), _( "View a list of nets with names and id's" ),
-                 KiBitmap( tools_xpm ) );
+                 KiBitmap( list_nets_xpm ) );
 
     viewMenu->AppendSeparator();
 

pcbnew/onrightclick.cpp

@@ -60,8 +60,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
                                     // to display menus relative to tracks twice
     bool        blockActive  = !GetScreen()->m_BlockLocate.IsIdle();
 
-    wxClientDC  dc( m_canvas );
-
     BOARD_ITEM* item = GetCurItem();
 
     m_canvas->SetCanStartBlock( -1 );    // Avoid to start a block command when clicking on menu
@@ -76,8 +74,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
         return true;
     }
 
-    m_canvas->CrossHairOff( &dc );
-
     if( GetToolId() != ID_NO_TOOL_SELECTED )
     {
         if( item && item->GetFlags() )
@@ -130,7 +126,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
 
             if( m_canvas->GetAbortRequest() )
             {
-                m_canvas->CrossHairOn( &dc );
                 return false;
             }
         }
@@ -489,7 +484,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
         break;
     }
 
-    m_canvas->CrossHairOn( &dc );
     return true;
 }
 

pcbnew/router/pns_line.cpp

@@ -233,8 +233,6 @@ bool PNS_LINE::Walkaround( SHAPE_LINE_CHAIN aObstacle, SHAPE_LINE_CHAIN& aPre,
     aWalk.SetClosed( false );
     aWalk.Append( nearest.p );
 
-    int i = nearest.their.Index();
-
     assert( nearest.their.Index() >= 0 );
     assert( farthest.their.Index() >= 0 );
 
@@ -246,7 +244,7 @@ bool PNS_LINE::Walkaround( SHAPE_LINE_CHAIN aObstacle, SHAPE_LINE_CHAIN& aPre,
     int i_first = aObstacle.Find( nearest.p );
     int i_last = aObstacle.Find( farthest.p );
 
-    i = i_first;
+    int i = i_first;
 
     while( i != i_last )
     {

pcbnew/zones_by_polygon.cpp

@@ -123,6 +123,16 @@ void PCB_EDIT_FRAME::duplicateZone( wxDC* aDC, ZONE_CONTAINER* aZone )
     else
         success = InvokeNonCopperZonesEditor( this, aZone, &zoneSettings );
 
+    // If the new zone is on the same layer as the the initial zone,
+    // do nothing
+    if( success && ( aZone->GetLayer() == zoneSettings.m_CurrentZone_Layer ) )
+    {
+        DisplayError( this,
+            _( "The duplicated zone is on the same layer as the initial zone, which has no sense.\n"
+               "Please, chose an other layer for the new zone") );
+        success = false;
+    }
+
     if( success )
     {
         zoneSettings.ExportSetting( *newZone );
@@ -148,7 +158,8 @@ void PCB_EDIT_FRAME::duplicateZone( wxDC* aDC, ZONE_CONTAINER* aZone )
         if( GetBoard()->GetAreaIndex( newZone ) >= 0
            && GetBoard()->Test_Drc_Areas_Outlines_To_Areas_Outlines( newZone, true ) )
         {
-            DisplayError( this, _( "Duplicate Zone: The outline of the duplicated zone fails DRC check!" ) );
+            DisplayError( this,
+                _( "The outline of the duplicated zone fails DRC check!" ) );
         }
 
         UpdateCopyOfZonesList( s_PickedList, s_AuxiliaryList, GetBoard() );

pcbnew/zones_functions_for_undo_redo.cpp

@@ -257,9 +257,13 @@ void UpdateCopyOfZonesList( PICKED_ITEMS_LIST& aPickList,
                     }
                 }
 
-                wxASSERT_MSG( notfound != true,
-                              wxT( "UpdateCopyOfZonesList() error: item not found in "
-                                   "aAuxiliaryList" ) );
+                if( notfound )  // happens when the new zone overlaps an existing zone
+                                // and these zones are combined
+                {
+                    DBG( printf(
+                        "UpdateCopyOfZonesList(): item not found in aAuxiliaryList,"
+                        "combined with an other zone\n" ) );
+                }
                 break;
             }