Code cleaning. Pcbnew: very minor fix

common/build_version.cpp

@@ -6,7 +6,7 @@
 #endif
 
 #ifndef KICAD_BUILD_VERSION
-#define KICAD_BUILD_VERSION "(2011-02-22 BZR 2835)"
+#define KICAD_BUILD_VERSION "(2011-03-03 BZR 2875)"
 #endif
 
 //#define VERSION_STABILITY      "stable"

eeschema/eeschema_id.h

@@ -43,6 +43,10 @@ enum id_eeschema_frm
     ID_SCHEMATIC_DELETE_ITEM_BUTT,
     ID_SCHEMATIC_VERTICAL_TOOLBAR_END,
 
+    // Toolbar options id:
+    ID_TB_OPTIONS_HIDDEN_PINS,
+    ID_TB_OPTIONS_BUS_WIRES_ORIENT,
+
     /* Schematic editor context menu IDs. */
     ID_POPUP_SCH_COPY_ITEM,
 

eeschema/schframe.cpp

@@ -113,7 +113,9 @@ BEGIN_EVENT_TABLE( SCH_EDIT_FRAME, EDA_DRAW_FRAME )
                     SCH_EDIT_FRAME::Process_Special_Functions )
 
     // Tools and buttons options toolbar
-    EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
+    EVT_TOOL( ID_TB_OPTIONS_HIDDEN_PINS,
+                    SCH_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_BUS_WIRES_ORIENT,
                     SCH_EDIT_FRAME::OnSelectOptionToolbar )
 
     EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE,

gerbview/gerberframe.cpp

@@ -93,7 +93,7 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, PCB_BASE_FRAME )
     EVT_MENU( ID_GERBVIEW_POPUP_DELETE_DCODE_ITEMS, WinEDA_GerberFrame::Process_Special_Functions )
 
     // Option toolbar
-    EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH,
                     WinEDA_GerberFrame::OnSelectOptionToolbar )
     EVT_TOOL( ID_TB_OPTIONS_SHOW_FLASHED_ITEMS_SKETCH, WinEDA_GerberFrame::OnSelectOptionToolbar )
     EVT_TOOL( ID_TB_OPTIONS_SHOW_LINES_SKETCH, WinEDA_GerberFrame::OnSelectOptionToolbar )
@@ -111,6 +111,7 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, PCB_BASE_FRAME )
     EVT_UPDATE_UI( ID_TB_OPTIONS_SHOW_DCODES, WinEDA_GerberFrame::OnUpdateShowDCodes )
     EVT_UPDATE_UI( ID_TB_OPTIONS_SHOW_LAYERS_MANAGER_VERTICAL_TOOLBAR,
                    WinEDA_GerberFrame::OnUpdateShowLayerManager )
