From e49ac45b84ea4db25b90a488f8b51ff58d8c457d Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Sun, 25 Oct 2020 09:14:52 -0400
Subject: [PATCH] HTML_MESSAGE_BOX is a dialog

---
 common/CMakeLists.txt                             | 2 +-
 common/confirm.cpp                                | 2 +-
 common/dialog_about/dialog_about.cpp              | 2 +-
 common/dialogs/dialog_configure_paths.cpp         | 2 +-
 common/{ => dialogs}/html_messagebox.cpp          | 2 +-
 common/footprint_info.cpp                         | 2 +-
 cvpcb/readwrite_dlgs.cpp                          | 2 +-
 eeschema/dialogs/dialog_bom.cpp                   | 2 +-
 eeschema/dialogs/dialog_edit_label.cpp            | 2 +-
 eeschema/dialogs/dialog_edit_sheet_pin.cpp        | 2 +-
 eeschema/sch_edit_frame.cpp                       | 2 +-
 eeschema/sch_text.cpp                             | 2 +-
 gerbview/excellon_read_drill_file.cpp             | 2 +-
 gerbview/files.cpp                                | 2 +-
 gerbview/job_file_reader.cpp                      | 2 +-
 gerbview/readgerb.cpp                             | 2 +-
 include/{ => dialogs}/html_messagebox.h           | 0
 pcbnew/dialogs/dialog_graphic_item_properties.cpp | 2 +-
 pcbnew/dialogs/dialog_netlist.cpp                 | 2 +-
 pcbnew/dialogs/dialog_pad_properties.cpp          | 2 +-
 pcbnew/dialogs/panel_setup_rules.cpp              | 2 +-
 pcbnew/footprint_info_impl.cpp                    | 2 +-
 pcbnew/import_gfx/dialog_import_gfx.cpp           | 2 +-
 23 files changed, 22 insertions(+), 22 deletions(-)
 rename common/{ => dialogs}/html_messagebox.cpp (99%)
 rename include/{ => dialogs}/html_messagebox.h (100%)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index f4f43daa07..b718779b85 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -186,6 +186,7 @@ set( COMMON_DLG_SRCS
     dialogs/eda_list_dialog_base.cpp
     dialogs/eda_view_switcher.cpp
     dialogs/eda_view_switcher_base.cpp
+    dialogs/html_messagebox.cpp
     dialogs/panel_color_settings_base.cpp
     dialogs/panel_color_settings.cpp
     dialogs/panel_common_settings.cpp
@@ -343,7 +344,6 @@ set( COMMON_SRCS
     grid_tricks.cpp
     hotkey_store.cpp
     hotkeys_basic.cpp
-    html_messagebox.cpp
     kiface_i.cpp
     kiid.cpp
     kiway.cpp
diff --git a/common/confirm.cpp b/common/confirm.cpp
index fa430cbea3..ef72a0f2df 100644
--- a/common/confirm.cpp
+++ b/common/confirm.cpp
@@ -27,7 +27,7 @@
 #include <wx/choicdlg.h>
 #include <confirm.h>
 #include <bitmaps.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <functional>
 #include <unordered_map>
 
diff --git a/common/dialog_about/dialog_about.cpp b/common/dialog_about/dialog_about.cpp
index 664b13efb0..65f93ae8da 100644
--- a/common/dialog_about/dialog_about.cpp
+++ b/common/dialog_about/dialog_about.cpp
@@ -42,7 +42,7 @@
  */
 #include <bitmaps.h>
 #include <build_version.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <tool/tool_manager.h>
 
 #include "dialog_about.h"
diff --git a/common/dialogs/dialog_configure_paths.cpp b/common/dialogs/dialog_configure_paths.cpp
index af0d36dc83..7dca1d12db 100644
--- a/common/dialogs/dialog_configure_paths.cpp
+++ b/common/dialogs/dialog_configure_paths.cpp
@@ -27,7 +27,7 @@
 #include <confirm.h>
 #include <menus_helpers.h>
 #include <validators.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <filename_resolver.h>
 #include <env_vars.h>
 #include <grid_tricks.h>
diff --git a/common/html_messagebox.cpp b/common/dialogs/html_messagebox.cpp
similarity index 99%
rename from common/html_messagebox.cpp
rename to common/dialogs/html_messagebox.cpp
index c8789b7cc7..3be60906b5 100644
--- a/common/html_messagebox.cpp
+++ b/common/dialogs/html_messagebox.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 
 #include <kicad_string.h>
 
diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index 316d16dcd5..795371ef30 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -30,7 +30,7 @@
 
 #include <footprint_info.h>
 #include <fp_lib_table.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <io_mgr.h>
 #include <kicad_string.h>
 #include <kiface_ids.h>
diff --git a/cvpcb/readwrite_dlgs.cpp b/cvpcb/readwrite_dlgs.cpp
index dc8f1c778f..3bb79ad00a 100644
--- a/cvpcb/readwrite_dlgs.cpp
+++ b/cvpcb/readwrite_dlgs.cpp
@@ -25,7 +25,7 @@
 
 #include <confirm.h>
 #include <fp_lib_table.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <kiway.h>
 #include <lib_id.h>
 
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index 3e4a89d344..edbbe60cf5 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -34,7 +34,7 @@
 #include <dialog_helpers.h>
 #include <eeschema_settings.h>
 #include <gestfich.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <i18n_utility.h> // for _HKI definition used in dialog_bom_help_md.h
 #include <invoke_sch_dialog.h>
 #include <kiface_i.h>
diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp
index 0f24ca6f2e..8f813e6e33 100644
--- a/eeschema/dialogs/dialog_edit_label.cpp
+++ b/eeschema/dialogs/dialog_edit_label.cpp
@@ -34,7 +34,7 @@
 #include <sch_reference_list.h>
 #include <schematic.h>
 #include <widgets/unit_binder.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <dialog_edit_label.h>
 #include <kicad_string.h>
 #include <tool/actions.h>
diff --git a/eeschema/dialogs/dialog_edit_sheet_pin.cpp b/eeschema/dialogs/dialog_edit_sheet_pin.cpp
index 06489c5f76..58266bdafb 100644
--- a/eeschema/dialogs/dialog_edit_sheet_pin.cpp
+++ b/eeschema/dialogs/dialog_edit_sheet_pin.cpp
@@ -26,7 +26,7 @@
 #include <sch_sheet.h>
 #include <sch_validators.h>
 #include <dialog_edit_sheet_pin.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <kicad_string.h>
 
 
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index fa74edf5bd..6b4435022b 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -31,7 +31,7 @@
 #include <executable_names.h>
 #include <gestfich.h>
 #include <hierarch.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <invoke_sch_dialog.h>
 #include <kicad_string.h>
 #include <kiface_i.h>
diff --git a/eeschema/sch_text.cpp b/eeschema/sch_text.cpp
index ea9d4ebe30..cf0f524576 100644
--- a/eeschema/sch_text.cpp
+++ b/eeschema/sch_text.cpp
@@ -41,7 +41,7 @@
 #include <sch_painter.h>
 #include <default_values.h>
 #include <wx/debug.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <project/project_file.h>
 #include <project/net_settings.h>
 #include <sch_iref.h>
diff --git a/gerbview/excellon_read_drill_file.cpp b/gerbview/excellon_read_drill_file.cpp
index 699dea26c4..9db724eec9 100644
--- a/gerbview/excellon_read_drill_file.cpp
+++ b/gerbview/excellon_read_drill_file.cpp
@@ -77,7 +77,7 @@
 
 #include <cmath>
 
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 
 // Default format for dimensions: they are the default values, not the actual values
 // number of digits in mantissa:
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 23efccba30..4ef24907e4 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -25,7 +25,7 @@
 #include <wx/wfstream.h>
 #include <wx/zipstrm.h>
 #include <reporter.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <gerbview_frame.h>
 #include <gerbview_id.h>
 #include <gerber_file_image.h>
diff --git a/gerbview/job_file_reader.cpp b/gerbview/job_file_reader.cpp
index c07df321ea..f1f56c62df 100644
--- a/gerbview/job_file_reader.cpp
+++ b/gerbview/job_file_reader.cpp
@@ -39,7 +39,7 @@
 #include <gerbview_frame.h>
 #include <reporter.h>
 #include <gbr_metadata.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <view/view.h>
 
 using json = nlohmann::json;
diff --git a/gerbview/readgerb.cpp b/gerbview/readgerb.cpp
index b41907bd04..b4e54a2ff1 100644
--- a/gerbview/readgerb.cpp
+++ b/gerbview/readgerb.cpp
@@ -30,7 +30,7 @@
 #include <gerber_file_image_list.h>
 #include <view/view.h>
 
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <macros.h>
 
 #include <wx/msgdlg.h>
diff --git a/include/html_messagebox.h b/include/dialogs/html_messagebox.h
similarity index 100%
rename from include/html_messagebox.h
rename to include/dialogs/html_messagebox.h
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index 59256e95b3..fe1d576530 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -31,7 +31,7 @@
 #include <wx/valnum.h>
 #include <board_commit.h>
 #include <pcb_layer_box_selector.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <class_board.h>
 #include <pcb_shape.h>
 #include <fp_shape.h>
diff --git a/pcbnew/dialogs/dialog_netlist.cpp b/pcbnew/dialogs/dialog_netlist.cpp
index dabc222377..49bc9e0b6f 100644
--- a/pcbnew/dialogs/dialog_netlist.cpp
+++ b/pcbnew/dialogs/dialog_netlist.cpp
@@ -24,7 +24,7 @@
 #include <project.h>
 #include <kiface_i.h>
 #include <confirm.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <pcb_edit_frame.h>
 #include <pcbnew_settings.h>
 #include <reporter.h>
diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp
index 2d759ab256..befd91d74e 100644
--- a/pcbnew/dialogs/dialog_pad_properties.cpp
+++ b/pcbnew/dialogs/dialog_pad_properties.cpp
@@ -33,7 +33,7 @@
 #include <convert_basic_shapes_to_polygon.h> // for enum RECT_CHAMFER_POSITIONS definition
 #include <dialog_pad_properties.h>
 #include <gal/graphics_abstraction_layer.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <macros.h>
 #include <pcb_base_frame.h>
 #include <pcb_painter.h>
diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp
index 3009a738bb..f2e1de1dd7 100644
--- a/pcbnew/dialogs/panel_setup_rules.cpp
+++ b/pcbnew/dialogs/panel_setup_rules.cpp
@@ -32,7 +32,7 @@
 #include <tool/tool_manager.h>
 #include <panel_setup_rules.h>
 #include <wx_html_report_box.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <scintilla_tricks.h>
 #include <drc/drc_rule_parser.h>
 #include <tools/drc_tool.h>
diff --git a/pcbnew/footprint_info_impl.cpp b/pcbnew/footprint_info_impl.cpp
index 3864d9a3dd..e650a24f6d 100644
--- a/pcbnew/footprint_info_impl.cpp
+++ b/pcbnew/footprint_info_impl.cpp
@@ -25,7 +25,7 @@
 #include <class_module.h>
 #include <footprint_info.h>
 #include <fp_lib_table.h>
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 #include <io_mgr.h>
 #include <kicad_string.h>
 #include <locale_io.h>
diff --git a/pcbnew/import_gfx/dialog_import_gfx.cpp b/pcbnew/import_gfx/dialog_import_gfx.cpp
index 68a77c8e92..bfc7c1d05f 100644
--- a/pcbnew/import_gfx/dialog_import_gfx.cpp
+++ b/pcbnew/import_gfx/dialog_import_gfx.cpp
@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <html_messagebox.h>
+#include <dialogs/html_messagebox.h>
 
 #include "dialog_import_gfx.h"
 #include <kiface_i.h>