Add sort feature to pre-defined list

Board setup rows should be sortable when inserting new elements. They get sorted when saving, this keeps that representation while editing Fixes https://gitlab.com/kicad/code/kicad/issues/12015
3 years ago · 595e5cb3f2
12 changed files with 620 additions and 10 deletions
--- a/bitmaps_png/CMakeLists.txt
+++ b/bitmaps_png/CMakeLists.txt
@ -115,6 +115,7 @@ set( BMAPS_SMALL
    small_library
    small_plus
    small_refresh
+    small_sort_desc
    small_trash
    small_up
    small_warning
--- a/bitmaps_png/png/small_sort_desc_16.png
+++ b/bitmaps_png/png/small_sort_desc_16.png
--- a/bitmaps_png/png/small_sort_desc_dark_16.png
+++ b/bitmaps_png/png/small_sort_desc_dark_16.png
--- a/bitmaps_png/sources/dark/small_sort_desc.svg
+++ b/bitmaps_png/sources/dark/small_sort_desc.svg
@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 16 16"
+   version="1.1"
+   sodipodi:docname="small_sort_desc.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2099"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="72.651158"
+     inkscape:cx="8.0905574"
+     inkscape:cy="11.73278"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>small_down</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs160009">
+    <style
+       id="style160007">.cls-1{fill:none;stroke:#DED3DD;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
+  </defs>
+  <title
+     id="title160011">small_down</title>
+  <line
+     class="cls-1"
+     x1="12"
+     y1="10"
+     x2="12"
+     y2="2"
+     id="line160013" />
+  <path
+     id="polyline160015"
+     style="fill:none;stroke:#ded3dd;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     d="M 14.5,7.5 12,10 9,7.5"
+     class="cls-1"
+     sodipodi:nodetypes="ccc" />
+  <line
+     class="cls-1"
+     x1="4"
+     y1="2"
+     x2="1"
+     y2="2"
+     id="line1038" />
+  <line
+     class="cls-1"
+     x1="5"
+     y1="6"
+     x2="1"
+     y2="6"
+     id="line1040" />
+  <line
+     class="cls-1"
+     x1="7"
+     y1="10"
+     x2="1"
+     y2="10"
+     id="line1042" />
+  <line
+     class="cls-1"
+     x1="10"
+     y1="14"
+     x2="1"
+     y2="14"
+     id="line1044" />
+</svg>
--- a/bitmaps_png/sources/light/small_sort_desc.svg
+++ b/bitmaps_png/sources/light/small_sort_desc.svg
@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Слой_1"
+   data-name="Слой 1"
+   viewBox="0 0 16 16"
+   version="1.1"
+   sodipodi:docname="small_sort_desc.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   width="16"
+   height="16">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2099"
+     id="namedview30"
+     showgrid="true"
+     inkscape:zoom="72.651158"
+     inkscape:cx="8.0905574"
+     inkscape:cy="11.73278"
+     inkscape:window-x="0"
+     inkscape:window-y="37"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="Слой_1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid_kicad"
+       spacingx="0.5"
+       spacingy="0.5"
+       color="#9999ff"
+       opacity="0.13"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata43">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>small_down</dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs160009">
+    <style
+       id="style160007">.cls-1{fill:none;stroke:#DED3DD;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style>
+  </defs>
+  <title
+     id="title160011">small_down</title>
+  <line
+     class="cls-1"
+     x1="12"
+     y1="10"
+     x2="12"
+     y2="2"
+     id="line160013"
+     style="stroke:#545454;stroke-opacity:1" />
+  <path
+     id="polyline160015"
+     style="fill:none;stroke:#545454;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 14.5,7.5 12,10 9,7.5"
+     class="cls-1"
+     sodipodi:nodetypes="ccc" />
+  <line
+     class="cls-1"
+     x1="4"
+     y1="2"
+     x2="1"
+     y2="2"
+     id="line1038"
+     style="stroke:#545454;stroke-opacity:1" />
+  <line
+     class="cls-1"
+     x1="5"
+     y1="6"
+     x2="1"
+     y2="6"
+     id="line1040"
+     style="stroke:#545454;stroke-opacity:1" />
+  <line
+     class="cls-1"
+     x1="7"
+     y1="10"
+     x2="1"
+     y2="10"
+     id="line1042"
+     style="stroke:#545454;stroke-opacity:1" />
+  <line
+     class="cls-1"
+     x1="10"
+     y1="14"
+     x2="1"
+     y2="14"
+     id="line1044"
+     style="stroke:#545454;stroke-opacity:1" />
+</svg>
--- a/common/bitmap_info.cpp
+++ b/common/bitmap_info.cpp
@ -73,6 +73,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
    aBitmapInfoCache[BITMAPS::small_library].emplace_back( BITMAPS::small_library, wxT( "small_library_16.png" ), 16, wxT( "light" ) );
    aBitmapInfoCache[BITMAPS::small_plus].emplace_back( BITMAPS::small_plus, wxT( "small_plus_16.png" ), 16, wxT( "light" ) );
    aBitmapInfoCache[BITMAPS::small_refresh].emplace_back( BITMAPS::small_refresh, wxT( "small_refresh_16.png" ), 16, wxT( "light" ) );
+    aBitmapInfoCache[BITMAPS::small_sort_desc].emplace_back( BITMAPS::small_sort_desc, wxT( "small_sort_desc_16.png" ), 16, wxT( "light" ) );
    aBitmapInfoCache[BITMAPS::small_trash].emplace_back( BITMAPS::small_trash, wxT( "small_trash_16.png" ), 16, wxT( "light" ) );
    aBitmapInfoCache[BITMAPS::small_up].emplace_back( BITMAPS::small_up, wxT( "small_up_16.png" ), 16, wxT( "light" ) );
    aBitmapInfoCache[BITMAPS::small_warning].emplace_back( BITMAPS::small_warning, wxT( "small_warning_16.png" ), 16, wxT( "light" ) );
@ -142,6 +143,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
    aBitmapInfoCache[BITMAPS::small_library].emplace_back( BITMAPS::small_library, wxT( "small_library_dark_16.png" ), 16, wxT( "dark" ) );
    aBitmapInfoCache[BITMAPS::small_plus].emplace_back( BITMAPS::small_plus, wxT( "small_plus_dark_16.png" ), 16, wxT( "dark" ) );
    aBitmapInfoCache[BITMAPS::small_refresh].emplace_back( BITMAPS::small_refresh, wxT( "small_refresh_dark_16.png" ), 16, wxT( "dark" ) );
+    aBitmapInfoCache[BITMAPS::small_sort_desc].emplace_back( BITMAPS::small_sort_desc, wxT( "small_sort_desc_dark_16.png" ), 16, wxT( "dark" ) );
    aBitmapInfoCache[BITMAPS::small_trash].emplace_back( BITMAPS::small_trash, wxT( "small_trash_dark_16.png" ), 16, wxT( "dark" ) );
    aBitmapInfoCache[BITMAPS::small_up].emplace_back( BITMAPS::small_up, wxT( "small_up_dark_16.png" ), 16, wxT( "dark" ) );
    aBitmapInfoCache[BITMAPS::small_warning].emplace_back( BITMAPS::small_warning, wxT( "small_warning_dark_16.png" ), 16, wxT( "dark" ) );
--- a/include/bitmaps/bitmaps_list.h
+++ b/include/bitmaps/bitmaps_list.h
@ -527,6 +527,7 @@ enum class BITMAPS : unsigned int
    small_library,
    small_plus,
    small_refresh,
+    small_sort_desc,
    small_trash,
    small_up,
    small_warning,
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
@ -64,10 +64,13 @@ PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS( PAGED_DIALOG* aParent,
    m_ConstraintsPanel = aConstraintsPanel;

    m_trackWidthsAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
+    m_trackWidthsSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
    m_trackWidthsRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
    m_viaSizesAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
+    m_viaSizesSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
    m_viaSizesRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );
    m_diffPairsAddButton->SetBitmap( KiBitmap( BITMAPS::small_plus ) );
+    m_diffPairsSortButton->SetBitmap( KiBitmap( BITMAPS::small_sort_desc ) );
    m_diffPairsRemoveButton->SetBitmap( KiBitmap( BITMAPS::small_trash ) );

    // Membership combobox editors require a bit more room, so increase the row size of
@ -116,6 +119,98 @@ PANEL_SETUP_TRACKS_AND_VIAS::~PANEL_SETUP_TRACKS_AND_VIAS()
 }


+void PANEL_SETUP_TRACKS_AND_VIAS::OnSortTrackWidthsClick( wxCommandEvent& aEvent )
+{
+    std::vector<int> trackWidths;
+    wxString         msg;
+
+    wxGridUpdateLocker lock( m_trackWidthsGrid );
+
+    for( int row = 0; row < m_trackWidthsGrid->GetNumberRows();  ++row )
+    {
+        msg = m_trackWidthsGrid->GetCellValue( row, TR_WIDTH_COL );
+
+        if( !msg.IsEmpty() )
+            trackWidths.push_back( ValueFromString( m_Frame->GetUserUnits(), msg ) );
+    }
+
+    std::sort( trackWidths.begin(), trackWidths.end() );
+    m_trackWidthsGrid->DeleteRows(0, m_trackWidthsGrid->GetNumberRows(), false);
+
+    for( int width : trackWidths )
+        AppendTrackWidth( width );
+}
+
+
+void PANEL_SETUP_TRACKS_AND_VIAS::OnSortViaSizesClick( wxCommandEvent& aEvent )
+{
+    std::vector<VIA_DIMENSION> vias;
+    wxString                   msg;
+
+    wxGridUpdateLocker lock( m_viaSizesGrid );
+
+    for( int row = 0; row < m_viaSizesGrid->GetNumberRows();  ++row )
+    {
+        msg = m_viaSizesGrid->GetCellValue( row, VIA_SIZE_COL );
+
+        if( !msg.IsEmpty() )
+        {
+            VIA_DIMENSION via_dim;
+            via_dim.m_Diameter = ValueFromString( m_Frame->GetUserUnits(), msg );
+
+            msg = m_viaSizesGrid->GetCellValue( row, VIA_DRILL_COL );
+
+            if( !msg.IsEmpty() )
+                via_dim.m_Drill = ValueFromString( m_Frame->GetUserUnits(), msg );
+
+            vias.push_back( via_dim );
+        }
+    }
+
+    std::sort( vias.begin(), vias.end() );
+    m_viaSizesGrid->DeleteRows(0, m_viaSizesGrid->GetNumberRows(), false );
+
+    for( const VIA_DIMENSION& via : vias )
+        AppendViaSize( via.m_Diameter, via.m_Drill );
+}
+
+
+void PANEL_SETUP_TRACKS_AND_VIAS::OnSortDiffPairsClick( wxCommandEvent& aEvent )
+{
+    wxString                         msg;
+    std::vector<DIFF_PAIR_DIMENSION> diffPairs;
+
+    wxGridUpdateLocker lock( m_diffPairsGrid );
+
+    for( int row = 0; row < m_diffPairsGrid->GetNumberRows();  ++row )
+    {
+        msg = m_diffPairsGrid->GetCellValue( row, DP_WIDTH_COL );
+
+        if( !msg.IsEmpty() )
+        {
+            DIFF_PAIR_DIMENSION diffPair_dim;
+            diffPair_dim.m_Width = ValueFromString( m_Frame->GetUserUnits(), msg );
+
+            msg = m_diffPairsGrid->GetCellValue( row, DP_GAP_COL );
+            diffPair_dim.m_Gap = ValueFromString( m_Frame->GetUserUnits(), msg );
+
+            msg = m_diffPairsGrid->GetCellValue( row, DP_VIA_GAP_COL );
+
+            if( !msg.IsEmpty() )
+                diffPair_dim.m_ViaGap = ValueFromString( m_Frame->GetUserUnits(), msg );
+
+            diffPairs.push_back( diffPair_dim );
+        }
+    }
+
+    std::sort( diffPairs.begin(), diffPairs.end() );
+    m_diffPairsGrid->DeleteRows(0, m_diffPairsGrid->GetNumberRows(), false );
+
+    for( const DIFF_PAIR_DIMENSION& dp : diffPairs )
+        AppendDiffPairs( dp.m_Width, dp.m_Gap, dp.m_ViaGap );
+}
+
+
 void PANEL_SETUP_TRACKS_AND_VIAS::onUnitsChanged( wxCommandEvent& aEvent )
 {
    BOARD_DESIGN_SETTINGS  tempBDS( nullptr, "dummy" );
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias.h
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias.h
@ -52,10 +52,13 @@ public:

 protected:
    void OnAddTrackWidthsClick( wxCommandEvent& event ) override;
+    void OnSortTrackWidthsClick( wxCommandEvent& event ) override;
    void OnRemoveTrackWidthsClick( wxCommandEvent& event ) override;
    void OnAddViaSizesClick( wxCommandEvent& event ) override;
+    void OnSortViaSizesClick( wxCommandEvent& event ) override;
    void OnRemoveViaSizesClick( wxCommandEvent& event ) override;
    void OnAddDiffPairsClick( wxCommandEvent& event ) override;
+    void OnSortDiffPairsClick( wxCommandEvent& event ) override;
    void OnRemoveDiffPairsClick( wxCommandEvent& event ) override;

    void onUnitsChanged( wxCommandEvent& aEvent );
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.cpp
@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.0)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@ -38,13 +38,12 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	// Columns
 	m_trackWidthsGrid->EnableDragColMove( false );
 	m_trackWidthsGrid->EnableDragColSize( false );
-	m_trackWidthsGrid->SetColLabelSize( 24 );
 	m_trackWidthsGrid->SetColLabelValue( 0, _("Width") );
+	m_trackWidthsGrid->SetColLabelSize( 24 );
 	m_trackWidthsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

 	// Rows
 	m_trackWidthsGrid->EnableDragRowSize( false );
-	m_trackWidthsGrid->SetRowLabelSize( 0 );
 	m_trackWidthsGrid->SetRowLabelValue( 0, _("1") );
 	m_trackWidthsGrid->SetRowLabelValue( 1, _("2") );
 	m_trackWidthsGrid->SetRowLabelValue( 2, _("3") );
@ -53,6 +52,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	m_trackWidthsGrid->SetRowLabelValue( 5, _("6") );
 	m_trackWidthsGrid->SetRowLabelValue( 6, _("7") );
 	m_trackWidthsGrid->SetRowLabelValue( 7, _("8") );
+	m_trackWidthsGrid->SetRowLabelSize( 0 );
 	m_trackWidthsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

 	// Label Appearance
@ -67,6 +67,9 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	m_trackWidthsAddButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	bSizer3->Add( m_trackWidthsAddButton, 0, wxLEFT|wxRIGHT, 5 );

+	m_trackWidthsSortButton = new wxBitmapButton( sbSizer4->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer3->Add( m_trackWidthsSortButton, 0, wxLEFT|wxRIGHT, 5 );
+

 	bSizer3->Add( 20, 0, 0, wxEXPAND, 5 );

@ -94,14 +97,13 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	// Columns
 	m_viaSizesGrid->EnableDragColMove( false );
 	m_viaSizesGrid->EnableDragColSize( false );
-	m_viaSizesGrid->SetColLabelSize( 24 );
 	m_viaSizesGrid->SetColLabelValue( 0, _("Diameter") );
 	m_viaSizesGrid->SetColLabelValue( 1, _("Hole") );
+	m_viaSizesGrid->SetColLabelSize( 24 );
 	m_viaSizesGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

 	// Rows
 	m_viaSizesGrid->EnableDragRowSize( false );
-	m_viaSizesGrid->SetRowLabelSize( 0 );
 	m_viaSizesGrid->SetRowLabelValue( 0, _("1") );
 	m_viaSizesGrid->SetRowLabelValue( 1, _("2") );
 	m_viaSizesGrid->SetRowLabelValue( 2, _("3") );
@ -110,6 +112,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	m_viaSizesGrid->SetRowLabelValue( 5, _("6") );
 	m_viaSizesGrid->SetRowLabelValue( 6, _("7") );
 	m_viaSizesGrid->SetRowLabelValue( 7, _("8") );
+	m_viaSizesGrid->SetRowLabelSize( 0 );
 	m_viaSizesGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

 	// Label Appearance
@ -124,6 +127,9 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	m_viaSizesAddButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	bSizer4->Add( m_viaSizesAddButton, 0, wxLEFT|wxRIGHT, 5 );

+	m_viaSizesSortButton = new wxBitmapButton( sbSizer5->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer4->Add( m_viaSizesSortButton, 0, wxALIGN_LEFT|wxALIGN_RIGHT, 5 );
+

 	bSizer4->Add( 20, 0, 0, wxEXPAND, 5 );

@ -151,15 +157,14 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	// Columns
 	m_diffPairsGrid->EnableDragColMove( false );
 	m_diffPairsGrid->EnableDragColSize( false );
-	m_diffPairsGrid->SetColLabelSize( 24 );
 	m_diffPairsGrid->SetColLabelValue( 0, _("Width") );
 	m_diffPairsGrid->SetColLabelValue( 1, _("Gap") );
 	m_diffPairsGrid->SetColLabelValue( 2, _("Via Gap") );
+	m_diffPairsGrid->SetColLabelSize( 24 );
 	m_diffPairsGrid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

 	// Rows
 	m_diffPairsGrid->EnableDragRowSize( false );
-	m_diffPairsGrid->SetRowLabelSize( 0 );
 	m_diffPairsGrid->SetRowLabelValue( 0, _("1") );
 	m_diffPairsGrid->SetRowLabelValue( 1, _("2") );
 	m_diffPairsGrid->SetRowLabelValue( 2, _("3") );
@ -168,6 +173,7 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	m_diffPairsGrid->SetRowLabelValue( 5, _("6") );
 	m_diffPairsGrid->SetRowLabelValue( 6, _("7") );
 	m_diffPairsGrid->SetRowLabelValue( 7, _("8") );
+	m_diffPairsGrid->SetRowLabelSize( 0 );
 	m_diffPairsGrid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );

 	// Label Appearance
@ -183,6 +189,9 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa
 	m_diffPairsAddButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
 	bSizer5->Add( m_diffPairsAddButton, 0, wxLEFT|wxRIGHT, 5 );

+	m_diffPairsSortButton = new wxBitmapButton( sbSizer6->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
+	bSizer5->Add( m_diffPairsSortButton, 0, wxALIGN_LEFT|wxALIGN_RIGHT, 5 );
+

 	bSizer5->Add( 20, 0, 0, wxEXPAND, 5 );

@ -204,10 +213,13 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* pa

 	// Connect Events
 	m_trackWidthsAddButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddTrackWidthsClick ), NULL, this );
+	m_trackWidthsSortButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnSortTrackWidthsClick ), NULL, this );
 	m_trackWidthsRemoveButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveTrackWidthsClick ), NULL, this );
 	m_viaSizesAddButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddViaSizesClick ), NULL, this );
