All: change some texts and messages hard to translate, or not translatable...

All: change some texts and messages hard to translate, or not translatable (and some incorrect messages).
Pcbnew, layer manager: add option (popup menu) to always keep copper layers not visible but the active layer, even when the active layer is changed.
Usefull for multilayer ( more than 4 layers) PCBs.

3d-viewer/3d_toolbar.cpp

@@ -105,16 +105,16 @@ void EDA_3D_FRAME::ReCreateHToolbar()
 
     m_HToolBar->AddSeparator();
     m_HToolBar->AddTool( ID_MOVE3D_LEFT, wxEmptyString, KiBitmap( left_xpm ),
-                         _( "Move left <-" ) );
+                         _( "Move left" ) );
 
     m_HToolBar->AddTool( ID_MOVE3D_RIGHT, wxEmptyString, KiBitmap( right_xpm ),
-                         _( "Move right ->" ) );
+                         _( "Move right" ) );
 
     m_HToolBar->AddTool( ID_MOVE3D_UP, wxEmptyString, KiBitmap( up_xpm ),
-                         _( "Move up ^" ) );
+                         _( "Move up" ) );
 
     m_HToolBar->AddTool( ID_MOVE3D_DOWN, wxEmptyString, KiBitmap( down_xpm ),
-                         _( "Move down v" ) );
+                         _( "Move down" ) );
 
     m_HToolBar->AddSeparator();
     m_HToolBar->AddTool( ID_ORTHO, wxEmptyString, KiBitmap( ortho_xpm ),

common/basicframe.cpp

 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
- * Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
- * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 1992-2011 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
+ * Copyright (C) 20131 Wayne Stambaugh <stambaughw@verizon.net>
+ * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -289,7 +289,7 @@ wxString EDA_BASE_FRAME::GetFileFromHistory( int cmdId, const wxString& type,
 
         if( !wxFileName::FileExists( fn ) )
         {
-            msg = type + _( " file <" ) + fn + _( "> was not found." );
+            msg.Printf( wxT( "file <%s> was not found." ), GetChars( fn ) );
             wxMessageBox( msg );
             fileHistory->RemoveFileFromHistory( i );
             fn = wxEmptyString;

eeschema/dialogs/dialog_plot_schematic_base.cpp

@@ -44,7 +44,7 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
 	m_plotOriginOpt->SetSelection( 0 );
 	m_paperHPGLSizer->Add( m_plotOriginOpt, 0, wxALL, 5 );
 	
-	m_penHPLGWidthTitle = new wxStaticText( this, wxID_ANY, _("Pen Width:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_penHPLGWidthTitle = new wxStaticText( this, wxID_ANY, _("Pen width"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_penHPLGWidthTitle->Wrap( -1 );
 	m_paperHPGLSizer->Add( m_penHPLGWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
@@ -67,7 +67,7 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
 	wxStaticBoxSizer* sbSizerPlotFormat;
 	sbSizerPlotFormat = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General Options") ), wxVERTICAL );
 	
-	m_defaultLineWidthTitle = new wxStaticText( this, wxID_ANY, _("Default Line Thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_defaultLineWidthTitle = new wxStaticText( this, wxID_ANY, _("Default line thickness"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_defaultLineWidthTitle->Wrap( -1 );
 	sbSizerPlotFormat->Add( m_defaultLineWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	

eeschema/dialogs/dialog_plot_schematic_base.fbp

@@ -45,7 +45,7 @@
             <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
-            <property name="title">Plot</property>
+            <property name="title">Plot Schematic</property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
@@ -507,7 +507,7 @@
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">Pen Width:</property>
+                                                <property name="label">Pen width</property>
                                                 <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
                                                 <property name="maximum_size"></property>
@@ -787,7 +787,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Default Line Thickness:</property>
+                                        <property name="label">Default line thickness</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>

eeschema/dialogs/dialog_plot_schematic_base.h

@@ -77,7 +77,7 @@ class DIALOG_PLOT_SCHEMATIC_BASE : public DIALOG_SHIM
 	
 	public:
 		
-		DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
 		~DIALOG_PLOT_SCHEMATIC_BASE();
 	
 };

include/convert_to_biu.h

@@ -20,9 +20,9 @@
 #if defined(PCBNEW) || defined(CVPCB) || defined(GERBVIEW)
  #if defined( USE_PCBNEW_NANOMETRES )
   #if defined(GERBVIEW)
-   #define IU_PER_MM        1e5     // Gerbview uses 10 micrometer.
+   #define IU_PER_MM        1e5     // Gerbview IU is 10 nanometers.
   #else
-   #define IU_PER_MM        1e6     // Pcbnew uses nanometers.
+   #define IU_PER_MM        1e6     // Pcbnew IU is 1 nanometer.
   #endif
   #define IU_PER_MILS       (IU_PER_MM * 0.0254)
   #define IU_PER_DECIMILS   (IU_PER_MM * 0.00254)

pcbnew/class_pcb_layer_widget.cpp

@@ -78,6 +78,7 @@ PCB_LAYER_WIDGET::PCB_LAYER_WIDGET( PCB_EDIT_FRAME* aParent, wxWindow* aFocusOwn
     LAYER_WIDGET( aParent, aFocusOwner, aPointSize ),
     myframe( aParent )
 {
+    m_alwaysShowActiveCopperLayer = false;
     ReFillRender();
 
     // Update default tabs labels for GerbView
@@ -90,7 +91,7 @@ PCB_LAYER_WIDGET::PCB_LAYER_WIDGET( PCB_EDIT_FRAME* aParent, wxWindow* aFocusOwn
 
     // since Popupmenu() calls this->ProcessEvent() we must call this->Connect()
     // and not m_LayerScrolledWindow->Connect()
-    Connect( ID_SHOW_ALL_COPPERS, ID_SHOW_NO_COPPERS_BUT_ACTIVE, wxEVT_COMMAND_MENU_SELECTED,
+    Connect( ID_SHOW_ALL_COPPERS, ID_ALWAYS_SHOW_NO_COPPERS_BUT_ACTIVE, wxEVT_COMMAND_MENU_SELECTED,
         wxCommandEventHandler( PCB_LAYER_WIDGET::onPopupSelection ), NULL, this );
 
     // install the right click handler into each control at end of ReFill()
@@ -120,9 +121,14 @@ void PCB_LAYER_WIDGET::onRightDownLayers( wxMouseEvent& event )
 
     // menu text is capitalized:
     // http://library.gnome.org/devel/hig-book/2.20/design-text-labels.html.en#layout-capitalization
-    menu.Append( new wxMenuItem( &menu, ID_SHOW_ALL_COPPERS, _( "Show All Copper Layers" ) ) );
-    menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS_BUT_ACTIVE,  _( "Hide All Copper Layers But Active" ) ) );
-    menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS,  _( "Hide All Copper Layers" ) ) );
+    menu.Append( new wxMenuItem( &menu, ID_SHOW_ALL_COPPERS,
+                                 _( "Show All Copper Layers" ) ) );
+    menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS_BUT_ACTIVE,
+                                 _( "Hide All Copper Layers But Active" ) ) );
+    menu.Append( new wxMenuItem( &menu, ID_ALWAYS_SHOW_NO_COPPERS_BUT_ACTIVE,
+                                 _( "Always Hide All Copper Layers But Active" ) ) );
+    menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS,
+                                 _( "Hide All Copper Layers" ) ) );
 
     PopupMenu( &menu );
 
@@ -135,20 +141,22 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
     int     rowCount;
     int     menuId = event.GetId();
     bool    visible;
+    bool    force_active_layer_visible;
 
     switch( menuId )
     {
     case ID_SHOW_ALL_COPPERS:
-        visible = true;
-        goto L_change_coppers;
-
+    case ID_ALWAYS_SHOW_NO_COPPERS_BUT_ACTIVE:
     case ID_SHOW_NO_COPPERS_BUT_ACTIVE:
     case ID_SHOW_NO_COPPERS:
-        visible = false;
-    L_change_coppers:
+        visible = menuId == ID_SHOW_ALL_COPPERS;
+        m_alwaysShowActiveCopperLayer = ( menuId == ID_ALWAYS_SHOW_NO_COPPERS_BUT_ACTIVE );
+        force_active_layer_visible = ( menuId == ID_SHOW_NO_COPPERS_BUT_ACTIVE ||
+                                       menuId == ID_ALWAYS_SHOW_NO_COPPERS_BUT_ACTIVE );
+        // Search the last copper layer row index:
         int lastCu = -1;
         rowCount = GetLayerRowCount();
-        for( int row=rowCount-1;  row>=0;  --row )
+        for( int row = rowCount-1; row>=0; --row )
         {
             wxCheckBox* cb = (wxCheckBox*) getLayerComp( row, 3 );
             LAYER_NUM layer = getDecodedId( cb->GetId() );
@@ -159,6 +167,7 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
             }
         }
 
+        // Enbale/disable the copper layers visibility:
         for( int row=0;  row<rowCount;  ++row )
         {
             wxCheckBox* cb = (wxCheckBox*) getLayerComp( row, 3 );
@@ -167,14 +176,12 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
             if( IsValidCopperLayerIndex( layer ) )
             {
                 bool loc_visible = visible;
-                if( (menuId == ID_SHOW_NO_COPPERS_BUT_ACTIVE ) &&
-                    (layer == myframe->getActiveLayer() ) )
+                if( force_active_layer_visible && (layer == myframe->getActiveLayer() ) )
                     loc_visible = true;
 
                 cb->SetValue( loc_visible );
 
                 bool isLastCopperLayer = (row==lastCu);
-
                 OnLayerVisible( layer, loc_visible, isLastCopperLayer );
 
                 if( isLastCopperLayer )
@@ -338,12 +345,27 @@ bool PCB_LAYER_WIDGET::OnLayerSelect( LAYER_NUM aLayer )
     // false from this function.
     myframe->setActiveLayer( aLayer, false );
 
-    if(DisplayOpt.ContrastModeDisplay)
+    if( m_alwaysShowActiveCopperLayer )
+        OnLayerSelected();
+    else if(DisplayOpt.ContrastModeDisplay)
         myframe->GetCanvas()->Refresh();
 
     return true;
 }
 
+void PCB_LAYER_WIDGET::OnLayerSelected()
+{
+    if( !m_alwaysShowActiveCopperLayer )
+        return;
+
+    // postprocess after an active layer selection
+    // ensure active layer visible
+    wxCommandEvent event;
+    event.SetId( ID_ALWAYS_SHOW_NO_COPPERS_BUT_ACTIVE );
+    onPopupSelection( event );
+}
+
+
 
 void PCB_LAYER_WIDGET::OnLayerVisible( LAYER_NUM aLayer, bool isVisible, bool isFinal )
 {
@@ -371,29 +393,7 @@ void PCB_LAYER_WIDGET::OnRenderColorChange( int aId, EDA_COLOR_T aColor )
 void PCB_LAYER_WIDGET::OnRenderEnable( int aId, bool isEnabled )
 {
     BOARD*  brd = myframe->GetBoard();
-
-    /* @todo:
-
-        move:
-
-        GRID_VISIBLE,   ? maybe not this one
-        into m_VisibleElements and get rid of globals.
-   */
-
-    switch( aId )
-    {
-        // see todo above, don't really want anything except IsElementVisible() here.
-
-    case GRID_VISIBLE:
-        // @todo, make read/write accessors for grid control so the write accessor can fire updates to
-        // grid state listeners.  I think the grid state should be kept in the BOARD.
-        brd->SetElementVisibility( aId, isEnabled );    // set visibilty flag also in list, and myframe->m_Draw_Grid
-        break;
-
-    default:
     brd->SetElementVisibility( aId, isEnabled );
-    }
-
     myframe->GetCanvas()->Refresh();
 }
 

pcbnew/class_pcb_layer_widget.h

@@ -89,10 +89,16 @@ public:
     void OnRenderEnable( int aId, bool isEnabled );
     //-----</implement LAYER_WIDGET abstract callback functions>----------
 
+    void OnLayerSelected();     // postprocess after an active layer selection
+                                // ensure active layer visible if
+                                // m_alwaysShowActiveCopperLayer is true;
+
 
 protected:
 
     static const LAYER_WIDGET::ROW  s_render_rows[];
+    bool m_alwaysShowActiveCopperLayer;         // If true: Only shows the current active layer
+                                                // even if it is changed
 
     PCB_EDIT_FRAME*    myframe;
 
@@ -100,6 +106,7 @@ protected:
 #define ID_SHOW_ALL_COPPERS                     wxID_HIGHEST
 #define ID_SHOW_NO_COPPERS                      (wxID_HIGHEST+1)
 #define ID_SHOW_NO_COPPERS_BUT_ACTIVE           (wxID_HIGHEST+2)
+#define ID_ALWAYS_SHOW_NO_COPPERS_BUT_ACTIVE    (wxID_HIGHEST+3)
 
     /**
      * Function OnRightDownLayers

pcbnew/dialogs/dialog_fp_lib_table_base.cpp

@@ -108,7 +108,7 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
 	bSizer51 = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_append_button = new wxButton( m_top, wxID_ANY, _("Append Row"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_append_button->SetToolTip( _("Add a pcb library row to this table") );
+	m_append_button->SetToolTip( _("Add a PCB library row to this table") );
 	
 	bSizer51->Add( m_append_button, 0, wxALL, 5 );
 	

pcbnew/dialogs/dialog_fp_lib_table_base.fbp

@@ -874,7 +874,7 @@
                                                     <property name="style"></property>
                                                     <property name="subclass"></property>
                                                     <property name="toolbar_pane">0</property>
-                                                    <property name="tooltip">Add a pcb library row to this table</property>
+                                                    <property name="tooltip">Add a PCB library row to this table</property>
                                                     <property name="validator_data_type"></property>
                                                     <property name="validator_style">wxFILTER_NONE</property>
                                                     <property name="validator_type">wxDefaultValidator</property>

pcbnew/dialogs/dialog_gendrill.cpp

@@ -523,7 +523,7 @@ void DIALOG_GENDRILL::OnGenReportFile( wxCommandEvent& event )
     }
     else
     {
-        msg.Printf( _( "Create report file %s\n" ), GetChars( dlg.GetPath() ) );
+        msg.Printf( _( "Report file %s created\n" ), GetChars( dlg.GetPath() ) );
         m_messagesBox->AppendText( msg );
     }
 }

pcbnew/files.cpp

@@ -161,8 +161,9 @@ bool PCB_EDIT_FRAME::LoadOnePcbFile( const wxString& aFileName, bool aAppend,
 {
     if( GetScreen()->IsModify() && !aAppend )
     {
-        if( !IsOK( this, _( "The current board has been modified.  Do you wish to discard \
-the changes?" ) ) )
+        if( !IsOK( this,
+                   _( "The current board has been modified.\n"
+                      "Do you wish to discard the changes?" ) ) )
             return false;
     }
 

pcbnew/gpcb_plugin.cpp

@@ -924,7 +924,7 @@ bool GPCB_PLUGIN::FootprintLibDelete( const wxString& aLibraryPath, PROPERTIES*
 
             if( tmp.GetExt() != KiCadFootprintFileExtension )
             {
-                THROW_IO_ERROR( wxString::Format( _( "unexpected file '%s' has found in library path '%s'" ),
+                THROW_IO_ERROR( wxString::Format( _( "unexpected file '%s' was found in library path '%s'" ),
                                                   files[i].GetData(), aLibraryPath.GetData() ) );
             }
         }

pcbnew/kicad_plugin.cpp

@@ -1758,7 +1758,7 @@ bool PCB_IO::FootprintLibDelete( const wxString& aLibraryPath, PROPERTIES* aProp
 
             if( tmp.GetExt() != KiCadFootprintFileExtension )
             {
-                THROW_IO_ERROR( wxString::Format( _( "unexpected file '%s' has found in library path '%s'" ),
+                THROW_IO_ERROR( wxString::Format( _( "unexpected file '%s' was found in library path '%s'" ),
                                                   files[i].GetData(), aLibraryPath.GetData() ) );
             }
         }

pcbnew/menubar_modedit.cpp

@@ -102,8 +102,8 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
 
     // Save the currently loaded legacy library as an s-expression library.
     AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBRARY_AS,
-                 _( "Save Current Library as Other" ),
-                 _( "Save entire current library as new library." ),
+                 _( "Save Current Library as ..." ),
+                 _( "Save entire current library under a new name." ),
                  wxNullBitmap );
 
     // Save module

pcbnew/pcbframe.cpp

@@ -679,6 +679,7 @@ bool PCB_EDIT_FRAME::IsMicroViaAcceptable( void )
 void PCB_EDIT_FRAME::syncLayerWidgetLayer()
 {
     m_Layers->SelectLayer( getActiveLayer() );
+    m_Layers->OnLayerSelected();
 }