Icons updates

- Remove 22px bitmaps
- Move 24px icons to icon_XXX_24 filenames
- Update convert icon thanks to MisterHW

Fixes https://gitlab.com/kicad/code/kicad/issues/6088

bitmaps_png/CMakeLists.txt

@@ -175,13 +175,11 @@ set( BMAPS_MID
     axis3d_right
     axis3d_top
     axis3d
-    bitmap2component
     bom
     break_line
     browse_files
     bug
     bus_definition_tool
-    calculator
     cancel
     change_entry_orient
     change_lib_symbols_in_schematic
@@ -199,7 +197,6 @@ set( BMAPS_MID
     cursor
     custom_pad_to_primitives
     cut
-    cvpcb
     datasheet
     delete_association
     delete_gerber
@@ -224,7 +221,6 @@ set( BMAPS_MID
     edit_text
     edit
     edge_to_copper_clearance
-    eeschema
     enter_sheet
     ercerr
     erc_green
@@ -287,8 +283,8 @@ set( BMAPS_MID
     hole_to_hole_clearance
     hole_to_copper_clearance
     icon
-    icon_cvpcb_small
+    icon_cvpcb_24
-    icon_gerbview_small
+    icon_gerbview_24
     import3d
     image
     import_brd_file
@@ -377,7 +373,6 @@ set( BMAPS_MID
     palette
     part_properties
     paste
-    pcbnew
     pcb_offset
     pin2pin
     pin_size_to
@@ -511,6 +506,19 @@ set( BMAPS_MID
     zoom_selection
     )
 
+# 24 x 24 for internal icons
+set( BMAPS_24
+    icon_bitmap2component_24
+    icon_eeschema_24
+    icon_gerbview_24
+    icon_kicad_24
+    icon_libedit_24
+    icon_modedit_24
+    icon_pagelayout_editor_24
+    icon_pcbcalculator_24
+    icon_pcbnew_24
+    )
+
 # 32 x 32 for icon sets
 set( BMAPS_32
     icon_bitmap2component_32
@@ -550,20 +558,6 @@ set( BMAPS_BIG
     wizard_add_fplib_icon
     )
 
-# 22 x 22 for Linux icons
-set( BMAPS_22
-    cvpcb
-    eeschema
-    icon_gerbview
-    icon_kicad
-    icon_libedit
-    icon_modedit
-    icon_pagelayout_editor
-    pcbnew
-    bitmap2component
-    calculator
-    )
-
 # 64 x 64 for icon sets
 set( BMAPS_64
     icon_cvpcb
@@ -578,7 +572,7 @@ set( BMAPS_64
     icon_pcbcalculator
     )
 
-# 64 x 64 for icon sets
+# 128 x 128 for icon sets
 set( BMAPS_128
     icon_cvpcb
     icon_eeschema

bitmaps_png/cpp_24/convert.cpp

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

bitmaps_png/cpp_24/icon_cvpcb_24.cpp

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

bitmaps_png/cpp_24/icon_gerbview_24.cpp

@@ -0,0 +1,34 @@
+
+/* Do not modify this file, it was automatically generated by the
+ * PNG2cpp CMake script, using a *.png file as input.
+ */
+
+#include <bitmaps_png/bitmaps_list.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, 0x18, 0x00, 0x00, 0x00, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x4a, 0x7e, 0xf5,
+ 0x73, 0x00, 0x00, 0x01, 0x0d, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0xad, 0x94, 0xb1, 0x8a, 0xc2,
+ 0x40, 0x10, 0x86, 0x07, 0x04, 0x9f, 0xc6, 0xb7, 0x71, 0x12, 0x15, 0xae, 0xbe, 0xca, 0xc2, 0x4a,
+ 0xee, 0x7a, 0x51, 0xb1, 0x13, 0xae, 0x31, 0x27, 0x82, 0x8d, 0x08, 0x07, 0x16, 0x6a, 0x84, 0x79,
+ 0x0e, 0xb5, 0xb1, 0x12, 0x11, 0xdf, 0x42, 0x7f, 0x67, 0x13, 0x11, 0x63, 0xd6, 0x98, 0x85, 0xe3,
+ 0x2f, 0xb2, 0x4c, 0xe6, 0xdb, 0xd9, 0xff, 0xdf, 0x10, 0x22, 0xf2, 0x8a, 0xfc, 0xcd, 0x27, 0x06,
+ 0xa3, 0x0e, 0x51, 0xd5, 0xc1, 0x91, 0xe4, 0xf6, 0xbc, 0xe9, 0xe4, 0x7d, 0x79, 0x45, 0x8a, 0xda,
+ 0xf7, 0x7c, 0x6f, 0x89, 0x95, 0x04, 0x56, 0x51, 0x2d, 0x34, 0xeb, 0xbd, 0x22, 0xba, 0x3b, 0xb2,
+ 0x01, 0x79, 0xd0, 0x74, 0x4d, 0xf1, 0x61, 0x62, 0x05, 0x18, 0xa9, 0x82, 0x68, 0xdd, 0xd1, 0xd7,
+ 0xdd, 0xe7, 0x09, 0xe0, 0x23, 0xd5, 0x92, 0x27, 0xbd, 0x6b, 0xae, 0x4d, 0x0b, 0x4b, 0x9d, 0xc6,
+ 0xa8, 0x5a, 0x81, 0x96, 0x02, 0x6d, 0x1b, 0xf0, 0x83, 0x21, 0xfc, 0xb4, 0x3d, 0xbb, 0x69, 0x03,
+ 0xf8, 0x18, 0x24, 0x6c, 0x65, 0x9b, 0x16, 0xd0, 0xe3, 0xb8, 0x5c, 0x13, 0x18, 0xaf, 0x24, 0xd6,
+ 0x6a, 0x06, 0x10, 0xa2, 0x69, 0x07, 0x3a, 0x1a, 0x9f, 0x25, 0x71, 0x7c, 0xe2, 0x0f, 0x7d, 0x0d,
+ 0x24, 0x75, 0xa4, 0x79, 0xca, 0xb4, 0xe8, 0xe5, 0x99, 0xe4, 0x3e, 0xf4, 0x1a, 0x25, 0x6d, 0xba,
+ 0xa5, 0x48, 0x3b, 0x31, 0xc1, 0x24, 0xf7, 0x8b, 0x8a, 0x8b, 0x69, 0x5f, 0x67, 0x04, 0x6e, 0xa6,
+ 0xfd, 0xec, 0x94, 0xcc, 0xa7, 0xd6, 0xcb, 0x17, 0xab, 0x58, 0x2c, 0xf7, 0x5c, 0x01, 0xf9, 0x57,
+ 0x20, 0xbc, 0xb8, 0x00, 0xe5, 0x03, 0x4d, 0xb7, 0x4e, 0x13, 0x1a, 0x34, 0x2b, 0x2d, 0xce, 0xb9,
+ 0x81, 0x9d, 0x57, 0xd0, 0xff, 0xc6, 0xac, 0x34, 0xd9, 0x2c, 0x2f, 0x6f, 0x81, 0x23, 0x37, 0x4c,
+ 0xfb, 0x15, 0xb6, 0xbd, 0x3b, 0x4d, 0x8c, 0x63, 0xa8, 0x73, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
+ 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+};
+
+const BITMAP_OPAQUE icon_gerbview_24_xpm[1] = {{ png, sizeof( png ), "icon_gerbview_24_xpm" }};
+
+//EOF

bitmaps_png/include/bitmaps_png/bitmaps_list.h

@@ -118,7 +118,6 @@ EXTERN_BITMAP( custom_pad_to_primitives_xpm )
 EXTERN_BITMAP( cursor_xpm )
 EXTERN_BITMAP( curved_ratsnest_xpm )
 EXTERN_BITMAP( cut_xpm )
-EXTERN_BITMAP( cvpcb_xpm )
 EXTERN_BITMAP( datasheet_xpm )
 EXTERN_BITMAP( delete_association_xpm )
 EXTERN_BITMAP( delete_gerber_xpm )
@@ -218,10 +217,9 @@ EXTERN_BITMAP( hotkeys_xpm )
 EXTERN_BITMAP( hole_to_copper_clearance_xpm )
 EXTERN_BITMAP( hole_to_hole_clearance_xpm )
 EXTERN_BITMAP( icon_xpm )
-EXTERN_BITMAP( icon_cvpcb_small_xpm )
+EXTERN_BITMAP( icon_cvpcb_24_xpm )
 EXTERN_BITMAP( icon_cvpcb_xpm )
 EXTERN_BITMAP( icon_eeschema_xpm )
-EXTERN_BITMAP( icon_gerbview_small_xpm )
 EXTERN_BITMAP( icon_gerbview_xpm )
 EXTERN_BITMAP( icon_kicad_xpm )
 EXTERN_BITMAP( icon_modedit_xpm )
@@ -232,6 +230,16 @@ EXTERN_BITMAP( icon_libedit_xpm )
 EXTERN_BITMAP( icon_pcbcalculator_xpm )
 EXTERN_BITMAP( icon_pagelayout_editor_xpm )
 
+EXTERN_BITMAP( icon_bitmap2component_24_xpm )
+EXTERN_BITMAP( icon_eeschema_24_xpm )
+EXTERN_BITMAP( icon_gerbview_24_xpm )
+EXTERN_BITMAP( icon_kicad_24_xpm )
+EXTERN_BITMAP( icon_libedit_24_xpm )
+EXTERN_BITMAP( icon_modedit_24_xpm )
+EXTERN_BITMAP( icon_pagelayout_editor_24_xpm )
+EXTERN_BITMAP( icon_pcbcalculator_24_xpm )
+EXTERN_BITMAP( icon_pcbnew_24_xpm )
+
 EXTERN_BITMAP( icon_bitmap2component_16_xpm )
 EXTERN_BITMAP( icon_eeschema_16_xpm )
 EXTERN_BITMAP( icon_gerbview_16_xpm )
@@ -320,7 +328,6 @@ EXTERN_BITMAP( net_locked_xpm )
 EXTERN_BITMAP( net_unlocked_xpm )
 EXTERN_BITMAP( new_board_xpm )
 EXTERN_BITMAP( new_component_xpm )
-EXTERN_BITMAP( new_cvpcb_xpm )
 EXTERN_BITMAP( new_document_xpm )
 EXTERN_BITMAP( new_footprint_xpm )
 EXTERN_BITMAP( new_gerb_xpm )

bitmaps_png/sources/convert.svg

@@ -11,8 +11,11 @@
    data-name="Слой 1"
    viewBox="0 0 24 24"
    version="1.1"
-   sodipodi:docname="convert.svg"
+   sodipodi:docname="convert2.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   inkscape:export-filename="S:\repos\kicad\bitmaps_png\sources\convert2\convert.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -22,16 +25,16 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1609"
+     inkscape:window-width="1600"
-     inkscape:window-height="1286"
+     inkscape:window-height="1173"
      id="namedview30"
      showgrid="true"
-     inkscape:zoom="27.961538"
+     inkscape:zoom="9.8280561"
-     inkscape:cx="12.618883"
+     inkscape:cx="25.612657"
-     inkscape:cy="11.603131"
+     inkscape:cy="6.0670136"
-     inkscape:window-x="0"
+     inkscape:window-x="1591"
-     inkscape:window-y="37"
+     inkscape:window-y="-9"
-     inkscape:window-maximized="0"
+     inkscape:window-maximized="1"
      inkscape:document-rotation="0"
      inkscape:current-layer="Слой_1">
     <inkscape:grid
@@ -53,7 +56,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
+        <dc:title>convert</dc:title>
       </cc:Work>
       <cc:License
          rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
@@ -86,15 +89,6 @@
      x2="21.001301"
      y2="3.0021"
      id="line727" />
-  <polygon
-     class="cls-2"
-     points="13,24.037 21.964,14.016 4,19.453 "
-     id="polygon729"
-     transform="translate(-1,-1)" />
-  <path
-     class="cls-3"
-     d="m 12,24.0371 a 0.99,0.99 0 0 1 -0.4541,-0.1094 l -9,-4.5839 A 1,1 0 0 1 2.71,17.4961 l 17.9638,-5.4375 a 1,1 0 0 1 1.0352,1.624 L 12.7451,23.7041 A 0.9976,0.9976 0 0 1 12,24.0371 Z M 5.6689,18.69 l 6.0987,3.1065 6.0752,-6.792 z"
-     id="path731" />
   <path
      class="cls-3"
      d="m 6.0008,6.0115 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
@@ -107,16 +101,26 @@
      class="cls-3"
      d="m 15,4.4971 a 3,3 0 1 1 -3,-3 3,3 0 0 1 3,3 z"
      id="path737" />
-  <line
+  <g
-     class="cls-4"
+     id="g871"
-     x1="12"
+     transform="translate(0,1)">
-     y1="8.4898996"
+    <path
-     x2="12"
+       style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     y2="15.3459"
+       d="M 15.000001,9.5 H 10 l 2.500001,3 z"
-     id="line739" />
+       id="path36"
-  <polygon
+       inkscape:connector-curvature="0"
-     class="cls-5"
+       sodipodi:nodetypes="cccc" />
-     points="13,20.776 14.453,15.355 11.547,15.355 "
+    <path
-     id="polygon741"
+       style="fill:#bf2641;fill-opacity:1;stroke:#bf2641;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     transform="translate(-1,-1)" />
+       d="M 15,9.5 H 9.999999 L 12.5,12.5 Z"
+       id="path36-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+  <path
+     style="fill:#b9b9b9;fill-opacity:1;stroke:#1a81c4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 3.5000004,18.463 12.5,23 l 9,-7.5 z"
+     id="path852"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
 </svg>

bitmaps_png/sources/icon_cvpcb_small.svg

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="Слой_1"
-   data-name="Слой 1"
-   viewBox="0 0 24 24"
-   version="1.1"
-   sodipodi:docname="icon_cvpcb.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1865"
-     inkscape:window-height="1469"
-     id="namedview30"
-     showgrid="true"
-     inkscape:zoom="27.961538"
-     inkscape:cx="10.078695"
-     inkscape:cy="5.7916477"
-     inkscape:window-x="76"
-     inkscape:window-y="283"
-     inkscape:window-maximized="0"
-     inkscape:document-rotation="0"
-     inkscape:current-layer="Слой_1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid_kicad"
-       spacingx="0.5"
-       spacingy="0.5"
-       color="#9999ff"
-       opacity="0.13"
-       empspacing="2" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata43">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>add_arc</dc:title>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25287">
-    <style
-       id="style25285">.cls-1{fill:#d8d8d8;}.cls-2{fill:#545454;}.cls-3{fill:#b9b9b9;}.cls-4{fill:#1a81c4;}</style>
-  </defs>
-  <title
-     id="title25289">icon_cvpcb</title>
-  <g
-     id="g903"
-     transform="translate(-1,2)">
-    <path
-       style="fill:#acbac8;fill-opacity:1;stroke:#545454;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="m 14.5,12.5 h -13 v 2 l 1.158679,1.158679 V 16.5 L 1.5,17.658679 v 1.917181 h 13 V 12.5"
-       id="path854" />
-    <rect
-       class="cls-4"
-       x="3"
-       y="10"
-       width="3"
-       height="4"
-       id="rect25311" />
-    <rect
-       class="cls-4"
-       x="7"
-       y="10"
-       width="3"
-       height="4"
-       id="rect844" />
-    <rect
-       class="cls-4"
-       x="11"
-       y="10"
-       width="3"
-       height="4"
-       id="rect846" />
-    <rect
-       class="cls-4"
-       x="3"
-       y="18"
-       width="3"
-       height="4"
-       id="rect848"
-       style="fill:#1a81c4;fill-opacity:1" />
-    <rect
-       class="cls-4"
-       x="7"
-       y="18"
-       width="3"
-       height="4"
-       id="rect850"
-       style="fill:#1a81c4;fill-opacity:1" />
-    <rect
-       class="cls-4"
-       x="11"
-       y="18"
-       width="3"
-       height="4"
-       id="rect852"
-       style="fill:#1a81c4;fill-opacity:1" />
-  </g>
-  <path
-     style="fill:#acbac8;stroke:#545454;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-     d="m 10.5,0.5 v 12 l 9.5,-6 z"
-     id="path928" />
-  <path
-     class="cls-2"
-     d="m 12.5,5 h 1.351 a 0.5808,0.5808 0 1 0 0,-1.1615 H 12.5 A 0.5808,0.5808 0 1 0 12.5,5 Z"
-     id="path25295" />
-  <path
-     class="cls-2"
-     d="M 14,8 V 7.8085 a 0.5808,0.5808 0 0 0 -1.1616,0 V 8 h -0.1911 a 0.5808,0.5808 0 1 0 0,1.1615 h 0.1911 v 0.1912 a 0.5808,0.5808 0 0 0 1.1616,0 V 9.1615 h 0.1912 a 0.5808,0.5808 0 1 0 0,-1.1615 z"
-     id="path25297" />
-  <g
-     id="g924">
-    <path
-       class="cls-3"
-       d="m 24.999996,16.992579 a 7.9999997,7.9999992 0 1 1 -8,-7.9925781 7.9962318,7.9962312 0 0 1 8,7.9925781 z"
-       id="path917"
-       style="fill:#ffffff;stroke-width:0.999996;fill-opacity:1" />
-    <path
-       class="cls-3"
-       d="m 23.999997,16.993507 a 7,6.9999996 0 1 1 -7,-6.993506 6.9967031,6.9967026 0 0 1 7,6.993506 z"
-       id="path867"
-       style="fill:#bf2641;stroke-width:0.999996" />
-    <path
-       class="cls-4"
-       d="m 17.289029,16.704475 v 0 a 1.6445729,1.6445728 0 0 1 0,-2.32574 l 0.837522,-0.837423 a 1.6442732,1.6442731 0 0 1 2.32564,0 v 0 a 1.6442732,1.6442731 0 0 1 0,2.325641 l -0.837422,0.837522 a 1.6445729,1.6445728 0 0 1 -2.32574,0 z"
-       id="path869"
-       style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
-    <path
-       class="cls-4"
-       d="m 13.547803,20.445701 v 0 a 1.6442732,1.6442731 0 0 1 0,-2.325641 l 0.837422,-0.837522 a 1.6445729,1.6445728 0 0 1 2.32574,0 v 0 a 1.6445729,1.6445728 0 0 1 0,2.32574 l -0.837522,0.837423 a 1.6442732,1.6442731 0 0 1 -2.32564,0 z"
-       id="path871"
-       style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
-    <line
-       class="cls-4"
-       x1="17.829226"
-       y1="16.164276"
-       x2="16.130503"
-       y2="17.863001"
-       id="line873"
-       style="fill:none;stroke:#ffffff;stroke-width:2px;stroke-linecap:round;stroke-linejoin:round" />
-  </g>
-  <path
-     style="fill:none;stroke:#545454;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 10.5,2.5 h -2"
-     id="path934" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 10.5,10.5 h -2"
-     id="path936" />
-  <path
-     style="fill:none;stroke:#545454;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 22,6.5 H 20"
-     id="path938" />
-</svg>

eeschema/tools/ee_actions.cpp

@@ -555,7 +555,7 @@ TOOL_ACTION EE_ACTIONS::editSymbolLibraryLinks( "eeschema.EditorControl.editSymb
 TOOL_ACTION EE_ACTIONS::assignFootprints( "eeschema.EditorControl.assignFootprints",
         AS_GLOBAL, 0, "",
         _( "Assign Footprints..." ), _( "Run footprint assignment tool" ),
-        cvpcb_xpm );
+        icon_cvpcb_24_xpm );
 
 TOOL_ACTION EE_ACTIONS::importFPAssignments( "eeschema.EditorControl.importFPAssignments",
         AS_GLOBAL, 0, "",

kicad/project_tree.cpp

@@ -58,7 +58,7 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) :
     m_imageList->Add( KiBitmap( eeschema_xpm ) );               // TREE_SEXPR_SCHEMATIC
     m_imageList->Add( KiBitmap( pcbnew_xpm ) );                 // TREE_LEGACY_PCB
     m_imageList->Add( KiBitmap( pcbnew_xpm ) );                 // TREE_SEXPR_PCB
-    m_imageList->Add( KiBitmap( icon_gerbview_small_xpm ) );    // TREE_GERBER
+    m_imageList->Add( KiBitmap( icon_gerbview_24_xpm ) );    // TREE_GERBER
     m_imageList->Add( KiBitmap( gerber_job_file_xpm ) );        // TREE_GERBER_JOB_FILE (.gbrjob)
     m_imageList->Add( KiBitmap( file_html_xpm ) );              // TREE_HTML
     m_imageList->Add( KiBitmap( file_pdf_xpm ) );               // TREE_PDF
@@ -66,7 +66,7 @@ PROJECT_TREE::PROJECT_TREE( PROJECT_TREE_PANE* parent ) :
     m_imageList->Add( KiBitmap( netlist_xpm ) );                // TREE_NET
     m_imageList->Add( KiBitmap( unknown_xpm ) );                // TREE_UNKNOWN
     m_imageList->Add( KiBitmap( directory_xpm ) );              // TREE_DIRECTORY
-    m_imageList->Add( KiBitmap( icon_cvpcb_small_xpm ) );       // TREE_CMP_LINK
+    m_imageList->Add( KiBitmap( icon_cvpcb_24_xpm ) );       // TREE_CMP_LINK
     m_imageList->Add( KiBitmap( tools_xpm ) );                  // TREE_REPORT
     m_imageList->Add( KiBitmap( file_pos_xpm ) );               // TREE_POS
     m_imageList->Add( KiBitmap( file_drl_xpm ) );               // TREE_DRILL

kicad/tools/kicad_manager_actions.cpp

@@ -87,7 +87,7 @@ TOOL_ACTION KICAD_MANAGER_ACTIONS::viewGerbers( "kicad.Control.viewGerbers",
         AS_GLOBAL,
         MD_CTRL + 'G', LEGACY_HK_NAME( "Run Gerbview" ),
         _( "View Gerber Files" ), _( "View Gerber Files" ),
-        icon_gerbview_small_xpm );
+        icon_gerbview_24_xpm );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::convertImage( "kicad.Control.convertImage",
         AS_GLOBAL,