+	m_viaSizesSortButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnSortViaSizesClick ), NULL, this );
 	m_viaSizesRemoveButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveViaSizesClick ), NULL, this );
 	m_diffPairsAddButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddDiffPairsClick ), NULL, this );
+	m_diffPairsSortButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnSortDiffPairsClick ), NULL, this );
 	m_diffPairsRemoveButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveDiffPairsClick ), NULL, this );
 }

@ -215,10 +227,13 @@ PANEL_SETUP_TRACKS_AND_VIAS_BASE::~PANEL_SETUP_TRACKS_AND_VIAS_BASE()
 {
 	// Disconnect Events
 	m_trackWidthsAddButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddTrackWidthsClick ), NULL, this );
+	m_trackWidthsSortButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnSortTrackWidthsClick ), NULL, this );
 	m_trackWidthsRemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveTrackWidthsClick ), NULL, this );
 	m_viaSizesAddButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddViaSizesClick ), NULL, this );
+	m_viaSizesSortButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnSortViaSizesClick ), NULL, this );
 	m_viaSizesRemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveViaSizesClick ), NULL, this );
 	m_diffPairsAddButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnAddDiffPairsClick ), NULL, this );
+	m_diffPairsSortButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnSortDiffPairsClick ), NULL, this );
 	m_diffPairsRemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_SETUP_TRACKS_AND_VIAS_BASE::OnRemoveDiffPairsClick ), NULL, this );

 }
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.fbp
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="15" />
+    <FileVersion major="1" minor="16" />
    <object class="Project" expanded="1">
        <property name="class_decoration"></property>
        <property name="code_generation">C++</property>
