Freshen microwave polygon dialog and remove a bunch of dead code.

common/CMakeLists.txt

@@ -328,7 +328,6 @@ set( COMMON_SRCS
     eda_item.cpp
     eda_pattern_match.cpp
     eda_rect.cpp
-    eda_size_ctrl.cpp
     eda_units.cpp
     env_paths.cpp
     env_vars.cpp

common/dialogs/eda_list_dialog.cpp

@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <dialog_helpers.h>
+#include <eda_list_dialog.h>
 #include <eda_draw_frame.h>
 #include <string_utils.h>
 #include <macros.h>

common/eda_size_ctrl.cpp

@@ -1,103 +0,0 @@
-/*
- * This program source code file is part of KiCad, a free EDA CAD application.
- *
- * Copyright (C) 2004 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, you may find one here:
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
- * or you may search the http://www.gnu.org website for the version 2 license,
- * or you may write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-#include <eda_base_frame.h>
-#include <dialog_helpers.h>
-#include <base_units.h>
-
-
-/********************************************************/
-/* Class to display and edit a coordinated INCHES or MM */
-/********************************************************/
-EDA_POSITION_CTRL::EDA_POSITION_CTRL( wxWindow* parent, const wxString& title, const wxPoint& aPos,
-        EDA_UNITS user_unit, wxBoxSizer* BoxSizer )
-{
-    m_UserUnit = user_unit;
-
-    m_TextX = new wxStaticText( parent, -1, title + wxS( " " ) + _( "X:" ) );
-    BoxSizer->Add( m_TextX, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
-
-    m_FramePosX = new wxTextCtrl( parent, -1, wxEmptyString, wxDefaultPosition );
-    BoxSizer->Add( m_FramePosX, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
-
-    m_TextY = new wxStaticText( parent, -1, title + wxS( " " ) + _( "Y:" ) );
-    BoxSizer->Add( m_TextY, 0, wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
-
-    m_FramePosY = new wxTextCtrl( parent, -1, wxEmptyString );
-    BoxSizer->Add( m_FramePosY, 0, wxGROW | wxLEFT | wxRIGHT | wxBOTTOM, 5 );
-
-    SetValue( aPos.x, aPos.y );
-}
-
-
-EDA_POSITION_CTRL::~EDA_POSITION_CTRL()
-{
-    delete m_TextX;
-    delete m_TextY;
-    delete m_FramePosX;
-    delete m_FramePosY;
-}
-
-
-/* Returns (in internal units) to coordinate between (in user units)
- */
-wxPoint EDA_POSITION_CTRL::GetValue() const
-{
-    return wxPoint( ValueFromString( m_UserUnit, m_FramePosX->GetValue() ),
-                    ValueFromString( m_UserUnit, m_FramePosY->GetValue() ) );
-}
-
-
-void EDA_POSITION_CTRL::Enable( bool x_win_on, bool y_win_on )
-{
-    m_FramePosX->Enable( x_win_on );
-    m_FramePosY->Enable( y_win_on );
-}
-
-
-void EDA_POSITION_CTRL::SetValue( int x_value, int y_value )
-{
-    m_FramePosX->SetValue( StringFromValue( m_UserUnit, x_value ) );
-    m_FramePosY->SetValue( StringFromValue( m_UserUnit, y_value ) );
-}
-
-
-/*******************/
-/* EDA_SIZE_CTRL */
-/*******************/
-EDA_SIZE_CTRL::EDA_SIZE_CTRL( wxWindow* parent, const wxString& title, const wxSize& aSize,
-        EDA_UNITS aUnit, wxBoxSizer* aBoxSizer )
-        : EDA_POSITION_CTRL( parent, title, wxPoint( aSize.x, aSize.y ), aUnit, aBoxSizer )
-{
-}
-
-
-wxSize EDA_SIZE_CTRL::GetValue() const
-{
-    wxPoint pos = EDA_POSITION_CTRL::GetValue();
-
-    return wxSize( pos.x, pos.y );
-}
-
-

eeschema/dialogs/dialog_bom.cpp

@@ -32,7 +32,7 @@
 #include <bom_plugins.h>
 #include <confirm.h>
 #include <dialog_bom_base.h>
-#include <dialog_helpers.h>
+#include <string_utils.h>
 #include <eeschema_settings.h>
 #include <gestfich.h>
 #include <dialogs/html_messagebox.h>

eeschema/sch_text.cpp

@@ -46,7 +46,6 @@
 #include <project/project_file.h>
 #include <project/net_settings.h>
 #include <core/mirror.h>
-#include <dialog_helpers.h>
 #include <trigo.h>
 
 using KIGFX::SCH_RENDER_SETTINGS;

eeschema/symbol_editor/symbol_editor.cpp

@@ -39,7 +39,7 @@
 #include <sch_plugins/legacy/sch_legacy_plugin.h>
 #include <sch_plugins/kicad/sch_sexpr_plugin.h>
 #include <dialogs/dialog_lib_new_symbol.h>
-#include <dialog_helpers.h>
+#include <eda_list_dialog.h>
 #include <wx/clipbrd.h>
 #include <wx/filedlg.h>
 #include <wx/log.h>

eeschema/symbol_editor/toolbars_symbol_editor.cpp

@@ -26,7 +26,6 @@
 #include <eeschema_id.h>
 #include <symbol_edit_frame.h>
 #include <sch_painter.h>
-#include <dialog_helpers.h>
 #include <bitmaps.h>
 #include <symbol_library_manager.h>
 #include <tool/action_toolbar.h>

eeschema/symbol_viewer_frame.cpp

@@ -26,7 +26,6 @@
 #include <bitmaps.h>
 #include <symbol_library.h>
 #include <confirm.h>
-#include <dialog_helpers.h>
 #include <dialog_choose_symbol.h>
 #include <eeschema_id.h>
 #include <eeschema_settings.h>

eeschema/tools/sch_editor_control.cpp

@@ -60,7 +60,7 @@
 #include <tools/sch_editor_control.h>
 #include <drawing_sheet/ds_proxy_undo_item.h>
 #include <dialog_update_from_pcb.h>
-#include <dialog_helpers.h>
+#include <eda_list_dialog.h>
 
 
 int SCH_EDITOR_CONTROL::New( const TOOL_EVENT& aEvent )

gerbview/events_called_functions.cpp

@@ -27,7 +27,6 @@
 #include <gerbview_id.h>
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
-#include <dialog_helpers.h>
 #include <gal/graphics_abstraction_layer.h>
 #include <tool/tool_manager.h>
 #include <tool/selection.h>

gerbview/toolbars_gerber.cpp

@@ -19,15 +19,16 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <wx/wupdlock.h>
+#include <wx/stattext.h>
+
 #include <gerbview.h>
 #include <gerbview_frame.h>
 #include <bitmaps.h>
 #include <gerbview_id.h>
 #include <gerber_file_image.h>
 #include <gerber_file_image_list.h>
-#include <dialog_helpers.h>
 #include <string_utils.h>
-#include <wx/wupdlock.h>
 #include <tool/actions.h>
 #include <tool/action_toolbar.h>
 #include <tools/gerbview_actions.h>

include/eda_list_dialog.h

@@ -22,20 +22,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file dialog_helpers.h
- * @brief Helper dialog and control classes.
- * @note Due to use of wxFormBuilder to create dialogs many of them should be removed.
- */
-
-#ifndef  DIALOG_HELPERS_H_
-#define  DIALOG_HELPERS_H_
+#ifndef  EDA_LIST_DIALOG_H
+#define  EDA_LIST_DIALOG_H
 
 
 #include <../common/dialogs/eda_list_dialog_base.h>
 #include <eda_units.h>
 
-void ConvertMarkdown2Html( const wxString& aMarkdownInput, wxString& aHtmlOutput );
 
 class EDA_DRAW_FRAME;
 
@@ -90,45 +83,4 @@ private:
 };
 
 
-/**
- * Object to edit/enter a coordinate (pair of values) ( INCHES or MM ) in  dialog boxes.
- */
-class EDA_POSITION_CTRL
-{
-public:
-    EDA_POSITION_CTRL( wxWindow* parent, const wxString& title, const wxPoint& pos_to_edit,
-                       EDA_UNITS user_unit, wxBoxSizer* BoxSizer );
-
-    ~EDA_POSITION_CTRL();
-
-    void    Enable( bool x_win_on, bool y_win_on );
-    void    SetValue( int x_value, int y_value );
-    wxPoint GetValue() const;
-
-    EDA_UNITS m_UserUnit;
-
-    wxTextCtrl*   m_FramePosX;
-    wxTextCtrl*   m_FramePosY;
-
-private:
-    wxStaticText* m_TextX;
-    wxStaticText* m_TextY;
-};
-
-
-/**
- * Object to edit/enter a size (pair of values for X and Y size ( INCHES or MM ) in dialog boxes.
- */
-class EDA_SIZE_CTRL : public EDA_POSITION_CTRL
-{
-public:
-    EDA_SIZE_CTRL( wxWindow* parent, const wxString& title, const wxSize& size_to_edit,
-                   EDA_UNITS user_unit, wxBoxSizer* BoxSizer );
-
-    ~EDA_SIZE_CTRL() { }
-
-    wxSize GetValue() const;
-};
-
-
-#endif    // DIALOG_HELPERS_H_
+#endif    // EDA_LIST_DIALOG_H

include/string_utils.h

@@ -32,6 +32,8 @@
 #include <wx/filename.h>
 
 
+void ConvertMarkdown2Html( const wxString& aMarkdownInput, wxString& aHtmlOutput );
+
 /**
  * Convert the old `~...~` overbar notation to the new `~{...}` one.
  */

pagelayout_editor/dialogs/dialogs_for_printing.cpp

@@ -29,10 +29,7 @@
  */
 
 #include <base_units.h>
-#include <dialog_helpers.h>
-#include <eda_item.h>
 #include <gr_basic.h>
-#include <drawing_sheet/ds_draw_item.h>
 #include <drawing_sheet/ds_data_item.h>
 #include <drawing_sheet/ds_data_model.h>
 #include <drawing_sheet/ds_painter.h>

pcb_calculator/attenuators.cpp

@@ -26,7 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <dialog_helpers.h>
+#include <string_utils.h>
 
 #include "pcb_calculator_frame.h"
 

pcb_calculator/eserie.cpp

@@ -19,12 +19,9 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <vector>
 #include <array>
-#include <iostream>
-#include <string>
 
-#include <dialog_helpers.h>
+#include <string_utils.h>
 #include "class_regulator_data.h"
 #include "pcb_calculator_frame.h"
 

pcb_calculator/tracks_width_versus_current.cpp

@@ -27,9 +27,8 @@
 #include <cassert>
 #include <cmath>
 #include <kiface_i.h>
-#include <dialog_helpers.h>
 
-#include "attenuators/attenuator_classes.h"
+#include <string_utils.h>
 #include "class_regulator_data.h"
 #include "pcb_calculator_frame.h"
 #include "pcb_calculator_settings.h"

pcbnew/board_stackup_manager/panel_board_stackup.cpp

@@ -47,7 +47,7 @@
 #include <wx/textdlg.h>
 
 #include <locale_io.h>
-#include <dialog_helpers.h>
+#include <eda_list_dialog.h>
 
 
 // Some wx widget ID to know what widget has fired a event:

pcbnew/dialogs/dialog_target_properties.cpp

@@ -24,10 +24,8 @@
  */
 
 #include <pcb_edit_frame.h>
-#include <dialog_helpers.h>
 #include <base_units.h>
 #include <board_commit.h>
-#include <board.h>
 #include <pcb_target.h>
 #include <dialog_target_properties_base.h>
 #include <widgets/unit_binder.h>

pcbnew/dialogs/panel_setup_layers.cpp

@@ -36,7 +36,7 @@
 
 #include <wx/choicdlg.h>
 #include <wx/treebook.h>
-#include <dialog_helpers.h>
+#include <eda_list_dialog.h>
 
 
 // some define to choose how copper layers widgets are shown

pcbnew/dialogs/panel_setup_rules.cpp

@@ -38,7 +38,6 @@
 #include <scintilla_tricks.h>
 #include <drc/drc_rule_parser.h>
 #include <tools/drc_tool.h>
-#include <dialog_helpers.h>
 
 PANEL_SETUP_RULES::PANEL_SETUP_RULES( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame ) :
         PANEL_SETUP_RULES_BASE( aParent->GetTreebook() ),

pcbnew/footprint_libraries_utils.cpp

@@ -28,7 +28,7 @@
 #include <string_utils.h>
 #include <macros.h>
 #include <pcb_edit_frame.h>
-#include <dialog_helpers.h>
+#include <eda_list_dialog.h>
 #include <filter_reader.h>
 #include <fp_lib_table.h>
 #include <validators.h>

pcbnew/footprint_viewer_frame.cpp

@@ -29,7 +29,6 @@
 #include <board.h>
 #include <footprint.h>
 #include <confirm.h>
-#include <dialog_helpers.h>
 #include <eda_pattern_match.h>
 #include <footprint_info.h>
 #include <footprint_viewer_frame.h>

pcbnew/footprint_wizard_frame_functions.cpp

@@ -24,22 +24,18 @@
  */
 
 #include <pcb_edit_frame.h>
-#include <dialog_helpers.h>
-
 #include <board.h>
 #include <footprint.h>
-
 #include <pcbnew.h>
 #include <pcbnew_id.h>
-#include "footprint_wizard_frame.h"
 #include <wildcards_and_files_ext.h>
 #include <dialogs/dialog_footprint_wizard_list.h>
 #include <base_units.h>
 #include <widgets/wx_grid.h>
 #include <wx/listbox.h>
 #include <wx/msgdlg.h>
-
 #include <tool/tool_manager.h>
+#include "footprint_wizard_frame.h"
 
 
 void FOOTPRINT_WIZARD_FRAME::Process_Special_Functions( wxCommandEvent& event )

pcbnew/load_select_footprint.cpp

@@ -32,7 +32,7 @@ using namespace std::placeholders;
 #include <connectivity/connectivity_data.h>
 #include <dialog_choose_footprint.h>
 #include <dialog_get_footprint_by_name.h>
-#include <dialog_helpers.h>
+#include <eda_list_dialog.h>
 #include <footprint_edit_frame.h>
 #include <footprint_info_impl.h>
 #include <footprint_tree_pane.h>