Relocate the page_layout includes to a page_layout folder

This commit is contained in:
Marek Roszko 2020-10-13 20:23:36 -04:00
parent efa28d3357
commit 2c86363aa0
56 changed files with 102 additions and 102 deletions

View File

@ -33,8 +33,8 @@
#include <tool/actions.h>
#include <tool/tool_manager.h>
#include <wildcards_and_files_ext.h>
#include <ws_data_model.h>
#include <ws_painter.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_painter.h>
#include <wx/valgen.h>
#include <wx/tokenzr.h>

View File

@ -51,7 +51,7 @@
#include <tool/zoom_menu.h>
#include <trace_helpers.h>
#include <view/view.h>
#include <ws_draw_item.h>
#include <page_layout/ws_draw_item.h>
#include <wx/snglinst.h>
#include <dialogs/dialog_grid_settings.h>

View File

@ -115,7 +115,7 @@
*
*/
#include <ws_painter.h>
#include <page_layout/ws_painter.h>
// height of the band reference grid 2.0 mm
// worksheet frame reference text size 1.3 mm

View File

@ -30,10 +30,10 @@
*/
#include <base_struct.h>
#include <ws_painter.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_painter.h>
#include <page_layout/page_layout_reader_lexer.h>
#include <wx/file.h>

View File

@ -53,11 +53,11 @@
#include <eda_rect.h>
#include <math/util.h> // for KiROUND
#include <view/view.h>
#include <ws_painter.h>
#include <title_block.h>
#include <ws_draw_item.h>
#include <ws_data_model.h>
#include <ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_painter.h>
using KIGFX::COLOR4D;

View File

@ -45,11 +45,11 @@
*/
#include <kiface_i.h>
#include <ws_painter.h>
#include <title_block.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_painter.h>
// The layout shape used in the application

View File

@ -31,10 +31,10 @@
*/
#include <base_struct.h>
#include <ws_painter.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_painter.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <math/vector2d.h>
#include <page_layout/page_layout_reader_lexer.h>
#include <convert_to_biu.h>

View File

@ -50,9 +50,9 @@
#include <eda_rect.h>
#include <eda_draw_frame.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <base_units.h>
#include <page_info.h>
#include <layers_id_colors_and_visibility.h>

View File

@ -29,11 +29,11 @@
#include <title_block.h>
#include <build_version.h>
#include <settings/color_settings.h>
#include <ws_draw_item.h>
#include <page_layout/ws_draw_item.h>
#include <gal/graphics_abstraction_layer.h>
#include <ws_painter.h>
#include <ws_data_item.h>
#include <page_layout/ws_painter.h>
#include <page_layout/ws_data_item.h>
using namespace KIGFX;

View File

@ -21,9 +21,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <ws_proxy_undo_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_proxy_undo_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <view/view.h>
#include <eda_draw_frame.h>
#include <macros.h>

View File

@ -22,13 +22,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <ws_proxy_view_item.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <layers_id_colors_and_visibility.h>
#include <page_info.h>
#include <page_layout/ws_proxy_view_item.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_painter.h>
#include <view/view.h>
#include <ws_painter.h>
using namespace KIGFX;

View File

@ -24,10 +24,10 @@
#include <base_struct.h>
#include <plotters_specific.h>
#include <ws_painter.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_painter.h>
#include <title_block.h>
#include "ws_draw_item.h"
#include "ws_data_item.h"
#include <wx/filename.h>

View File

@ -30,7 +30,7 @@
#include <kiface_i.h>
#include <pgm_base.h>
#include <settings/settings_manager.h>
#include <ws_painter.h>
#include <page_layout/ws_painter.h>
#include <sch_painter.h>
#include <schematic.h>

View File

@ -41,7 +41,7 @@
#include <settings/settings_manager.h>
#include <title_block.h>
#include <view/view.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <sch_base_frame.h>
#include <widgets/color_swatch.h>

View File

@ -47,7 +47,7 @@
#include <symbol_lib_table.h>
#include <widgets/paged_dialog.h>
#include <wildcards_and_files_ext.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_model.h>
#define FieldNameTemplatesKey wxT( "FieldNameTemplates" )

View File

@ -37,8 +37,8 @@
#include <sch_reference_list.h>
#include <sch_sheet.h>
#include <schematic.h>
#include <ws_draw_item.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <wx/ffile.h>

View File