@ -14,6 +14,7 @@
        <property name="file">panel_setup_tracks_and_vias_base</property>
        <property name="first_id">1000</property>
        <property name="help_provider">none</property>
+        <property name="image_path_wrapper_function_name"></property>
        <property name="indent_with_spaces"></property>
        <property name="internationalize">1</property>
        <property name="name">panel_setup_tracks_and_vias_base</property>
@ -25,6 +26,7 @@
        <property name="skip_php_events">1</property>
        <property name="skip_python_events">1</property>
        <property name="ui_table">UI</property>
+        <property name="use_array_enum">0</property>
        <property name="use_enum">1</property>
        <property name="use_microsoft_bom">0</property>
        <object class="Panel" expanded="1">
@ -46,6 +48,7 @@
            <property name="size">674,343</property>
            <property name="subclass">; forward_declare</property>
            <property name="tooltip"></property>
+            <property name="two_step_creation">0</property>
            <property name="window_extra_style"></property>
            <property name="window_name"></property>
            <property name="window_style">wxTAB_TRAVERSAL</property>
@ -246,6 +249,7 @@
                                                <property name="aui_name"></property>
                                                <property name="aui_position"></property>
                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                <property name="best_size"></property>
                                                <property name="bg"></property>
                                                <property name="bitmap"></property>
