diff --git a/common/bitmap_info.cpp b/common/bitmap_info.cpp index 48900c9bd1..0c1dae5be9 100644 --- a/common/bitmap_info.cpp +++ b/common/bitmap_info.cpp @@ -4505,6 +4505,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::icon_pagelayout_editor].emplace_back( BITMAPS::icon_pagelayout_editor, wxT( "icon_pagelayout_editor_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_bitmap2component].emplace_back( BITMAPS::icon_bitmap2component, wxT( "icon_bitmap2component_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcbcalculator].emplace_back( BITMAPS::icon_pcbcalculator, wxT( "icon_pcbcalculator_64.png" ), 64, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcm].emplace_back( BITMAPS::icon_pcm, wxT( "icon_pcm_64.png" ), 64, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb].emplace_back( BITMAPS::icon_cvpcb, wxT( "icon_cvpcb_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_eeschema].emplace_back( BITMAPS::icon_eeschema, wxT( "icon_eeschema_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview].emplace_back( BITMAPS::icon_gerbview, wxT( "icon_gerbview_dark_64.png" ), 64, wxT( "dark" ) ); @@ -4516,6 +4517,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::icon_pagelayout_editor].emplace_back( BITMAPS::icon_pagelayout_editor, wxT( "icon_pagelayout_editor_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_bitmap2component].emplace_back( BITMAPS::icon_bitmap2component, wxT( "icon_bitmap2component_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcbcalculator].emplace_back( BITMAPS::icon_pcbcalculator, wxT( "icon_pcbcalculator_dark_64.png" ), 64, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcm].emplace_back( BITMAPS::icon_pcm, wxT( "icon_pcm_dark_64.png" ), 64, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb].emplace_back( BITMAPS::icon_cvpcb, wxT( "icon_cvpcb_128.png" ), 128, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_eeschema].emplace_back( BITMAPS::icon_eeschema, wxT( "icon_eeschema_128.png" ), 128, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview].emplace_back( BITMAPS::icon_gerbview, wxT( "icon_gerbview_128.png" ), 128, wxT( "light" ) ); @@ -4527,6 +4529,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::icon_pagelayout_editor].emplace_back( BITMAPS::icon_pagelayout_editor, wxT( "icon_pagelayout_editor_128.png" ), 128, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_bitmap2component].emplace_back( BITMAPS::icon_bitmap2component, wxT( "icon_bitmap2component_128.png" ), 128, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcbcalculator].emplace_back( BITMAPS::icon_pcbcalculator, wxT( "icon_pcbcalculator_128.png" ), 128, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcm].emplace_back( BITMAPS::icon_pcm, wxT( "icon_pcm_128.png" ), 128, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb].emplace_back( BITMAPS::icon_cvpcb, wxT( "icon_cvpcb_dark_128.png" ), 128, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_eeschema].emplace_back( BITMAPS::icon_eeschema, wxT( "icon_eeschema_dark_128.png" ), 128, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview].emplace_back( BITMAPS::icon_gerbview, wxT( "icon_gerbview_dark_128.png" ), 128, wxT( "dark" ) ); @@ -4538,6 +4541,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::icon_pagelayout_editor].emplace_back( BITMAPS::icon_pagelayout_editor, wxT( "icon_pagelayout_editor_dark_128.png" ), 128, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_bitmap2component].emplace_back( BITMAPS::icon_bitmap2component, wxT( "icon_bitmap2component_dark_128.png" ), 128, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcbcalculator].emplace_back( BITMAPS::icon_pcbcalculator, wxT( "icon_pcbcalculator_dark_128.png" ), 128, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcm].emplace_back( BITMAPS::icon_pcm, wxT( "icon_pcm_dark_128.png" ), 128, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb].emplace_back( BITMAPS::icon_cvpcb, wxT( "icon_cvpcb_256.png" ), 256, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_eeschema].emplace_back( BITMAPS::icon_eeschema, wxT( "icon_eeschema_256.png" ), 256, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview].emplace_back( BITMAPS::icon_gerbview, wxT( "icon_gerbview_256.png" ), 256, wxT( "light" ) ); @@ -4549,6 +4553,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::icon_pagelayout_editor].emplace_back( BITMAPS::icon_pagelayout_editor, wxT( "icon_pagelayout_editor_256.png" ), 256, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_bitmap2component].emplace_back( BITMAPS::icon_bitmap2component, wxT( "icon_bitmap2component_256.png" ), 256, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_pcbcalculator].emplace_back( BITMAPS::icon_pcbcalculator, wxT( "icon_pcbcalculator_256.png" ), 256, wxT( "light" ) ); + aBitmapInfoCache[BITMAPS::icon_pcm].emplace_back( BITMAPS::icon_pcm, wxT( "icon_pcm_256.png" ), 256, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb].emplace_back( BITMAPS::icon_cvpcb, wxT( "icon_cvpcb_dark_256.png" ), 256, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_eeschema].emplace_back( BITMAPS::icon_eeschema, wxT( "icon_eeschema_dark_256.png" ), 256, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_gerbview].emplace_back( BITMAPS::icon_gerbview, wxT( "icon_gerbview_dark_256.png" ), 256, wxT( "dark" ) ); @@ -4560,6 +4565,7 @@ void BuildBitmapInfo( std::unordered_map>& aBi aBitmapInfoCache[BITMAPS::icon_pagelayout_editor].emplace_back( BITMAPS::icon_pagelayout_editor, wxT( "icon_pagelayout_editor_dark_256.png" ), 256, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_bitmap2component].emplace_back( BITMAPS::icon_bitmap2component, wxT( "icon_bitmap2component_dark_256.png" ), 256, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::icon_pcbcalculator].emplace_back( BITMAPS::icon_pcbcalculator, wxT( "icon_pcbcalculator_dark_256.png" ), 256, wxT( "dark" ) ); + aBitmapInfoCache[BITMAPS::icon_pcm].emplace_back( BITMAPS::icon_pcm, wxT( "icon_pcm_dark_256.png" ), 256, wxT( "dark" ) ); aBitmapInfoCache[BITMAPS::dialog_warning].emplace_back( BITMAPS::dialog_warning, wxT( "dialog_warning_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_3d].emplace_back( BITMAPS::icon_3d, wxT( "icon_3d_48.png" ), 48, wxT( "light" ) ); aBitmapInfoCache[BITMAPS::icon_cvpcb].emplace_back( BITMAPS::icon_cvpcb, wxT( "icon_cvpcb_48.png" ), 48, wxT( "light" ) ); diff --git a/resources/bitmaps_png/CMakeLists.txt b/resources/bitmaps_png/CMakeLists.txt index baeb5845b0..0cec5bdb46 100644 --- a/resources/bitmaps_png/CMakeLists.txt +++ b/resources/bitmaps_png/CMakeLists.txt @@ -628,6 +628,7 @@ set( BMAPS_64 icon_pagelayout_editor icon_bitmap2component icon_pcbcalculator + icon_pcm ) # 128 x 128 for icon sets @@ -643,6 +644,7 @@ set( BMAPS_128 icon_pagelayout_editor icon_bitmap2component icon_pcbcalculator + icon_pcm ) # 256 x 256 for icon sets (windows namely) @@ -658,6 +660,7 @@ set( BMAPS_256 icon_pagelayout_editor icon_bitmap2component icon_pcbcalculator + icon_pcm ) # Teardrop images (275x130 native size) for teardrop dialogs diff --git a/resources/bitmaps_png/png/icon_pcm_128.png b/resources/bitmaps_png/png/icon_pcm_128.png new file mode 100644 index 0000000000..85e55f57a8 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_128.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_16.png b/resources/bitmaps_png/png/icon_pcm_24_16.png index fad45443ce..4108b42504 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_16.png and b/resources/bitmaps_png/png/icon_pcm_24_16.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_24.png b/resources/bitmaps_png/png/icon_pcm_24_24.png index 765b96227b..60407ad0c2 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_24.png and b/resources/bitmaps_png/png/icon_pcm_24_24.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_32.png b/resources/bitmaps_png/png/icon_pcm_24_32.png index b70fa563df..579376124e 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_32.png and b/resources/bitmaps_png/png/icon_pcm_24_32.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_48.png b/resources/bitmaps_png/png/icon_pcm_24_48.png index fecc8a5744..fa79dbf09a 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_48.png and b/resources/bitmaps_png/png/icon_pcm_24_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_64.png b/resources/bitmaps_png/png/icon_pcm_24_64.png index 61a2f16e6f..bab69e0a48 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_64.png and b/resources/bitmaps_png/png/icon_pcm_24_64.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_dark_16.png b/resources/bitmaps_png/png/icon_pcm_24_dark_16.png index fad45443ce..4108b42504 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_dark_16.png and b/resources/bitmaps_png/png/icon_pcm_24_dark_16.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_dark_24.png b/resources/bitmaps_png/png/icon_pcm_24_dark_24.png index 765b96227b..60407ad0c2 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_dark_24.png and b/resources/bitmaps_png/png/icon_pcm_24_dark_24.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_dark_32.png b/resources/bitmaps_png/png/icon_pcm_24_dark_32.png index b70fa563df..579376124e 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_dark_32.png and b/resources/bitmaps_png/png/icon_pcm_24_dark_32.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_dark_48.png b/resources/bitmaps_png/png/icon_pcm_24_dark_48.png index fecc8a5744..fa79dbf09a 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_dark_48.png and b/resources/bitmaps_png/png/icon_pcm_24_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_24_dark_64.png b/resources/bitmaps_png/png/icon_pcm_24_dark_64.png index 61a2f16e6f..bab69e0a48 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_24_dark_64.png and b/resources/bitmaps_png/png/icon_pcm_24_dark_64.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_256.png b/resources/bitmaps_png/png/icon_pcm_256.png new file mode 100644 index 0000000000..29cd6dcae0 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_256.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_48.png b/resources/bitmaps_png/png/icon_pcm_48.png index fecc8a5744..fa79dbf09a 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_48.png and b/resources/bitmaps_png/png/icon_pcm_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_64.png b/resources/bitmaps_png/png/icon_pcm_64.png new file mode 100644 index 0000000000..bab69e0a48 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_64.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_dark_128.png b/resources/bitmaps_png/png/icon_pcm_dark_128.png new file mode 100644 index 0000000000..85e55f57a8 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_dark_128.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_dark_256.png b/resources/bitmaps_png/png/icon_pcm_dark_256.png new file mode 100644 index 0000000000..29cd6dcae0 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_dark_256.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_dark_48.png b/resources/bitmaps_png/png/icon_pcm_dark_48.png index fecc8a5744..fa79dbf09a 100644 Binary files a/resources/bitmaps_png/png/icon_pcm_dark_48.png and b/resources/bitmaps_png/png/icon_pcm_dark_48.png differ diff --git a/resources/bitmaps_png/png/icon_pcm_dark_64.png b/resources/bitmaps_png/png/icon_pcm_dark_64.png new file mode 100644 index 0000000000..bab69e0a48 Binary files /dev/null and b/resources/bitmaps_png/png/icon_pcm_dark_64.png differ