From 3ddee6503afb648fad71a3df37b8403f5ed9e03d Mon Sep 17 00:00:00 2001 From: Ian McInerney Date: Thu, 20 Aug 2020 01:43:52 +0100 Subject: [PATCH] Dialog changes forgotten in c479deaf --- pcbnew/import_gfx/dialog_import_gfx_base.fbp | 1607 +++++++----------- 1 file changed, 638 insertions(+), 969 deletions(-) diff --git a/pcbnew/import_gfx/dialog_import_gfx_base.fbp b/pcbnew/import_gfx/dialog_import_gfx_base.fbp index 15cf8b6e9c..72913df727 100644 --- a/pcbnew/import_gfx/dialog_import_gfx_base.fbp +++ b/pcbnew/import_gfx/dialog_import_gfx_base.fbp @@ -2,7 +2,7 @@ - + C++ 1 source_name @@ -14,11 +14,12 @@ dialog_import_gfx_base 1000 none + 1 dialog_dxf_import - + . - + 1 1 1 @@ -29,67 +30,31 @@ 0 wxAUI_MGR_DEFAULT - + wxBOTH - + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + DIALOG_IMPORT_GFX_BASE - - -1,-1 + + 446,432 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER DIALOG_SHIM; dialog_shim.h Import Vector Graphics File - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + bSizerMain wxVERTICAL none @@ -98,7 +63,7 @@ wxALL|wxEXPAND 0 - + bSizerFile wxHORIZONTAL none @@ -111,78 +76,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY File: - + 0 + 0 - - + + 0 - + 1 m_staticTextFile 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Only vectors will be imported. Bitmaps and fonts will be ignored. - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -194,86 +137,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 300,-1 1 m_textCtrlFileName 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Only vectors will be imported. Bitmaps and fonts will be ignored. - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -285,83 +201,68 @@ 1 1 1 - - - - - - - + + + + + + + + 1 0 1 - + 1 + 0 0 + Dock 0 Left 1 - + 1 - + + 0 0 wxID_ANY Browse - + + 0 + 0 - - + + 0 - + 1 m_buttonBrowse 1 - - + + protected 1 - + + + Resizable 1 - - - + + + 0 Only vectors will be imported. Bitmaps and fonts will be ignored. - + wxFILTER_NONE wxDefaultValidator - - - - + + + + onBrowseFiles - - - - - - - - - - - - - - - - - - - - - - - @@ -373,18 +274,17 @@ wxID_ANY Placement: - + sbSizer2 wxVERTICAL 1 none - 20 wxEXPAND|wxLEFT - 1 + 0 - + bSizerOptions wxVERTICAL none @@ -397,82 +297,60 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Interactive placement - + 0 - - + + 0 - + 1 m_rbInteractivePlacement 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - + 1 - - - - - - - - - - - - - - - - - - - - + + + onInteractivePlacement - - - - - originOptionOnUpdateUI @@ -481,7 +359,7 @@ wxEXPAND 0 - + bSizerUserPos wxHORIZONTAL none @@ -494,91 +372,69 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY At - + 0 - - + + 0 - + 1 m_rbAbsolutePlacement 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - + + + onAbsolutePlacement - - - - - originOptionOnUpdateUI - + 5 - wxBOTTOM|wxEXPAND|wxTOP + wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP 1 - - + + bSizerPosSettings wxHORIZONTAL none @@ -591,78 +447,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY X: - + 0 + 0 - - + + 0 - + 1 m_staticTextXpos 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -674,86 +508,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 10 - + 0 - + 1 m_DxfPcbXCoord 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 DXF origin on PCB Grid, X Coordinate - + wxFILTER_NUMERIC wxTextValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -765,78 +572,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Y: - + 0 + 0 - - + + 0 - + 1 m_staticTextYpos 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -848,86 +633,59 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - + 10 - + 0 - + 1 m_DxfPcbYCoord 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 DXF origin on PCB Grid, Y Coordinate - + wxFILTER_NUMERIC wxTextValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -939,78 +697,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Units: - + 0 + 0 - - + + 0 - + 1 m_staticTextUnits 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1022,83 +758,60 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "mm" "inch" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_DxfPcbPositionUnits 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 Select PCB grid units - + wxFILTER_NONE wxDefaultValidator - - - - - + + + + onUnitPositionSelection - - - - - - - - - - - - - - - - - - - - - - @@ -1116,18 +829,17 @@ wxID_ANY Import parameters: - + sbSizer1 wxVERTICAL 1 none - 5 wxEXPAND 1 - + bSizer7 wxHORIZONTAL none @@ -1141,17 +853,17 @@ 0 - + 5 wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP 1 - + 3 wxBOTH 1 - + 5 - + fgSizerImportSettings wxFLEX_GROWMODE_SPECIFIED none @@ -1166,78 +878,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Line width (DXF import): - + 0 + 0 - - + + 0 - + 1 m_staticTextLineWidth 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1249,174 +939,124 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_textCtrlLineWidth 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 5 - wxALIGN_CENTER_VERTICAL + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 1 1 1 - - - - - - - + + + + + + + 1 0 "mm" "mils" "inches" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_choiceUnitLineWidth 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - + + + + onUnitWidthSelection - - - - - - - - - - - - - - - - - - - - - - @@ -1428,78 +1068,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Graphic layer: - + 0 + 0 - - + + 0 - + 1 m_staticTextBrdlayer 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1511,91 +1129,65 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 - + 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_SelLayerBox 1 - - + + protected 1 - + Resizable -1 1 - - + + PCB_LAYER_BOX_SELECTOR; pcb_layer_box_selector.h 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 5 - + 0 0 @@ -1612,78 +1204,56 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Import scale: - + 0 + 0 - - + + 0 - + 1 m_staticTextscale 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -1695,91 +1265,64 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_textCtrlImportScale 1 - - + + protected 1 - + Resizable 1 - - + + ; forward_declare 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + 5 - + 0 0 @@ -1791,6 +1334,140 @@ + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_staticline1 + 1 + + + protected + 1 + + Resizable + 1 + + wxLI_HORIZONTAL + ; ; forward_declare + 0 + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + bSizer8 + wxVERTICAL + none + + 10 + wxBOTTOM|wxEXPAND|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Group items + + 0 + + + 0 + + 1 + m_groupItems + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Add all imported items into a new group + + wxFILTER_NONE + wxDefaultValidator + + + + + onGroupItems + + + + @@ -1816,17 +1493,9 @@ 1 0 0 - + m_sdbSizer protected - - - - - - - -