+
     EVT_UPDATE_UI( ID_TOOLBARH_GERBER_SELECT_TOOL, WinEDA_GerberFrame::OnUpdateSelectDCode )
     EVT_UPDATE_UI( ID_TOOLBARH_GERBVIEW_SELECT_LAYER, WinEDA_GerberFrame::OnUpdateLayerSelectBox )
     EVT_UPDATE_UI_RANGE( ID_TB_OPTIONS_SHOW_GBR_MODE_0, ID_TB_OPTIONS_SHOW_GBR_MODE_2,

gerbview/gerbview_id.h

@@ -25,6 +25,7 @@ enum gerbview_ids
     ID_TB_OPTIONS_SHOW_DCODES,
     ID_TB_OPTIONS_SHOW_FLASHED_ITEMS_SKETCH,
     ID_TB_OPTIONS_SHOW_LINES_SKETCH,
+    ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH,
     ID_TB_OPTIONS_SHOW_GBR_MODE_0,
     ID_TB_OPTIONS_SHOW_GBR_MODE_1,
     ID_TB_OPTIONS_SHOW_GBR_MODE_2,

include/id.h

@@ -200,37 +200,20 @@ enum main_id
     ID_EDA_SOCKET_EVENT_SERV,
     ID_EDA_SOCKET_EVENT,
 
-    /* Command IDs common to PCBNew and GerbView. */
+    /* Command IDs common to PCBNew and cvpcb. */
     ID_PCB_DISPLAY_FOOTPRINT_DOC,
 
+    // Common to all
     ID_TB_OPTIONS_SELECT_UNIT_MM,
     ID_TB_OPTIONS_SELECT_UNIT_INCH,
     ID_TB_OPTIONS_SELECT_CURSOR,
     ID_TB_OPTIONS_SHOW_POLAR_COORD,
     ID_TB_OPTIONS_SHOW_GRID,
-    ID_TB_OPTIONS_SHOW_PADS_SKETCH,
 
-    ID_TB_OPTIONS_SHOW_ZONES,
+    // Common to pcbnew, cvpcb
-    ID_TB_OPTIONS_SHOW_ZONES_DISABLE,
-    ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY,
-
-    ID_TB_OPTIONS_START,
-
-    ID_TB_OPTIONS_DRC_OFF,
-    ID_TB_OPTIONS_SHOW_RATSNEST,
-    ID_TB_OPTIONS_SHOW_MODULE_RATSNEST,
-    ID_TB_OPTIONS_AUTO_DEL_TRACK,
-
-    ID_TB_OPTIONS_HIDDEN_PINS,
-    ID_TB_OPTIONS_BUS_WIRES_ORIENT,
-    ID_TB_OPTIONS_SHOW_VIAS_SKETCH,
-    ID_TB_OPTIONS_SHOW_TRACKS_SKETCH,
     ID_TB_OPTIONS_SHOW_MODULE_TEXT_SKETCH,
     ID_TB_OPTIONS_SHOW_MODULE_EDGE_SKETCH,
-    ID_TB_OPTIONS_SHOW_HIGH_CONTRAST_MODE,
+    ID_TB_OPTIONS_SHOW_PADS_SKETCH,
-    ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1,
-    ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH,
-    ID_TB_OPTIONS_END,
 
     ID_END_LIST
 };

packaging/windows/nsis/install.nsi

@@ -17,7 +17,7 @@
 
 ; General Product Description Definitions
 !define PRODUCT_NAME "KiCad"
-!define PRODUCT_VERSION "2011.02.22"
+!define PRODUCT_VERSION "2011.03.03"
 !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
 !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
 !define COMPANY_NAME ""

pcbnew/dialogs/dialog_general_options.cpp

@@ -115,6 +115,13 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event )
     {
     case ID_TB_OPTIONS_DRC_OFF:
         Drc_On = !state;
+        if( GetToolId() == ID_TRACK_BUTT )
+        {
+            if( Drc_On )
+                DrawPanel->SetCursor( wxCURSOR_PENCIL );
+            else
+                DrawPanel->SetCursor( wxCURSOR_QUESTION_ARROW );
+        }
         break;
 
     case ID_TB_OPTIONS_SHOW_RATSNEST:
@@ -160,7 +167,7 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event )
         DrawPanel->Refresh();
         break;
 
-    case ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1:
+    case ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR_MICROWAVE:
         m_show_microwave_tools = state;
         m_auimgr.GetPane( wxT( "m_AuxVToolBar" ) ).Show( m_show_microwave_tools );
         m_auimgr.Update();

pcbnew/moduleframe.cpp

@@ -66,7 +66,13 @@ BEGIN_EVENT_TABLE( WinEDA_ModuleEditFrame, PCB_BASE_FRAME )
                     WinEDA_ModuleEditFrame::OnVerticalToolbar )
 
     // Options Toolbar
-    EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_PADS_SKETCH,
+                    WinEDA_ModuleEditFrame::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_VIAS_SKETCH,
+                    WinEDA_ModuleEditFrame::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_MODULE_TEXT_SKETCH,
+                    WinEDA_ModuleEditFrame::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_MODULE_EDGE_SKETCH,
                     WinEDA_ModuleEditFrame::OnSelectOptionToolbar )
 
     // popup commands

pcbnew/pcbframe.cpp

