Woops, should have grepped the fbp files this time which I didn't the
first time either.
Thanks to Konstantin for showing the errors of my way, attached patch
that combines the first patch with the additional dialogs.
From 70f0cb0bdd3553fc7b3be36d6394bc68c172aa93 Mon Sep 17 00:00:00 2001
From: Mark Roszko mark.ros...@gmail.com
Date: Fri, 10 Oct 2014 00:54:10 -0400
Subject: [PATCH] Fix further references to modules in various dialogs in
pcbnew.
---
pcbnew/dialogs/dialog_block_options_base.cpp | 6 +-
pcbnew/dialogs/dialog_block_options_base.fbp | 10 +-
pcbnew/dialogs/dialog_block_options_base.h | 6 +-
pcbnew/dialogs/dialog_display_options_base.cpp | 6 +-
pcbnew/dialogs/dialog_display_options_base.fbp | 10 +-
pcbnew/dialogs/dialog_display_options_base.h | 6 +-
pcbnew/dialogs/dialog_exchange_modules_base.cpp| 6 +-
pcbnew/dialogs/dialog_exchange_modules_base.fbp| 8 +-
pcbnew/dialogs/dialog_exchange_modules_base.h | 4 +-
.../dialog_global_modules_fields_edition_base.cpp | 4 +-
.../dialog_global_modules_fields_edition_base.fbp | 6 +-
.../dialog_global_modules_fields_edition_base.h| 2 +-
pcbnew/dialogs/dialog_global_pads_edition_base.cpp | 6 +-
pcbnew/dialogs/dialog_global_pads_edition_base.fbp | 8 +-
pcbnew/dialogs/dialog_global_pads_edition_base.h | 2 +-
.../dialogs/dialog_graphic_items_options_base.cpp | 31 +++--
.../dialogs/dialog_graphic_items_options_base.fbp | 16 +--
pcbnew/dialogs/dialog_graphic_items_options_base.h | 21 ++--
pcbnew/dialogs/dialog_netlist_fbp.cpp | 8 +-
pcbnew/dialogs/dialog_netlist_fbp.fbp | 8 +-
pcbnew/dialogs/dialog_netlist_fbp.h| 2 +-
pcbnew/dialogs/dialog_pad_properties_base.cpp | 4 +-
pcbnew/dialogs/dialog_pad_properties_base.fbp | 6 +-
pcbnew/dialogs/dialog_pad_properties_base.h| 2 +-
pcbnew/dialogs/dialog_plot_base.cpp| 13 +-
pcbnew/dialogs/dialog_plot_base.fbp| 138 ++---
pcbnew/dialogs/dialog_plot_base.h | 2 +-
pcbnew/tool_pcb.cpp| 4 +-
pcbnew/toolbars_update_user_interface.cpp | 4 +-
29 files changed, 194 insertions(+), 155 deletions(-)
diff --git a/pcbnew/dialogs/dialog_block_options_base.cpp b/pcbnew/dialogs/dialog_block_options_base.cpp
index 6ad3e57..c41d41d 100644
--- a/pcbnew/dialogs/dialog_block_options_base.cpp
+++ b/pcbnew/dialogs/dialog_block_options_base.cpp
@@ -1,5 +1,5 @@
///
-// C++ code generated with wxFormBuilder (version Apr 10 2012)
+// C++ code generated with wxFormBuilder (version Jun 6 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO NOT EDIT THIS FILE!
@@ -22,14 +22,14 @@ DIALOG_BLOCK_OPTIONS_BASE::DIALOG_BLOCK_OPTIONS_BASE( wxWindow* parent, wxWindow
wxGridSizer* gSizer1;
gSizer1 = new wxGridSizer( 4, 2, 0, 0 );
- m_Include_Modules = new wxCheckBox( this, wxID_ANY, _(Include modules), wxDefaultPosition, wxDefaultSize, 0 );
+ m_Include_Modules = new wxCheckBox( this, wxID_ANY, _(Include footprints), wxDefaultPosition, wxDefaultSize, 0 );
gSizer1-Add( m_Include_Modules, 0, wxALL, 5 );
m_Include_PcbTextes = new wxCheckBox( this, wxID_ANY, _(Include text items), wxDefaultPosition, wxDefaultSize, 0 );
m_Include_PcbTextes-SetValue(true);
gSizer1-Add( m_Include_PcbTextes, 0, wxALL, 5 );
- m_IncludeLockedModules = new wxCheckBox( this, wxID_ANY, _(Include locked modules), wxDefaultPosition, wxDefaultSize, 0 );
+ m_IncludeLockedModules = new wxCheckBox( this, wxID_ANY, _(Include locked footprints), wxDefaultPosition, wxDefaultSize, 0 );
gSizer1-Add( m_IncludeLockedModules, 0, wxALL, 5 );
m_Include_Draw_Items = new wxCheckBox( this, wxID_ANY, _(Include drawings), wxDefaultPosition, wxDefaultSize, 0 );
diff --git a/pcbnew/dialogs/dialog_block_options_base.fbp b/pcbnew/dialogs/dialog_block_options_base.fbp
index b43baec..8e2d8d2 100644
--- a/pcbnew/dialogs/dialog_block_options_base.fbp
+++ b/pcbnew/dialogs/dialog_block_options_base.fbp
@@ -1,6 +1,6 @@
?xml version=1.0 encoding=UTF-8 standalone=yes ?
wxFormBuilder_Project
-FileVersion major=1 minor=11 /
+FileVersion major=1 minor=13 /
object class=Project expanded=1
property name=class_decoration/property
property name=code_generationC++/property
@@ -20,8 +20,10 @@
property name=path./property
property name=precompiled_header/property
property name=relative_path1/property
+property name=skip_lua_events1/property
property name=skip_php_events1/property
property name=skip_python_events1/property
+property name=ui_tableUI/property
property name=use_enum0/property
property name=use_microsoft_bom0/property
object class=Dialog expanded=1
@@ -42,7 +44,7 @@
property
