added " pcbnew module editor toolbar items now in menubar" patch from Jerry...

added " pcbnew module editor toolbar items now in menubar" patch from Jerry Jacobs. Fixed TODO, and some issues.
Fixed some minor translation issues (different help texts for the same command in tools and menus).
minor code cleaning.
fixed minor warnings in debug mode.

eeschema/dialog_edit_component_in_lib_base.cpp

@@ -107,7 +107,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	m_PanelBasic->SetSizer( bSizerBasicPanel );
 	m_PanelBasic->Layout();
 	bSizerBasicPanel->Fit( m_PanelBasic );
-	m_NoteBook->AddPage( m_PanelBasic, _("Options"), true );
+	m_NoteBook->AddPage( m_PanelBasic, _("Options"), false );
 	m_PanelDoc = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
 	wxBoxSizer* m_PanelDocBoxSizer;
 	m_PanelDocBoxSizer = new wxBoxSizer( wxVERTICAL );
@@ -123,7 +123,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	
 	m_staticTextKeywords = new wxStaticText( m_PanelDoc, wxID_ANY, _("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextKeywords->Wrap( -1 );
-	m_staticTextKeywords->SetToolTip( _("Enter keys words that can be used to select this composant\nkeys words cannot have spaces and are separated by a space") );
+	m_staticTextKeywords->SetToolTip( _("Enter keys words that can be used to select this composant.\nKey words cannot have spaces and are separated by a space.") );
 	
 	m_PanelDocBoxSizer->Add( m_staticTextKeywords, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
@@ -153,7 +153,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	m_PanelDoc->SetSizer( m_PanelDocBoxSizer );
 	m_PanelDoc->Layout();
 	m_PanelDocBoxSizer->Fit( m_PanelDoc );
-	m_NoteBook->AddPage( m_PanelDoc, _("Description"), false );
+	m_NoteBook->AddPage( m_PanelDoc, _("Description"), true );
 	m_PanelAlias = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizerMainPanelAlias;
 	bSizerMainPanelAlias = new wxBoxSizer( wxHORIZONTAL );

eeschema/dialog_edit_component_in_lib_base.fbp

@@ -128,7 +128,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Options</property>
-                            <property name="select">1</property>
+                            <property name="select">0</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
@@ -851,7 +851,7 @@
                         <object class="notebookpage" expanded="1">
                             <property name="bitmap"></property>
                             <property name="label">Description</property>
-                            <property name="select">0</property>
+                            <property name="select">1</property>
                             <object class="wxPanel" expanded="1">
                                 <property name="bg"></property>
                                 <property name="context_help"></property>
@@ -1026,7 +1026,7 @@
                                             <property name="size"></property>
                                             <property name="style"></property>
                                             <property name="subclass"></property>
-                                            <property name="tooltip">Enter keys words that can be used to select this composant&#x0A;keys words cannot have spaces and are separated by a space</property>
+                                            <property name="tooltip">Enter keys words that can be used to select this composant.&#x0A;Key words cannot have spaces and are separated by a space.</property>
                                             <property name="window_extra_style"></property>
                                             <property name="window_name"></property>
                                             <property name="window_style"></property>

eeschema/hotkeys.cpp

@@ -429,7 +429,7 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
         {
             if( m_ID_current_state != ID_NOCONN_BUTT )
                 SetToolID( ID_NOCONN_BUTT, wxCURSOR_PENCIL,
-                          _( "Add a no connected flag" ) );
+                          _( "Add \"NoNonnect\" Flags" ) );
             OnLeftClick( DC, MousePos );
         }
         break;

eeschema/menubar.cpp

@@ -144,6 +144,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     filesMenu->AppendSeparator();
     item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),
                           _( "Quit EESchema" ) );
+    item->SetBitmap( exit_xpm );
     filesMenu->Append( item );
 
 #endif /* !defined( __WXMAC__) */

eeschema/menubar_libedit.cpp

@@ -76,6 +76,7 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
     filesMenu->AppendSeparator();
     item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),
                            _( "Quit Library Editor" ) );