@ -56,7 +56,7 @@
#include <trace_helpers.h>
#include <widgets/infobar.h>
#include <wildcards_and_files_ext.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_model.h>
bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName )
{

View File

@ -76,7 +76,7 @@
#include <wildcards_and_files_ext.h>
#include <wx/cmdline.h>
#include <gal/graphics_abstraction_layer.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
// non-member so it can be moved easily, and kept REALLY private.
// Do NOT Clear() in here.

View File

@ -61,7 +61,7 @@
#include <symbol_lib_table.h>
#include <template_fieldnames.h>
#include <wildcards_and_files_ext.h>
#include <ws_draw_item.h>
#include <page_layout/ws_draw_item.h>
// Eagle schematic axes are aligned with x increasing left to right and Y increasing bottom to top

View File

@ -23,7 +23,7 @@
#include <view/wx_view_controls.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <gal/graphics_abstraction_layer.h>

View File

@ -31,7 +31,7 @@
#include <view/view_group.h>
#include <view/view_rtree.h>
#include <view/wx_view_controls.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <layers_id_colors_and_visibility.h>
#include <sch_screen.h>
#include <schematic.h>

View File

@ -29,7 +29,7 @@
#include <sch_line.h>
#include <sch_bitmap.h>
#include <tools/ee_selection_tool.h>
#include <ws_proxy_undo_item.h>
#include <page_layout/ws_proxy_undo_item.h>
#include <tool/actions.h>
/* Functions to undo and redo edit commands.

View File

@ -46,7 +46,7 @@
#include <sch_junction.h>
#include <sch_edit_frame.h>
#include <schematic.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <eeschema_id.h>
#include <status_popup.h>
#include <wx/gdicmn.h>

View File

@ -55,7 +55,7 @@
#include <tools/ee_selection.h>
#include <tools/ee_selection_tool.h>
#include <tools/sch_editor_control.h>
#include <ws_proxy_undo_item.h>
#include <page_layout/ws_proxy_undo_item.h>
#include <dialog_update_from_pcb.h>
#include <dialog_helpers.h>

View File

@ -21,7 +21,7 @@
#include <view/view.h>
#include <view/wx_view_controls.h>
#include <gerbview_painter.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <gerbview_frame.h>
#include <gbr_display_options.h>

View File

@ -21,7 +21,7 @@
#define GERBVIEW_DRAW_PANEL_GAL_H_
#include <class_draw_panel_gal.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
namespace KIGFX
{

View File

@ -33,7 +33,7 @@
#include <math/vector2d.h>
#include <eda_text.h>
#include <bitmap_base.h>
#include "ws_draw_item.h"
#include "page_layout/ws_draw_item.h"
class WS_DRAW_ITEM_TEXT; // Forward declaration

View File

@ -29,7 +29,7 @@
#include <gal/color4d.h>
#include <painter.h>
#include <page_info.h>
#include <ws_draw_item.h>
#include <page_layout/ws_draw_item.h>
// Forward declarations:
class EDA_RECT;

View File

@ -25,9 +25,9 @@
#include <wx/imaglist.h>
#include <wx/wupdlock.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <tool/tool_manager.h>
#include "dialogs/dialog_design_inspector_base.h"

View File

@ -22,7 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <ws_data_item.h>
#include <page_layout/ws_data_item.h>
#include "dialog_new_dataitem_base.h"
#include "pl_editor_frame.h"

View File

@ -28,10 +28,10 @@
#include <base_units.h>
#include <dialog_helpers.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <ws_painter.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_painter.h>
#include <dialog_page_settings.h>
#include "invoke_pl_editor_dialog.h"

View File

@ -26,7 +26,7 @@
#include <confirm.h>
#include <gestfich.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_model.h>
#include <widgets/infobar.h>
#include <wildcards_and_files_ext.h>

View File

@ -23,10 +23,10 @@
#include <view/view.h>
#include <tool/tool_manager.h>
#include <view/wx_view_controls.h>
#include <ws_proxy_view_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <ws_painter.h>
#include <page_layout/ws_proxy_view_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_painter.h>
#include <pgm_base.h>
#include <kiway.h>
#include <settings/settings_manager.h>

View File

@ -27,8 +27,8 @@
#include <pgm_base.h>
#include <msgpanel.h>
#include <bitmaps.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <widgets/paged_dialog.h>
#include <panel_gal_display_options.h>
#include <panel_hotkeys_editor.h>

View File

@ -30,7 +30,7 @@
#include <page_info.h>
#include <title_block.h>
#include <ws_draw_item.h>
#include <page_layout/ws_draw_item.h>
/**

View File

@ -23,8 +23,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <ws_data_model.h>
#include <ws_proxy_undo_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_proxy_undo_item.h>
#include <tool/tool_manager.h>
#include <tool/actions.h>

View File

@ -26,9 +26,9 @@
#include <project.h>
#include <scintilla_tricks.h>
#include <tool/tool_manager.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <view/view.h>
#include "properties_frame.h"

View File

@ -24,7 +24,7 @@
#include <tool/tool_action.h>
#include <bitmaps.h>
#include <ws_data_item.h>
#include <page_layout/ws_data_item.h>
#include "tools/pl_actions.h"

View File

@ -29,8 +29,8 @@
#include <view/view.h>
#include <tool/tool_manager.h>
#include <bitmaps.h>
#include <ws_draw_item.h>
#include <ws_data_item.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include "invoke_pl_editor_dialog.h"
#include "pl_editor_frame.h"

View File

@ -24,9 +24,9 @@
#include <tool/tool_manager.h>
#include <tool/picker_tool.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_draw_item.h>
#include <bitmaps.h>
#include <confirm.h>
#include <base_struct.h>

View File

@ -25,11 +25,11 @@
#include <kiway.h>
#include <view/view.h>
#include <tool/tool_manager.h>
#include <ws_painter.h>
#include <confirm.h>
#include <bitmaps.h>
#include <dialog_page_settings.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_painter.h>
#include "pl_editor_frame.h"
#include "pl_editor_id.h"

View File

@ -34,7 +34,7 @@ using namespace std::placeholders;
#include <bitmaps.h>
#include <status_popup.h>
#include <ws_draw_item.h>
#include <page_layout/ws_draw_item.h>
#include <widgets/progress_reporter.h>
#include "pl_editor_frame.h"

View File

@ -30,9 +30,9 @@
#include <tool/tool_event.h>
#include <tool/tool_manager.h>
#include <tool/selection.h>
#include <ws_data_item.h>
#include <ws_data_model.h>
#include <ws_draw_item.h>
#include <page_layout/ws_data_item.h>
#include <page_layout/ws_data_model.h>
#include <page_layout/ws_draw_item.h>
#include <collector.h>
#include <math/util.h> // for KiROUND

View File

@ -29,7 +29,7 @@
#include <iterator>
#include <pcb_base_frame.h>
#include <reporter.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <board_commit.h>
#include <class_board.h>
#include <class_module.h>

View File

@ -30,7 +30,7 @@
#include <settings/settings_manager.h>
#include <footprint_preview_panel.h>
#include <widgets/appearance_controls.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <pcb_painter.h>
#include <class_track.h>
#include <plugins/kicad/kicad_plugin.h>

View File

@ -26,8 +26,8 @@
#include <drc/drc_rule.h>
#include <drc/drc_test_provider.h>
#include <ws_draw_item.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_draw_item.h>
#include <page_layout/ws_proxy_view_item.h>
/*
Miscellaneous tests:

View File

@ -26,7 +26,7 @@
#include <pcb_view.h>
#include <view/wx_view_controls.h>
#include <pcb_painter.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <connectivity/connectivity_data.h>
#include <class_board.h>

View File

@ -40,7 +40,7 @@
#include <invoke_pcb_dialog.h>
#include <class_board.h>
#include <class_module.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <connectivity/connectivity_data.h>
#include <wildcards_and_files_ext.h>
#include <pcb_draw_panel_gal.h>

View File

@ -33,7 +33,7 @@
#include <panel_pcbnew_display_origin.h>
#include <tool/tool_manager.h>
#include <tools/selection_tool.h>
#include <ws_data_model.h>
#include <page_layout/ws_data_model.h>
#include <pcbplot.h>
#include <pcb_painter.h>
#include <invoke_pcb_dialog.h>

View File

@ -30,7 +30,7 @@
#include <fp_shape.h>
#include <collectors.h>
#include <pcb_edit_frame.h>
#include <ws_proxy_view_item.h>
#include <page_layout/ws_proxy_view_item.h>
#include <kiway.h>
#include <array_creator.h>
#include <pcbnew_settings.h>

View File

@ -61,7 +61,7 @@
#include <view/view_controls.h>
#include <view/view_group.h>
#include <wildcards_and_files_ext.h>
#include <ws_proxy_undo_item.h>
#include <page_layout/ws_proxy_undo_item.h>
#include <footprint_edit_frame.h>
using namespace std::placeholders;
@ -784,9 +784,9 @@ int PCB_EDITOR_CONTROL::PlaceModule( const TOOL_EVENT& aEvent )
else if( aEvent.HasPosition() )
m_toolMgr->RunAction( PCB_ACTIONS::cursorClick );
auto setCursor =
[&]()
{
auto setCursor =
[&]()
{
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::PENCIL );
};
@ -1007,9 +1007,9 @@ int PCB_EDITOR_CONTROL::PlaceTarget( const TOOL_EVENT& aEvent )
m_frame->PushTool( tool );
Activate();
auto setCursor =
[&]()
{
auto setCursor =
[&]()
{
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::ARROW );
};

View File

@ -42,7 +42,7 @@ using namespace std::placeholders;
#include <tools/selection_tool.h>
#include <tools/pcbnew_control.h>
#include <tools/pcb_editor_control.h>
#include <ws_proxy_undo_item.h>
#include <page_layout/ws_proxy_undo_item.h>
/* Functions to undo and redo edit commands.
* commands to undo are stored in CurrentScreen->m_UndoList