From 154e19b6e74f8d33cbca54a701af2f68c228f1a3 Mon Sep 17 00:00:00 2001 From: Michael Kavanagh Date: Sat, 2 Jan 2021 20:48:43 +0000 Subject: [PATCH] Icons: use common prefix for small 16x16 --- bitmaps_png/CMakeLists.txt | 10 +- .../cpp_16/{folder.cpp => small_folder.cpp} | 2 +- .../cpp_16/{refresh.cpp => small_refresh.cpp} | 2 +- .../cpp_16/{trash.cpp => small_trash.cpp} | 2 +- .../cpp_24/{refresh24.cpp => refresh.cpp} | 2 +- bitmaps_png/cpp_24/{trash24.cpp => trash.cpp} | 2 +- .../include/bitmaps_png/bitmaps_list.h | 6 +- bitmaps_png/sources/refresh.svg | 34 +- .../sources/{folder.svg => small_folder.svg} | 0 .../{refresh24.svg => small_refresh.svg} | 34 +- bitmaps_png/sources/small_trash.svg | 573 ++++++++++++++++++ bitmaps_png/sources/trash.svg | 567 ++--------------- bitmaps_png/sources/trash24.svg | 124 ---- common/dialogs/dialog_configure_paths.cpp | 6 +- common/dialogs/dialog_migrate_settings.cpp | 2 +- common/dialogs/panel_common_settings.cpp | 4 +- common/dialogs/panel_setup_netclasses.cpp | 2 +- common/dialogs/panel_text_variables.cpp | 2 +- common/tool/actions.cpp | 4 +- common/widgets/grid_text_button_helpers.cpp | 2 +- eeschema/dialogs/dialog_bom.cpp | 2 +- .../dialogs/dialog_fields_editor_global.cpp | 2 +- .../dialogs/dialog_lib_edit_pin_table.cpp | 4 +- .../dialogs/dialog_lib_symbol_properties.cpp | 4 +- eeschema/dialogs/dialog_pin_properties.cpp | 2 +- eeschema/dialogs/dialog_plot_schematic.cpp | 2 +- .../dialogs/dialog_sch_import_settings.cpp | 2 +- eeschema/dialogs/dialog_sheet_properties.cpp | 2 +- eeschema/dialogs/dialog_symbol_properties.cpp | 2 +- .../panel_eeschema_template_fieldnames.cpp | 2 +- eeschema/dialogs/panel_sym_lib_table.cpp | 4 +- eeschema/sim/sim_plot_frame.cpp | 2 +- eeschema/tools/ee_actions.cpp | 2 +- kicad/project_tree_pane.cpp | 2 +- .../dialog_edit_footprint_for_fp_editor.cpp | 6 +- pcbnew/dialogs/dialog_export_svg.cpp | 2 +- .../dialogs/dialog_footprint_properties.cpp | 6 +- pcbnew/dialogs/dialog_fp_plugin_options.cpp | 2 +- pcbnew/dialogs/dialog_gendrill.cpp | 2 +- pcbnew/dialogs/dialog_group_properties.cpp | 2 +- pcbnew/dialogs/dialog_import_settings.cpp | 2 +- pcbnew/dialogs/dialog_net_inspector.cpp | 2 +- pcbnew/dialogs/dialog_netlist.cpp | 2 +- .../dialog_pad_basicshapes_properties.cpp | 2 +- pcbnew/dialogs/dialog_plot.cpp | 2 +- pcbnew/dialogs/panel_fp_editor_defaults.cpp | 2 +- pcbnew/dialogs/panel_fp_lib_table.cpp | 4 +- .../dialogs/panel_pcbnew_action_plugins.cpp | 2 +- .../dialogs/panel_setup_tracks_and_vias.cpp | 6 +- pcbnew/exporters/gen_footprints_placefile.cpp | 2 +- pcbnew/import_gfx/dialog_import_gfx.cpp | 2 +- pcbnew/tools/pcb_actions.cpp | 2 +- 52 files changed, 732 insertions(+), 732 deletions(-) rename bitmaps_png/cpp_16/{folder.cpp => small_folder.cpp} (91%) rename bitmaps_png/cpp_16/{refresh.cpp => small_refresh.cpp} (95%) rename bitmaps_png/cpp_16/{trash.cpp => small_trash.cpp} (96%) rename bitmaps_png/cpp_24/{refresh24.cpp => refresh.cpp} (97%) rename bitmaps_png/cpp_24/{trash24.cpp => trash.cpp} (98%) rename bitmaps_png/sources/{folder.svg => small_folder.svg} (100%) rename bitmaps_png/sources/{refresh24.svg => small_refresh.svg} (74%) create mode 100644 bitmaps_png/sources/small_trash.svg mode change 100644 => 100755 bitmaps_png/sources/trash.svg delete mode 100755 bitmaps_png/sources/trash24.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 9edcb0e20c..8741d2adf0 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -65,7 +65,6 @@ option( MAINTAIN_PNGS # small icons (16x16) needed in listboxes and dialog buttons set( BMAPS_SMALL - folder icon_bitmap2component_16 icon_eeschema_16 icon_gerbview_16 @@ -99,13 +98,14 @@ set( BMAPS_SMALL pintype_opencoll pintype_openemit pintype_noconnect - refresh small_down small_edit + small_folder small_library small_plus + small_refresh + small_trash small_up - trash tree_nosel tree_sel triangle_down @@ -396,7 +396,7 @@ set( BMAPS_MID py_script recent redo - refresh24 + refresh reload2 reload render_mode @@ -464,7 +464,7 @@ set( BMAPS_MID three_d tool_ratsnest tools - trash24 + trash undo unit_inch unit_mil diff --git a/bitmaps_png/cpp_16/folder.cpp b/bitmaps_png/cpp_16/small_folder.cpp similarity index 91% rename from bitmaps_png/cpp_16/folder.cpp rename to bitmaps_png/cpp_16/small_folder.cpp index a23b5ffcbb..baa613bd80 100644 --- a/bitmaps_png/cpp_16/folder.cpp +++ b/bitmaps_png/cpp_16/small_folder.cpp @@ -16,6 +16,6 @@ static const unsigned char png[] = { 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; -const BITMAP_OPAQUE folder_xpm[1] = {{ png, sizeof( png ), "folder_xpm" }}; +const BITMAP_OPAQUE small_folder_xpm[1] = {{ png, sizeof( png ), "small_folder_xpm" }}; //EOF diff --git a/bitmaps_png/cpp_16/refresh.cpp b/bitmaps_png/cpp_16/small_refresh.cpp similarity index 95% rename from bitmaps_png/cpp_16/refresh.cpp rename to bitmaps_png/cpp_16/small_refresh.cpp index a3b0fe3c91..6b69af70ef 100644 --- a/bitmaps_png/cpp_16/refresh.cpp +++ b/bitmaps_png/cpp_16/small_refresh.cpp @@ -28,6 +28,6 @@ static const unsigned char png[] = { 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; -const BITMAP_OPAQUE refresh_xpm[1] = {{ png, sizeof( png ), "refresh_xpm" }}; +const BITMAP_OPAQUE small_refresh_xpm[1] = {{ png, sizeof( png ), "small_refresh_xpm" }}; //EOF diff --git a/bitmaps_png/cpp_16/trash.cpp b/bitmaps_png/cpp_16/small_trash.cpp similarity index 96% rename from bitmaps_png/cpp_16/trash.cpp rename to bitmaps_png/cpp_16/small_trash.cpp index 63f0eb044d..261d114985 100644 --- a/bitmaps_png/cpp_16/trash.cpp +++ b/bitmaps_png/cpp_16/small_trash.cpp @@ -34,6 +34,6 @@ static const unsigned char png[] = { 0x82, }; -const BITMAP_OPAQUE trash_xpm[1] = {{ png, sizeof( png ), "trash_xpm" }}; +const BITMAP_OPAQUE small_trash_xpm[1] = {{ png, sizeof( png ), "small_trash_xpm" }}; //EOF diff --git a/bitmaps_png/cpp_24/refresh24.cpp b/bitmaps_png/cpp_24/refresh.cpp similarity index 97% rename from bitmaps_png/cpp_24/refresh24.cpp rename to bitmaps_png/cpp_24/refresh.cpp index 1fdb8599da..13108ab462 100644 --- a/bitmaps_png/cpp_24/refresh24.cpp +++ b/bitmaps_png/cpp_24/refresh.cpp @@ -38,6 +38,6 @@ static const unsigned char png[] = { 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; -const BITMAP_OPAQUE refresh24_xpm[1] = {{ png, sizeof( png ), "refresh24_xpm" }}; +const BITMAP_OPAQUE refresh_xpm[1] = {{ png, sizeof( png ), "refresh_xpm" }}; //EOF diff --git a/bitmaps_png/cpp_24/trash24.cpp b/bitmaps_png/cpp_24/trash.cpp similarity index 98% rename from bitmaps_png/cpp_24/trash24.cpp rename to bitmaps_png/cpp_24/trash.cpp index 242a5a166c..906e77aed8 100644 --- a/bitmaps_png/cpp_24/trash24.cpp +++ b/bitmaps_png/cpp_24/trash.cpp @@ -46,6 +46,6 @@ static const unsigned char png[] = { 0xe3, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; -const BITMAP_OPAQUE trash24_xpm[1] = {{ png, sizeof( png ), "trash24_xpm" }}; +const BITMAP_OPAQUE trash_xpm[1] = {{ png, sizeof( png ), "trash_xpm" }}; //EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index 4dcfd293f8..28bfe4a621 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -178,7 +178,6 @@ EXTERN_BITMAP( find_replace_xpm ) EXTERN_BITMAP( flag_xpm ) EXTERN_BITMAP( flag_remove_xpm ) EXTERN_BITMAP( flip_board_xpm ) -EXTERN_BITMAP( folder_xpm ) EXTERN_BITMAP( fonts_xpm ) EXTERN_BITMAP( footprint_browser_xpm ) EXTERN_BITMAP( footprint_text_xpm ) @@ -430,7 +429,6 @@ EXTERN_BITMAP( recent_xpm ) EXTERN_BITMAP( redo_xpm ) EXTERN_BITMAP( red_xpm ) EXTERN_BITMAP( refresh_xpm ) -EXTERN_BITMAP( refresh24_xpm ) EXTERN_BITMAP( render_mode_xpm ) EXTERN_BITMAP( reload2_xpm ) EXTERN_BITMAP( reload_xpm ) @@ -487,8 +485,11 @@ EXTERN_BITMAP( show_zone_disable_xpm ) EXTERN_BITMAP( show_zone_outline_only_xpm ) EXTERN_BITMAP( small_down_xpm ) EXTERN_BITMAP( small_edit_xpm ) +EXTERN_BITMAP( small_folder_xpm ) EXTERN_BITMAP( small_library_xpm ) EXTERN_BITMAP( small_plus_xpm ) +EXTERN_BITMAP( small_refresh_xpm ) +EXTERN_BITMAP( small_trash_xpm ) EXTERN_BITMAP( small_up_xpm ) EXTERN_BITMAP( special_tools_xpm ) EXTERN_BITMAP( spreadsheet_xpm ) @@ -508,7 +509,6 @@ EXTERN_BITMAP( track_locked_xpm ) EXTERN_BITMAP( track_sketch_xpm ) EXTERN_BITMAP( track_unlocked_xpm ) EXTERN_BITMAP( trash_xpm ) -EXTERN_BITMAP( trash24_xpm ) EXTERN_BITMAP( tree_nosel_xpm ) EXTERN_BITMAP( tree_sel_xpm ) EXTERN_BITMAP( triangle_right_xpm ) diff --git a/bitmaps_png/sources/refresh.svg b/bitmaps_png/sources/refresh.svg index b3362677dd..cb063bcece 100755 --- a/bitmaps_png/sources/refresh.svg +++ b/bitmaps_png/sources/refresh.svg @@ -9,12 +9,10 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" - viewBox="0 0 16 16" + viewBox="0 0 24 24" version="1.1" sodipodi:docname="refresh.svg" - inkscape:version="1.0.1 (c497b03c, 2020-09-10)" - width="16" - height="16"> + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> @@ -55,7 +53,7 @@ image/svg+xml - refresh + add_arc @@ -83,24 +81,20 @@ id="title26817">refresh + d="M 2.95,7.57 A 10.2024,10.2024 0 0 1 21.5675,8.5535" + id="path26819" /> + d="M 21.0361,16.35 A 10.1937,10.1937 0 0 1 2.0809,14.5042" + id="path26821" /> + transform="translate(-1,-1)" /> + transform="translate(-1,-1)" /> diff --git a/bitmaps_png/sources/folder.svg b/bitmaps_png/sources/small_folder.svg similarity index 100% rename from bitmaps_png/sources/folder.svg rename to bitmaps_png/sources/small_folder.svg diff --git a/bitmaps_png/sources/refresh24.svg b/bitmaps_png/sources/small_refresh.svg similarity index 74% rename from bitmaps_png/sources/refresh24.svg rename to bitmaps_png/sources/small_refresh.svg index cb063bcece..b3362677dd 100755 --- a/bitmaps_png/sources/refresh24.svg +++ b/bitmaps_png/sources/small_refresh.svg @@ -9,10 +9,12 @@ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" id="Слой_1" data-name="Слой 1" - viewBox="0 0 24 24" + viewBox="0 0 16 16" version="1.1" sodipodi:docname="refresh.svg" - inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + inkscape:version="1.0.1 (c497b03c, 2020-09-10)" + width="16" + height="16"> @@ -53,7 +55,7 @@ image/svg+xml - add_arc + refresh @@ -81,20 +83,24 @@ id="title26817">refresh + d="M 2.5984,5.3419694 A 6.12144,6.1212522 0 0 1 13.7689,5.9320513" + id="path26819" + style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" /> + d="M 13.45006,10.609808 A 6.11622,6.1160323 0 0 1 2.07694,9.5023617" + id="path26821" + style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" /> + transform="matrix(0.6,0,0,0.59998159,0.2284,0.20012715)" + style="stroke-width:3.33338447;stroke-miterlimit:4;stroke-dasharray:none" /> + transform="matrix(0.6,0,0,0.59998159,0.2284,0.20012715)" + style="stroke-width:3.33338447;stroke-miterlimit:4;stroke-dasharray:none" /> diff --git a/bitmaps_png/sources/small_trash.svg b/bitmaps_png/sources/small_trash.svg new file mode 100644 index 0000000000..49719feaff --- /dev/null +++ b/bitmaps_png/sources/small_trash.svg @@ -0,0 +1,573 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/trash.svg b/bitmaps_png/sources/trash.svg old mode 100644 new mode 100755 index 49719feaff..092f63128c --- a/bitmaps_png/sources/trash.svg +++ b/bitmaps_png/sources/trash.svg @@ -5,29 +5,55 @@ 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:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - height="16" - width="16" - version="1.0" - id="svg2" - inkscape:version="1.0.1 (c497b03c, 2020-09-10)" - sodipodi:docname="trash.svg" - inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/trash2.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96"> + id="Слой_1" + data-name="Слой 1" + viewBox="0 0 24 24" + version="1.1" + sodipodi:docname="trash24.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + + + + id="metadata43"> + image/svg+xml - - + add_arc @@ -46,528 +72,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + trash diff --git a/bitmaps_png/sources/trash24.svg b/bitmaps_png/sources/trash24.svg deleted file mode 100755 index 092f63128c..0000000000 --- a/bitmaps_png/sources/trash24.svg +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - image/svg+xml - - add_arc - - - - - - - - - - - - - - - trash - - - - - - - - diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp index 8b9a5c5b61..8941418ab1 100644 --- a/common/dialogs/dialog_configure_paths.cpp +++ b/common/dialogs/dialog_configure_paths.cpp @@ -63,9 +63,9 @@ DIALOG_CONFIGURE_PATHS::DIALOG_CONFIGURE_PATHS( wxWindow* aParent, FILENAME_RESO m_helpDialog( nullptr ) { m_btnAddEnvVar->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_btnDeleteEnvVar->SetBitmap( KiBitmap( trash_xpm ) ); + m_btnDeleteEnvVar->SetBitmap( KiBitmap( small_trash_xpm ) ); m_btnAddSearchPath->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_btnDeleteSearchPath->SetBitmap( KiBitmap( trash_xpm ) ); + m_btnDeleteSearchPath->SetBitmap( KiBitmap( small_trash_xpm ) ); m_btnMoveUp->SetBitmap( KiBitmap( small_up_xpm ) ); m_btnMoveDown->SetBitmap( KiBitmap( small_down_xpm ) ); @@ -491,7 +491,7 @@ void DIALOG_CONFIGURE_PATHS::OnGridCellRightClick( wxGridEvent& aEvent ) { wxMenu menu; - AddMenuItem( &menu, 1, _( "File Browser..." ), KiBitmap( folder_xpm ) ); + AddMenuItem( &menu, 1, _( "File Browser..." ), KiBitmap( small_folder_xpm ) ); if( GetPopupMenuSelectionFromUser( menu ) == 1 ) { wxDirDialog dlg( nullptr, _( "Select Path" ), m_curdir, diff --git a/common/dialogs/dialog_migrate_settings.cpp b/common/dialogs/dialog_migrate_settings.cpp index ee539225d6..223cb1c375 100644 --- a/common/dialogs/dialog_migrate_settings.cpp +++ b/common/dialogs/dialog_migrate_settings.cpp @@ -30,7 +30,7 @@ DIALOG_MIGRATE_SETTINGS::DIALOG_MIGRATE_SETTINGS( SETTINGS_MANAGER* aManager ) : { m_standardButtonsCancel->SetLabel( _( "Quit KiCad" ) ); - m_btnCustomPath->SetBitmap( KiBitmap( folder_xpm ) ); + m_btnCustomPath->SetBitmap( KiBitmap( small_folder_xpm ) ); GetSizer()->SetSizeHints( this ); Centre(); diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp index c177acf0e7..ca73201483 100644 --- a/common/dialogs/panel_common_settings.cpp +++ b/common/dialogs/panel_common_settings.cpp @@ -72,8 +72,8 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aP m_antialiasingFallbackLabel->Show( false ); #endif - m_textEditorBtn->SetBitmap( KiBitmap( folder_xpm ) ); - m_pdfViewerBtn->SetBitmap( KiBitmap( folder_xpm ) ); + m_textEditorBtn->SetBitmap( KiBitmap( small_folder_xpm ) ); + m_pdfViewerBtn->SetBitmap( KiBitmap( small_folder_xpm ) ); m_canvasScaleCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( PANEL_COMMON_SETTINGS::OnCanvasScaleChange ), diff --git a/common/dialogs/panel_setup_netclasses.cpp b/common/dialogs/panel_setup_netclasses.cpp index 7a41097272..903ed232a7 100644 --- a/common/dialogs/panel_setup_netclasses.cpp +++ b/common/dialogs/panel_setup_netclasses.cpp @@ -171,7 +171,7 @@ PANEL_SETUP_NETCLASSES::PANEL_SETUP_NETCLASSES( PAGED_DIALOG* aParent, NETCLASSE m_membershipGrid->SetColAttr( 0, attr ); m_addButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_removeButton->SetBitmap( KiBitmap( trash_xpm ) ); + m_removeButton->SetBitmap( KiBitmap( small_trash_xpm ) ); // wxFormBuilder doesn't include this event... m_netclassGrid->Connect( wxEVT_GRID_CELL_CHANGING, diff --git a/common/dialogs/panel_text_variables.cpp b/common/dialogs/panel_text_variables.cpp index 7b3546d703..710fc27cad 100644 --- a/common/dialogs/panel_text_variables.cpp +++ b/common/dialogs/panel_text_variables.cpp @@ -46,7 +46,7 @@ PANEL_TEXT_VARIABLES::PANEL_TEXT_VARIABLES( wxWindow* aParent, PROJECT* aProject m_gridWidthsDirty( true ) { m_btnAddTextVar->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_btnDeleteTextVar->SetBitmap( KiBitmap( trash_xpm ) ); + m_btnDeleteTextVar->SetBitmap( KiBitmap( small_trash_xpm ) ); m_TextVars->DeleteRows( 0, m_TextVars->GetNumberRows() ); diff --git a/common/tool/actions.cpp b/common/tool/actions.cpp index 956cec90a1..3706da5ff6 100644 --- a/common/tool/actions.cpp +++ b/common/tool/actions.cpp @@ -185,7 +185,7 @@ TOOL_ACTION ACTIONS::doDelete( "common.Interactive.delete", AS_GLOBAL, WXK_DELETE, LEGACY_HK_NAME( "Delete Item" ), _( "Delete" ), _( "Deletes selected item(s)" ), - trash24_xpm ); + trash_xpm ); TOOL_ACTION ACTIONS::deleteTool( "common.Interactive.deleteTool", AS_GLOBAL, 0, "", @@ -267,7 +267,7 @@ TOOL_ACTION ACTIONS::zoomRedraw( "common.Control.zoomRedraw", #endif LEGACY_HK_NAME( "Zoom Redraw" ), _( "Refresh" ), _( "Refresh" ), - refresh24_xpm ); + refresh_xpm ); TOOL_ACTION ACTIONS::zoomFitScreen( "common.Control.zoomFitScreen", AS_GLOBAL, diff --git a/common/widgets/grid_text_button_helpers.cpp b/common/widgets/grid_text_button_helpers.cpp index 1a75428b9c..178c148c1f 100644 --- a/common/widgets/grid_text_button_helpers.cpp +++ b/common/widgets/grid_text_button_helpers.cpp @@ -328,7 +328,7 @@ public: m_normalize( aNormalize ), m_normalizeBasePath( aNormalizeBasePath ) { - SetButtonBitmaps( KiBitmap( folder_xpm ) ); + SetButtonBitmaps( KiBitmap( small_folder_xpm ) ); } protected: diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp index daf5b235b4..dce0cd2d36 100644 --- a/eeschema/dialogs/dialog_bom.cpp +++ b/eeschema/dialogs/dialog_bom.cpp @@ -232,7 +232,7 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) : m_helpWindow( nullptr ) { m_buttonAddGenerator->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_buttonDelGenerator->SetBitmap( KiBitmap( trash_xpm ) ); + m_buttonDelGenerator->SetBitmap( KiBitmap( small_trash_xpm ) ); m_buttonEdit->SetBitmap( KiBitmap( small_edit_xpm ) ); installGeneratorsList(); diff --git a/eeschema/dialogs/dialog_fields_editor_global.cpp b/eeschema/dialogs/dialog_fields_editor_global.cpp index 9e5d4aed80..083ba6bc20 100644 --- a/eeschema/dialogs/dialog_fields_editor_global.cpp +++ b/eeschema/dialogs/dialog_fields_editor_global.cpp @@ -685,7 +685,7 @@ DIALOG_FIELDS_EDITOR_GLOBAL::DIALOG_FIELDS_EDITOR_GLOBAL( SCH_EDIT_FRAME* parent // Get all symbols from the list of schematic sheets m_parent->Schematic().GetSheets().GetSymbols( m_symbolsList, false ); - m_bRefresh->SetBitmap( KiBitmap( refresh_xpm ) ); + m_bRefresh->SetBitmap( KiBitmap( small_refresh_xpm ) ); m_fieldsCtrl->AppendTextColumn( _( "Field" ), wxDATAVIEW_CELL_INERT, 0, wxALIGN_LEFT, 0 ); diff --git a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp index 1fd4184664..f86323284a 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin_table.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin_table.cpp @@ -443,8 +443,8 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( SYMBOL_EDIT_FRAME* parent, */ m_addButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_deleteButton->SetBitmap( KiBitmap( trash_xpm ) ); - m_refreshButton->SetBitmap( KiBitmap( refresh_xpm ) ); + m_deleteButton->SetBitmap( KiBitmap( small_trash_xpm ) ); + m_refreshButton->SetBitmap( KiBitmap( small_refresh_xpm ) ); GetSizer()->SetSizeHints(this); Centre(); diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp index f5fbecf919..4ad57ab291 100644 --- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp +++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp @@ -79,11 +79,11 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a // Configure button logos m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) ); + m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) ); m_bpMoveUp->SetBitmap( KiBitmap( small_up_xpm ) ); m_bpMoveDown->SetBitmap( KiBitmap( small_down_xpm ) ); m_addFilterButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_deleteFilterButton->SetBitmap( KiBitmap( trash_xpm ) ); + m_deleteFilterButton->SetBitmap( KiBitmap( small_trash_xpm ) ); m_editFilterButton->SetBitmap( KiBitmap( small_edit_xpm ) ); if( aParent->IsSymbolFromLegacyLibrary() ) diff --git a/eeschema/dialogs/dialog_pin_properties.cpp b/eeschema/dialogs/dialog_pin_properties.cpp index 5e894875b7..fb3975c948 100644 --- a/eeschema/dialogs/dialog_pin_properties.cpp +++ b/eeschema/dialogs/dialog_pin_properties.cpp @@ -195,7 +195,7 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN m_alternatesGrid->SetColAttr( COL_SHAPE, attr ); m_addAlternate->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_deleteAlternate->SetBitmap( KiBitmap( trash_xpm ) ); + m_deleteAlternate->SetBitmap( KiBitmap( small_trash_xpm ) ); m_sdbSizerButtonsOK->SetDefault(); SetInitialFocus( m_textPinName ); diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp index 5e48c31716..61976e04b1 100644 --- a/eeschema/dialogs/dialog_plot_schematic.cpp +++ b/eeschema/dialogs/dialog_plot_schematic.cpp @@ -52,7 +52,7 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent ) { m_configChanged = false; - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); // We use a sdbSizer to get platform-dependent ordering of the action buttons, but // that requires us to correct the button labels here. diff --git a/eeschema/dialogs/dialog_sch_import_settings.cpp b/eeschema/dialogs/dialog_sch_import_settings.cpp index db82a039d1..892683a4bf 100644 --- a/eeschema/dialogs/dialog_sch_import_settings.cpp +++ b/eeschema/dialogs/dialog_sch_import_settings.cpp @@ -37,7 +37,7 @@ DIALOG_SCH_IMPORT_SETTINGS::DIALOG_SCH_IMPORT_SETTINGS( wxWindow* aParent, SCH_E DIALOG_SCH_IMPORT_SETTINGS_BASE( aParent ), m_frame( aFrame ) { - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); m_sdbSizer1OK->SetLabel( _( "Import Settings" ) ); m_buttonsSizer->Layout(); diff --git a/eeschema/dialogs/dialog_sheet_properties.cpp b/eeschema/dialogs/dialog_sheet_properties.cpp index 3bb557e0cb..1d2c77d010 100644 --- a/eeschema/dialogs/dialog_sheet_properties.cpp +++ b/eeschema/dialogs/dialog_sheet_properties.cpp @@ -75,7 +75,7 @@ DIALOG_SHEET_PROPERTIES::DIALOG_SHEET_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_S // Configure button logos m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) ); + m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) ); m_bpMoveUp->SetBitmap( KiBitmap( small_up_xpm ) ); m_bpMoveDown->SetBitmap( KiBitmap( small_down_xpm ) ); diff --git a/eeschema/dialogs/dialog_symbol_properties.cpp b/eeschema/dialogs/dialog_symbol_properties.cpp index 41fcb77382..60b139687f 100644 --- a/eeschema/dialogs/dialog_symbol_properties.cpp +++ b/eeschema/dialogs/dialog_symbol_properties.cpp @@ -349,7 +349,7 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent, // Configure button logos m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) ); + m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) ); m_bpMoveUp->SetBitmap( KiBitmap( small_up_xpm ) ); m_bpMoveDown->SetBitmap( KiBitmap( small_down_xpm ) ); diff --git a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp index 906bfe6007..fd03f9e6f8 100644 --- a/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp +++ b/eeschema/dialogs/panel_eeschema_template_fieldnames.cpp @@ -50,7 +50,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT } m_addFieldButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_deleteFieldButton->SetBitmap( KiBitmap( trash_xpm ) ); + m_deleteFieldButton->SetBitmap( KiBitmap( small_trash_xpm ) ); m_checkboxColWidth = m_grid->GetColSize( 1 ); diff --git a/eeschema/dialogs/panel_sym_lib_table.cpp b/eeschema/dialogs/panel_sym_lib_table.cpp index a14a3e859f..f867fe21ac 100644 --- a/eeschema/dialogs/panel_sym_lib_table.cpp +++ b/eeschema/dialogs/panel_sym_lib_table.cpp @@ -283,10 +283,10 @@ PANEL_SYM_LIB_TABLE::PANEL_SYM_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, P // Configure button logos m_append_button->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_delete_button->SetBitmap( KiBitmap( trash_xpm ) ); + m_delete_button->SetBitmap( KiBitmap( small_trash_xpm ) ); m_move_up_button->SetBitmap( KiBitmap( small_up_xpm ) ); m_move_down_button->SetBitmap( KiBitmap( small_down_xpm ) ); - m_browse_button->SetBitmap( KiBitmap( folder_xpm ) ); + m_browse_button->SetBitmap( KiBitmap( small_folder_xpm ) ); } diff --git a/eeschema/sim/sim_plot_frame.cpp b/eeschema/sim/sim_plot_frame.cpp index 54bcddb610..e1b578d368 100644 --- a/eeschema/sim/sim_plot_frame.cpp +++ b/eeschema/sim/sim_plot_frame.cpp @@ -1593,7 +1593,7 @@ SIM_PLOT_FRAME::SIGNAL_CONTEXT_MENU::SIGNAL_CONTEXT_MENU( const wxString& aSigna AddMenuItem( this, HIDE_SIGNAL, _( "Hide Signal" ), _( "Erase the signal from plot screen" ), - KiBitmap( trash24_xpm ) ); + KiBitmap( trash_xpm ) ); TRACE* trace = plot->GetTrace( m_signal ); diff --git a/eeschema/tools/ee_actions.cpp b/eeschema/tools/ee_actions.cpp index ed935899eb..a223222a37 100644 --- a/eeschema/tools/ee_actions.cpp +++ b/eeschema/tools/ee_actions.cpp @@ -139,7 +139,7 @@ TOOL_ACTION EE_ACTIONS::saveSymbolAs( "eeschema.SymbolLibraryControl.saveSymbolA TOOL_ACTION EE_ACTIONS::deleteSymbol( "eeschema.SymbolLibraryControl.deleteSymbol", AS_GLOBAL, 0, "", _( "Delete" ), _( "Remove the selected symbol from its library" ), - trash24_xpm ); + trash_xpm ); TOOL_ACTION EE_ACTIONS::cutSymbol( "eeschema.SymbolLibraryControl.cutSymbol", AS_GLOBAL, 0, "", diff --git a/kicad/project_tree_pane.cpp b/kicad/project_tree_pane.cpp index 6dcc41e60a..382c919703 100644 --- a/kicad/project_tree_pane.cpp +++ b/kicad/project_tree_pane.cpp @@ -758,7 +758,7 @@ void PROJECT_TREE_PANE::onRight( wxTreeEvent& Event ) } AddMenuItem( &popup_menu, ID_PROJECT_DELETE, _( "Delete" ), help_text, - KiBitmap( trash24_xpm ) ); + KiBitmap( trash_xpm ) ); } if( can_print ) diff --git a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp index a71c76d5a2..654b2efd69 100644 --- a/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp +++ b/pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.cpp @@ -154,10 +154,10 @@ DIALOG_FOOTPRINT_FP_EDITOR::DIALOG_FOOTPRINT_FP_EDITOR( FOOTPRINT_EDIT_FRAME* aP // Configure button logos m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) ); + m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) ); m_button3DShapeAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_button3DShapeBrowse->SetBitmap( KiBitmap( folder_xpm ) ); - m_button3DShapeRemove->SetBitmap( KiBitmap( trash_xpm ) ); + m_button3DShapeBrowse->SetBitmap( KiBitmap( small_folder_xpm ) ); + m_button3DShapeRemove->SetBitmap( KiBitmap( small_trash_xpm ) ); // wxFormBuilder doesn't include this event... m_itemsGrid->Connect( wxEVT_GRID_CELL_CHANGING, wxGridEventHandler( DIALOG_FOOTPRINT_FP_EDITOR::OnGridCellChanging ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_export_svg.cpp b/pcbnew/dialogs/dialog_export_svg.cpp index cebfc52ea0..9d0f0936a1 100644 --- a/pcbnew/dialogs/dialog_export_svg.cpp +++ b/pcbnew/dialogs/dialog_export_svg.cpp @@ -83,7 +83,7 @@ DIALOG_EXPORT_SVG::DIALOG_EXPORT_SVG( PCB_EDIT_FRAME* aParent, BOARD* aBoard ) : m_oneFileOnly( false ), m_lineWidth( aParent, m_penWidthLabel, m_penWidthCtrl, m_penWidthUnits, true ) { - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); initDialog(); diff --git a/pcbnew/dialogs/dialog_footprint_properties.cpp b/pcbnew/dialogs/dialog_footprint_properties.cpp index 2e85e00dea..7cf9b2716f 100644 --- a/pcbnew/dialogs/dialog_footprint_properties.cpp +++ b/pcbnew/dialogs/dialog_footprint_properties.cpp @@ -168,10 +168,10 @@ DIALOG_FOOTPRINT_PROPERTIES::DIALOG_FOOTPRINT_PROPERTIES( PCB_EDIT_FRAME* aParen // Configure button logos m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) ); + m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) ); m_buttonAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_buttonBrowse->SetBitmap( KiBitmap( folder_xpm ) ); - m_buttonRemove->SetBitmap( KiBitmap( trash_xpm ) ); + m_buttonBrowse->SetBitmap( KiBitmap( small_folder_xpm ) ); + m_buttonRemove->SetBitmap( KiBitmap( small_trash_xpm ) ); finishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_fp_plugin_options.cpp b/pcbnew/dialogs/dialog_fp_plugin_options.cpp index 818a214456..49e187ea06 100644 --- a/pcbnew/dialogs/dialog_fp_plugin_options.cpp +++ b/pcbnew/dialogs/dialog_fp_plugin_options.cpp @@ -91,7 +91,7 @@ public: // Configure button logos m_append_button->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_delete_button->SetBitmap( KiBitmap( trash_xpm ) ); + m_delete_button->SetBitmap( KiBitmap( small_trash_xpm ) ); // initial focus on the grid please. SetInitialFocus( m_grid ); diff --git a/pcbnew/dialogs/dialog_gendrill.cpp b/pcbnew/dialogs/dialog_gendrill.cpp index 1aa7f977c1..84975244c7 100644 --- a/pcbnew/dialogs/dialog_gendrill.cpp +++ b/pcbnew/dialogs/dialog_gendrill.cpp @@ -117,7 +117,7 @@ void DIALOG_GENDRILL::initDialog() void DIALOG_GENDRILL::InitDisplayParams() { - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); m_rbExcellon->SetValue( m_drillFileType == 0 ); m_rbGerberX2->SetValue( m_drillFileType == 1 ); diff --git a/pcbnew/dialogs/dialog_group_properties.cpp b/pcbnew/dialogs/dialog_group_properties.cpp index 5c9c693f19..4feb3d4dd4 100644 --- a/pcbnew/dialogs/dialog_group_properties.cpp +++ b/pcbnew/dialogs/dialog_group_properties.cpp @@ -38,7 +38,7 @@ DIALOG_GROUP_PROPERTIES::DIALOG_GROUP_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, m_group( aGroup ) { m_bpAddMember->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_bpRemoveMember->SetBitmap( KiBitmap( trash_xpm ) ); + m_bpRemoveMember->SetBitmap( KiBitmap( small_trash_xpm ) ); m_nameCtrl->SetValue( m_group->GetName() ); diff --git a/pcbnew/dialogs/dialog_import_settings.cpp b/pcbnew/dialogs/dialog_import_settings.cpp index 550ee692ee..56b974123c 100644 --- a/pcbnew/dialogs/dialog_import_settings.cpp +++ b/pcbnew/dialogs/dialog_import_settings.cpp @@ -39,7 +39,7 @@ DIALOG_IMPORT_SETTINGS::DIALOG_IMPORT_SETTINGS( wxWindow* aParent, PCB_EDIT_FRAM { wxSize sizeNeeded; - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); // Button created in wxFormBuilder is an "OK" button. Change label here m_sdbSizer1OK->SetLabel( _( "Import Settings" ) ); diff --git a/pcbnew/dialogs/dialog_net_inspector.cpp b/pcbnew/dialogs/dialog_net_inspector.cpp index da6836e189..c8ade0f9ea 100644 --- a/pcbnew/dialogs/dialog_net_inspector.cpp +++ b/pcbnew/dialogs/dialog_net_inspector.cpp @@ -893,7 +893,7 @@ DIALOG_NET_INSPECTOR::DIALOG_NET_INSPECTOR( PCB_EDIT_FRAME* aParent, m_addNet->SetBitmap( KiBitmap( small_plus_xpm ) ); m_renameNet->SetBitmap( KiBitmap( small_edit_xpm ) ); - m_deleteNet->SetBitmap( KiBitmap( trash_xpm ) ); + m_deleteNet->SetBitmap( KiBitmap( small_trash_xpm ) ); m_sdbSizerOK->SetDefault(); m_renameNet->Disable(); diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp index 9c90d494a1..4dade2396d 100644 --- a/pcbnew/dialogs/dialog_netlist.cpp +++ b/pcbnew/dialogs/dialog_netlist.cpp @@ -66,7 +66,7 @@ DIALOG_NETLIST::DIALOG_NETLIST( PCB_EDIT_FRAME* aParent, wxString& aNetlistFullF m_runDragCommand( false ) { m_NetlistFilenameCtrl->SetValue( m_netlistPath ); - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); auto cfg = m_parent->GetPcbNewSettings(); diff --git a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp index d2269998f8..29d9f6d14d 100644 --- a/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_basicshapes_properties.cpp @@ -235,7 +235,7 @@ DIALOG_PAD_PRIMITIVE_POLY_PROPS::DIALOG_PAD_PRIMITIVE_POLY_PROPS( wxWindow* aPar } m_addButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_deleteButton->SetBitmap( KiBitmap( trash_xpm ) ); + m_deleteButton->SetBitmap( KiBitmap( small_trash_xpm ) ); m_warningIcon->SetBitmap( KiBitmap( dialog_warning_xpm ) ); // Test for acceptable polygon (more than 2 corners, and not self-intersecting) and diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp index 7b9a316ca9..b52b018a9b 100644 --- a/pcbnew/dialogs/dialog_plot.cpp +++ b/pcbnew/dialogs/dialog_plot.cpp @@ -82,7 +82,7 @@ void DIALOG_PLOT::init_Dialog() m_zoneFillCheck->SetValue( cfg->m_Plot.check_zones_before_plotting ); - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); // m_PSWidthAdjust is stored in mm in user config m_PSWidthAdjust = KiROUND( cfg->m_Plot.ps_fine_width_adjust * IU_PER_MM ); diff --git a/pcbnew/dialogs/panel_fp_editor_defaults.cpp b/pcbnew/dialogs/panel_fp_editor_defaults.cpp index d167bcdc07..0ff1f3ab14 100644 --- a/pcbnew/dialogs/panel_fp_editor_defaults.cpp +++ b/pcbnew/dialogs/panel_fp_editor_defaults.cpp @@ -285,7 +285,7 @@ bool PANEL_FP_EDITOR_DEFAULTS::Show( bool aShow ) // first displayed. However, on OSX 3.0.5 (at least), if another panel is displayed // first then the icons will be blank unless they're set here. m_bpAdd->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_bpDelete->SetBitmap( KiBitmap( trash_xpm ) ); + m_bpDelete->SetBitmap( KiBitmap( small_trash_xpm ) ); } if( aShow && m_firstShow ) diff --git a/pcbnew/dialogs/panel_fp_lib_table.cpp b/pcbnew/dialogs/panel_fp_lib_table.cpp index 7e0feba7ff..07fe41ed75 100644 --- a/pcbnew/dialogs/panel_fp_lib_table.cpp +++ b/pcbnew/dialogs/panel_fp_lib_table.cpp @@ -461,10 +461,10 @@ PANEL_FP_LIB_TABLE::PANEL_FP_LIB_TABLE( DIALOG_EDIT_LIBRARY_TABLES* aParent, // Configure button logos m_append_button->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_delete_button->SetBitmap( KiBitmap( trash_xpm ) ); + m_delete_button->SetBitmap( KiBitmap( small_trash_xpm ) ); m_move_up_button->SetBitmap( KiBitmap( small_up_xpm ) ); m_move_down_button->SetBitmap( KiBitmap( small_down_xpm ) ); - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); // For aesthetic reasons, we must set the size of m_browseButton to match // the other bitmaps manually (for instance m_append_button) diff --git a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp index 65d0e2aed2..4bdf9c734f 100644 --- a/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp +++ b/pcbnew/dialogs/panel_pcbnew_action_plugins.cpp @@ -41,7 +41,7 @@ PANEL_PCBNEW_ACTION_PLUGINS::PANEL_PCBNEW_ACTION_PLUGINS( PCB_EDIT_FRAME* aFrame m_moveUpButton->SetBitmap( KiBitmap( small_up_xpm ) ); m_moveDownButton->SetBitmap( KiBitmap( small_down_xpm ) ); - m_reloadButton->SetBitmap( KiBitmap( refresh_xpm ) ); + m_reloadButton->SetBitmap( KiBitmap( small_refresh_xpm ) ); } diff --git a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp index 2a4ff5d326..7049dcd1fa 100644 --- a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp +++ b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp @@ -63,11 +63,11 @@ PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS( PAGED_DIALOG* aParent, m_ConstraintsPanel = aConstraintsPanel; m_trackWidthsAddButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_trackWidthsRemoveButton->SetBitmap( KiBitmap( trash_xpm ) ); + m_trackWidthsRemoveButton->SetBitmap( KiBitmap( small_trash_xpm ) ); m_viaSizesAddButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_viaSizesRemoveButton->SetBitmap( KiBitmap( trash_xpm ) ); + m_viaSizesRemoveButton->SetBitmap( KiBitmap( small_trash_xpm ) ); m_diffPairsAddButton->SetBitmap( KiBitmap( small_plus_xpm ) ); - m_diffPairsRemoveButton->SetBitmap( KiBitmap( trash_xpm ) ); + m_diffPairsRemoveButton->SetBitmap( KiBitmap( small_trash_xpm ) ); // Membership combobox editors require a bit more room, so increase the row size of // all our grids for consistency diff --git a/pcbnew/exporters/gen_footprints_placefile.cpp b/pcbnew/exporters/gen_footprints_placefile.cpp index ee967c09af..34db91c732 100644 --- a/pcbnew/exporters/gen_footprints_placefile.cpp +++ b/pcbnew/exporters/gen_footprints_placefile.cpp @@ -149,7 +149,7 @@ bool DIALOG_GEN_FOOTPRINT_POSITION::m_includeBoardEdge = false; void DIALOG_GEN_FOOTPRINT_POSITION::initDialog() { - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); auto cfg = m_parent->GetPcbNewSettings(); diff --git a/pcbnew/import_gfx/dialog_import_gfx.cpp b/pcbnew/import_gfx/dialog_import_gfx.cpp index 1566ae7c5c..58e99a5417 100644 --- a/pcbnew/import_gfx/dialog_import_gfx.cpp +++ b/pcbnew/import_gfx/dialog_import_gfx.cpp @@ -128,7 +128,7 @@ DIALOG_IMPORT_GFX::DIALOG_IMPORT_GFX( PCB_BASE_FRAME* aParent, bool aImportAsFoo m_choiceDxfUnits->SetSelection( m_dxfUnits ); - m_browseButton->SetBitmap( KiBitmap( folder_xpm ) ); + m_browseButton->SetBitmap( KiBitmap( small_folder_xpm ) ); SetInitialFocus( m_textCtrlFileName ); m_sdbSizerOK->SetDefault(); diff --git a/pcbnew/tools/pcb_actions.cpp b/pcbnew/tools/pcb_actions.cpp index b8bdb49dc4..84aee3f335 100644 --- a/pcbnew/tools/pcb_actions.cpp +++ b/pcbnew/tools/pcb_actions.cpp @@ -351,7 +351,7 @@ TOOL_ACTION PCB_ACTIONS::editFootprint( "pcbnew.ModuleEditor.editFootprint", TOOL_ACTION PCB_ACTIONS::deleteFootprint( "pcbnew.ModuleEditor.deleteFootprint", AS_GLOBAL, 0, "", _( "Delete Footprint from Library" ), "", - trash24_xpm ); + trash_xpm ); TOOL_ACTION PCB_ACTIONS::cutFootprint( "pcbnew.ModuleEditor.cutFootprint", AS_GLOBAL, 0, "",