+    item->SetBitmap( exit_xpm );
     filesMenu->Append( item );
 #endif
 

gerbview/gerberframe.cpp

@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame )
     EVT_TOOL( wxID_COPY, WinEDA_GerberFrame::Process_Special_Functions )
     EVT_TOOL( wxID_PASTE, WinEDA_GerberFrame::Process_Special_Functions )
     EVT_TOOL( wxID_UNDO, WinEDA_GerberFrame::Process_Special_Functions )
-    EVT_TOOL( ID_GEN_PRINT, WinEDA_GerberFrame::ToPrinter )
+    EVT_TOOL( wxID_PRINT, WinEDA_GerberFrame::ToPrinter )
     EVT_TOOL( ID_FIND_ITEMS, WinEDA_GerberFrame::Process_Special_Functions )
     EVT_KICAD_CHOICEBOX( ID_TOOLBARH_GERBVIEW_SELECT_LAYER,
                          WinEDA_GerberFrame::Process_Special_Functions )

gerbview/tool_gerber.cpp

@@ -68,7 +68,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
 
     filesMenu->AppendSeparator();
 
-    filesMenu->Append( ID_GEN_PRINT, _( "P&rint" ), _( "Print gerber" ) );
+    filesMenu->Append( wxID_PRINT, _( "P&rint" ), _( "Print gerber" ) );
     filesMenu->Append( ID_GEN_PLOT, _( "Plot" ),
                        _( "Plotting in various formats" ) );
 
@@ -177,7 +177,7 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
                          _( "Undelete" ) );
 
     m_HToolBar->AddSeparator();
-    m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString,
+    m_HToolBar->AddTool( wxID_PRINT, wxEmptyString,
                          wxBitmap( print_button ),
                          _( "Print world" ) );
 

include/id.h

@@ -43,7 +43,6 @@ enum main_id
     ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
     ID_PREFERENCES_HOTKEY_END,
 
-    ID_GEN_PRINT,
     ID_GEN_PLOT,
     ID_GEN_PLOT_PS,
     ID_GEN_PLOT_HPGL,
@@ -52,7 +51,6 @@ enum main_id
     ID_GEN_PLOT_DXF,
     ID_GEN_COPY_SHEET_TO_CLIPBOARD,
     ID_GEN_COPY_BLOCK_TO_CLIPBOARD,
-    ID_GEN_UNUSED0,
 
     ID_GEN_EXPORT_FILE,
     ID_GEN_EXPORT_SPECCTRA,

include/wxPcbStruct.h

@@ -1073,6 +1073,8 @@ public:
     void         InstallOptionsFrame( const wxPoint& pos );
 
     void         OnCloseWindow( wxCloseEvent& Event );
+    void         CloseModuleEditor( wxCommandEvent& Event );
+
     void         Process_Special_Functions( wxCommandEvent& event );
     void         RedrawActiveWindow( wxDC* DC, bool EraseBg );
     void         ReCreateHToolbar();

pcbnew/dialog_pad_properties_base.cpp

@@ -40,7 +40,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
 	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Geometry:") ), wxVERTICAL );
 	
 	wxFlexGridSizer* fgSizerGeometry;
-	fgSizerGeometry = new wxFlexGridSizer( 9, 3, 0, 0 );
+	fgSizerGeometry = new wxFlexGridSizer( 12, 3, 0, 0 );
 	fgSizerGeometry->SetFlexibleDirection( wxBOTH );
 	fgSizerGeometry->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