@ -306,6 +310,80 @@
                                                <event name="OnButtonClick">OnAddTrackWidthsClick</event>
                                            </object>
                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxLEFT|wxRIGHT</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxBitmapButton" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="bitmap"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="current"></property>
+                                                <property name="default">0</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="disabled"></property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="focus"></property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">MyButton</property>
+                                                <property name="margins"></property>
+                                                <property name="markup">0</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size">-1,-1</property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_trackWidthsSortButton</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="position"></property>
+                                                <property name="pressed"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass">; forward_declare</property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnButtonClick">OnSortTrackWidthsClick</event>
+                                            </object>
+                                        </object>
                                        <object class="sizeritem" expanded="1">
                                            <property name="border">5</property>
                                            <property name="flag">wxEXPAND</property>
@ -329,6 +407,7 @@
                                                <property name="aui_name"></property>
                                                <property name="aui_position"></property>
                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                <property name="best_size"></property>
                                                <property name="bg"></property>
                                                <property name="bitmap"></property>
@ -515,6 +594,7 @@
                                                <property name="aui_name"></property>
                                                <property name="aui_position"></property>
                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                <property name="best_size"></property>
                                                <property name="bg"></property>
                                                <property name="bitmap"></property>
@ -575,6 +655,80 @@
                                                <event name="OnButtonClick">OnAddViaSizesClick</event>
                                            </object>
                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALIGN_LEFT|wxALIGN_RIGHT</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxBitmapButton" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="bitmap"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="current"></property>