@@ -173,15 +173,30 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
     EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS, PCB_EDIT_FRAME::Access_to_External_Tool )
 
     // Option toolbar
-    EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END,
+    EVT_TOOL( ID_TB_OPTIONS_DRC_OFF,
                     PCB_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_RATSNEST,
+                    PCB_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_MODULE_RATSNEST,
+                    PCB_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_AUTO_DEL_TRACK,
+                    PCB_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_VIAS_SKETCH,
+                    PCB_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_TRACKS_SKETCH,
+                    PCB_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_HIGH_CONTRAST_MODE,
+                    PCB_EDIT_FRAME::OnSelectOptionToolbar )
+    EVT_TOOL( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR_MICROWAVE,
+                    PCB_EDIT_FRAME::OnSelectOptionToolbar )
+
     EVT_TOOL_RANGE( ID_TB_OPTIONS_SHOW_ZONES, ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY,
                     PCB_EDIT_FRAME::OnSelectOptionToolbar )
 
     EVT_TOOL( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
               PCB_EDIT_FRAME::OnSelectOptionToolbar )
 
-    // Vertical toolbar:
+    // Vertical main toolbar:
     EVT_TOOL( ID_NO_TOOL_SELECTED, PCB_EDIT_FRAME::OnSelectTool )
     EVT_TOOL_RANGE( ID_PCB_HIGHLIGHT_BUTT, ID_PCB_PLACE_GRID_COORD_BUTT,
                     PCB_EDIT_FRAME::OnSelectTool )
@@ -220,7 +235,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
                    PCB_EDIT_FRAME::OnUpdateHighContrastDisplayMode )
     EVT_UPDATE_UI( ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
                    PCB_EDIT_FRAME::OnUpdateShowLayerManager )
-    EVT_UPDATE_UI( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1,
+    EVT_UPDATE_UI( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR_MICROWAVE,
                    PCB_EDIT_FRAME::OnUpdateShowMicrowaveToolbar )
     EVT_UPDATE_UI( ID_NO_TOOL_SELECTED, PCB_EDIT_FRAME::OnUpdateVerticalToolbar )
     EVT_UPDATE_UI( ID_AUX_TOOLBAR_PCB_TRACK_WIDTH, PCB_EDIT_FRAME::OnUpdateSelectTrackWidth )

pcbnew/pcbnew_id.h

@@ -246,6 +246,17 @@ enum pcbnew_ids
     ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG,
 
     ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
+    ID_TB_OPTIONS_SHOW_ZONES,
+    ID_TB_OPTIONS_SHOW_ZONES_DISABLE,
+    ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY,
+    ID_TB_OPTIONS_DRC_OFF,
+    ID_TB_OPTIONS_SHOW_RATSNEST,
+    ID_TB_OPTIONS_SHOW_MODULE_RATSNEST,
+    ID_TB_OPTIONS_AUTO_DEL_TRACK,
+    ID_TB_OPTIONS_SHOW_VIAS_SKETCH,
+    ID_TB_OPTIONS_SHOW_TRACKS_SKETCH,
+    ID_TB_OPTIONS_SHOW_HIGH_CONTRAST_MODE,
+    ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR_MICROWAVE,
 
     ID_PCB_MUWAVE_START_CMD,
     ID_PCB_MUWAVE_TOOL_DISPLAY_TOOLS,

pcbnew/tool_pcb.cpp

@@ -364,7 +364,7 @@ void PCB_EDIT_FRAME::ReCreateOptToolbar()
                                wxBitmap( layers_manager_xpm ),
                                HELP_SHOW_HIDE_LAYERMANAGER,
                                wxITEM_CHECK );
-    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR1,
+    m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR_MICROWAVE,
                                wxEmptyString,
                                wxBitmap( mw_toolbar_xpm ),
  _( "Show/hide the toolbar for microwaves tools\n This is a experimental feature (under development)" ),

version.txt

@@ -1,4 +1,4 @@
 release version:
-2011 feb 22
+2011 mar 03
 files (.zip,.tgz):
-kicad-2011-02-22
+kicad-2011-03-03