From bce1e9cfa5487f365e9d2c56ad84d599a26493d6 Mon Sep 17 00:00:00 2001
From: Michael Kavanagh <michael@michaelkavanagh.me>
Date: Sun, 3 Jan 2021 14:31:43 +0000
Subject: [PATCH] Icons: rename directory_close to project_close

Since it is only used for the "Close Project" action
---
 bitmaps_png/CMakeLists.txt                                     | 2 +-
 bitmaps_png/cpp_24/{directory_close.cpp => project_close.cpp}  | 2 +-
 bitmaps_png/include/bitmaps_png/bitmaps_list.h                 | 2 +-
 bitmaps_png/sources/{directory_close.svg => project_close.svg} | 2 +-
 kicad/tools/kicad_manager_actions.cpp                          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename bitmaps_png/cpp_24/{directory_close.cpp => project_close.cpp} (95%)
 rename bitmaps_png/sources/{directory_close.svg => project_close.svg} (98%)

diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt
index 8741d2adf0..171c609f62 100644
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@@ -202,7 +202,6 @@ set( BMAPS_MID
     delete
     directory
     directory_browser
-    directory_close
     directory_open
     distribute_horizontal
     distribute_vertical
@@ -386,6 +385,7 @@ set( BMAPS_MID
     preference
     print_button
     project
+    project_close
     project_kicad
     ps_diff_pair
     ps_diff_pair_gap
diff --git a/bitmaps_png/cpp_24/directory_close.cpp b/bitmaps_png/cpp_24/project_close.cpp
similarity index 95%
rename from bitmaps_png/cpp_24/directory_close.cpp
rename to bitmaps_png/cpp_24/project_close.cpp
index a50c328d95..4d0c1c073b 100644
--- a/bitmaps_png/cpp_24/directory_close.cpp
+++ b/bitmaps_png/cpp_24/project_close.cpp
@@ -26,6 +26,6 @@ static const unsigned char png[] = {
  0x15, 0xde, 0x16, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
 };
 
-const BITMAP_OPAQUE directory_close_xpm[1] = {{ png, sizeof( png ), "directory_close_xpm" }};
+const BITMAP_OPAQUE project_close_xpm[1] = {{ png, sizeof( png ), "project_close_xpm" }};
 
 //EOF
diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
index 28bfe4a621..f58f8ee2a9 100644
--- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h
+++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h
@@ -123,7 +123,6 @@ EXTERN_BITMAP( delete_xpm )
 EXTERN_BITMAP( dialog_warning_xpm )
 EXTERN_BITMAP( directory_xpm )
 EXTERN_BITMAP( directory_browser_xpm )
-EXTERN_BITMAP( directory_close_xpm )
 EXTERN_BITMAP( directory_open_xpm )
 EXTERN_BITMAP( display_options_xpm )
 EXTERN_BITMAP( distribute_horizontal_xpm )
@@ -406,6 +405,7 @@ EXTERN_BITMAP( post_rpt_xpm )
 EXTERN_BITMAP( preference_xpm )
 EXTERN_BITMAP( primitives_to_custom_pad_xpm )
 EXTERN_BITMAP( project_xpm )
+EXTERN_BITMAP( project_close_xpm )
 EXTERN_BITMAP( project_kicad_xpm )
 EXTERN_BITMAP( print_button_xpm )
 EXTERN_BITMAP( ps_router_xpm )
diff --git a/bitmaps_png/sources/directory_close.svg b/bitmaps_png/sources/project_close.svg
similarity index 98%
rename from bitmaps_png/sources/directory_close.svg
rename to bitmaps_png/sources/project_close.svg
index 8bdab06f94..74b915994f 100644
--- a/bitmaps_png/sources/directory_close.svg
+++ b/bitmaps_png/sources/project_close.svg
@@ -11,7 +11,7 @@
    data-name="Слой 1"
    viewBox="0 0 24 24"
    version="1.1"
-   sodipodi:docname="directory_close.svg"
+   sodipodi:docname="project_close.svg"
    inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
   <sodipodi:namedview
      pagecolor="#ffffff"
diff --git a/kicad/tools/kicad_manager_actions.cpp b/kicad/tools/kicad_manager_actions.cpp
index 462f65fa61..435dfc6c52 100644
--- a/kicad/tools/kicad_manager_actions.cpp
+++ b/kicad/tools/kicad_manager_actions.cpp
@@ -57,7 +57,7 @@ TOOL_ACTION KICAD_MANAGER_ACTIONS::closeProject( "kicad.Control.closeProject",
         AS_GLOBAL,
         0, LEGACY_HK_NAME( "Close Project" ),
         _( "Close Project" ), _( "Close the current project" ),
-        directory_close_xpm );
+        project_close_xpm );
 
 TOOL_ACTION KICAD_MANAGER_ACTIONS::editSchematic( "kicad.Control.editSchematic",
         AS_GLOBAL,