diff --git a/pcbnew/dialogs/panel_setup_teardrops_base.cpp b/pcbnew/dialogs/panel_setup_teardrops_base.cpp index 8730b3e6f3..567971d464 100644 --- a/pcbnew/dialogs/panel_setup_teardrops_base.cpp +++ b/pcbnew/dialogs/panel_setup_teardrops_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -196,7 +196,7 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind m_gridSizer->Add( bSizerShapeColumns, 1, wxEXPAND, 5 ); - m_gridSizer->Add( 0, 30, 0, wxEXPAND, 5 ); + m_gridSizer->Add( 0, 10, 0, wxEXPAND, 5 ); m_rectShapesLabel = new wxStaticText( this, wxID_ANY, _("Default properties for rectangular shapes:"), wxDefaultPosition, wxDefaultSize, 0 ); m_rectShapesLabel->Wrap( -1 ); @@ -378,7 +378,7 @@ PANEL_SETUP_TEARDROPS_BASE::PANEL_SETUP_TEARDROPS_BASE( wxWindow* parent, wxWind m_gridSizer->Add( bSizerShapeColumns1, 1, wxEXPAND, 5 ); - m_gridSizer->Add( 0, 30, 0, wxEXPAND, 5 ); + m_gridSizer->Add( 0, 10, 0, wxEXPAND, 5 ); m_tracksLabel = new wxStaticText( this, wxID_ANY, _("Properties for track-to-track teardrops:"), wxDefaultPosition, wxDefaultSize, 0 ); m_tracksLabel->Wrap( -1 ); diff --git a/pcbnew/dialogs/panel_setup_teardrops_base.fbp b/pcbnew/dialogs/panel_setup_teardrops_base.fbp index 0c047d073d..7887662a14 100644 --- a/pcbnew/dialogs/panel_setup_teardrops_base.fbp +++ b/pcbnew/dialogs/panel_setup_teardrops_base.fbp @@ -2166,7 +2166,7 @@ wxEXPAND 0 - 30 + 10 protected 0 @@ -2296,25 +2296,25 @@ 5 wxEXPAND 1 - + bSizerShapeColumns1 wxHORIZONTAL none - + 10 wxEXPAND|wxRIGHT 0 - + bSizerLeftCol1 wxVERTICAL none - + 5 wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT 1 - + 1 1 1 @@ -2369,20 +2369,20 @@ - + 4 wxEXPAND|wxBOTTOM 0 - + bSizer411 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL|wxLEFT 0 - + 1 1 1 @@ -2440,11 +2440,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -2505,11 +2505,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 - + 1 1 1 @@ -2574,21 +2574,21 @@ - + 5 wxEXPAND 0 - + 0 protected 10 - + 20 wxEXPAND|wxLEFT 0 - + 10,7 wxBOTH @@ -2599,14 +2599,14 @@ wxFLEX_GROWMODE_SPECIFIED none 2 - + 5 1 0 wxALIGN_CENTER_VERTICAL 0 1 - + 1 1 1 @@ -2664,14 +2664,14 @@ -1 - + 5 1 1 wxALIGN_CENTER_VERTICAL|wxEXPAND 0 1 - + 1 1 1 @@ -2732,23 +2732,23 @@ - + 5 1 2 wxALIGN_CENTER_VERTICAL 0 1 - + bSizer122 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -2806,11 +2806,11 @@ -1 - + 1 wxALIGN_BOTTOM 0 - + 1 1 1 @@ -2868,11 +2868,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -2932,14 +2932,14 @@ - + 5 1 0 wxALIGN_CENTER_VERTICAL 1 1 - + 1 1 1 @@ -2997,14 +2997,14 @@ -1 - + 5 1 1 wxALIGN_CENTER_VERTICAL|wxEXPAND 1 1 - + 1 1 1 @@ -3065,14 +3065,14 @@ - + 5 1 2 wxALIGN_CENTER_VERTICAL 1 1 - + 1 1 1 @@ -3130,14 +3130,14 @@ -1 - + 5 1 0 wxALIGN_CENTER_VERTICAL 3 1 - + 1 1 1 @@ -3195,14 +3195,14 @@ -1 - + 5 1 1 wxALIGN_CENTER_VERTICAL|wxEXPAND 3 1 - + 1 1 1 @@ -3263,23 +3263,23 @@ - + 5 1 2 wxEXPAND|wxALIGN_CENTER_VERTICAL 3 1 - + bSizer12 wxHORIZONTAL none - + 5 wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -3337,11 +3337,11 @@ -1 - + 1 wxALIGN_BOTTOM 0 - + 1 1 1 @@ -3399,11 +3399,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -3463,14 +3463,14 @@ - + 5 1 0 wxALIGN_CENTER_VERTICAL 4 1 - + 1 1 1 @@ -3528,14 +3528,14 @@ -1 - + 5 1 1 wxALIGN_CENTER_VERTICAL|wxEXPAND 4 1 - + 1 1 1 @@ -3596,14 +3596,14 @@ - + 5 1 2 wxALIGN_CENTER_VERTICAL 4 1 - + 1 1 1 @@ -3661,14 +3661,14 @@ -1 - + 5 1 0 wxALIGN_CENTER_VERTICAL 6 1 - + 1 1 1 @@ -3726,14 +3726,14 @@ -1 - + 5 1 1 wxALIGN_CENTER_VERTICAL 6 1 - + 1 1 1 @@ -3792,14 +3792,14 @@ - + 40 3 3 wxALIGN_CENTER_VERTICAL|wxLEFT 1 1 - + 1 1 1 @@ -3860,14 +3860,14 @@ - + 40 1 3 wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 - + 1 1 1 @@ -3925,14 +3925,14 @@ -1 - + 5 1 4 wxALIGN_CENTER_VERTICAL 0 1 - + 1 1 1 @@ -3993,23 +3993,23 @@ - + 5 1 5 wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 - + bSizer1221 wxHORIZONTAL none - + 5 0 - + 1 1 1 @@ -4067,11 +4067,11 @@ -1 - + 1 wxALIGN_BOTTOM 0 - + 1 1 1 @@ -4129,11 +4129,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -4193,14 +4193,14 @@ - + 5 5 2 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 6 1 - + 1 1 1 @@ -4270,7 +4270,7 @@ wxEXPAND 0 - 30 + 10 protected 0 @@ -4400,7 +4400,7 @@ 5 wxEXPAND 1 - + bSizerShapeColumns2 wxHORIZONTAL @@ -4688,11 +4688,11 @@ 10 - + 20 wxEXPAND|wxLEFT 0 - + 10,7 wxBOTH @@ -4836,14 +4836,14 @@ - + 5 1 2 wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 - + bSizer1211 wxHORIZONTAL @@ -4972,11 +4972,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -5367,14 +5367,14 @@ - + 5 1 2 wxEXPAND|wxALIGN_CENTER_VERTICAL 3 1 - + bSizer121 wxHORIZONTAL @@ -5503,11 +5503,11 @@ -1 - + 5 wxALIGN_CENTER_VERTICAL 0 - + 1 1 1 @@ -6165,11 +6165,11 @@ -1 - + 1 wxALIGN_BOTTOM|wxBOTTOM 0 - + 1 1 1 diff --git a/pcbnew/dialogs/panel_setup_teardrops_base.h b/pcbnew/dialogs/panel_setup_teardrops_base.h index 1a98aa44ff..1a7ef450e7 100644 --- a/pcbnew/dialogs/panel_setup_teardrops_base.h +++ b/pcbnew/dialogs/panel_setup_teardrops_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf) +// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/resources/bitmaps_png/png/teardrop_rect_sizes.png b/resources/bitmaps_png/png/teardrop_rect_sizes.png index cc96d19e9c..24bd08d5e8 100644 Binary files a/resources/bitmaps_png/png/teardrop_rect_sizes.png and b/resources/bitmaps_png/png/teardrop_rect_sizes.png differ diff --git a/resources/bitmaps_png/png/teardrop_rect_sizes_dark.png b/resources/bitmaps_png/png/teardrop_rect_sizes_dark.png index 486f707f56..00bf176851 100644 Binary files a/resources/bitmaps_png/png/teardrop_rect_sizes_dark.png and b/resources/bitmaps_png/png/teardrop_rect_sizes_dark.png differ diff --git a/resources/bitmaps_png/png/teardrop_sizes.png b/resources/bitmaps_png/png/teardrop_sizes.png index ef290291b0..3131aeb31b 100644 Binary files a/resources/bitmaps_png/png/teardrop_sizes.png and b/resources/bitmaps_png/png/teardrop_sizes.png differ diff --git a/resources/bitmaps_png/png/teardrop_sizes_dark.png b/resources/bitmaps_png/png/teardrop_sizes_dark.png index 9415952c3c..f9b3918e75 100644 Binary files a/resources/bitmaps_png/png/teardrop_sizes_dark.png and b/resources/bitmaps_png/png/teardrop_sizes_dark.png differ diff --git a/resources/bitmaps_png/png/teardrop_track_sizes.png b/resources/bitmaps_png/png/teardrop_track_sizes.png index 5811d7d1eb..4397c95512 100644 Binary files a/resources/bitmaps_png/png/teardrop_track_sizes.png and b/resources/bitmaps_png/png/teardrop_track_sizes.png differ diff --git a/resources/bitmaps_png/png/teardrop_track_sizes_dark.png b/resources/bitmaps_png/png/teardrop_track_sizes_dark.png index 98b81e10f9..ca74dde297 100644 Binary files a/resources/bitmaps_png/png/teardrop_track_sizes_dark.png and b/resources/bitmaps_png/png/teardrop_track_sizes_dark.png differ diff --git a/resources/bitmaps_png/sources/dark/teardrop_rect_sizes.svg b/resources/bitmaps_png/sources/dark/teardrop_rect_sizes.svg index dae93f9aa8..c3a67b9a08 100644 --- a/resources/bitmaps_png/sources/dark/teardrop_rect_sizes.svg +++ b/resources/bitmaps_png/sources/dark/teardrop_rect_sizes.svg @@ -2,12 +2,12 @@ + originx="-0.64005777" + originy="-4.388889" /> @@ -223,7 +223,7 @@ + transform="translate(-0.57549644,-3.95)"> @@ -237,12 +237,12 @@ d="M 25,22 A 1.5,1.5 0 0 0 23.5,23.5 1.5,1.5 0 0 0 25,25 h 8.5 A 1.5,1.5 0 0 0 35,23.5 1.5,1.5 0 0 0 33.5,22 Z" id="path1389" /> @@ -250,12 +250,12 @@ xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.94202px;line-height:1.25;font-family:'Noto Sans Mono CJK SC';-inkscape-font-specification:'Noto Sans Mono CJK SC';letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.121376" x="28.523277" - y="33.939037" + y="32.339031" id="text3524">L W diff --git a/resources/bitmaps_png/sources/dark/teardrop_sizes.svg b/resources/bitmaps_png/sources/dark/teardrop_sizes.svg index 837b0d9cbb..ad856759c9 100644 --- a/resources/bitmaps_png/sources/dark/teardrop_sizes.svg +++ b/resources/bitmaps_png/sources/dark/teardrop_sizes.svg @@ -2,12 +2,12 @@ + originx="1.0534922" + originy="-6.1400174" /> @@ -153,7 +153,11 @@ orient="auto" inkscape:stockid="Arrow2Mstart" inkscape:isstock="true" - inkscape:collect="always"> + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> + inkscape:collect="always" + viewBox="0 0 6.9304588 5.1962256" + markerWidth="6.9304585" + markerHeight="5.1962256" + preserveAspectRatio="xMidYMid"> ps_diff_pair_tune_phase + transform="translate(1.1590478,-5.8289061)"> - - - L W - + + + + diff --git a/resources/bitmaps_png/sources/dark/teardrop_track_sizes.svg b/resources/bitmaps_png/sources/dark/teardrop_track_sizes.svg index fe21a78442..cbc7ac3491 100644 --- a/resources/bitmaps_png/sources/dark/teardrop_track_sizes.svg +++ b/resources/bitmaps_png/sources/dark/teardrop_track_sizes.svg @@ -2,12 +2,12 @@ + originx="-0.98750015" + originy="-7.7222225" /> @@ -209,7 +209,7 @@ id="title159431">ps_diff_pair_tune_phase + transform="translate(-0.88749995,-6.95)"> @@ -246,12 +246,12 @@ xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.94202px;line-height:1.25;font-family:'Noto Sans Mono CJK SC';-inkscape-font-specification:'Noto Sans Mono CJK SC';letter-spacing:0px;word-spacing:0px;fill:#42b8eb;fill-opacity:1;stroke:none;stroke-width:0.121376" x="12.773277" - y="21.753771" + y="18.95376" id="text3524">L W diff --git a/resources/bitmaps_png/sources/light/teardrop_rect_sizes.svg b/resources/bitmaps_png/sources/light/teardrop_rect_sizes.svg index 7bd4cd3300..10b6494171 100644 --- a/resources/bitmaps_png/sources/light/teardrop_rect_sizes.svg +++ b/resources/bitmaps_png/sources/light/teardrop_rect_sizes.svg @@ -2,12 +2,12 @@ + originx="-0.63311354" + originy="-5.5000004" /> @@ -280,100 +280,100 @@ id="title159431">ps_diff_pair_tune_phase L W + inkscape:original-d="m 4.4314478,0.05 h 6.0000002 v 13 H 4.4314478 Z" /> diff --git a/resources/bitmaps_png/sources/light/teardrop_sizes.svg b/resources/bitmaps_png/sources/light/teardrop_sizes.svg index 300ce6c8d6..86f0e38948 100644 --- a/resources/bitmaps_png/sources/light/teardrop_sizes.svg +++ b/resources/bitmaps_png/sources/light/teardrop_sizes.svg @@ -2,12 +2,12 @@ + inkscape:deskcolor="#d1d1d1" + showguides="true"> + originx="1.3714213" + originy="-6.1252091" /> + @@ -180,7 +186,7 @@ id="title159431">ps_diff_pair_tune_phase + transform="translate(1.4769769,-5.8231037)"> L W diff --git a/resources/bitmaps_png/sources/light/teardrop_track_sizes.svg b/resources/bitmaps_png/sources/light/teardrop_track_sizes.svg index 9d41fadb63..c8a0516d4d 100644 --- a/resources/bitmaps_png/sources/light/teardrop_track_sizes.svg +++ b/resources/bitmaps_png/sources/light/teardrop_track_sizes.svg @@ -2,12 +2,12 @@ + originx="-0.98749996" + originy="-7.7222219" /> @@ -210,18 +210,18 @@ + transform="translate(-0.88749995,-6.95)"> @@ -245,12 +245,12 @@ xml:space="preserve" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:1.94202px;line-height:1.25;font-family:'Noto Sans Mono CJK SC';-inkscape-font-specification:'Noto Sans Mono CJK SC';letter-spacing:0px;word-spacing:0px;fill:#1a81c4;fill-opacity:1;stroke:none;stroke-width:0.121376" x="12.773277" - y="21.753771" + y="18.953787" id="text3524">L W