From 6d9b73237ea54c324410eb6bd874326ddc2773c3 Mon Sep 17 00:00:00 2001
From: Jan Wichmann <j-wichmann@gmx.net>
Date: Sun, 17 Nov 2024 05:19:26 +0000
Subject: [PATCH] Add apply button to the dialog 'Edit track and vias'
Fixes: https://gitlab.com/kicad/code/kicad/-/issues/19110
---
.../dialog_global_edit_text_and_graphics.cpp | 7 +
.../dialog_global_edit_tracks_and_vias.cpp | 12 +-
...ialog_global_edit_tracks_and_vias_base.cpp | 4 +-
...ialog_global_edit_tracks_and_vias_base.fbp | 182 +++++++++---------
.../dialog_global_edit_tracks_and_vias_base.h | 3 +-
5 files changed, 113 insertions(+), 95 deletions(-)
diff --git a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
index d347c5bc9f..57ca15df4a 100644
--- a/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -80,6 +80,7 @@ static wxString g_referenceFilter;
static bool g_filterByFootprint;
static wxString g_footprintFilter;
static bool g_filterSelected = false;
+static bool g_setToSpecifiedValues = true;
class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS : public DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE
@@ -162,6 +163,11 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( PCB_
m_grid->SetCellHighlightPenWidth( 0 );
m_grid->SetDefaultCellFont( KIUI::GetInfoFont( this ) );
+ if( g_setToSpecifiedValues == true )
+ m_setToSpecifiedValues->SetValue( true );
+ else
+ m_setToLayerDefaults->SetValue( true );
+
SetupStandardButtons();
finishDialogSettings();
@@ -195,6 +201,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::~DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS()
}
g_filterSelected = m_selectedItemsFilter->GetValue();
+ g_setToSpecifiedValues = m_setToSpecifiedValues->GetValue();
}
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
index 73035307c2..4a165da343 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias.cpp
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2009-2016 Jean-Pierre Charras, jean-pierre.charras at wanadoo.fr
- * Copyright (C) 1992-2023 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 1992-2024 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
@@ -66,6 +66,7 @@ static int g_trackWidthFilter = 0;
static bool g_filterByViaSize = false;
static int g_viaSizeFilter = 0;
static bool g_filterSelected = false;
+static bool g_setToSpecifiedValues = true;
class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS : public DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE
@@ -147,6 +148,11 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS( PCB_EDIT
m_annularRingsLabel->Show( m_brd->GetCopperLayerCount() > 2 );
m_annularRingsCtrl->Show( m_brd->GetCopperLayerCount() > 2 );
+ if( g_setToSpecifiedValues == true )
+ m_setToSpecifiedValues->SetValue( true );
+ else
+ m_setToDesignRuleValues->SetValue( true );
+
SetupStandardButtons();
m_netFilter->Connect( FILTERED_ITEM_SELECTED,
@@ -175,6 +181,7 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::~DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS()
g_filterByViaSize = m_filterByViaSize->GetValue();
g_viaSizeFilter = m_viaSizeFilter.GetIntValue();
g_filterSelected = m_selectedItemsFilter->GetValue();
+ g_setToSpecifiedValues = m_setToSpecifiedValues->GetValue();
m_netFilter->Disconnect( FILTERED_ITEM_SELECTED,
wxCommandEventHandler( DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS::OnNetFilterSelect ),
@@ -491,5 +498,4 @@ int GLOBAL_EDIT_TOOL::EditTracksAndVias( const TOOL_EVENT& aEvent )
dlg.ShowQuasiModal(); // QuasiModal required for NET_SELECTOR
return 0;
-}
-
+}
\ No newline at end of file
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp
index 385d797790..63fdbb7a05 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.cpp
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6-dirty)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -203,6 +203,8 @@ DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE::DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE
m_sdbSizer = new wxStdDialogButtonSizer();
m_sdbSizerOK = new wxButton( this, wxID_OK );
m_sdbSizer->AddButton( m_sdbSizerOK );
+ m_sdbSizerApply = new wxButton( this, wxID_APPLY );
+ m_sdbSizer->AddButton( m_sdbSizerApply );
m_sdbSizerCancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer->AddButton( m_sdbSizerCancel );
m_sdbSizer->Realize();
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp
index a214205ab3..4891cc6ed6 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.fbp
@@ -1,34 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<wxFormBuilder_Project>
- <FileVersion major="1" minor="17"/>
+ <FileVersion major="1" minor="18"/>
<object class="Project" expanded="true">
- <property name="class_decoration"></property>
<property name="code_generation">C++</property>
- <property name="disconnect_events">1</property>
- <property name="disconnect_mode">source_name</property>
- <property name="disconnect_php_events">0</property>
- <property name="disconnect_python_events">0</property>
+ <property name="cpp_class_decoration"></property>
+ <property name="cpp_disconnect_events">1</property>
+ <property name="cpp_event_generation">connect</property>
+ <property name="cpp_help_provider">none</property>
+ <property name="cpp_namespace"></property>
+ <property name="cpp_precompiled_header"></property>
+ <property name="cpp_use_array_enum">0</property>
+ <property name="cpp_use_enum">0</property>
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
- <property name="event_generation">connect</property>
<property name="file">dialog_global_edit_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="lua_skip_events">1</property>
+ <property name="lua_ui_table">UI</property>
<property name="name">dialog_global_edit_tracks_and_vias_base</property>
- <property name="namespace"></property>
<property name="path">.</property>
- <property name="precompiled_header"></property>
+ <property name="php_disconnect_events">0</property>
+ <property name="php_disconnect_mode">source_name</property>
+ <property name="php_skip_events">1</property>
+ <property name="python_disconnect_events">0</property>
+ <property name="python_disconnect_mode">source_name</property>
+ <property name="python_image_path_wrapper_function_name"></property>
+ <property name="python_indent_with_spaces"></property>
+ <property name="python_skip_events">1</property>
<property name="relative_path">1</property>
- <property name="skip_lua_events">1</property>
- <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">0</property>
<property name="use_microsoft_bom">0</property>
+ <property name="use_native_eol">0</property>
<object class="Dialog" expanded="true">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@@ -92,10 +94,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -157,10 +159,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -252,10 +254,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -317,10 +319,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -380,10 +382,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -445,10 +447,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -531,10 +533,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -596,10 +598,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -683,10 +685,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -757,10 +759,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -784,7 +786,7 @@
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
- <property name="maxlength"></property>
+ <property name="maxlength">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
@@ -823,10 +825,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -887,10 +889,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -961,10 +963,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -988,7 +990,7 @@
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
- <property name="maxlength"></property>
+ <property name="maxlength">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
@@ -1027,10 +1029,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1103,10 +1105,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1184,10 +1186,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1266,10 +1268,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1328,10 +1330,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1414,10 +1416,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1476,10 +1478,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1561,10 +1563,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1623,10 +1625,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1817,10 +1819,10 @@
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
- <property name="aui_layer"></property>
+ <property name="aui_layer">0</property>
<property name="aui_name"></property>
- <property name="aui_position"></property>
- <property name="aui_row"></property>
+ <property name="aui_position">0</property>
+ <property name="aui_row">0</property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
@@ -1881,7 +1883,7 @@
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="true">
- <property name="Apply">0</property>
+ <property name="Apply">1</property>
<property name="Cancel">1</property>
<property name="ContextHelp">0</property>
<property name="Help">0</property>
diff --git a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h
index 660244428b..baca602f80 100644
--- a/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h
+++ b/pcbnew/dialogs/dialog_global_edit_tracks_and_vias_base.h
@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6-dirty)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@@ -70,6 +70,7 @@ class DIALOG_GLOBAL_EDIT_TRACKS_AND_VIAS_BASE : public DIALOG_SHIM
wxRadioButton* m_setToDesignRuleValues;
wxStdDialogButtonSizer* m_sdbSizer;
wxButton* m_sdbSizerOK;
+ wxButton* m_sdbSizerApply;
wxButton* m_sdbSizerCancel;
// Virtual event handlers, override them in your derived class