@@ -230,7 +230,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind
 	sbClearancesSizer->Add( m_staticText20, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 	
 	wxFlexGridSizer* fgClearancesGridSizer;
-	fgClearancesGridSizer = new wxFlexGridSizer( 4, 3, 0, 0 );
+	fgClearancesGridSizer = new wxFlexGridSizer( 5, 3, 0, 0 );
 	fgClearancesGridSizer->SetFlexibleDirection( wxBOTH );
 	fgClearancesGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	

pcbnew/dialog_pad_properties_base.fbp

@@ -331,7 +331,7 @@
                                                 <property name="name">fgSizerGeometry</property>
                                                 <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                                 <property name="permission">none</property>
-                                                <property name="rows">9</property>
+                                                <property name="rows">12</property>
                                                 <property name="vgap">0</property>
                                                 <object class="sizeritem" expanded="1">
                                                     <property name="border">5</property>
@@ -2207,7 +2207,7 @@
                             <property name="border">5</property>
                             <property name="flag">wxEXPAND</property>
                             <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="0">
+                            <object class="wxBoxSizer" expanded="1">
                                 <property name="minimum_size"></property>
                                 <property name="name">bMiddleSizer</property>
                                 <property name="orient">wxVERTICAL</property>
@@ -2590,7 +2590,7 @@
                                                 <property name="name">fgClearancesGridSizer</property>
                                                 <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                                 <property name="permission">none</property>
-                                                <property name="rows">4</property>
+                                                <property name="rows">5</property>
                                                 <property name="vgap">0</property>
                                                 <object class="sizeritem" expanded="1">
                                                     <property name="border">5</property>

pcbnew/menubar_pcbframe.cpp

@@ -195,7 +195,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
     filesMenu->AppendSeparator();
 
     /* Print */
-    item = new wxMenuItem( filesMenu, ID_GEN_PRINT, _( "&Print" ),
+    item = new wxMenuItem( filesMenu, wxID_PRINT, _( "&Print" ),
                            _( "Print pcb board" ) );
     item->SetBitmap( print_button );
     filesMenu->Append( item );
@@ -237,6 +237,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
     filesMenu->AppendSeparator();
     item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),
                            _( "Quit PCBNew" ) );
+    item->SetBitmap( exit_xpm );
     filesMenu->Append( item );
 
 #endif /* !defined( __WXMAC__ ) */

pcbnew/modedit_onclick.cpp

@@ -135,6 +135,9 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
     case ID_MODEDIT_PLACE_ANCHOR:
     {
         MODULE* module = GetBoard()->m_Modules;
+        if( module == NULL    // No module loaded
+            || (module->m_Flags != 0) )
+            break;
         module->m_Flags = 0;
         SaveCopyInUndoList( module, UR_MODEDIT );
         Place_Ancre( module );      // set the new relatives internal
@@ -145,7 +148,7 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
         // Replace the module in position 0, to recalculate absolutes
         // coordinates of items
         module->SetPosition( wxPoint( 0, 0 ) );
-        SetToolID( 0, wxCURSOR_ARROW, wxEmptyString );
+        SetToolID( 0, 0, wxEmptyString );
         SetCurItem( NULL );
         DrawPanel->Refresh();
     }
@@ -159,6 +162,8 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
         break;
 
     case ID_PCB_ADD_TEXT_BUTT:
+        if( GetBoard()->m_Modules == NULL )
+            break;
         SaveCopyInUndoList( GetBoard()->m_Modules, UR_MODEDIT );
         CreateTextModule( GetBoard()->m_Modules, DC );
         break;
@@ -172,10 +177,9 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
         break;
 
     default:
-        DrawPanel->SetCursor( wxCURSOR_ARROW );
         DisplayError( this,
                       wxT( "WinEDA_ModuleEditFrame::ProcessCommand error" ) );
-        m_ID_current_state = 0;
+        SetToolID( 0, 0, wxEmptyString );
         break;
     }
 

pcbnew/pcbframe.cpp

@@ -166,7 +166,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
     EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions )
     EVT_TOOL( wxID_UNDO, WinEDA_PcbFrame::GetBoardFromUndoList )
     EVT_TOOL( wxID_REDO, WinEDA_PcbFrame::GetBoardFromRedoList )
-    EVT_TOOL( ID_GEN_PRINT, WinEDA_PcbFrame::ToPrinter )
+    EVT_TOOL( wxID_PRINT, WinEDA_PcbFrame::ToPrinter )
     EVT_TOOL( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print )
     EVT_TOOL( ID_GEN_PLOT, WinEDA_PcbFrame::Process_Special_Functions )
     EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions )

pcbnew/polygons_defs.h