+                                                <property name="default">0</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="disabled"></property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="focus"></property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">MyButton</property>
+                                                <property name="margins"></property>
+                                                <property name="markup">0</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size">-1,-1</property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_viaSizesSortButton</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="position"></property>
+                                                <property name="pressed"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass">; forward_declare</property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnButtonClick">OnSortViaSizesClick</event>
+                                            </object>
+                                        </object>
                                        <object class="sizeritem" expanded="1">
                                            <property name="border">5</property>
                                            <property name="flag">wxEXPAND</property>
@ -598,6 +752,7 @@
                                                <property name="aui_name"></property>
                                                <property name="aui_position"></property>
                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                <property name="best_size"></property>
                                                <property name="bg"></property>
                                                <property name="bitmap"></property>
@ -784,6 +939,7 @@
                                                <property name="aui_name"></property>
                                                <property name="aui_position"></property>
                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                <property name="best_size"></property>
                                                <property name="bg"></property>
                                                <property name="bitmap"></property>
@ -844,6 +1000,80 @@
                                                <event name="OnButtonClick">OnAddDiffPairsClick</event>
                                            </object>
                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALIGN_LEFT|wxALIGN_RIGHT</property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxBitmapButton" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="bitmap"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="current"></property>
+                                                <property name="default">0</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="disabled"></property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="focus"></property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">MyButton</property>
+                                                <property name="margins"></property>
+                                                <property name="markup">0</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size">-1,-1</property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_diffPairsSortButton</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="position"></property>
+                                                <property name="pressed"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass">; forward_declare</property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnButtonClick">OnSortDiffPairsClick</event>
+                                            </object>
+                                        </object>
                                        <object class="sizeritem" expanded="1">
                                            <property name="border">5</property>
                                            <property name="flag">wxEXPAND</property>
