From 7cc28a5a0245a76c0e5a91c3b36f0e6130b7555c Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Sat, 6 Feb 2021 15:52:57 +0000 Subject: [PATCH] Shrink appearance manager bitmap buttons to 16x16 Finish off 38cc2f106b20a4ff2a7e47e5f4f38324af88f74a --- bitmaps_png/CMakeLists.txt | 2 + bitmaps_png/cpp_16/list_nets_16.cpp | 38 ++++++ bitmaps_png/cpp_16/options_generic_16.cpp | 29 ++++ .../include/bitmaps_png/bitmaps_list.h | 2 + .../{list_nets-16.svg => list_nets_16.svg} | 124 +++++++----------- bitmaps_png/sources/options_generic_16.svg | 19 +-- pcbnew/widgets/appearance_controls.cpp | 4 +- 7 files changed, 133 insertions(+), 85 deletions(-) create mode 100644 bitmaps_png/cpp_16/list_nets_16.cpp create mode 100644 bitmaps_png/cpp_16/options_generic_16.cpp rename bitmaps_png/sources/{list_nets-16.svg => list_nets_16.svg} (65%) diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index ac06e4b18a..899168a621 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -74,6 +74,8 @@ set( BMAPS_SMALL icon_pagelayout_editor_16 icon_pcbcalculator_16 icon_pcbnew_16 + list_nets_16 + options_generic_16 pinorient_right pinorient_left pinorient_up diff --git a/bitmaps_png/cpp_16/list_nets_16.cpp b/bitmaps_png/cpp_16/list_nets_16.cpp new file mode 100644 index 0000000000..970039a244 --- /dev/null +++ b/bitmaps_png/cpp_16/list_nets_16.cpp @@ -0,0 +1,38 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff, + 0x61, 0x00, 0x00, 0x01, 0x4f, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x48, 0x4a, 0x4a, 0x52, + 0x4a, 0x48, 0x48, 0xd8, 0x03, 0xc4, 0x6f, 0x80, 0xf8, 0x1d, 0x01, 0xfc, 0x16, 0x88, 0xf7, 0x03, + 0xb1, 0x2a, 0x03, 0x0c, 0x40, 0x05, 0xfe, 0x93, 0x88, 0x8f, 0x22, 0x1b, 0xf0, 0x05, 0x24, 0x08, + 0x02, 0x30, 0x05, 0xf8, 0x00, 0x54, 0xcd, 0x1f, 0xa0, 0x56, 0x46, 0x98, 0x01, 0x3f, 0xc8, 0x70, + 0xc1, 0x7f, 0xea, 0x1b, 0x40, 0xa2, 0x17, 0x48, 0x73, 0x41, 0x62, 0x7c, 0xc2, 0xff, 0x82, 0xf0, + 0xe8, 0xff, 0x95, 0x81, 0x11, 0xff, 0xb3, 0x23, 0x63, 0x48, 0x33, 0xa0, 0xc6, 0x3f, 0xfc, 0xff, + 0x26, 0x7d, 0xb7, 0xff, 0xfb, 0xd5, 0x1c, 0xe1, 0x78, 0xb9, 0xa9, 0xe7, 0xff, 0x3d, 0x6a, 0x36, + 0x4a, 0x04, 0xbd, 0xf0, 0xe6, 0xc0, 0x89, 0xff, 0x07, 0x34, 0x5d, 0xe0, 0x1a, 0x9f, 0xaf, 0xdf, + 0xf9, 0xff, 0xc5, 0xa6, 0x3d, 0x30, 0xfe, 0xb3, 0x5d, 0xea, 0xae, 0x52, 0xb8, 0x5d, 0x00, 0x74, + 0xf6, 0x26, 0x5d, 0x57, 0x14, 0x9b, 0x2f, 0xa5, 0x57, 0xfd, 0xbf, 0x9c, 0x51, 0x0d, 0xe7, 0xef, + 0x53, 0x73, 0x9c, 0x85, 0xd3, 0x80, 0xa2, 0x90, 0x28, 0xb8, 0xc2, 0x83, 0xba, 0xee, 0xff, 0x1f, + 0x4c, 0x5b, 0xfc, 0xff, 0xf5, 0xee, 0xc3, 0xff, 0x8f, 0x98, 0x07, 0x20, 0x1b, 0xfa, 0x0a, 0x64, + 0xc0, 0x37, 0x6c, 0x5e, 0x78, 0x7b, 0xf8, 0x14, 0x8a, 0xed, 0x67, 0x43, 0x32, 0xc1, 0xe2, 0x67, + 0xc3, 0xb3, 0x91, 0xc5, 0x7f, 0x83, 0x0c, 0x38, 0x8e, 0xcd, 0x05, 0x79, 0x11, 0x31, 0x28, 0x06, + 0xdc, 0x6a, 0x9e, 0xf4, 0xff, 0xef, 0x8f, 0x9f, 0xff, 0x0f, 0xe9, 0x7b, 0x20, 0x8b, 0xdf, 0x00, + 0x19, 0xa0, 0x0b, 0xc4, 0x17, 0xb0, 0x19, 0xb2, 0xd2, 0xc4, 0x13, 0xae, 0xf8, 0xd5, 0xf6, 0x03, + 0xff, 0x3f, 0x9e, 0xbf, 0x8a, 0x62, 0xe8, 0x7e, 0x75, 0x87, 0x72, 0x78, 0x9e, 0x88, 0x8d, 0x8d, + 0xe5, 0x8e, 0x8a, 0x8a, 0x12, 0x44, 0xc6, 0x73, 0x4c, 0x3c, 0x0d, 0xf7, 0xab, 0x3b, 0xbe, 0x02, + 0x29, 0xbe, 0x92, 0xd7, 0xf0, 0xff, 0xf5, 0x9e, 0x23, 0xff, 0x2f, 0xa6, 0x94, 0x83, 0x35, 0x1f, + 0x50, 0x73, 0xdc, 0xbb, 0x5f, 0xc1, 0x81, 0x83, 0x81, 0x10, 0xd8, 0xaf, 0xed, 0x20, 0x01, 0xd4, + 0xb0, 0x00, 0xa8, 0xe1, 0x23, 0xd8, 0x56, 0x55, 0xa7, 0x5b, 0x40, 0x76, 0xe5, 0x36, 0x15, 0x4f, + 0x76, 0x90, 0x3c, 0x00, 0xb3, 0x1b, 0x11, 0xc1, 0x83, 0x34, 0xa0, 0xdc, 0x00, 0x00, 0x00, 0x00, + 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE list_nets_16_xpm[1] = {{ png, sizeof( png ), "list_nets_16_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_16/options_generic_16.cpp b/bitmaps_png/cpp_16/options_generic_16.cpp new file mode 100644 index 0000000000..94f907e0d1 --- /dev/null +++ b/bitmaps_png/cpp_16/options_generic_16.cpp @@ -0,0 +1,29 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff, + 0x61, 0x00, 0x00, 0x00, 0xc2, 0x49, 0x44, 0x41, 0x54, 0x38, 0xcb, 0x63, 0x60, 0xa0, 0x26, 0x90, + 0x68, 0x38, 0xae, 0x20, 0xd5, 0x70, 0x64, 0xb2, 0x54, 0xc3, 0xa1, 0x00, 0xb2, 0x0d, 0x91, 0x6a, + 0x3a, 0x9c, 0x25, 0xd5, 0x78, 0xe4, 0x1f, 0x10, 0x4f, 0x23, 0x5a, 0x93, 0x78, 0xc3, 0x51, 0x1d, + 0x86, 0xff, 0xff, 0x19, 0xe1, 0x86, 0x34, 0x1e, 0x79, 0x00, 0x32, 0x44, 0xb2, 0xf9, 0xb8, 0x26, + 0x91, 0xb6, 0x1e, 0xa9, 0x93, 0x6a, 0x38, 0x3a, 0x57, 0xa1, 0x61, 0x3f, 0x87, 0x74, 0xe3, 0x21, + 0x67, 0xa0, 0xe6, 0xff, 0x60, 0xdc, 0x70, 0xd4, 0x8d, 0x48, 0xbf, 0x1f, 0xd2, 0x02, 0x6a, 0xf8, + 0x09, 0xc4, 0xbf, 0xe0, 0x9a, 0x81, 0x58, 0xb2, 0xf1, 0x70, 0x0b, 0xd1, 0xde, 0x90, 0x6e, 0x38, + 0x1a, 0x02, 0xd4, 0xf4, 0x06, 0xd9, 0x00, 0x08, 0x3e, 0xdc, 0x40, 0xb4, 0x21, 0xda, 0x0d, 0x57, + 0xd9, 0x80, 0xb1, 0x20, 0x07, 0x0c, 0xc8, 0x24, 0xa0, 0xe6, 0xbf, 0x64, 0x19, 0x82, 0x08, 0x97, + 0xa3, 0x11, 0x40, 0xcd, 0x7f, 0x10, 0x86, 0x1c, 0xed, 0x20, 0xd7, 0x90, 0xdf, 0x88, 0x40, 0x3d, + 0xdc, 0x39, 0x84, 0x0d, 0x01, 0x46, 0x69, 0x2c, 0x4a, 0x98, 0x34, 0x1d, 0x49, 0xa1, 0xc8, 0x10, + 0xe9, 0x86, 0x23, 0xfd, 0xe4, 0xe5, 0x95, 0x86, 0xc3, 0x2e, 0xd2, 0x8d, 0x47, 0x6a, 0x65, 0x1a, + 0x8e, 0x09, 0x51, 0x25, 0x07, 0x03, 0x00, 0x28, 0x74, 0x91, 0x27, 0xb1, 0x4d, 0xc4, 0xee, 0x00, + 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE options_generic_16_xpm[1] = {{ png, sizeof( png ), "options_generic_16_xpm" }}; + +//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index 2dd3888dc1..3d8c7d0608 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -277,6 +277,7 @@ EXTERN_BITMAP( library_archive_as_xpm ) EXTERN_BITMAP( library_xpm ) EXTERN_BITMAP( library_table_xpm ) EXTERN_BITMAP( lines90_xpm ) +EXTERN_BITMAP( list_nets_16_xpm ) EXTERN_BITMAP( list_nets_xpm ) EXTERN_BITMAP( load_drill_xpm ) EXTERN_BITMAP( load_gerber_xpm ) @@ -327,6 +328,7 @@ EXTERN_BITMAP( normal_xpm ) EXTERN_BITMAP( open_project_xpm ) EXTERN_BITMAP( options_3drender_xpm ) EXTERN_BITMAP( options_board_xpm ) +EXTERN_BITMAP( options_generic_16_xpm ) EXTERN_BITMAP( options_generic_xpm ) EXTERN_BITMAP( options_pad_xpm ) EXTERN_BITMAP( options_schematic_xpm ) diff --git a/bitmaps_png/sources/list_nets-16.svg b/bitmaps_png/sources/list_nets_16.svg similarity index 65% rename from bitmaps_png/sources/list_nets-16.svg rename to bitmaps_png/sources/list_nets_16.svg index b6341040ff..a0bcf2b518 100644 --- a/bitmaps_png/sources/list_nets-16.svg +++ b/bitmaps_png/sources/list_nets_16.svg @@ -11,8 +11,8 @@ data-name="Слой 1" viewBox="0 0 16 16" version="1.1" - sodipodi:docname="list_nets-16.svg" - inkscape:version="0.92.2 5c3e80d, 2017-08-06" + sodipodi:docname="list_nets_16.svg" + inkscape:version="1.0.1 (c497b03c, 2020-09-10)" inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/list_nets_16.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" @@ -27,18 +27,18 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-width="1280" + inkscape:window-height="715" id="namedview30" showgrid="true" - inkscape:zoom="21.081183" - inkscape:cx="15.668224" - inkscape:cy="9.2124204" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:zoom="35.608235" + inkscape:cx="6.327365" + inkscape:cy="6.697435" + inkscape:window-x="0" + inkscape:window-y="23" inkscape:window-maximized="1" inkscape:document-rotation="0" - inkscape:current-layer="Слой_1" + inkscape:current-layer="g883" inkscape:snap-global="false"> - - - - - - - - + + + + + + + + diff --git a/bitmaps_png/sources/options_generic_16.svg b/bitmaps_png/sources/options_generic_16.svg index a9e6bbc9d3..6d89763674 100644 --- a/bitmaps_png/sources/options_generic_16.svg +++ b/bitmaps_png/sources/options_generic_16.svg @@ -12,7 +12,7 @@ viewBox="0 0 16 16" version="1.1" sodipodi:docname="options_generic_16.svg" - inkscape:version="0.92.2 5c3e80d, 2017-08-06" + inkscape:version="1.0.1 (c497b03c, 2020-09-10)" width="16" height="16" inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/options_generic_16.png" @@ -27,15 +27,15 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1609" - inkscape:window-height="1286" + inkscape:window-width="1280" + inkscape:window-height="715" id="namedview30" showgrid="true" - inkscape:zoom="27.961538" - inkscape:cx="11.104539" - inkscape:cy="8.7083906" + inkscape:zoom="27.642408" + inkscape:cx="12.982194" + inkscape:cy="13.002553" inkscape:window-x="0" - inkscape:window-y="37" + inkscape:window-y="23" inkscape:window-maximized="0" inkscape:document-rotation="0" inkscape:current-layer="Слой_1" @@ -87,8 +87,9 @@ id="title26097">options_generic + style="fill:#1a81c4;stroke-width:1" + sodipodi:nodetypes="cccccccccccccc" /> diff --git a/pcbnew/widgets/appearance_controls.cpp b/pcbnew/widgets/appearance_controls.cpp index f2fa1f9148..18e5e37f4a 100644 --- a/pcbnew/widgets/appearance_controls.cpp +++ b/pcbnew/widgets/appearance_controls.cpp @@ -423,10 +423,10 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo createControls(); - m_btnNetInspector->SetBitmap( KiBitmap( list_nets_xpm ) ); + m_btnNetInspector->SetBitmap( KiBitmap( list_nets_16_xpm ) ); m_btnNetInspector->SetPadding( 2 ); - m_btnConfigureNetClasses->SetBitmap( KiBitmap( options_generic_xpm ) ); + m_btnConfigureNetClasses->SetBitmap( KiBitmap( options_generic_16_xpm ) ); m_btnConfigureNetClasses->SetPadding( 2 ); m_txtNetFilter->SetHint( _( "Filter nets" ) );