next to last name bitmap resolution issues before big PNG switch

bitmaps/CMakeLists.txt

@@ -217,7 +217,7 @@ set(BITMAP_SRCS
     lines90.xpm
     load_module_board.xpm
     load_module_lib.xpm
-    local_ratsnet.xpm
+    local_ratsnest.xpm
     locked.xpm
     mirepcb.xpm
     mirror_h.xpm
@@ -231,7 +231,7 @@ set(BITMAP_SRCS
     module_filtered_list.xpm
     module_full_list.xpm
     module_options.xpm
-    module_ratsnet.xpm
+#    module_ratsnest.xpm
     module.xpm
     morgan1.xpm
     morgan2.xpm
@@ -387,7 +387,7 @@ set(BITMAP_SRCS
     swap_layer.xpm
     text_sketch.xpm
     three_d.xpm
-    tool_ratsnet.xpm
+    tool_ratsnest.xpm
     tools.xpm
     track_locked.xpm
     track_sketch.xpm

bitmaps/local_ratsnet.xpm → bitmaps/local_ratsnest.xpm

 /* XPM */
 #ifndef XPMMAIN
-extern const char* local_ratsnet_xpm[];
+extern const char* local_ratsnest_xpm[];
 #else
-const char * local_ratsnet_xpm[] = {
+const char * local_ratsnest_xpm[] = {
 "16 16 61 1",
 " 	c None",
 ".	c #FFFFFF",

bitmaps/module_ratsnet.xpm → bitmaps/module_ratsnest.xpm

 /* XPM */
 #ifndef XPMMAIN
-extern const char* module_ratsnet_xpm[];
+extern const char* module_ratsnest_xpm[];
 #else
-const char * module_ratsnet_xpm[] = {
+const char * module_ratsnest_xpm[] = {
 "16 16 39 1",
 " 	c None",
 ".	c #FFFFFF",

bitmaps/tool_ratsnet.xpm → bitmaps/tool_ratsnest.xpm

 /* XPM */
 #ifndef XPMMAIN
-extern const char* tool_ratsnet_xpm[];
+extern const char* tool_ratsnest_xpm[];
 #else
-const char * tool_ratsnet_xpm[] = {
+const char * tool_ratsnest_xpm[] = {
 "16 16 53 1",
 " 	c None",
 ".	c #FFFFFF",

include/bitmaps.h

@@ -263,7 +263,7 @@ EXTERN_BITMAP( libview_xpm )
 EXTERN_BITMAP( lines90_xpm )
 EXTERN_BITMAP( load_module_board_xpm )
 EXTERN_BITMAP( load_module_lib_xpm )
-EXTERN_BITMAP( local_ratsnet_xpm )
+EXTERN_BITMAP( local_ratsnest_xpm )
 EXTERN_BITMAP( locked_xpm )
 EXTERN_BITMAP( mirepcb_xpm )
 EXTERN_BITMAP( mirror_h_xpm )
@@ -277,7 +277,7 @@ EXTERN_BITMAP( module_edit_xpm )
 EXTERN_BITMAP( module_filtered_list_xpm )
 EXTERN_BITMAP( module_full_list_xpm )
 EXTERN_BITMAP( module_options_xpm )
-EXTERN_BITMAP( module_ratsnet_xpm )
+EXTERN_BITMAP( module_ratsnest_xpm )
 EXTERN_BITMAP( module_xpm )
 EXTERN_BITMAP( morgan1_xpm )
 EXTERN_BITMAP( morgan2_xpm )
@@ -435,7 +435,7 @@ EXTERN_BITMAP( show_zone_outline_only_xpm )
 EXTERN_BITMAP( swap_layer_xpm )
 EXTERN_BITMAP( text_sketch_xpm )
 EXTERN_BITMAP( three_d_xpm )
-EXTERN_BITMAP( tool_ratsnet_xpm )
+EXTERN_BITMAP( tool_ratsnest_xpm )
 EXTERN_BITMAP( tools_xpm )
 EXTERN_BITMAP( track_locked_xpm )
 EXTERN_BITMAP( track_sketch_xpm )

pcbnew/tool_pcb.cpp

@@ -317,7 +317,7 @@ void PCB_EDIT_FRAME::ReCreateOptToolbar()
                                KiBitmap( general_ratsnet_xpm ),
                                _( "Show board ratsnest" ), wxITEM_CHECK );
     m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_MODULE_RATSNEST, wxEmptyString,
-                               KiBitmap( local_ratsnet_xpm ),
+                               KiBitmap( local_ratsnest_xpm ),
                                _( "Show module ratsnest when moving" ),
                                wxITEM_CHECK );
 
@@ -395,7 +395,7 @@ void PCB_EDIT_FRAME::ReCreateVToolbar()
     m_VToolBar->AddTool( ID_PCB_HIGHLIGHT_BUTT, wxEmptyString, KiBitmap( net_highlight_xpm ),
                          _( "Highlight net" ), wxITEM_CHECK );
 
-    m_VToolBar->AddTool( ID_PCB_SHOW_1_RATSNEST_BUTT, wxEmptyString, KiBitmap( tool_ratsnet_xpm ),
+    m_VToolBar->AddTool( ID_PCB_SHOW_1_RATSNEST_BUTT, wxEmptyString, KiBitmap( tool_ratsnest_xpm ),
                          _( "Display local ratsnest" ), wxITEM_CHECK );
 
     m_VToolBar->AddSeparator();