@ -867,6 +1097,7 @@
                                                <property name="aui_name"></property>
                                                <property name="aui_position"></property>
                                                <property name="aui_row"></property>
+                                                <property name="auth_needed">0</property>
                                                <property name="best_size"></property>
                                                <property name="bg"></property>
                                                <property name="bitmap"></property>
--- a/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
+++ b/pcbnew/dialogs/panel_setup_tracks_and_vias_base.h
@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Oct 26 2018)
+// C++ code generated with wxFormBuilder (version 3.10.0)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@ -41,26 +41,33 @@ class PANEL_SETUP_TRACKS_AND_VIAS_BASE : public wxPanel
 		wxStaticText* m_label;
 		WX_GRID* m_trackWidthsGrid;
 		wxBitmapButton* m_trackWidthsAddButton;
+		wxBitmapButton* m_trackWidthsSortButton;
 		wxBitmapButton* m_trackWidthsRemoveButton;
 		WX_GRID* m_viaSizesGrid;
 		wxBitmapButton* m_viaSizesAddButton;
+		wxBitmapButton* m_viaSizesSortButton;
 		wxBitmapButton* m_viaSizesRemoveButton;
 		WX_GRID* m_diffPairsGrid;
 		wxBitmapButton* m_diffPairsAddButton;
+		wxBitmapButton* m_diffPairsSortButton;
 		wxBitmapButton* m_diffPairsRemoveButton;

-		// Virtual event handlers, overide them in your derived class
+		// Virtual event handlers, override them in your derived class
 		virtual void OnAddTrackWidthsClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSortTrackWidthsClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRemoveTrackWidthsClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnAddViaSizesClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSortViaSizesClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRemoveViaSizesClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnAddDiffPairsClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSortDiffPairsClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnRemoveDiffPairsClick( wxCommandEvent& event ) { event.Skip(); }


 	public:

 		PANEL_SETUP_TRACKS_AND_VIAS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 674,343 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
+
 		~PANEL_SETUP_TRACKS_AND_VIAS_BASE();

 };