+/*
+ * file polygons_defs.h
+ * definitions to use boost::polygon in Kicad
+ */
+
+#ifndef _POLYGONS_DEFS_H_
+#define _POLYGONS_DEFS_H_
+
+#ifdef USE_BOOST_POLYGON_LIBRARY
+
+#include "boost/polygon/polygon.hpp"
+
+// Define some types used here from boost::polygon
+namespace bpl = boost::polygon;         // bpl = boost polygon library
+using namespace bpl::operators;         // +, -, =, ...
+
+typedef int                    coordinate_type;
+
+typedef bpl::polygon_data<int> KPolygon;
+typedef std::vector<KPolygon>  KPolygonSet;
+
+typedef bpl::point_data<int>   KPolyPoint;
+#endif          // USE_BOOST_POLYGON_LIBRARY
+
+#endif          // #ifndef _POLYGONS_DEFS_H_

pcbnew/tool_modedit.cpp

@@ -96,7 +96,7 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar()
                          _( "Module Properties" ) );
 
     m_HToolBar->AddSeparator();
-    m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, wxBitmap( print_button ),
+    m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button ),
                          _( "Print Module" ) );
 
     m_HToolBar->AddSeparator();
@@ -173,7 +173,8 @@ void WinEDA_ModuleEditFrame::ReCreateVToolbar()
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_MODEDIT_PLACE_ANCHOR, wxEmptyString,
                          wxBitmap( anchor_xpm ),
-                         _( "Place anchor" ), wxITEM_CHECK );
+                         _( "Place the footprint module reference anchor" ),
+                         wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_MODEDIT_DELETE_ITEM_BUTT, wxEmptyString,

pcbnew/tool_pcb.cpp

@@ -222,7 +222,7 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
                          HELP_REDO );
 
     m_HToolBar->AddSeparator();
-    m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, wxBitmap( print_button ),
+    m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button ),
                          _( "Print board" ) );
     m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, wxBitmap( plot_xpm ),
                          _( "Plot (HPGL, PostScript, or GERBER format)" ) );

pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp

@@ -22,29 +22,18 @@
 #include <math.h>
 #include <vector>
 
-#include "boost/polygon/polygon.hpp"
 
 #include "fctsys.h"
+#include "polygons_defs.h"
+
 #include "common.h"
 #include "pcbnew.h"
 #include "wxPcbStruct.h"
 #include "trigo.h"
 
 #include "zones.h"
-
 #include "PolyLine.h"
 
-#include "boost/polygon/polygon.hpp"
-
-// Define some types used here from boost::polygon
-namespace bpl = boost::polygon;         // bpl = boost polygon library
-using namespace bpl::operators;         // +, -, =, ...
-using namespace bpl;
-
-typedef int                     coordinate_type;
-typedef bpl::point_data<int>    KPolyPoint;
-typedef bpl::polygon_data<int>  KPolygon;
-typedef std::vector< KPolygon > KPolygonSet;
 
 extern void Test_For_Copper_Island_And_Remove( BOARD*          aPcb,
                                                ZONE_CONTAINER* aZone_container );

uncrustify.cfg

@@ -246,16 +246,16 @@ sp_after_type                            = force    # ignore/add/remove/force
 
 # Add or remove space in 'template <' vs 'template<'.
 # If set to ignore, sp_before_angle is used.
-sp_template_angle                        = ignore   # ignore/add/remove/force
+sp_template_angle                        = force   # ignore/add/remove/force
 
 # Add or remove space before '<>'
 sp_before_angle                          = ignore   # ignore/add/remove/force
 
 # Add or remove space inside '<' and '>'
-sp_inside_angle                          = ignore   # ignore/add/remove/force
+sp_inside_angle                          = remove   # ignore/add/remove/force
 
 # Add or remove space after '<>'
-sp_after_angle                           = ignore   # ignore/add/remove/force
+sp_after_angle                           = force   # ignore/add/remove/force
 
 # Add or remove space between '<>' and '(' as found in 'new List<byte>();'
 sp_angle_paren                           = ignore   # ignore/add/remove/force